@vercel/next 4.4.2 → 4.4.4

package/dist/index.js

@@ -433,7 +433,7 @@ var require_superstatic = __commonJS({
       sourceToRegex: () => sourceToRegex
     });
     module2.exports = __toCommonJS2(superstatic_exports);
-    var import_url3 = require("url");
+    var import_url4 = require("url");
     var import_path_to_regexp = require_dist();
     var UN_NAMED_SEGMENT = "__UN_NAMED_SEGMENT__";
     function getCleanUrls(filePaths) {
@@ -649,7 +649,7 @@ var require_superstatic = __commonJS({
         indexes[name] = "$" + name;
         escapedDestination = escapeSegment(escapedDestination, name);
       });
-      const parsedDestination = (0, import_url3.parse)(escapedDestination, true);
+      const parsedDestination = (0, import_url4.parse)(escapedDestination, true);
       delete parsedDestination.href;
       delete parsedDestination.path;
       delete parsedDestination.search;
@@ -701,7 +701,7 @@ var require_superstatic = __commonJS({
           }
         }
       }
-      destination = (0, import_url3.format)({
+      destination = (0, import_url4.format)({
         ...rest,
         hostname,
         pathname,
@@ -7736,24 +7736,24 @@ var require_util = __commonJS({
     }
     exports.urlParse = urlParse;
     function urlGenerate(aParsedUrl) {
-      let url3 = "";
+      let url4 = "";
       if (aParsedUrl.scheme) {
-        url3 += aParsedUrl.scheme + ":";
+        url4 += aParsedUrl.scheme + ":";
       }
-      url3 += "//";
+      url4 += "//";
       if (aParsedUrl.auth) {
-        url3 += aParsedUrl.auth + "@";
+        url4 += aParsedUrl.auth + "@";
       }
       if (aParsedUrl.host) {
-        url3 += aParsedUrl.host;
+        url4 += aParsedUrl.host;
       }
       if (aParsedUrl.port) {
-        url3 += ":" + aParsedUrl.port;
+        url4 += ":" + aParsedUrl.port;
       }
       if (aParsedUrl.path) {
-        url3 += aParsedUrl.path;
+        url4 += aParsedUrl.path;
       }
-      return url3;
+      return url4;
     }
     exports.urlGenerate = urlGenerate;
     var MAX_CACHED_INPUTS = 32;
@@ -7781,12 +7781,12 @@ var require_util = __commonJS({
     }
     var normalize = lruMemoize(function normalize2(aPath) {
       let path5 = aPath;
-      const url3 = urlParse(aPath);
-      if (url3) {
-        if (!url3.path) {
+      const url4 = urlParse(aPath);
+      if (url4) {
+        if (!url4.path) {
           return aPath;
         }
-        path5 = url3.path;
+        path5 = url4.path;
       }
       const isAbsolute = exports.isAbsolute(path5);
       const parts = [];
@@ -7826,9 +7826,9 @@ var require_util = __commonJS({
       if (path5 === "") {
         path5 = isAbsolute ? "/" : ".";
       }
-      if (url3) {
-        url3.path = path5;
-        return urlGenerate(url3);
+      if (url4) {
+        url4.path = path5;
+        return urlGenerate(url4);
       }
       return path5;
     });
@@ -9149,13 +9149,13 @@ var require_source_map_consumer = __commonJS({
         if (this.sourceRoot != null) {
           relativeSource = util.relative(this.sourceRoot, relativeSource);
         }
-        let url3;
-        if (this.sourceRoot != null && (url3 = util.urlParse(this.sourceRoot))) {
+        let url4;
+        if (this.sourceRoot != null && (url4 = util.urlParse(this.sourceRoot))) {
           const fileUriAbsPath = relativeSource.replace(/^file:\/\//, "");
-          if (url3.scheme == "file" && this._sources.has(fileUriAbsPath)) {
+          if (url4.scheme == "file" && this._sources.has(fileUriAbsPath)) {
             return this.sourcesContent[this._sources.indexOf(fileUriAbsPath)];
           }
-          if ((!url3.path || url3.path == "/") && this._sources.has("/" + relativeSource)) {
+          if ((!url4.path || url4.path == "/") && this._sources.has("/" + relativeSource)) {
             return this.sourcesContent[this._sources.indexOf("/" + relativeSource)];
           }
         }
@@ -10374,7 +10374,7 @@ var import_find_up = __toESM(require_find_up());
 var import_fs_extra6 = __toESM(require_lib2());
 var import_path5 = __toESM(require("path"));
 var import_semver4 = __toESM(require_semver());
-var import_url2 = __toESM(require("url"));
+var import_url3 = __toESM(require("url"));
 
 // src/create-serverless-config.ts
 var import_fs_extra4 = __toESM(require_lib2());
@@ -10545,6 +10545,9 @@ var RSC_PREFETCH_SUFFIX = ".prefetch.rsc";
 var MAX_UNCOMPRESSED_LAMBDA_SIZE = !isNaN(
   Number(process.env.MAX_UNCOMPRESSED_LAMBDA_SIZE)
 ) ? Number(process.env.MAX_UNCOMPRESSED_LAMBDA_SIZE) : DEFAULT_MAX_UNCOMPRESSED_LAMBDA_SIZE;
+var skipDefaultLocaleRewrite = Boolean(
+  process.env.NEXT_EXPERIMENTAL_DEFER_DEFAULT_LOCALE_REWRITE
+);
 var TEST_DYNAMIC_ROUTE = /\/\[[^\/]+?\](?=\/|$)/;
 function isDynamicRoute(route) {
   route = route.startsWith("/") ? route : `/${route}`;
@@ -10823,9 +10826,12 @@ async function getDynamicRoutes({
   return routes;
 }
 function localizeDynamicRoutes(dynamicRoutes, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, isServerMode, isCorrectLocaleAPIRoutes, inversedAppPathRoutesManifest) {
-  return dynamicRoutes.map((route) => {
-    if (route.middleware !== void 0 || route.middlewarePath !== void 0)
-      return route;
+  const finalDynamicRoutes = [];
+  for (const route of dynamicRoutes) {
+    if (route.middleware !== void 0 || route.middlewarePath !== void 0) {
+      finalDynamicRoutes.push(route);
+      continue;
+    }
     const { i18n } = routesManifest || {};
     if (i18n) {
       const { pathname } = import_url.default.parse(route.dest);
@@ -10836,6 +10842,14 @@ function localizeDynamicRoutes(dynamicRoutes, dynamicPrefix, entryDirectory, sta
       const isAutoExport = staticPages[addLocaleOrDefault(pathname, routesManifest).substring(1)];
       const isAppRoute = inversedAppPathRoutesManifest?.[pathnameNoPrefix || ""];
       const isLocalePrefixed = isFallback || isBlocking || isAutoExport || isServerMode;
+      if (skipDefaultLocaleRewrite && isLocalePrefixed && routesManifest?.i18n?.localeDetection === false) {
+        const nonLocalePrefixedRoute = JSON.parse(JSON.stringify(route));
+        nonLocalePrefixedRoute.src = nonLocalePrefixedRoute.src.replace(
+          "^",
+          `^${dynamicPrefix || ""}[/]?`
+        );
+        finalDynamicRoutes.push(nonLocalePrefixedRoute);
+      }
       route.src = route.src.replace(
         "^",
         `^${dynamicPrefix ? `${dynamicPrefix}[/]?` : "[/]?"}(?${isLocalePrefixed ? "<nextLocale>" : ":"}${i18n.locales.map((locale) => (0, import_escape_string_regexp.default)(locale)).join("|")})?`
@@ -10849,8 +10863,9 @@ function localizeDynamicRoutes(dynamicRoutes, dynamicPrefix, entryDirectory, sta
     } else {
       route.src = route.src.replace("^", `^${dynamicPrefix}`);
     }
-    return route;
-  });
+    finalDynamicRoutes.push(route);
+  }
+  return finalDynamicRoutes;
 }
 async function getImagesManifest(entryPath, outputDirectory) {
   const pathImagesManifest = import_path2.default.join(
@@ -13097,6 +13112,7 @@ var legacy_versions_default = [
 
 // src/server-build.ts
 var import_path4 = __toESM(require("path"));
+var import_url2 = __toESM(require("url"));
 var import_semver3 = __toESM(require_semver());
 var import_async_sema2 = __toESM(require_lib());
 var import_build_utils2 = require("@vercel/build-utils");
@@ -13186,6 +13202,9 @@ async function serverBuild({
   const experimentalAllowBundling = Boolean(
     process.env.NEXT_EXPERIMENTAL_FUNCTION_BUNDLING
   );
+  const skipDefaultLocaleRewrite2 = Boolean(
+    process.env.NEXT_EXPERIMENTAL_DEFER_DEFAULT_LOCALE_REWRITE
+  );
   const lambdas = {};
   const prerenders = {};
   const lambdaPageKeys = Object.keys(lambdaPages);
@@ -13205,6 +13224,7 @@ async function serverBuild({
   let appRscPrefetches = {};
   let appBuildTraces = {};
   let appDir = null;
+  const rscHeader = routesManifest.rsc?.header?.toLowerCase() || "__rsc__";
   if (appPathRoutesManifest) {
     appDir = import_path4.default.join(pagesDir, "../app");
     appBuildTraces = await (0, import_build_utils2.glob)("**/*.js.nft.json", appDir);
@@ -13216,20 +13236,84 @@ async function serverBuild({
         value.contentType = rscContentTypeHeader;
       }
     }
-    for (const rewrite of afterFilesRewrites) {
-      if (rewrite.src && rewrite.dest) {
-        const rscSuffix = isAppPPREnabled ? `(\\.prefetch)?\\.rsc` : "\\.rsc";
-        rewrite.src = rewrite.src.replace(
-          /\/?\(\?:\/\)\?/,
-          `(?<rscsuff>${rscSuffix})?(?:/)?`
+    const modifyRewrites = (rewrites, isAfterFilesRewrite = false) => {
+      for (let i = 0; i < rewrites.length; i++) {
+        const rewrite = rewrites[i];
+        if (!rewrite.src || !rewrite.dest)
+          continue;
+        const { protocol, pathname, query } = import_url2.default.parse(rewrite.dest);
+        if (isAfterFilesRewrite) {
+          const rscSuffix = isAppPPREnabled ? `(\\.prefetch)?\\.rsc` : "\\.rsc";
+          rewrite.src = rewrite.src.replace(
+            /\/?\(\?:\/\)\?/,
+            `(?<rscsuff>${rscSuffix})?(?:/)?`
+          );
+          let destQueryIndex = rewrite.dest.indexOf("?");
+          if (destQueryIndex === -1) {
+            destQueryIndex = rewrite.dest.length;
+          }
+          rewrite.dest = rewrite.dest.substring(0, destQueryIndex) + "$rscsuff" + rewrite.dest.substring(destQueryIndex);
+        }
+        const { rewriteHeaders } = routesManifest;
+        if (!rewriteHeaders)
+          continue;
+        if (protocol || !pathname && !query)
+          continue;
+        const missing = "missing" in rewrite && rewrite.missing ? rewrite.missing : [];
+        let found = missing.filter(
+          (h) => h.type === "header" && h.key.toLowerCase() === rscHeader
+        );
+        if (found.some(
+          (m) => (
+            // These are rules that don't have a value check or those that
+            // have their value set to '1'.
+            !m.value || m.value === "1"
+          )
+        )) {
+          continue;
+        }
+        const has = "has" in rewrite && rewrite.has ? (
+          // As we mutate the array below, we need to clone it to avoid
+          // mutating the original
+          [...rewrite.has]
+        ) : [];
+        found = has.filter(
+          (h) => h.type === "header" && h.key.toLowerCase() === rscHeader
         );
-        let destQueryIndex = rewrite.dest.indexOf("?");
-        if (destQueryIndex === -1) {
-          destQueryIndex = rewrite.dest.length;
+        if (found.some(
+          (h) => (
+            // These are rules that have a value set to anything other than
+            // '1'.
+            h.value && h.value !== "1"
+          )
+        )) {
+          continue;
         }
-        rewrite.dest = rewrite.dest.substring(0, destQueryIndex) + "$rscsuff" + rewrite.dest.substring(destQueryIndex);
+        for (const h of found) {
+          has.splice(has.indexOf(h), 1);
+        }
+        has.push({ type: "header", key: rscHeader, value: "1" });
+        const headers2 = "headers" in rewrite && rewrite.headers ? (
+          // Clone the existing headers to avoid mutating the original
+          // object.
+          { ...rewrite.headers }
+        ) : {};
+        const updated = {
+          ...rewrite,
+          has,
+          headers: headers2
+        };
+        if (pathname)
+          headers2[rewriteHeaders.pathHeader] = pathname;
+        if (query)
+          headers2[rewriteHeaders.queryHeader] = query;
+        rewrites.splice(i, 0, updated);
+        i++;
       }
-    }
+    };
+    modifyRewrites(beforeFilesRewrites);
+    modifyRewrites(afterFilesRewrites, true);
+    modifyRewrites(fallbackRewrites);
   }
   const isCorrectNotFoundRoutes = import_semver3.default.gte(
     nextVersion,
@@ -14282,7 +14366,6 @@ ${JSON.stringify(
       }
     }
   }
-  const rscHeader = routesManifest.rsc?.header?.toLowerCase() || "__rsc__";
   const rscPrefetchHeader = routesManifest.rsc?.prefetchHeader?.toLowerCase();
   const rscVaryHeader = routesManifest?.rsc?.varyHeader || "RSC, Next-Router-State-Tree, Next-Router-Prefetch";
   const appNotFoundPath = import_path4.default.posix.join(".", entryDirectory, "_not-found");
@@ -14420,33 +14503,38 @@ ${JSON.stringify(
             continue: true
           }
         ] : [],
-        {
-          src: `^${import_path4.default.posix.join("/", entryDirectory)}$`,
-          dest: `${import_path4.default.posix.join(
-            "/",
-            entryDirectory,
-            i18n.defaultLocale
-          )}`,
-          continue: true
-        },
-        // Auto-prefix non-locale path with default locale
-        // note for prerendered pages this will cause
-        // x-now-route-matches to contain the path minus the locale
-        // e.g. for /de/posts/[slug] x-now-route-matches would have
-        // 1=posts%2Fpost-1
-        {
-          src: `^${import_path4.default.posix.join(
-            "/",
-            entryDirectory,
-            "/"
-          )}(?!(?:_next/.*|${i18n.locales.map((locale) => (0, import_escape_string_regexp2.default)(locale)).join("|")})(?:/.*|$))(.*)$`,
-          dest: `${import_path4.default.posix.join(
-            "/",
-            entryDirectory,
-            i18n.defaultLocale
-          )}/$1`,
-          continue: true
-        }
+        // We only want to add these rewrites before user redirects
+        // when `skipDefaultLocaleRewrite` is not flagged on
+        // and when localeDetection is enabled.
+        ...!skipDefaultLocaleRewrite2 || i18n.localeDetection !== false ? [
+          {
+            src: `^${import_path4.default.posix.join("/", entryDirectory)}$`,
+            dest: `${import_path4.default.posix.join(
+              "/",
+              entryDirectory,
+              i18n.defaultLocale
+            )}`,
+            continue: true
+          },
+          // Auto-prefix non-locale path with default locale
+          // note for prerendered pages this will cause
+          // x-now-route-matches to contain the path minus the locale
+          // e.g. for /de/posts/[slug] x-now-route-matches would have
+          // 1=posts%2Fpost-1
+          {
+            src: `^${import_path4.default.posix.join(
+              "/",
+              entryDirectory,
+              "/"
+            )}(?!(?:_next/.*|${i18n.locales.map((locale) => (0, import_escape_string_regexp2.default)(locale)).join("|")})(?:/.*|$))(.*)$`,
+            dest: `${import_path4.default.posix.join(
+              "/",
+              entryDirectory,
+              i18n.defaultLocale
+            )}/$1`,
+            continue: true
+          }
+        ] : []
       ] : [],
       ...headers,
       ...redirects,
@@ -14677,6 +14765,37 @@ ${JSON.stringify(
       // remove locale prefixes to check public files and
       // to allow checking non-prefixed lambda outputs
       ...i18n ? [
+        // When `skipDefaultLocaleRewrite` is flagged on and localeDetection is disabled,
+        // we only want to add the rewrite as the fallback case once routing is complete.
+        ...skipDefaultLocaleRewrite2 && i18n.localeDetection === false ? [
+          {
+            src: `^${import_path4.default.posix.join("/", entryDirectory)}$`,
+            dest: `${import_path4.default.posix.join(
+              "/",
+              entryDirectory,
+              i18n.defaultLocale
+            )}`,
+            check: true
+          },
+          // Auto-prefix non-locale path with default locale
+          // note for prerendered pages this will cause
+          // x-now-route-matches to contain the path minus the locale
+          // e.g. for /de/posts/[slug] x-now-route-matches would have
+          // 1=posts%2Fpost-1
+          {
+            src: `^${import_path4.default.posix.join(
+              "/",
+              entryDirectory,
+              "/"
+            )}(?!(?:_next/.*|${i18n.locales.map((locale) => (0, import_escape_string_regexp2.default)(locale)).join("|")})(?:/.*|$))(.*)$`,
+            dest: `${import_path4.default.posix.join(
+              "/",
+              entryDirectory,
+              i18n.defaultLocale
+            )}/$1`,
+            check: true
+          }
+        ] : [],
         {
           src: import_path4.default.posix.join(
             "/",
@@ -16578,7 +16697,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
     for (let i = 0; i < dynamicRoutes.length; i++) {
       const route = dynamicRoutes[i];
       mergedDynamicRoutesLambdaRoutes.push(route);
-      const { pathname } = import_url2.default.parse(route.dest);
+      const { pathname } = import_url3.default.parse(route.dest);
       if (pathname && pageLambdaMap[pathname]) {
         mergedDynamicRoutesLambdaRoutes.push(
           dynamicPageLambdaRoutesMap[pathname]
@@ -16588,7 +16707,7 @@ More info: http://err.sh/vercel/vercel/next-functions-config-optimized-lambdas`
     for (let i = 0; i < dataRoutes.length; i++) {
       const route = dataRoutes[i];
       mergedDataRoutesLambdaRoutes.push(route);
-      const { pathname } = import_url2.default.parse(route.dest);
+      const { pathname } = import_url3.default.parse(route.dest);
       if (pathname && pageLambdaMap[pathname] && dynamicPageLambdaRoutesMap[pathname]) {
         mergedDataRoutesLambdaRoutes.push(dynamicPageLambdaRoutesMap[pathname]);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.4.2",
+  "version": "4.4.4",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -30,7 +30,7 @@
     "@types/semver": "6.0.0",
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
-    "@vercel/build-utils": "9.0.1",
+    "@vercel/build-utils": "9.1.0",
     "@vercel/routing-utils": "5.0.0",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",