ignore for now

cloudflare · Oct 3, 2024 · d039902 · d039902
1 parent 18e0e46
commit d039902
Show file tree

Hide file tree

Showing 20 changed files with 154 additions and 2,293 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/next-on-pages/package.json b/packages/next-on-pages/package.json
@@ -56,15 +56,14 @@
 	"dependencies": {
 		"acorn": "^8.8.0",
 		"ast-types": "^0.14.2",
+		"build-output-router": "^0.0.1-d4ce9a1",
 		"chalk": "^5.2.0",
 		"chokidar": "^3.5.3",
 		"commander": "^11.1.0",
-		"cookie": "^0.5.0",
 		"esbuild": "^0.15.3",
 		"js-yaml": "^4.1.0",
 		"miniflare": "^3.20231218.1",
 		"package-manager-manager": "^0.2.0",
-		"pcre-to-regexp": "^1.1.0",
 		"semver": "^7.5.2"
 	},
 	"devDependencies": {
@@ -88,9 +87,9 @@
 		"vitest-environment-miniflare": "^2.13.0"
 	},
 	"peerDependencies": {
+		"@cloudflare/workers-types": "^4.20240208.0",
 		"vercel": ">=30.0.0",
-		"wrangler": "^3.28.2",
-		"@cloudflare/workers-types": "^4.20240208.0"
+		"wrangler": "^3.28.2"
 	},
 	"peerDependenciesMeta": {
 		"@cloudflare/workers-types": {

diff --git a/packages/next-on-pages/src/buildApplication/buildWorkerFile.ts b/packages/next-on-pages/src/buildApplication/buildWorkerFile.ts
@@ -6,6 +6,7 @@ import { generateGlobalJs } from './generateGlobalJs';
 import type { ProcessedVercelOutput } from './processVercelOutput';
 import { getNodeEnv } from '../utils/getNodeEnv';
 import { normalizePath } from '../utils';
+import { collectLocalesFromRoutes } from 'build-output-router/router';
 import { cliLog } from '../cli';
 
 /**
@@ -20,10 +21,6 @@ export function constructBuildOutputRecord(
 	outputDir: string,
 ) {
 	if (item.type === 'static') {
-		return `{ type: ${JSON.stringify(item.type)} }`;
-	}
-
-	if (item.type === 'override') {
 		return `{
 				type: ${JSON.stringify(item.type)},
 				path: ${item.path ? JSON.stringify(item.path) : undefined},
@@ -86,7 +83,7 @@ export async function buildWorkerFile(
 			__CONFIG__: JSON.stringify(vercelConfig),
 			__NODE_ENV__: JSON.stringify(getNodeEnv()),
 			__BUILD_METADATA__: JSON.stringify({
-				collectedLocales: collectLocales(vercelConfig.routes),
+				collectedLocales: collectLocalesFromRoutes(vercelConfig.routes),
 			}),
 		},
 		outfile: outputFile,
@@ -134,22 +131,3 @@ type BuildWorkerFileOpts = {
 	customEntrypoint?: string;
 	minify?: boolean;
 };
-
-/**
- * Collects all the locales present in the processed Vercel routes
- *
- * @param routes The Vercel routes to collect the locales from
- * @returns an array containing all the found locales (without duplicates)
- */
-function collectLocales(routes: ProcessedVercelRoutes): string[] {
-	const locales = Object.values(routes)
-		.flat()
-		.flatMap(source => {
-			if (source.locale?.redirect) {
-				return Object.keys(source.locale.redirect);
-			}
-			return [];
-		})
-		.filter(Boolean);
-	return [...new Set(locales)];
-}
diff --git a/packages/next-on-pages/src/buildApplication/processVercelOutput.ts b/packages/next-on-pages/src/buildApplication/processVercelOutput.ts
@@ -230,8 +230,8 @@ function applyVercelOverrides(
 			const assetPath = addLeadingSlash(rawAssetPath);
 			const servedPath = addLeadingSlash(rawServedPath ?? '');
 
-			const newValue: BuildOutputStaticOverride = {
-				type: 'override',
+			const newValue: BuildOutputStaticAsset = {
+				type: 'static',
 				path: assetPath,
 				headers: contentType ? { 'content-type': contentType } : undefined,
 			};
@@ -270,14 +270,14 @@ function applyPrerenderedRoutes(
 		const path = route?.path ?? stripFuncExtension(relativePath);
 
 		vercelOutput.set(path, {
-			type: 'override',
+			type: 'static',
 			path,
 			headers: route?.headers,
 		});
 
 		route?.overrides?.forEach(overridenPath => {
 			vercelOutput.set(overridenPath, {
-				type: 'override',
+				type: 'static',
 				path,
 				headers: route?.headers,
 			});

diff --git a/packages/next-on-pages/templates/_worker.js/handleRequest.ts b/packages/next-on-pages/templates/_worker.js/handleRequest.ts
diff --git a/packages/next-on-pages/templates/_worker.js/index.ts b/packages/next-on-pages/templates/_worker.js/index.ts
@@ -1,12 +1,13 @@
 import { SUSPENSE_CACHE_URL } from '../cache';
-import { handleRequest } from './handleRequest';
 import { setupRoutesIsolation } from './routesIsolation';
 import {
 	adjustRequestForVercel,
+	getAssetsHandler,
 	handleImageResizingRequest,
 	patchFetch,
 } from './utils';
 import type { AsyncLocalStorage } from 'node:async_hooks';
+import { Router } from 'build-output-router';
 
 declare const __NODE_ENV__: string;
 
@@ -21,6 +22,11 @@ declare const __ALSes_PROMISE__: Promise<null | {
 	requestContextAsyncLocalStorage: AsyncLocalStorage<unknown>;
 }>;
 
+const router = new Router(__CONFIG__.routes, {
+	locales: new Set(__BUILD_METADATA__.collectedLocales),
+	wildcardConfig: __CONFIG__.wildcard,
+});
+
 export default {
 	async fetch(request, env, ctx) {
 		setupRoutesIsolation();
@@ -60,16 +66,13 @@ export default {
 
 						const adjustedRequest = adjustRequestForVercel(request);
 
-						return handleRequest(
-							{
-								request: adjustedRequest,
-								ctx,
-								assetsFetcher: env.ASSETS,
-							},
-							__CONFIG__,
-							__BUILD_OUTPUT__,
-							__BUILD_METADATA__,
-						);
+						const assets = getAssetsHandler(__BUILD_OUTPUT__, {
+							request: adjustedRequest,
+							ctx,
+							assetsFetcher: env.ASSETS,
+						});
+
+						return router.fetch({ request: adjustedRequest, ctx, assets });
 					},
 				);
 			},