@vercel/next 4.5.0 → 4.5.1

package/dist/index.js

@@ -790,6 +790,66 @@ var require_dist2 = __commonJS({
   }
 });
 
+// ../../internals/path-to-regexp/dist/index.js
+var require_dist3 = __commonJS({
+  "../../internals/path-to-regexp/dist/index.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.compile = exports.pathToRegexp = void 0;
+    var path_to_regexp_1 = require_dist();
+    Object.defineProperty(exports, "compile", { enumerable: true, get: function() {
+      return path_to_regexp_1.compile;
+    } });
+    var path_to_regexp_updated_1 = require_dist2();
+    function cloneKeys(keys) {
+      if (typeof keys === "undefined") {
+        return void 0;
+      }
+      return keys.slice(0);
+    }
+    function compareKeys(left, right) {
+      const leftSerialized = typeof left === "undefined" ? "undefined" : left.toString();
+      const rightSerialized = typeof right === "undefined" ? "undefined" : right.toString();
+      return leftSerialized === rightSerialized;
+    }
+    function pathToRegexp(callerId, path5, keys, options) {
+      const newKeys = cloneKeys(keys);
+      const currentRegExp = (0, path_to_regexp_1.pathToRegexp)(path5, keys, options);
+      try {
+        const currentKeys = keys;
+        const newRegExp = (0, path_to_regexp_updated_1.pathToRegexp)(path5, newKeys, options);
+        const isDiffRegExp = currentRegExp.toString() !== newRegExp.toString();
+        if (process.env.FORCE_PATH_TO_REGEXP_LOG || isDiffRegExp) {
+          const message = JSON.stringify({
+            path: path5,
+            currentRegExp: currentRegExp.toString(),
+            newRegExp: newRegExp.toString()
+          });
+          console.error(`[vc] PATH TO REGEXP PATH DIFF @ #${callerId}: ${message}`);
+        }
+        const isDiffKeys = !compareKeys(keys, newKeys);
+        if (process.env.FORCE_PATH_TO_REGEXP_LOG || isDiffKeys) {
+          const message = JSON.stringify({
+            isDiffKeys,
+            currentKeys,
+            newKeys
+          });
+          console.error(`[vc] PATH TO REGEXP KEYS DIFF @ #${callerId}: ${message}`);
+        }
+      } catch (err) {
+        const error = err;
+        const message = JSON.stringify({
+          path: path5,
+          error: error.message
+        });
+        console.error(`[vc] PATH TO REGEXP ERROR @ #${callerId}: ${message}`);
+      }
+      return currentRegExp;
+    }
+    exports.pathToRegexp = pathToRegexp;
+  }
+});
+
 // ../routing-utils/dist/superstatic.js
 var require_superstatic = __commonJS({
   "../routing-utils/dist/superstatic.js"(exports, module2) {
@@ -824,38 +884,7 @@ var require_superstatic = __commonJS({
     });
     module2.exports = __toCommonJS2(superstatic_exports);
     var import_url4 = require("url");
-    var import_path_to_regexp = require_dist();
-    var import_path_to_regexp_updated = require_dist2();
-    function pathToRegexp(callerId, path5, keys, options) {
-      const currentRegExp = (0, import_path_to_regexp.pathToRegexp)(path5, keys, options);
-      try {
-        const currentKeys = keys;
-        const newKeys = [];
-        const newRegExp = (0, import_path_to_regexp_updated.pathToRegexp)(path5, newKeys, options);
-        const isDiffRegExp = currentRegExp.toString() !== newRegExp.toString();
-        if (process.env.FORCE_PATH_TO_REGEXP_LOG || isDiffRegExp) {
-          const message = JSON.stringify({
-            path: path5,
-            currentRegExp: currentRegExp.toString(),
-            newRegExp: newRegExp.toString()
-          });
-          console.error(`[vc] PATH TO REGEXP PATH DIFF @ #${callerId}: ${message}`);
-        }
-        const isDiffKeys = keys?.toString() !== newKeys?.toString();
-        if (process.env.FORCE_PATH_TO_REGEXP_LOG || isDiffKeys) {
-          const message = JSON.stringify({
-            isDiffKeys,
-            currentKeys,
-            newKeys
-          });
-          console.error(`[vc] PATH TO REGEXP KEYS DIFF @ #${callerId}: ${message}`);
-        }
-      } catch (err) {
-        const error = err;
-        console.error(`[vc] PATH TO REGEXP ERROR @ #${callerId}: ${error.message}`);
-      }
-      return currentRegExp;
-    }
+    var import_path_to_regexp = require_dist3();
     var UN_NAMED_SEGMENT = "__UN_NAMED_SEGMENT__";
     function getCleanUrls(filePaths) {
       const htmlFiles = filePaths.map(toRoute).filter((f) => f.endsWith(".html")).map((f) => ({
@@ -1011,7 +1040,7 @@ var require_superstatic = __commonJS({
     }
     function sourceToRegex(source) {
       const keys = [];
-      const r = pathToRegexp("632", source, keys, {
+      const r = (0, import_path_to_regexp.pathToRegexp)("632", source, keys, {
         strict: true,
         sensitive: true,
         delimiter: "/"
@@ -1084,9 +1113,9 @@ var require_superstatic = __commonJS({
       const hashKeys = [];
       const hostnameKeys = [];
       try {
-        pathToRegexp("528", pathname, pathnameKeys);
-        pathToRegexp("834", hash || "", hashKeys);
-        pathToRegexp("712", hostname || "", hostnameKeys);
+        (0, import_path_to_regexp.pathToRegexp)("528", pathname, pathnameKeys);
+        (0, import_path_to_regexp.pathToRegexp)("834", hash || "", hashKeys);
+        (0, import_path_to_regexp.pathToRegexp)("712", hostname || "", hostnameKeys);
       } catch (_) {
       }
       destParams = new Set(
@@ -11248,6 +11277,7 @@ async function getDynamicRoutes({
 }
 function localizeDynamicRoutes(dynamicRoutes, dynamicPrefix, entryDirectory, staticPages, prerenderManifest, routesManifest, isServerMode, isCorrectLocaleAPIRoutes, inversedAppPathRoutesManifest) {
   const finalDynamicRoutes = [];
+  const nonLocalePrefixedRoutes = [];
   for (const route of dynamicRoutes) {
     if (route.middleware !== void 0 || route.middlewarePath !== void 0) {
       finalDynamicRoutes.push(route);
@@ -11269,11 +11299,13 @@ function localizeDynamicRoutes(dynamicRoutes, dynamicPrefix, entryDirectory, sta
           "^",
           `^${dynamicPrefix || ""}[/]?`
         );
-        finalDynamicRoutes.push(nonLocalePrefixedRoute);
+        nonLocalePrefixedRoutes.push(nonLocalePrefixedRoute);
       }
       route.src = route.src.replace(
         "^",
-        `^${dynamicPrefix ? `${dynamicPrefix}[/]?` : "[/]?"}(?${isLocalePrefixed ? "<nextLocale>" : ":"}${i18n.locales.map((locale) => (0, import_escape_string_regexp.default)(locale)).join("|")})?`
+        `^${dynamicPrefix ? `${dynamicPrefix}[/]?` : "[/]?"}(?${isLocalePrefixed ? "<nextLocale>" : ":"}${i18n.locales.map((locale) => (0, import_escape_string_regexp.default)(locale)).join("|")})${// the locale is not optional on this path with the skip default
+        // locale rewrite flag otherwise can cause double slash in dest
+        skipDefaultLocaleRewrite ? "" : "?"}`
       );
       if (isLocalePrefixed && !(isCorrectLocaleAPIRoutes && isApiRoute) && !isAppRoute) {
         route.dest = route.dest.replace(
@@ -11286,6 +11318,9 @@ function localizeDynamicRoutes(dynamicRoutes, dynamicPrefix, entryDirectory, sta
     }
     finalDynamicRoutes.push(route);
   }
+  if (nonLocalePrefixedRoutes.length > 0) {
+    finalDynamicRoutes.push(...nonLocalePrefixedRoutes);
+  }
   return finalDynamicRoutes;
 }
 async function getImagesManifest(entryPath, outputDirectory) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/next",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/next-js",
@@ -31,7 +31,7 @@
     "@types/text-table": "0.2.1",
     "@types/webpack-sources": "3.2.0",
     "@vercel/build-utils": "9.2.0",
-    "@vercel/routing-utils": "5.0.2",
+    "@vercel/routing-utils": "5.0.3",
     "async-sema": "3.0.1",
     "buffer-crc32": "0.2.13",
     "bytes": "3.1.2",