@vercel/remix-builder 5.5.1 → 5.5.3

package/dist/index.js

@@ -2984,11 +2984,15 @@ var build = async ({
     packageJsonPackageManager,
     turboSupportsCorepackHome
   } = await (0, import_build_utils3.scanParentDirs)(entrypointFsDirname, true);
-  const spawnEnv = (0, import_build_utils3.getEnvForPackageManager)({
+  const spawnOpts = (0, import_build_utils3.getSpawnOptions)(meta, nodeVersion);
+  if (!spawnOpts.env) {
+    spawnOpts.env = {};
+  }
+  spawnOpts.env = (0, import_build_utils3.getEnvForPackageManager)({
     cliType,
     lockfileVersion,
     packageJsonPackageManager,
-    env: process.env,
+    env: spawnOpts.env,
     turboSupportsCorepackHome,
     projectCreatedAt: config.projectSettings?.createdAt
   });
@@ -2996,7 +3000,7 @@ var build = async ({
     if (installCommand.trim()) {
       console.log(`Running "install" command: \`${installCommand}\`...`);
       await (0, import_build_utils3.execCommand)(installCommand, {
-        env: spawnEnv,
+        ...spawnOpts,
         cwd: entrypointFsDirname
       });
     } else {
@@ -3006,7 +3010,7 @@ var build = async ({
     await (0, import_build_utils3.runNpmInstall)(
       entrypointFsDirname,
       [],
-      { env: spawnEnv },
+      spawnOpts,
       meta,
       config.projectSettings?.createdAt
     );
@@ -3019,7 +3023,7 @@ var build = async ({
   if (buildCommand) {
     (0, import_build_utils3.debug)(`Executing build command "${buildCommand}"`);
     await (0, import_build_utils3.execCommand)(buildCommand, {
-      env: spawnEnv,
+      ...spawnOpts,
       cwd: entrypointFsDirname
     });
   } else {
@@ -3028,7 +3032,7 @@ var build = async ({
       await (0, import_build_utils3.runPackageJsonScript)(
         entrypointFsDirname,
         "vercel-build",
-        { env: spawnEnv },
+        spawnOpts,
         config.projectSettings?.createdAt
       );
     } else if (hasScript("build", packageJson)) {
@@ -3036,12 +3040,12 @@ var build = async ({
       await (0, import_build_utils3.runPackageJsonScript)(
         entrypointFsDirname,
         "build",
-        { env: spawnEnv },
+        spawnOpts,
         config.projectSettings?.createdAt
       );
     } else {
       await (0, import_build_utils3.execCommand)(frameworkSettings.buildCommand, {
-        env: spawnEnv,
+        ...spawnOpts,
         cwd: entrypointFsDirname
       });
     }
@@ -3461,11 +3465,15 @@ var build2 = async ({
     import_fs3.promises.readFile(packageJsonPath, "utf8")
   ]);
   const pkg = JSON.parse(pkgRaw);
-  const spawnEnv = (0, import_build_utils4.getEnvForPackageManager)({
+  const spawnOpts = (0, import_build_utils4.getSpawnOptions)(meta, nodeVersion);
+  if (!spawnOpts.env) {
+    spawnOpts.env = {};
+  }
+  spawnOpts.env = (0, import_build_utils4.getEnvForPackageManager)({
     cliType,
     lockfileVersion,
     packageJsonPackageManager,
-    env: process.env,
+    env: spawnOpts.env,
     turboSupportsCorepackHome,
     projectCreatedAt: config.projectSettings?.createdAt
   });
@@ -3473,7 +3481,7 @@ var build2 = async ({
     if (installCommand.trim()) {
       console.log(`Running "install" command: \`${installCommand}\`...`);
       await (0, import_build_utils4.execCommand)(installCommand, {
-        env: spawnEnv,
+        ...spawnOpts,
         cwd: entrypointFsDirname
       });
     } else {
@@ -3483,7 +3491,7 @@ var build2 = async ({
     await (0, import_build_utils4.runNpmInstall)(
       entrypointFsDirname,
       [],
-      { env: spawnEnv },
+      spawnOpts,
       meta,
       config.projectSettings?.createdAt
     );
@@ -3596,7 +3604,7 @@ var build2 = async ({
   }
   if (depsModified) {
     await import_fs3.promises.writeFile(packageJsonPath, JSON.stringify(pkg, null, 2) + "\n");
-    const nonCiEnv = { ...process.env };
+    const nonCiEnv = { ...spawnOpts.env };
     delete nonCiEnv.CI;
     delete nonCiEnv.VERCEL;
     delete nonCiEnv.NOW_BUILDER;
@@ -3604,6 +3612,7 @@ var build2 = async ({
       entrypointFsDirname,
       [],
       {
+        ...spawnOpts,
         env: nonCiEnv
       },
       void 0,
@@ -3677,11 +3686,11 @@ module.exports = config;`;
         console.log('WARN: No "server" field found in Remix config');
       }
     }
-    spawnEnv.NODE_ENV = "production";
+    spawnOpts.env.NODE_ENV = "production";
     if (buildCommand) {
       (0, import_build_utils4.debug)(`Executing build command "${buildCommand}"`);
       await (0, import_build_utils4.execCommand)(buildCommand, {
-        env: spawnEnv,
+        ...spawnOpts,
         cwd: entrypointFsDirname
       });
     } else {
@@ -3690,7 +3699,7 @@ module.exports = config;`;
         await (0, import_build_utils4.runPackageJsonScript)(
           entrypointFsDirname,
           "vercel-build",
-          { env: spawnEnv },
+          spawnOpts,
           config.projectSettings?.createdAt
         );
       } else if (hasScript2("build", pkg)) {
@@ -3698,12 +3707,12 @@ module.exports = config;`;
         await (0, import_build_utils4.runPackageJsonScript)(
           entrypointFsDirname,
           "build",
-          { env: spawnEnv },
+          spawnOpts,
           config.projectSettings?.createdAt
         );
       } else {
         await (0, import_build_utils4.execCommand)("remix build", {
-          env: spawnEnv,
+          ...spawnOpts,
           cwd: entrypointFsDirname
         });
       }
@@ -4011,10 +4020,17 @@ var prepareCache = async ({
   const entrypointFsDirname = (0, import_path5.join)(workPath, mountpoint);
   let cacheDirFiles;
   if (!isVite(workPath)) {
+    const nodeVersion = await (0, import_build_utils5.getNodeVersion)(
+      entrypointFsDirname,
+      void 0,
+      config
+    );
+    const spawnOpts = (0, import_build_utils5.getSpawnOptions)({}, nodeVersion);
     await (0, import_build_utils5.runNpmInstall)(
       entrypointFsDirname,
       [],
       {
+        ...spawnOpts,
         stdio: "ignore"
       },
       void 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix-builder",
-  "version": "5.5.1",
+  "version": "5.5.3",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -16,7 +16,7 @@
   ],
   "dependencies": {
     "@vercel/error-utils": "2.0.3",
-    "@vercel/nft": "0.30.1",
+    "@vercel/nft": "1.1.0",
     "@vercel/static-config": "3.1.2",
     "path-to-regexp-updated": "npm:path-to-regexp@6.3.0",
     "path-to-regexp": "6.1.0",
@@ -26,7 +26,7 @@
     "@types/jest": "27.5.1",
     "@types/node": "14.18.33",
     "@types/semver": "7.3.13",
-    "@vercel/build-utils": "13.0.0",
+    "@vercel/build-utils": "13.2.0",
     "glob": "10.3.16",
     "jest-junit": "16.0.0",
     "semver": "7.5.2",