@vercel/static-build 2.8.5 → 2.8.6

package/dist/index.js

@@ -29152,23 +29152,27 @@ var build = async ({
       config,
       meta
     );
+    const spawnOpts = (0, import_build_utils4.getSpawnOptions)(meta, nodeVersion);
+    if (!spawnOpts.env) {
+      spawnOpts.env = {};
+    }
+    if (framework?.slug === "create-react-app") {
+      spawnOpts.env.CI = "false";
+    }
     const {
       cliType,
       lockfileVersion,
       packageJsonPackageManager,
       turboSupportsCorepackHome
     } = await (0, import_build_utils4.scanParentDirs)(entrypointDir, true);
-    const spawnEnv = (0, import_build_utils4.getEnvForPackageManager)({
+    spawnOpts.env = (0, import_build_utils4.getEnvForPackageManager)({
       cliType,
       lockfileVersion,
       packageJsonPackageManager,
-      env: process.env,
+      env: spawnOpts.env || {},
       turboSupportsCorepackHome,
       projectCreatedAt: config.projectSettings?.createdAt
     });
-    if (framework?.slug === "create-react-app") {
-      spawnEnv.CI = "false";
-    }
     if (meta.isDev) {
       (0, import_build_utils4.debug)("Skipping dependency installation because dev mode is enabled");
     } else {
@@ -29184,7 +29188,7 @@ var build = async ({
         await (0, import_build_utils4.runNpmInstall)(
           entrypointDir,
           [],
-          { env: spawnEnv },
+          spawnOpts,
           meta,
           config.projectSettings?.createdAt
         );
@@ -29193,7 +29197,7 @@ var build = async ({
         if (installCommand.trim()) {
           console.log(`Running "install" command: \`${installCommand}\`...`);
           await (0, import_build_utils4.execCommand)(installCommand, {
-            env: spawnEnv,
+            ...spawnOpts,
             cwd: entrypointDir
           });
           isNpmInstall = true;
@@ -29237,7 +29241,7 @@ var build = async ({
           await (0, import_build_utils4.runNpmInstall)(
             entrypointDir,
             [],
-            { env: spawnEnv },
+            spawnOpts,
             meta,
             config.projectSettings?.createdAt
           );
@@ -29279,11 +29283,11 @@ var build = async ({
     }
     if (isPipInstall) {
     }
-    if (spawnEnv.PATH) {
-      pathList.push(spawnEnv.PATH);
+    if (spawnOpts?.env?.PATH) {
+      pathList.push(spawnOpts.env.PATH);
     }
-    const cliEnv = {
-      ...process.env,
+    spawnOpts.env = {
+      ...spawnOpts.env,
       PATH: pathList.join(import_path6.default.delimiter),
       GEM_HOME: gemHome
     };
@@ -29301,7 +29305,7 @@ var build = async ({
         const opts = {
           cwd: entrypointDir,
           stdio: "inherit",
-          env: { ...cliEnv, PORT: String(devPort) }
+          env: { ...spawnOpts.env, PORT: String(devPort) }
         };
         const cmd = devCommand || `yarn run ${devScript}`;
         const child = (0, import_build_utils4.spawnCommand)(cmd, opts);
@@ -29336,17 +29340,18 @@ Details: https://err.sh/vercel/vercel/now-static-build-failed-to-detect-a-server
       }
       try {
         const found = typeof buildCommand === "string" ? await (0, import_build_utils4.execCommand)(buildCommand, {
+          ...spawnOpts,
           // Yarn v2 PnP mode may be activated, so force
           // "node-modules" linker style
           env: {
             YARN_NODE_LINKER: "node-modules",
-            ...cliEnv
+            ...spawnOpts.env
           },
           cwd: entrypointDir
         }) : await (0, import_build_utils4.runPackageJsonScript)(
           entrypointDir,
           ["vercel-build", "now-build", "build"],
-          { env: cliEnv },
+          spawnOpts,
           config.projectSettings?.createdAt
         );
         if (!found) {
@@ -29431,7 +29436,14 @@ Details: https://err.sh/vercel/vercel/now-static-build-failed-to-detect-a-server
   }
   if (!config.zeroConfig && entrypoint.endsWith(".sh")) {
     (0, import_build_utils4.debug)(`Running build script "${entrypoint}"`);
-    await (0, import_build_utils4.runShellScript)(import_path6.default.join(workPath, entrypoint));
+    const nodeVersion = await (0, import_build_utils4.getNodeVersion)(
+      entrypointDir,
+      void 0,
+      config,
+      meta
+    );
+    const spawnOpts = (0, import_build_utils4.getSpawnOptions)(meta, nodeVersion);
+    await (0, import_build_utils4.runShellScript)(import_path6.default.join(workPath, entrypoint), [], spawnOpts);
     validateDistDir(distPath, workPath);
     const output = await (0, import_build_utils4.glob)("**", distPath, mountpoint);
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "2.8.5",
+  "version": "2.8.6",
   "license": "Apache-2.0",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@vercel/gatsby-plugin-vercel-analytics": "1.0.11",
-    "@vercel/gatsby-plugin-vercel-builder": "2.0.104",
+    "@vercel/gatsby-plugin-vercel-builder": "2.0.105",
     "@vercel/static-config": "3.1.2",
     "ts-morph": "12.0.0"
   },
@@ -28,7 +28,7 @@
     "@types/node-fetch": "2.5.4",
     "@types/promise-timeout": "1.3.0",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "13.0.0",
+    "@vercel/build-utils": "13.0.1",
     "@vercel/error-utils": "2.0.3",
     "@vercel/frameworks": "3.15.2",
     "@vercel/fs-detectors": "5.7.5",