@vercel/redwood 2.4.0 → 2.4.1

package/dist/index.js

@@ -821,7 +821,7 @@ var require_superstatic = __commonJS({
       convertTrailingSlash: () => convertTrailingSlash,
       getCleanUrls: () => getCleanUrls2,
       pathToRegexp: () => pathToRegexp,
-      sourceToRegex: () => sourceToRegex
+      sourceToRegex: () => sourceToRegex2
     });
     module2.exports = __toCommonJS2(superstatic_exports);
     var import_url = require("url");
@@ -899,7 +899,7 @@ var require_superstatic = __commonJS({
     }
     function convertRedirects(redirects, defaultStatus = 308) {
       return redirects.map((r) => {
-        const { src, segments } = sourceToRegex(r.source);
+        const { src, segments } = sourceToRegex2(r.source);
         const hasSegments = collectHasSegments(r.has);
         normalizeHasKeys(r.has);
         normalizeHasKeys(r.missing);
@@ -932,7 +932,7 @@ var require_superstatic = __commonJS({
     }
     function convertRewrites(rewrites, internalParamNames) {
       return rewrites.map((r) => {
-        const { src, segments } = sourceToRegex(r.source);
+        const { src, segments } = sourceToRegex2(r.source);
         const hasSegments = collectHasSegments(r.has);
         normalizeHasKeys(r.has);
         normalizeHasKeys(r.missing);
@@ -963,7 +963,7 @@ var require_superstatic = __commonJS({
     function convertHeaders(headers) {
       return headers.map((h) => {
         const obj = {};
-        const { src, segments } = sourceToRegex(h.source);
+        const { src, segments } = sourceToRegex2(h.source);
         const hasSegments = collectHasSegments(h.has);
         normalizeHasKeys(h.has);
         normalizeHasKeys(h.missing);
@@ -1025,7 +1025,7 @@ var require_superstatic = __commonJS({
       }
       return routes;
     }
-    function sourceToRegex(source) {
+    function sourceToRegex2(source) {
       const keys = [];
       const r = pathToRegexp("632", source, keys, {
         strict: true,
@@ -2077,7 +2077,8 @@ var require_dist3 = __commonJS({
       isHandler: () => isHandler,
       isValidHandleValue: () => isValidHandleValue,
       mergeRoutes: () => import_merge.mergeRoutes,
-      normalizeRoutes: () => normalizeRoutes
+      normalizeRoutes: () => normalizeRoutes,
+      sourceToRegex: () => import_superstatic2.sourceToRegex
     });
     module2.exports = __toCommonJS2(src_exports2);
     var import_url = require("url");
@@ -2457,21 +2458,17 @@ var build = async ({
     config,
     meta
   );
-  const spawnOpts = (0, import_build_utils.getSpawnOptions)(meta, nodeVersion);
-  if (!spawnOpts.env) {
-    spawnOpts.env = {};
-  }
   const {
     cliType,
     lockfileVersion,
     packageJsonPackageManager,
     turboSupportsCorepackHome
   } = await (0, import_build_utils.scanParentDirs)(entrypointFsDirname, true);
-  spawnOpts.env = (0, import_build_utils.getEnvForPackageManager)({
+  const spawnEnv = (0, import_build_utils.getEnvForPackageManager)({
     cliType,
     lockfileVersion,
     packageJsonPackageManager,
-    env: spawnOpts.env || {},
+    env: process.env,
     turboSupportsCorepackHome,
     projectCreatedAt: config.projectSettings?.createdAt
   });
@@ -2479,7 +2476,7 @@ var build = async ({
     if (installCommand.trim()) {
       console.log(`Running "install" command: \`${installCommand}\`...`);
       await (0, import_build_utils.execCommand)(installCommand, {
-        ...spawnOpts,
+        env: spawnEnv,
         cwd: entrypointFsDirname
       });
     } else {
@@ -2489,7 +2486,7 @@ var build = async ({
     await (0, import_build_utils.runNpmInstall)(
       entrypointFsDirname,
       [],
-      spawnOpts,
+      { env: spawnEnv },
       meta,
       config.projectSettings?.createdAt
     );
@@ -2504,7 +2501,7 @@ var build = async ({
   if (buildCommand) {
     (0, import_build_utils.debug)(`Executing build command "${buildCommand}"`);
     await (0, import_build_utils.execCommand)(buildCommand, {
-      ...spawnOpts,
+      env: spawnEnv,
       cwd: workPath
     });
   } else if (hasScript("vercel-build", pkg)) {
@@ -2512,7 +2509,7 @@ var build = async ({
     await (0, import_build_utils.runPackageJsonScript)(
       workPath,
       "vercel-build",
-      spawnOpts,
+      { env: spawnEnv },
       config.projectSettings?.createdAt
     );
   } else if (hasScript("build", pkg)) {
@@ -2520,7 +2517,7 @@ var build = async ({
     await (0, import_build_utils.runPackageJsonScript)(
       workPath,
       "build",
-      spawnOpts,
+      { env: spawnEnv },
       config.projectSettings?.createdAt
     );
   } else {
@@ -2538,7 +2535,7 @@ var build = async ({
       cmd = "yarn rw deploy vercel";
     }
     await (0, import_build_utils.execCommand)(cmd, {
-      ...spawnOpts,
+      env: spawnEnv,
       cwd: workPath
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/redwood",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs",
@@ -22,8 +22,8 @@
     "@types/aws-lambda": "8.10.19",
     "@types/node": "14.18.33",
     "@types/semver": "6.0.0",
-    "@vercel/build-utils": "12.2.0",
-    "@vercel/routing-utils": "5.2.0",
+    "@vercel/build-utils": "13.0.0",
+    "@vercel/routing-utils": "5.2.1",
     "execa": "3.2.0",
     "fs-extra": "11.1.0",
     "jest-junit": "16.0.0"