@vercel/next 4.15.20 → 4.15.22

package/dist/adapter/node-handler.js

@@ -23,17 +23,10 @@ __export(node_handler_exports, {
 module.exports = __toCommonJS(node_handler_exports);
 const getHandlerSource = (ctx) => `
   process.env.NODE_ENV = 'production';
-  require('next/dist/server/node-environment');
-  require('next/dist/server/node-polyfill-crypto');
-  
-  try {
-    // this can fail to install if styled-jsx is not discoverable
-    // but this is tolerable as the require-hook is handling edge cases
-    require('next/dist/server/require-hook');
-  } catch (_) {}
-  
   process.chdir(__dirname);
   
+  require('next/setup-node-env')
+  
   const _n_handler = (${ctx.isMiddleware ? () => {
   const path = require("path");
   const relativeDistDir = process.env.__PRIVATE_RELATIVE_DIST_DIR;
@@ -242,10 +235,18 @@ const getHandlerSource = (ctx) => `
       }
     }
   };
+  function fixMojibake(input) {
+    const bytes = new Uint8Array(input.length);
+    for (let i = 0; i < input.length; i++) {
+      bytes[i] = input.charCodeAt(i);
+    }
+    const decoder = new TextDecoder("utf-8");
+    return decoder.decode(bytes);
+  }
   return async function handler(req, res, internalMetadata) {
     try {
       const parsedUrl = new URL(req.url || "/", "http://n");
-      let urlPathname = req.headers["x-matched-path"];
+      let urlPathname = typeof req.headers["x-matched-path"] === "string" ? fixMojibake(req.headers["x-matched-path"]) : void 0;
       if (typeof urlPathname !== "string") {
         console.log("no x-matched-path", { url: req.url });
         urlPathname = parsedUrl.pathname || "/";

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",
@@ -14473,7 +14474,15 @@ async function serverBuild({
     nextVersion,
     CORRECT_MIDDLEWARE_ORDER_VERSION
   );
-  const isCorrectManifests = !experimentalAllowBundling && import_semver4.default.gte(nextVersion, CORRECTED_MANIFESTS_VERSION);
+  const mayFilterManifests = !experimentalAllowBundling;
+  const isCorrectManifests = import_semver4.default.gte(
+    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({
@@ -14676,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");
@@ -15089,52 +15098,70 @@ ${JSON.stringify(
       }
       const updatedManifestFiles = {};
       if (isCorrectManifests) {
-        for (const manifest of [
+        for (const manifest of mayFilterManifests ? [
           "routes-manifest.json",
           "server/pages-manifest.json",
           ...appPathRoutesManifest ? ["server/app-paths-manifest.json"] : []
-        ]) {
+        ] : ["routes-manifest.json"]) {
           const fsPath = import_path5.default.join(entryPath, outputDirectory, manifest);
           const relativePath = import_path5.default.relative(baseDir, fsPath);
           delete group.pseudoLayer[relativePath];
           const manifestData = await import_fs_extra5.default.readJSON(fsPath);
-          const normalizedPages = new Set(
-            group.pages.map((page) => {
-              page = `/${page.replace(/\.js$/, "")}`;
-              if (page === "/index")
-                page = "/";
-              return page;
-            })
-          );
-          switch (manifest) {
-            case "routes-manifest.json": {
-              const filterItem = (item) => normalizedPages.has(item.page);
-              manifestData.dynamicRoutes = manifestData.dynamicRoutes?.filter(filterItem);
-              manifestData.staticRoutes = manifestData.staticRoutes?.filter(filterItem);
-              break;
+          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";
             }
-            case "server/pages-manifest.json": {
-              for (const key of Object.keys(manifestData)) {
-                if (isDynamicRoute(key, nextVersion) && !normalizedPages.has(key)) {
-                  delete manifestData[key];
+            if (i18n) {
+              for (const locale of i18n.locales) {
+                const locale404Key = `/${locale}/404`;
+                if (manifestData[locale404Key] === `pages/${locale}/404.html`) {
+                  manifestData[locale404Key] = lambdaPages["404.js"] && !lambdaAppPaths["404.js"] ? `pages/404.js` : "pages/_error.js";
                 }
               }
-              break;
             }
-            case "server/app-paths-manifest.json": {
-              for (const key of Object.keys(manifestData)) {
-                const normalizedKey = appPathRoutesManifest?.[key] || key.replace(/(^|\/)(page|route)$/, "");
-                if (isDynamicRoute(normalizedKey, nextVersion) && !normalizedPages.has(normalizedKey)) {
-                  delete manifestData[key];
+          }
+          if (mayFilterManifests) {
+            const normalizedPages = new Set(
+              group.pages.map((page) => {
+                page = `/${page.replace(/\.js$/, "")}`;
+                if (page === "/index")
+                  page = "/";
+                return page;
+              })
+            );
+            switch (manifest) {
+              case "routes-manifest.json": {
+                const filterItem = (item) => normalizedPages.has(item.page);
+                manifestData.dynamicRoutes = manifestData.dynamicRoutes?.filter(filterItem);
+                manifestData.staticRoutes = manifestData.staticRoutes?.filter(filterItem);
+                break;
+              }
+              case "server/pages-manifest.json": {
+                for (const key of Object.keys(manifestData)) {
+                  if (isDynamicRoute(key, nextVersion) && !normalizedPages.has(key)) {
+                    delete manifestData[key];
+                  }
                 }
+                break;
+              }
+              case "server/app-paths-manifest.json": {
+                for (const key of Object.keys(manifestData)) {
+                  const normalizedKey = appPathRoutesManifest?.[key] || key.replace(/(^|\/)(page|route)$/, "");
+                  if (isDynamicRoute(normalizedKey, nextVersion) && !normalizedPages.has(normalizedKey)) {
+                    delete manifestData[key];
+                  }
+                }
+                break;
+              }
+              default: {
+                throw new import_build_utils2.NowBuildError({
+                  message: `Unexpected manifest value ${manifest}, please contact support if this continues`,
+                  code: "NEXT_MANIFEST_INVARIANT"
+                });
               }
-              break;
-            }
-            default: {
-              throw new import_build_utils2.NowBuildError({
-                message: `Unexpected manifest value ${manifest}, please contact support if this continues`,
-                code: "NEXT_MANIFEST_INVARIANT"
-              });
             }
           }
           updatedManifestFiles[relativePath] = new import_build_utils2.FileBlob({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.15.20",
+  "version": "4.15.22",
   "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.2",
+    "@next-community/adapter-vercel": "0.0.1-beta.3",
     "@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.0",
     "@vercel/routing-utils": "5.3.2"
   },
   "scripts": {