@vercel/remix-builder 3.0.0 → 5.0.1

package/dist/index.js

@@ -2442,9 +2442,9 @@ var require_semver2 = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/path-to-regexp@6.3.0/node_modules/path-to-regexp/dist/index.js
+// ../../node_modules/.pnpm/path-to-regexp@6.2.1/node_modules/path-to-regexp/dist/index.js
 var require_dist = __commonJS({
-  "../../node_modules/.pnpm/path-to-regexp@6.3.0/node_modules/path-to-regexp/dist/index.js"(exports) {
+  "../../node_modules/.pnpm/path-to-regexp@6.2.1/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,7 +2536,8 @@ var require_dist = __commonJS({
         options = {};
       }
       var tokens = lexer(str);
-      var _a = options.prefixes, prefixes = _a === void 0 ? "./" : _a, _b = options.delimiter, delimiter = _b === void 0 ? "/#?" : _b;
+      var _a = options.prefixes, prefixes = _a === void 0 ? "./" : _a;
+      var defaultPattern = "[^".concat(escapeString(options.delimiter || "/#?"), "]+?");
       var result = [];
       var key = 0;
       var i = 0;
@@ -2560,24 +2561,6 @@ 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");
@@ -2596,7 +2579,7 @@ var require_dist = __commonJS({
             name: name || key++,
             prefix,
             suffix: "",
-            pattern: pattern || safePattern(prefix),
+            pattern: pattern || defaultPattern,
             modifier: tryConsume("MODIFIER") || ""
           });
           continue;
@@ -2619,7 +2602,7 @@ var require_dist = __commonJS({
           mustConsume("CLOSE");
           result.push({
             name: name_1 || (pattern_1 ? key++ : ""),
-            pattern: name_1 && !pattern_1 ? safePattern(prefix) : pattern_1,
+            pattern: name_1 && !pattern_1 ? defaultPattern : pattern_1,
             prefix,
             suffix,
             modifier: tryConsume("MODIFIER") || ""
@@ -2795,9 +2778,10 @@ var require_dist = __commonJS({
               }
             } else {
               if (token.modifier === "+" || 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(token.pattern, ")").concat(token.modifier);
               }
-              route += "(".concat(token.pattern, ")").concat(token.modifier);
             }
           } else {
             route += "(?:".concat(prefix).concat(suffix, ")").concat(token.modifier);
@@ -3174,7 +3158,8 @@ var build = async ({
     lockfileVersion,
     packageJson,
     packageJsonPackageManager,
-    turboSupportsCorepackHome
+    turboSupportsCorepackHome,
+    detectedLockfile
   } = await (0, import_build_utils3.scanParentDirs)(entrypointFsDirname, true);
   const spawnOpts = (0, import_build_utils3.getSpawnOptions)(meta, nodeVersion);
   if (!spawnOpts.env) {
@@ -3186,7 +3171,8 @@ var build = async ({
     packageJsonPackageManager,
     nodeVersion,
     env: spawnOpts.env,
-    turboSupportsCorepackHome
+    turboSupportsCorepackHome,
+    detectedLockfile
   });
   if (typeof installCommand === "string") {
     if (installCommand.trim()) {
@@ -3542,10 +3528,6 @@ ${updatedCodeString}`;
 }
 
 // src/build-legacy.ts
-var remixBuilderPkg = JSON.parse(
-  (0, import_fs3.readFileSync)((0, import_path4.join)(__dirname, "../package.json"), "utf8")
-);
-var remixRunDevForkVersion = remixBuilderPkg.devDependencies["@remix-run/dev"];
 var DEFAULTS_PATH2 = (0, import_path4.join)(__dirname, "../defaults");
 var edgeServerSrcPromise2 = import_fs3.promises.readFile(
   (0, import_path4.join)(DEFAULTS_PATH2, "server-edge.mjs"),
@@ -3556,9 +3538,9 @@ var nodeServerSrcPromise2 = import_fs3.promises.readFile(
   "utf-8"
 );
 var VERCEL_REMIX_MIN_VERSION = "1.10.0";
-var REMIX_RUN_DEV_MIN_VERSION = "1.15.0";
-var REMIX_RUN_DEV_MAX_VERSION = remixRunDevForkVersion.slice(
-  remixRunDevForkVersion.lastIndexOf("@") + 1
+var VERCEL_REMIX_RUN_DEV_MIN_VERSION = "1.15.0";
+var { VERCEL_REMIX_RUN_DEV_MAX_VERSION } = JSON.parse(
+  (0, import_fs3.readFileSync)((0, import_path4.join)(__dirname, "../package.json"), "utf8")
 );
 var build2 = async ({
   entrypoint,
@@ -3584,7 +3566,8 @@ var build2 = async ({
     lockfileVersion,
     lockfilePath,
     packageJsonPackageManager,
-    turboSupportsCorepackHome
+    turboSupportsCorepackHome,
+    detectedLockfile
   } = await (0, import_build_utils4.scanParentDirs)(entrypointFsDirname, true);
   if (!packageJsonPath) {
     throw new Error("Failed to locate `package.json` file in your project");
@@ -3604,7 +3587,8 @@ var build2 = async ({
     packageJsonPackageManager,
     nodeVersion,
     env: spawnOpts.env,
-    turboSupportsCorepackHome
+    turboSupportsCorepackHome,
+    detectedLockfile
   });
   if (typeof installCommand === "string") {
     if (installCommand.trim()) {
@@ -3696,8 +3680,8 @@ var build2 = async ({
   }
   if (serverBundles.length > 1 && !isHydrogen2 && remixRunDevPkg.name !== "@vercel/remix-run-dev" && !remixRunDevPkgVersion?.startsWith("https:")) {
     const remixDevForkVersion = resolveSemverMinMax(
-      REMIX_RUN_DEV_MIN_VERSION,
-      REMIX_RUN_DEV_MAX_VERSION,
+      VERCEL_REMIX_RUN_DEV_MIN_VERSION,
+      VERCEL_REMIX_RUN_DEV_MAX_VERSION,
       remixVersion
     );
     if (pkg.devDependencies["@remix-run/dev"]) {
@@ -3718,7 +3702,7 @@ var build2 = async ({
     if (!pkg.dependencies["@vercel/remix"]) {
       const vercelRemixVersion = resolveSemverMinMax(
         VERCEL_REMIX_MIN_VERSION,
-        REMIX_RUN_DEV_MAX_VERSION,
+        VERCEL_REMIX_RUN_DEV_MAX_VERSION,
         remixVersion
       );
       pkg.dependencies["@vercel/remix"] = vercelRemixVersion;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix-builder",
-  "version": "3.0.0",
+  "version": "5.0.1",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -21,17 +21,17 @@
     "ts-morph": "12.0.0"
   },
   "devDependencies": {
-    "@remix-run/dev": "npm:@vercel/remix-run-dev@2.13.1",
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "8.8.0",
+    "@vercel/build-utils": "9.0.0",
     "glob": "10.3.16",
     "jest-junit": "16.0.0",
-    "path-to-regexp": "6.3.0",
+    "path-to-regexp": "6.2.1",
     "semver": "7.5.2",
     "vitest": "2.0.1"
   },
+  "VERCEL_REMIX_RUN_DEV_MAX_VERSION": "2.15.1",
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",
     "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --bail --runInBand",