@vercel/next 4.15.21 → 4.15.23

package/dist/adapter/index.js

@@ -9711,6 +9711,17 @@ async function handleStaticOutputs(outputs, {
   );
 }
 var vercelConfig = JSON.parse(process.env.NEXT_ADAPTER_VERCEL_CONFIG || "{}");
+async function writeDeterministicRoutesManifest(distDir) {
+  const manifest = require(import_node_path.default.join(distDir, "routes-manifest.json"));
+  manifest.headers = [];
+  delete manifest.deploymentId;
+  const outputManifestPath = import_node_path.default.join(
+    distDir,
+    "routes-manifest-deterministic.json"
+  );
+  await import_promises.default.writeFile(outputManifestPath, JSON.stringify(manifest));
+  return outputManifestPath;
+}
 async function handleNodeOutputs(nodeOutputs, {
   config,
   distDir,
@@ -9738,6 +9749,14 @@ async function handleNodeOutputs(nodeOutputs, {
       break;
     }
   }
+  const routesManifestDeterministicRelativePath = import_node_path.default.posix.relative(
+    repoRoot,
+    await writeDeterministicRoutesManifest(distDir)
+  );
+  const routesManifestRelativePath = import_node_path.default.posix.join(
+    import_node_path.default.posix.relative(repoRoot, distDir),
+    "routes-manifest.json"
+  );
   await Promise.all(
     nodeOutputs.map(async (output) => {
       await fsSema.acquire();
@@ -9762,6 +9781,9 @@ async function handleNodeOutputs(nodeOutputs, {
           files[import_node_path.default.posix.relative(repoRoot, notFoundOutput.filePath)] = import_node_path.default.posix.relative(repoRoot, notFoundOutput.filePath);
         }
       }
+      if (files[routesManifestRelativePath]) {
+        files[routesManifestRelativePath] = routesManifestDeterministicRelativePath;
+      }
       const handlerFilePath = import_node_path.default.join(
         functionDir,
         handlerRelativeDir,

package/dist/adapter/node-handler.js

@@ -60,17 +60,16 @@ const getHandlerSource = (ctx) => `
     staticRoutes: staticRoutesRaw,
     i18n
   } = require("./" + path.posix.join(relativeDistDir, "routes-manifest.json"));
-  const hydrateRoutesManifestItem = (item) => {
-    return {
-      ...item,
-      namedRegex: new RegExp(item.namedRegex || item.regex)
-    };
-  };
   const matchOperatorsRegex = /[|\\{}()[\]^$+*?.-]/g;
   function escapeStringRegexp(str) {
     return str.replace(matchOperatorsRegex, "\\$&");
   }
-  const dynamicRoutes = dynamicRoutesRaw.map(hydrateRoutesManifestItem);
+  const dynamicRoutes = dynamicRoutesRaw.map((item) => {
+    return {
+      ...item,
+      namedRegex: new RegExp(item.namedRegex || item.regex)
+    };
+  });
   const staticRoutes = staticRoutesRaw.map((route) => {
     return {
       ...route,

package/dist/index.js

@@ -14260,6 +14260,7 @@ var CORRECT_MIDDLEWARE_ORDER_VERSION = "v12.1.7-canary.29";
 var NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION = "v12.1.7-canary.33";
 var EMPTY_ALLOW_QUERY_FOR_PRERENDERED_VERSION = "v12.2.0";
 var CORRECTED_MANIFESTS_VERSION = "v12.2.0";
+var DYNAMICALLY_RENDER_404_VERSION = "v16.2.0-canary.17";
 var PRELOAD_CHUNKS = {
   APP_ROUTER_PAGES: [
     ".next/server/webpack-runtime.js",
@@ -14478,6 +14479,10 @@ async function serverBuild({
     nextVersion,
     CORRECTED_MANIFESTS_VERSION
   );
+  const shouldUse404Prerender = import_semver4.default.lt(
+    nextVersion,
+    DYNAMICALLY_RENDER_404_VERSION
+  );
   let hasStatic500 = !!staticPages[import_path5.default.posix.join(entryDirectory, "500")];
   if (lambdaPageKeys.length === 0) {
     throw new import_build_utils2.NowBuildError({
@@ -14680,7 +14685,7 @@ async function serverBuild({
       mode: (await import_fs_extra5.default.lstat(nextServerFile)).mode,
       fsPath: nextServerFile
     });
-    if (static404Pages.size > 0) {
+    if (shouldUse404Prerender && static404Pages.size > 0) {
       if (i18n) {
         for (const locale of i18n.locales) {
           const static404Page2 = import_path5.default.posix.join(entryDirectory, locale, "404");
@@ -15093,11 +15098,11 @@ ${JSON.stringify(
       }
       const updatedManifestFiles = {};
       if (isCorrectManifests) {
-        for (const manifest of mayFilterManifests ? [
+        for (const manifest of [
           "routes-manifest.json",
           "server/pages-manifest.json",
-          ...appPathRoutesManifest ? ["server/app-paths-manifest.json"] : []
-        ] : ["routes-manifest.json"]) {
+          ...mayFilterManifests && appPathRoutesManifest ? ["server/app-paths-manifest.json"] : []
+        ]) {
           const fsPath = import_path5.default.join(entryPath, outputDirectory, manifest);
           const relativePath = import_path5.default.relative(baseDir, fsPath);
           delete group.pseudoLayer[relativePath];
@@ -15105,6 +15110,18 @@ ${JSON.stringify(
           if (manifest === "routes-manifest.json") {
             manifestData.headers = [];
             delete manifestData.deploymentId;
+          } else if (manifest === "server/pages-manifest.json" && !shouldUse404Prerender) {
+            if (manifestData["/404"] === "pages/404.html") {
+              manifestData["/404"] = lambdaPages["404.js"] && !lambdaAppPaths["404.js"] ? "pages/404.js" : "pages/_error.js";
+            }
+            if (i18n) {
+              for (const locale of i18n.locales) {
+                const locale404Key = `/${locale}/404`;
+                if (manifestData[locale404Key]?.endsWith("/404.html")) {
+                  manifestData[locale404Key] = lambdaPages["404.js"] && !lambdaAppPaths["404.js"] ? "pages/404.js" : "pages/_error.js";
+                }
+              }
+            }
           }
           if (mayFilterManifests) {
             const normalizedPages = new Set(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.15.21",
+  "version": "4.15.23",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -16,7 +16,7 @@
     "@vercel/nft": "1.1.1"
   },
   "devDependencies": {
-    "@next-community/adapter-vercel": "0.0.1-beta.3",
+    "@next-community/adapter-vercel": "0.0.1-beta.4",
     "@types/aws-lambda": "8.10.19",
     "@types/buffer-crc32": "0.2.0",
     "@types/bytes": "3.1.1",
@@ -53,7 +53,7 @@
     "test-listen": "1.1.0",
     "text-table": "0.2.0",
     "webpack-sources": "3.2.3",
-    "@vercel/build-utils": "13.2.16",
+    "@vercel/build-utils": "13.3.1",
     "@vercel/routing-utils": "5.3.2"
   },
   "scripts": {