@vercel/next 4.3.18 → 4.3.20

package/dist/index.js

@@ -426,7 +426,7 @@ var require_superstatic = __commonJS({
       collectHasSegments: () => collectHasSegments,
       convertCleanUrls: () => convertCleanUrls,
       convertHeaders: () => convertHeaders2,
-      convertRedirects: () => convertRedirects2,
+      convertRedirects: () => convertRedirects3,
       convertRewrites: () => convertRewrites2,
       convertTrailingSlash: () => convertTrailingSlash,
       getCleanUrls: () => getCleanUrls,
@@ -460,7 +460,7 @@ var require_superstatic = __commonJS({
       }
       return routes;
     }
-    function convertRedirects2(redirects, defaultStatus = 308) {
+    function convertRedirects3(redirects, defaultStatus = 308) {
       return redirects.map((r) => {
         const { src, segments } = sourceToRegex(r.source);
         const hasSegments = collectHasSegments(r.has);
@@ -10367,7 +10367,7 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_build_utils3 = require("@vercel/build-utils");
-var import_superstatic = __toESM(require_superstatic());
+var import_superstatic2 = __toESM(require_superstatic());
 var import_nft2 = require("@vercel/nft");
 var import_async_sema3 = __toESM(require_lib());
 var import_escape_string_regexp3 = __toESM(require_escape_string_regexp());
@@ -11955,7 +11955,12 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
     }
     let chain;
     let experimentalStreamingLambdaPath;
-    if (renderingMode === "PARTIALLY_STATIC" /* PARTIALLY_STATIC */ && experimentalStreamingLambdaPaths) {
+    if (renderingMode === "PARTIALLY_STATIC" /* PARTIALLY_STATIC */ && routesManifest?.ppr?.chain?.headers) {
+      chain = {
+        outputPath: pathnameToOutputName(entryDirectory, routeKey),
+        headers: routesManifest.ppr.chain.headers
+      };
+    } else if (renderingMode === "PARTIALLY_STATIC" /* PARTIALLY_STATIC */ && experimentalStreamingLambdaPaths) {
       let paths = experimentalStreamingLambdaPaths.get(
         pathnameToOutputName(entryDirectory, routeKey)
       );
@@ -11970,17 +11975,10 @@ var onPrerenderRoute = (prerenderRouteArgs) => async (routeKey, {
         );
       }
       experimentalStreamingLambdaPath = paths.output;
-      if (routesManifest?.ppr?.chain?.headers) {
-        chain = {
-          outputPath: pathnameToOutputName(entryDirectory, routeKey),
-          headers: routesManifest.ppr.chain.headers
-        };
-      } else {
-        chain = {
-          outputPath: paths.output,
-          headers: { "x-matched-path": paths.pathname }
-        };
-      }
+      chain = {
+        outputPath: paths.output,
+        headers: { "x-matched-path": paths.pathname }
+      };
     }
     let htmlAllowQuery = allowQuery;
     if (renderingMode === "PARTIALLY_STATIC" /* PARTIALLY_STATIC */ && isFallback) {
@@ -13085,6 +13083,7 @@ var import_resolve_from = __toESM(require_resolve_from());
 var import_fs_extra5 = __toESM(require_lib2());
 var import_escape_string_regexp2 = __toESM(require_escape_string_regexp());
 var import_pretty_bytes3 = __toESM(require_pretty_bytes());
+var import_superstatic = __toESM(require_superstatic());
 var CORRECT_NOT_FOUND_ROUTES_VERSION = "v12.0.1";
 var CORRECT_MIDDLEWARE_ORDER_VERSION = "v12.1.7-canary.29";
 var NEXT_DATA_MIDDLEWARE_RESOLVING_VERSION = "v12.1.7-canary.33";
@@ -13128,7 +13127,6 @@ async function serverBuild({
   dynamicPrefix,
   entryDirectory,
   outputDirectory,
-  redirects,
   beforeFilesRewrites,
   afterFilesRewrites,
   fallbackRewrites,
@@ -13149,7 +13147,6 @@ async function serverBuild({
   prerenderManifest,
   appPathRoutesManifest,
   omittedPrerenderRoutes,
-  trailingSlashRedirects,
   isCorrectLocaleAPIRoutes,
   requiredServerFilesManifest,
   variantsManifest,
@@ -13963,31 +13960,33 @@ ${JSON.stringify(
             throw new Error("Invariant: PPR lambda isn't streaming");
           }
           lambdas[outputName] = lambda;
-          if (!omittedPrerenderRoutes.has(pagePathname)) {
-            const output = getPostponeResumeOutput(entryDirectory, pageName);
-            lambdas[output] = lambda;
-            experimentalStreamingLambdaPaths.set(outputName, {
-              pathname: getPostponeResumePathname(pageName),
-              output
-            });
-          }
-          for (const [
-            routePathname,
-            { srcRoute, renderingMode }
-          ] of Object.entries(prerenderManifest.staticRoutes)) {
-            if (srcRoute !== pagePathname || renderingMode !== "PARTIALLY_STATIC" /* PARTIALLY_STATIC */)
-              continue;
-            if (routePathname === pagePathname)
-              continue;
-            const output = getPostponeResumePathname(routePathname);
-            lambdas[output] = lambda;
-            outputName = import_path4.default.posix.join(entryDirectory, routePathname);
-            experimentalStreamingLambdaPaths.set(outputName, {
-              pathname: getPostponeResumePathname(routePathname),
-              output
-            });
+          if (typeof routesManifest?.ppr?.chain?.headers === "undefined") {
+            if (!omittedPrerenderRoutes.has(pagePathname)) {
+              const output = getPostponeResumeOutput(entryDirectory, pageName);
+              lambdas[output] = lambda;
+              experimentalStreamingLambdaPaths.set(outputName, {
+                pathname: getPostponeResumePathname(pageName),
+                output
+              });
+            }
+            for (const [
+              routePathname,
+              { srcRoute, renderingMode }
+            ] of Object.entries(prerenderManifest.staticRoutes)) {
+              if (srcRoute !== pagePathname || renderingMode !== "PARTIALLY_STATIC" /* PARTIALLY_STATIC */)
+                continue;
+              if (routePathname === pagePathname)
+                continue;
+              const output = getPostponeResumePathname(routePathname);
+              lambdas[output] = lambda;
+              outputName = import_path4.default.posix.join(entryDirectory, routePathname);
+              experimentalStreamingLambdaPaths.set(outputName, {
+                pathname: getPostponeResumePathname(routePathname),
+                output
+              });
+            }
+            continue;
           }
-          continue;
         }
         if (!group.isAppRouter && !group.isAppRouteHandler) {
           outputName = normalizeIndexOutput(outputName, true);
@@ -14289,6 +14288,22 @@ ${JSON.stringify(
       lambdas[dataPathname] = lambdas[srcPathname];
     }
   }
+  const internalRedirects = [];
+  const userRedirects = [];
+  for (const redirect of routesManifest.redirects || []) {
+    if (redirect.internal) {
+      internalRedirects.push(redirect);
+    } else {
+      userRedirects.push(redirect);
+    }
+  }
+  const internalRedirectRoutes = (0, import_superstatic.convertRedirects)(internalRedirects).map(
+    (item) => {
+      item.continue = true;
+      return item;
+    }
+  );
+  const userRedirectRoutes = (0, import_superstatic.convertRedirects)(userRedirects);
   return {
     wildcard: wildcardConfig,
     images: getImagesConfig(imagesManifest),
@@ -14322,7 +14337,7 @@ ${JSON.stringify(
       // force trailingSlashRedirect to the very top so it doesn't
       // conflict with i18n routes that don't have or don't have the
       // trailing slash
-      ...trailingSlashRedirects,
+      ...internalRedirectRoutes,
       ...privateOutputs.routes,
       // normalize _next/data URL before processing redirects
       ...normalizeNextDataRoute(true),
@@ -14427,7 +14442,7 @@ ${JSON.stringify(
         }
       ] : [],
       ...headers,
-      ...redirects,
+      ...userRedirectRoutes,
       // middleware comes directly after redirects but before
       // beforeFiles rewrites as middleware is not a "file" route
       ...routesManifest?.skipMiddlewareUrlNormalize ? denormalizeNextDataRoute(true) : [],
@@ -14832,7 +14847,14 @@ ${JSON.stringify(
         }
       ] : [
         {
-          src: import_path4.default.posix.join("/", entryDirectory, ".*"),
+          src: import_path4.default.posix.join(
+            "/",
+            entryDirectory,
+            // if entryDirectory is populated we need to
+            // add optional handling for trailing slash so
+            // that the entryDirectory (basePath) itself matches
+            `${entryDirectory !== "." ? "?" : ""}.*`
+          ),
           dest: import_path4.default.posix.join(
             "/",
             entryDirectory,
@@ -14864,7 +14886,14 @@ ${JSON.stringify(
         }
       ] : [
         {
-          src: import_path4.default.posix.join("/", entryDirectory, ".*"),
+          src: import_path4.default.posix.join(
+            "/",
+            entryDirectory,
+            // if entryDirectory is populated we need to
+            // add optional handling for trailing slash so
+            // that the entryDirectory (basePath) itself matches
+            `${entryDirectory !== "." ? "?" : ""}.*`
+          ),
           dest: import_path4.default.posix.join(
             "/",
             entryDirectory,
@@ -15250,17 +15279,17 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
       case 2:
       case 3:
       case 4: {
-        redirects.push(...(0, import_superstatic.convertRedirects)(routesManifest.redirects));
+        redirects.push(...(0, import_superstatic2.convertRedirects)(routesManifest.redirects));
         if (Array.isArray(routesManifest.rewrites)) {
           afterFilesRewrites.push(
-            ...(0, import_superstatic.convertRewrites)(
+            ...(0, import_superstatic2.convertRewrites)(
               routesManifest.rewrites,
               routesManifest.i18n ? ["nextInternalLocale"] : void 0
             )
           );
         } else {
           beforeFilesRewrites.push(
-            ...(0, import_superstatic.convertRewrites)(routesManifest.rewrites.beforeFiles).map((r) => {
+            ...(0, import_superstatic2.convertRewrites)(routesManifest.rewrites.beforeFiles).map((r) => {
               if ("check" in r) {
                 if (beforeFilesShouldContinue) {
                   delete r.check;
@@ -15272,14 +15301,14 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
             })
           );
           afterFilesRewrites.push(
-            ...(0, import_superstatic.convertRewrites)(routesManifest.rewrites.afterFiles)
+            ...(0, import_superstatic2.convertRewrites)(routesManifest.rewrites.afterFiles)
           );
           fallbackRewrites.push(
-            ...(0, import_superstatic.convertRewrites)(routesManifest.rewrites.fallback)
+            ...(0, import_superstatic2.convertRewrites)(routesManifest.rewrites.fallback)
           );
         }
         if (routesManifest.headers) {
-          headers.push(...(0, import_superstatic.convertHeaders)(routesManifest.headers));
+          headers.push(...(0, import_superstatic2.convertHeaders)(routesManifest.headers));
         }
         if (import_semver4.default.gte(nextVersion, REDIRECTS_NO_STATIC_NEXT_VERSION)) {
           redirects.forEach(
@@ -15829,7 +15858,6 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
         afterFilesRewrites,
         fallbackRewrites,
         workPath,
-        redirects,
         nodeVersion,
         dynamicPrefix,
         routesManifest,
@@ -15843,7 +15871,6 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
         buildId,
         escapedBuildId,
         outputDirectory,
-        trailingSlashRedirects,
         requiredServerFilesManifest,
         privateOutputs,
         hasIsr404Page,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.3.18",
+  "version": "4.3.20",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",