@vercel/routing-utils 4.0.0 → 5.0.1

package/dist/superstatic.js

@@ -30,6 +30,37 @@ __export(superstatic_exports, {
 module.exports = __toCommonJS(superstatic_exports);
 var import_url = require("url");
 var import_path_to_regexp = require("path-to-regexp");
+var import_path_to_regexp_updated = require("path-to-regexp-updated");
+function pathToRegexp(callerId, path, keys, options) {
+  const currentRegExp = (0, import_path_to_regexp.pathToRegexp)(path, keys, options);
+  try {
+    const currentKeys = keys;
+    const newKeys = [];
+    const newRegExp = (0, import_path_to_regexp_updated.pathToRegexp)(path, newKeys, options);
+    const isDiffRegExp = currentRegExp.toString() !== newRegExp.toString();
+    if (process.env.FORCE_PATH_TO_REGEXP_LOG || isDiffRegExp) {
+      const message = JSON.stringify({
+        path,
+        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;
+}
 const UN_NAMED_SEGMENT = "__UN_NAMED_SEGMENT__";
 function getCleanUrls(filePaths) {
   const htmlFiles = filePaths.map(toRoute).filter((f) => f.endsWith(".html")).map((f) => ({
@@ -185,7 +216,7 @@ function convertTrailingSlash(enable, status = 308) {
 }
 function sourceToRegex(source) {
   const keys = [];
-  const r = (0, import_path_to_regexp.pathToRegexp)(source, keys, {
+  const r = pathToRegexp("632", source, keys, {
     strict: true,
     sensitive: true,
     delimiter: "/"
@@ -258,9 +289,9 @@ function replaceSegments(segments, hasItemSegments, destination, isRedirect, int
   const hashKeys = [];
   const hostnameKeys = [];
   try {
-    (0, import_path_to_regexp.pathToRegexp)(pathname, pathnameKeys);
-    (0, import_path_to_regexp.pathToRegexp)(hash || "", hashKeys);
-    (0, import_path_to_regexp.pathToRegexp)(hostname || "", hostnameKeys);
+    pathToRegexp("528", pathname, pathnameKeys);
+    pathToRegexp("834", hash || "", hashKeys);
+    pathToRegexp("712", hostname || "", hostnameKeys);
   } catch (_) {
   }
   destParams = new Set(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/routing-utils",
-  "version": "4.0.0",
+  "version": "5.0.1",
   "description": "Vercel routing utilities",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -14,17 +14,18 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "path-to-regexp": "6.3.0"
+    "path-to-regexp-updated": "npm:path-to-regexp@6.3.0",
+    "path-to-regexp": "6.1.0"
   },
   "devDependencies": {
     "@types/jest": "27.4.1",
     "@types/node": "14.18.33",
-    "ajv": "^6.0.0",
+    "ajv": "^6.12.3",
     "jest-junit": "16.0.0",
     "typescript": "4.9.5"
   },
   "optionalDependencies": {
-    "ajv": "^6.0.0"
+    "ajv": "^6.12.3"
   },
   "scripts": {
     "build": "node ../../utils/build.mjs",