@vercel/remix-builder 5.2.1 → 5.2.3

package/dist/index.js

@@ -2442,12 +2442,11 @@ var require_semver2 = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/path-to-regexp@6.2.1/node_modules/path-to-regexp/dist/index.js
+// ../../node_modules/.pnpm/path-to-regexp@6.1.0/node_modules/path-to-regexp/dist/index.js
 var require_dist = __commonJS({
-  "../../node_modules/.pnpm/path-to-regexp@6.2.1/node_modules/path-to-regexp/dist/index.js"(exports) {
+  "../../node_modules/.pnpm/path-to-regexp@6.1.0/node_modules/path-to-regexp/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.pathToRegexp = exports.tokensToRegexp = exports.regexpToFunction = exports.match = exports.tokensToFunction = exports.compile = exports.parse = void 0;
     function lexer(str) {
       var tokens = [];
       var i = 0;
@@ -2487,7 +2486,7 @@ var require_dist = __commonJS({
             break;
           }
           if (!name)
-            throw new TypeError("Missing parameter name at ".concat(i));
+            throw new TypeError("Missing parameter name at " + i);
           tokens.push({ type: "NAME", index: i, value: name });
           i = j;
           continue;
@@ -2497,7 +2496,7 @@ var require_dist = __commonJS({
           var pattern = "";
           var j = i + 1;
           if (str[j] === "?") {
-            throw new TypeError('Pattern cannot start with "?" at '.concat(j));
+            throw new TypeError('Pattern cannot start with "?" at ' + j);
           }
           while (j < str.length) {
             if (str[j] === "\\") {
@@ -2513,15 +2512,15 @@ var require_dist = __commonJS({
             } else if (str[j] === "(") {
               count++;
               if (str[j + 1] !== "?") {
-                throw new TypeError("Capturing groups are not allowed at ".concat(j));
+                throw new TypeError("Capturing groups are not allowed at " + j);
               }
             }
             pattern += str[j++];
           }
           if (count)
-            throw new TypeError("Unbalanced pattern at ".concat(i));
+            throw new TypeError("Unbalanced pattern at " + i);
           if (!pattern)
-            throw new TypeError("Missing pattern at ".concat(i));
+            throw new TypeError("Missing pattern at " + i);
           tokens.push({ type: "PATTERN", index: i, value: pattern });
           i = j;
           continue;
@@ -2537,7 +2536,7 @@ var require_dist = __commonJS({
       }
       var tokens = lexer(str);
       var _a = options.prefixes, prefixes = _a === void 0 ? "./" : _a;
-      var defaultPattern = "[^".concat(escapeString(options.delimiter || "/#?"), "]+?");
+      var defaultPattern = "[^" + escapeString(options.delimiter || "/#?") + "]+?";
       var result = [];
       var key = 0;
       var i = 0;
@@ -2551,7 +2550,7 @@ var require_dist = __commonJS({
         if (value2 !== void 0)
           return value2;
         var _a2 = tokens[i], nextType = _a2.type, index = _a2.index;
-        throw new TypeError("Unexpected ".concat(nextType, " at ").concat(index, ", expected ").concat(type));
+        throw new TypeError("Unexpected " + nextType + " at " + index + ", expected " + type);
       };
       var consumeText = function() {
         var result2 = "";
@@ -2628,7 +2627,7 @@ var require_dist = __commonJS({
       } : _a, _b = options.validate, validate = _b === void 0 ? true : _b;
       var matches = tokens.map(function(token) {
         if (typeof token === "object") {
-          return new RegExp("^(?:".concat(token.pattern, ")$"), reFlags);
+          return new RegExp("^(?:" + token.pattern + ")$", reFlags);
         }
       });
       return function(data) {
@@ -2644,17 +2643,17 @@ var require_dist = __commonJS({
           var repeat = token.modifier === "*" || token.modifier === "+";
           if (Array.isArray(value)) {
             if (!repeat) {
-              throw new TypeError('Expected "'.concat(token.name, '" to not repeat, but got an array'));
+              throw new TypeError('Expected "' + token.name + '" to not repeat, but got an array');
             }
             if (value.length === 0) {
               if (optional)
                 continue;
-              throw new TypeError('Expected "'.concat(token.name, '" to not be empty'));
+              throw new TypeError('Expected "' + token.name + '" to not be empty');
             }
             for (var j = 0; j < value.length; j++) {
               var segment = encode(value[j], token);
               if (validate && !matches[i].test(segment)) {
-                throw new TypeError('Expected all "'.concat(token.name, '" to match "').concat(token.pattern, '", but got "').concat(segment, '"'));
+                throw new TypeError('Expected all "' + token.name + '" to match "' + token.pattern + '", but got "' + segment + '"');
               }
               path += token.prefix + segment + token.suffix;
             }
@@ -2663,7 +2662,7 @@ var require_dist = __commonJS({
           if (typeof value === "string" || typeof value === "number") {
             var segment = encode(String(value), token);
             if (validate && !matches[i].test(segment)) {
-              throw new TypeError('Expected "'.concat(token.name, '" to match "').concat(token.pattern, '", but got "').concat(segment, '"'));
+              throw new TypeError('Expected "' + token.name + '" to match "' + token.pattern + '", but got "' + segment + '"');
             }
             path += token.prefix + segment + token.suffix;
             continue;
@@ -2671,7 +2670,7 @@ var require_dist = __commonJS({
           if (optional)
             continue;
           var typeOfMessage = repeat ? "an array" : "a string";
-          throw new TypeError('Expected "'.concat(token.name, '" to be ').concat(typeOfMessage));
+          throw new TypeError('Expected "' + token.name + '" to be ' + typeOfMessage);
         }
         return path;
       };
@@ -2724,19 +2723,17 @@ var require_dist = __commonJS({
     function regexpToRegexp(path, keys) {
       if (!keys)
         return path;
-      var groupsRegex = /\((?:\?<(.*?)>)?(?!\?)/g;
-      var index = 0;
-      var execResult = groupsRegex.exec(path.source);
-      while (execResult) {
-        keys.push({
-          // Use parenthesized substring match if available, index otherwise
-          name: execResult[1] || index++,
-          prefix: "",
-          suffix: "",
-          modifier: "",
-          pattern: ""
-        });
-        execResult = groupsRegex.exec(path.source);
+      var groups = path.source.match(/\((?!\?)/g);
+      if (groups) {
+        for (var i = 0; i < groups.length; i++) {
+          keys.push({
+            name: i,
+            prefix: "",
+            suffix: "",
+            modifier: "",
+            pattern: ""
+          });
+        }
       }
       return path;
     }
@@ -2744,7 +2741,7 @@ var require_dist = __commonJS({
       var parts = paths.map(function(path) {
         return pathToRegexp2(path, keys, options).source;
       });
-      return new RegExp("(?:".concat(parts.join("|"), ")"), flags(options));
+      return new RegExp("(?:" + parts.join("|") + ")", flags(options));
     }
     function stringToRegexp(path, keys, options) {
       return tokensToRegexp(parse(path, options), keys, options);
@@ -2755,9 +2752,9 @@ var require_dist = __commonJS({
       }
       var _a = options.strict, strict = _a === void 0 ? false : _a, _b = options.start, start = _b === void 0 ? true : _b, _c = options.end, end = _c === void 0 ? true : _c, _d = options.encode, encode = _d === void 0 ? function(x) {
         return x;
-      } : _d, _e = options.delimiter, delimiter = _e === void 0 ? "/#?" : _e, _f = options.endsWith, endsWith = _f === void 0 ? "" : _f;
-      var endsWithRe = "[".concat(escapeString(endsWith), "]|$");
-      var delimiterRe = "[".concat(escapeString(delimiter), "]");
+      } : _d;
+      var endsWith = "[" + escapeString(options.endsWith || "") + "]|$";
+      var delimiter = "[" + escapeString(options.delimiter || "/#?") + "]";
       var route = start ? "^" : "";
       for (var _i = 0, tokens_1 = tokens; _i < tokens_1.length; _i++) {
         var token = tokens_1[_i];
@@ -2772,34 +2769,33 @@ var require_dist = __commonJS({
             if (prefix || suffix) {
               if (token.modifier === "+" || token.modifier === "*") {
                 var mod = token.modifier === "*" ? "?" : "";
-                route += "(?:".concat(prefix, "((?:").concat(token.pattern, ")(?:").concat(suffix).concat(prefix, "(?:").concat(token.pattern, "))*)").concat(suffix, ")").concat(mod);
+                route += "(?:" + prefix + "((?:" + token.pattern + ")(?:" + suffix + prefix + "(?:" + token.pattern + "))*)" + suffix + ")" + mod;
               } else {
-                route += "(?:".concat(prefix, "(").concat(token.pattern, ")").concat(suffix, ")").concat(token.modifier);
+                route += "(?:" + prefix + "(" + token.pattern + ")" + suffix + ")" + token.modifier;
               }
             } else {
-              if (token.modifier === "+" || token.modifier === "*") {
-                route += "((?:".concat(token.pattern, ")").concat(token.modifier, ")");
-              } else {
-                route += "(".concat(token.pattern, ")").concat(token.modifier);
-              }
+              route += "(" + token.pattern + ")" + token.modifier;
             }
           } else {
-            route += "(?:".concat(prefix).concat(suffix, ")").concat(token.modifier);
+            route += "(?:" + prefix + suffix + ")" + token.modifier;
           }
         }
       }
       if (end) {
         if (!strict)
-          route += "".concat(delimiterRe, "?");
-        route += !options.endsWith ? "$" : "(?=".concat(endsWithRe, ")");
+          route += delimiter + "?";
+        route += !options.endsWith ? "$" : "(?=" + endsWith + ")";
       } else {
         var endToken = tokens[tokens.length - 1];
-        var isEndDelimited = typeof endToken === "string" ? delimiterRe.indexOf(endToken[endToken.length - 1]) > -1 : endToken === void 0;
+        var isEndDelimited = typeof endToken === "string" ? delimiter.indexOf(endToken[endToken.length - 1]) > -1 : (
+          // tslint:disable-next-line
+          endToken === void 0
+        );
         if (!strict) {
-          route += "(?:".concat(delimiterRe, "(?=").concat(endsWithRe, "))?");
+          route += "(?:" + delimiter + "(?=" + endsWith + "))?";
         }
         if (!isEndDelimited) {
-          route += "(?=".concat(delimiterRe, "|").concat(endsWithRe, ")");
+          route += "(?=" + delimiter + "|" + endsWith + ")";
         }
       }
       return new RegExp(route, flags(options));
@@ -3206,6 +3202,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 pathToRegexp2(callerId, path, keys, options) {
+      const newKeys = cloneKeys(keys);
+      const currentRegExp = (0, path_to_regexp_1.pathToRegexp)(path, keys, options);
+      try {
+        const currentKeys = keys;
+        const newRegExp = (0, path_to_regexp_updated_1.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 = !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,
+          error: error.message
+        });
+        console.error(`[vc] PATH TO REGEXP ERROR @ #${callerId}: ${message}`);
+      }
+      return currentRegExp;
+    }
+    exports.pathToRegexp = pathToRegexp2;
+  }
+});
+
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
@@ -3226,41 +3282,10 @@ var import_build_utils3 = require("@vercel/build-utils");
 var import_semver = __toESM(require_semver2());
 var import_fs = require("fs");
 var import_path = require("path");
-var import_path_to_regexp = __toESM(require_dist());
-var import_path_to_regexp_updated = __toESM(require_dist2());
+var import_path_to_regexp = __toESM(require_dist3());
 var import_build_utils = require("@vercel/build-utils");
 var import_build_utils2 = require("@vercel/build-utils");
 var import_module = require("module");
-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;
-}
 var require_ = (0, import_module.createRequire)(__filename);
 var SPLAT_PATH = "/:params*";
 var entryExts = [".js", ".jsx", ".ts", ".tsx"];
@@ -3371,7 +3396,7 @@ function getPathFromRoute(route, routes) {
 }
 function getRegExpFromPath(rePath) {
   const keys = [];
-  const re = pathToRegexp("923", rePath, keys);
+  const re = (0, import_path_to_regexp.pathToRegexp)("923", rePath, keys);
   return keys.length > 0 ? re : false;
 }
 async function chdirAndReadConfig(remixRunDevPath, dir, packageJsonPath) {
@@ -3566,6 +3591,15 @@ var REMIX_FRAMEWORK_SETTINGS = {
   buildResultFilePath: ".vercel/remix-build-result.json",
   slug: "remix",
   sourceSearchValue: "@remix-run/dev/server-build",
+  edge: {
+    serverSourcePromise: edgeServerSrcPromise,
+    traceWarningTag: "@remix-run/server-runtime"
+  },
+  node: {
+    serverSourcePromise: nodeServerSrcPromise,
+    traceWarningTag: "@remix-run/node",
+    options: {}
+  },
   createRenderFunction({
     nodeVersion,
     entrypointDir,
@@ -3602,6 +3636,16 @@ var REACT_ROUTER_FRAMEWORK_SETTINGS = {
   buildResultFilePath: ".vercel/react-router-build-result.json",
   slug: "react-router",
   sourceSearchValue: "ENTRYPOINT_PLACEHOLDER",
+  // React Router uses the same server source for both node and edge
+  edge: {
+    serverSourcePromise: reactRouterServerSrcPromise,
+    traceWarningTag: "react-router"
+  },
+  node: {
+    serverSourcePromise: reactRouterServerSrcPromise,
+    traceWarningTag: "react-router",
+    options: { useWebApi: true }
+  },
   createRenderFunction({
     nodeVersion,
     entrypointDir,
@@ -3894,7 +3938,11 @@ async function createRenderReactRouterFunction(nodeVersion, entrypointDir, rootD
     rootDir,
     serverBuildPath,
     serverEntryPoint,
-    serverSourcePromise: reactRouterServerSrcPromise,
+    serverSourcePromise: (
+      // React Router has the same promise for both edge and node
+      // so this chooses edge out of convenience
+      REACT_ROUTER_FRAMEWORK_SETTINGS.edge.serverSourcePromise
+    ),
     sourceSearchValue: REACT_ROUTER_FRAMEWORK_SETTINGS.sourceSearchValue
   });
   let conditions;
@@ -3909,7 +3957,10 @@ async function createRenderReactRouterFunction(nodeVersion, entrypointDir, rootD
     conditions,
     readFile
   });
-  logNftWarnings(trace.warnings, "react-router");
+  logNftWarnings(
+    trace.warnings,
+    REACT_ROUTER_FRAMEWORK_SETTINGS.edge.traceWarningTag
+  );
   const files = await getFilesFromTrace({ fileList: trace.fileList, rootDir });
   let fn;
   if (isEdgeFunction) {
@@ -3929,7 +3980,7 @@ async function createRenderReactRouterFunction(nodeVersion, entrypointDir, rootD
       files,
       handler,
       runtime: nodeVersion.runtime,
-      useWebApi: true,
+      useWebApi: REACT_ROUTER_FRAMEWORK_SETTINGS.node.options.useWebApi,
       regions: config.regions,
       memory: config.memory,
       maxDuration: config.maxDuration,
@@ -3946,14 +3997,14 @@ async function createRenderNodeFunction(nodeVersion, entrypointDir, rootDir, ser
     rootDir,
     serverBuildPath,
     serverEntryPoint,
-    serverSourcePromise: nodeServerSrcPromise,
+    serverSourcePromise: REMIX_FRAMEWORK_SETTINGS.node.serverSourcePromise,
     sourceSearchValue: REMIX_FRAMEWORK_SETTINGS.sourceSearchValue
   });
   const trace = await (0, import_nft.nodeFileTrace)([handlerPath], {
     base: rootDir,
     processCwd: entrypointDir
   });
-  logNftWarnings(trace.warnings, "@remix-run/node");
+  logNftWarnings(trace.warnings, REMIX_FRAMEWORK_SETTINGS.node.traceWarningTag);
   const files = await getFilesFromTrace({ fileList: trace.fileList, rootDir });
   const fn = new import_build_utils3.NodejsLambda({
     ...COMMON_NODE_FUNCTION_OPTIONS,
@@ -3963,6 +4014,7 @@ async function createRenderNodeFunction(nodeVersion, entrypointDir, rootDir, ser
     regions: config.regions,
     memory: config.memory,
     maxDuration: config.maxDuration,
+    useWebApi: REMIX_FRAMEWORK_SETTINGS.node.options.useWebApi,
     framework: {
       slug: REMIX_FRAMEWORK_SETTINGS.slug,
       version: frameworkVersion
@@ -3975,7 +4027,7 @@ async function createRenderEdgeFunction(entrypointDir, rootDir, serverBuildPath,
     rootDir,
     serverBuildPath,
     serverEntryPoint,
-    serverSourcePromise: edgeServerSrcPromise,
+    serverSourcePromise: REMIX_FRAMEWORK_SETTINGS.edge.serverSourcePromise,
     sourceSearchValue: REMIX_FRAMEWORK_SETTINGS.sourceSearchValue
   });
   const trace = await (0, import_nft.nodeFileTrace)([handlerPath], {
@@ -3984,7 +4036,7 @@ async function createRenderEdgeFunction(entrypointDir, rootDir, serverBuildPath,
     conditions: EDGE_TRACE_CONDITIONS,
     readFile: edgeReadFile
   });
-  logNftWarnings(trace.warnings, "@remix-run/server-runtime");
+  logNftWarnings(trace.warnings, REMIX_FRAMEWORK_SETTINGS.edge.traceWarningTag);
   const files = await getFilesFromTrace({ fileList: trace.fileList, rootDir });
   const fn = new import_build_utils3.EdgeFunction({
     ...COMMON_EDGE_FUNCTION_OPTIONS,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix-builder",
-  "version": "5.2.1",
+  "version": "5.2.3",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -24,11 +24,10 @@
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "9.2.0",
+    "@vercel/build-utils": "9.2.1",
+    "@vercel-internals/path-to-regexp": "1.0.0",
     "glob": "10.3.16",
     "jest-junit": "16.0.0",
-    "path-to-regexp": "6.2.1",
-    "path-to-regexp-updated": "npm:path-to-regexp@6.3.0",
     "semver": "7.5.2",
     "vitest": "2.0.1"
   },