@vercel/remix-builder 2.2.13 → 3.0.0

package/dist/index.js

@@ -2442,9 +2442,9 @@ 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.3.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.3.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;
@@ -2536,8 +2536,7 @@ var require_dist = __commonJS({
         options = {};
       }
       var tokens = lexer(str);
-      var _a = options.prefixes, prefixes = _a === void 0 ? "./" : _a;
-      var defaultPattern = "[^".concat(escapeString(options.delimiter || "/#?"), "]+?");
+      var _a = options.prefixes, prefixes = _a === void 0 ? "./" : _a, _b = options.delimiter, delimiter = _b === void 0 ? "/#?" : _b;
       var result = [];
       var key = 0;
       var i = 0;
@@ -2561,6 +2560,24 @@ var require_dist = __commonJS({
         }
         return result2;
       };
+      var isSafe = function(value2) {
+        for (var _i = 0, delimiter_1 = delimiter; _i < delimiter_1.length; _i++) {
+          var char2 = delimiter_1[_i];
+          if (value2.indexOf(char2) > -1)
+            return true;
+        }
+        return false;
+      };
+      var safePattern = function(prefix2) {
+        var prev = result[result.length - 1];
+        var prevText = prefix2 || (prev && typeof prev === "string" ? prev : "");
+        if (prev && !prevText) {
+          throw new TypeError('Must have text between two parameters, missing text after "'.concat(prev.name, '"'));
+        }
+        if (!prevText || isSafe(prevText))
+          return "[^".concat(escapeString(delimiter), "]+?");
+        return "(?:(?!".concat(escapeString(prevText), ")[^").concat(escapeString(delimiter), "])+?");
+      };
       while (i < tokens.length) {
         var char = tryConsume("CHAR");
         var name = tryConsume("NAME");
@@ -2579,7 +2596,7 @@ var require_dist = __commonJS({
             name: name || key++,
             prefix,
             suffix: "",
-            pattern: pattern || defaultPattern,
+            pattern: pattern || safePattern(prefix),
             modifier: tryConsume("MODIFIER") || ""
           });
           continue;
@@ -2602,7 +2619,7 @@ var require_dist = __commonJS({
           mustConsume("CLOSE");
           result.push({
             name: name_1 || (pattern_1 ? key++ : ""),
-            pattern: name_1 && !pattern_1 ? defaultPattern : pattern_1,
+            pattern: name_1 && !pattern_1 ? safePattern(prefix) : pattern_1,
             prefix,
             suffix,
             modifier: tryConsume("MODIFIER") || ""
@@ -2778,10 +2795,9 @@ var require_dist = __commonJS({
               }
             } else {
               if (token.modifier === "+" || token.modifier === "*") {
-                route += "((?:".concat(token.pattern, ")").concat(token.modifier, ")");
-              } else {
-                route += "(".concat(token.pattern, ")").concat(token.modifier);
+                throw new TypeError('Can not repeat "'.concat(token.name, '" without a prefix and suffix'));
               }
+              route += "(".concat(token.pattern, ")").concat(token.modifier);
             }
           } else {
             route += "(?:".concat(prefix).concat(suffix, ")").concat(token.modifier);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix-builder",
-  "version": "2.2.13",
+  "version": "3.0.0",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -15,7 +15,7 @@
     "defaults"
   ],
   "dependencies": {
-    "@vercel/error-utils": "2.0.2",
+    "@vercel/error-utils": "2.0.3",
     "@vercel/nft": "0.27.3",
     "@vercel/static-config": "3.0.0",
     "ts-morph": "12.0.0"
@@ -25,10 +25,10 @@
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "8.4.11",
+    "@vercel/build-utils": "8.8.0",
     "glob": "10.3.16",
     "jest-junit": "16.0.0",
-    "path-to-regexp": "6.2.1",
+    "path-to-regexp": "6.3.0",
     "semver": "7.5.2",
     "vitest": "2.0.1"
   },