@vercel/redwood 2.4.6 → 2.4.8

package/dist/index.js

@@ -918,6 +918,9 @@ var require_superstatic = __commonJS({
             headers: { Location: loc },
             status
           };
+          if (typeof r.env !== "undefined") {
+            route.env = r.env;
+          }
           if (r.has) {
             route.has = r.has;
           }
@@ -945,6 +948,9 @@ var require_superstatic = __commonJS({
             internalParamNames
           );
           const route = { src, dest, check: true };
+          if (typeof r.env !== "undefined") {
+            route.env = r.env;
+          }
           if (r.has) {
             route.has = r.has;
           }
@@ -1863,7 +1869,21 @@ var require_schemas = __commonJS({
               has: hasSchema,
               missing: hasSchema,
               mitigate: mitigateSchema,
-              transforms: transformsSchema
+              transforms: transformsSchema,
+              env: {
+                description: "An array of environment variable names that should be replaced at runtime in the destination or headers",
+                type: "array",
+                minItems: 1,
+                maxItems: 64,
+                items: {
+                  type: "string",
+                  maxLength: 256
+                }
+              },
+              respectOriginCacheControl: {
+                description: "When set to true (default), external rewrites will respect the Cache-Control header from the origin. When false, caching is disabled for this rewrite.",
+                type: "boolean"
+              }
             }
           },
           {
@@ -1907,6 +1927,20 @@ var require_schemas = __commonJS({
             type: "integer",
             minimum: 100,
             maximum: 999
+          },
+          env: {
+            description: "An array of environment variable names that should be replaced at runtime in the destination",
+            type: "array",
+            minItems: 1,
+            maxItems: 64,
+            items: {
+              type: "string",
+              maxLength: 256
+            }
+          },
+          respectOriginCacheControl: {
+            description: "When set to true (default), external rewrites will respect the Cache-Control header from the origin. When false, caching is disabled for this rewrite.",
+            type: "boolean"
           }
         }
       }
@@ -1943,7 +1977,17 @@ var require_schemas = __commonJS({
             maximum: 999
           },
           has: hasSchema,
-          missing: hasSchema
+          missing: hasSchema,
+          env: {
+            description: "An array of environment variable names that should be replaced at runtime in the destination",
+            type: "array",
+            minItems: 1,
+            maxItems: 64,
+            items: {
+              type: "string",
+              maxLength: 256
+            }
+          }
         }
       }
     };
@@ -2462,27 +2506,23 @@ var build = async ({
   const { installCommand, buildCommand } = config;
   const mountpoint = (0, import_path.dirname)(entrypoint);
   const entrypointFsDirname = (0, import_path.join)(workPath, mountpoint);
-  const nodeVersion = await (0, import_build_utils.getNodeVersion)(
+  const nodeVersion = await (0, import_build_utils.getRuntimeNodeVersion)(
     entrypointFsDirname,
     void 0,
     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
   });
@@ -2490,7 +2530,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 {
@@ -2500,7 +2540,7 @@ var build = async ({
     await (0, import_build_utils.runNpmInstall)(
       entrypointFsDirname,
       [],
-      spawnOpts,
+      { env: spawnEnv },
       meta,
       config.projectSettings?.createdAt
     );
@@ -2515,7 +2555,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)) {
@@ -2523,7 +2563,7 @@ var build = async ({
     await (0, import_build_utils.runPackageJsonScript)(
       workPath,
       "vercel-build",
-      spawnOpts,
+      { env: spawnEnv },
       config.projectSettings?.createdAt
     );
   } else if (hasScript("build", pkg)) {
@@ -2531,7 +2571,7 @@ var build = async ({
     await (0, import_build_utils.runPackageJsonScript)(
       workPath,
       "build",
-      spawnOpts,
+      { env: spawnEnv },
       config.projectSettings?.createdAt
     );
   } else {
@@ -2549,7 +2589,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.6",
+  "version": "2.4.8",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs",
@@ -25,8 +25,8 @@
     "execa": "3.2.0",
     "fs-extra": "11.1.0",
     "jest-junit": "16.0.0",
-    "@vercel/routing-utils": "5.3.0",
-    "@vercel/build-utils": "13.2.3"
+    "@vercel/build-utils": "13.2.8",
+    "@vercel/routing-utils": "5.3.2"
   },
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",