@vercel/static-build 0.24.2-canary.0 → 0.25.0

package/dist/index.js

@@ -17073,6 +17073,9 @@ const build = async ({ files, entrypoint, workPath, config, meta = {}, }) => {
         }
         const nodeVersion = await build_utils_1.getNodeVersion(entrypointDir, undefined, config, meta);
         const spawnOpts = build_utils_1.getSpawnOptions(meta, nodeVersion);
+        if (!spawnOpts.env) {
+            spawnOpts.env = {};
+        }
         /* Don't fail the build on warnings from Create React App.
         Node.js will load 'false' as a string, not a boolean, so it's truthy still.
         This is to ensure we don't accidentally break other packages that check
@@ -17083,11 +17086,25 @@ const build = async ({ files, entrypoint, workPath, config, meta = {}, }) => {
         https://github.com/vercel/community/discussions/30
         */
         if ((framework === null || framework === void 0 ? void 0 : framework.slug) === 'create-react-app') {
-            if (!spawnOpts.env) {
-                spawnOpts.env = {};
-            }
             spawnOpts.env.CI = 'false';
         }
+        const { cliType, lockfileVersion } = await build_utils_1.scanParentDirs(entrypointDir);
+        if (cliType === 'npm') {
+            if (typeof lockfileVersion === 'number' &&
+                lockfileVersion >= 2 &&
+                ((nodeVersion === null || nodeVersion === void 0 ? void 0 : nodeVersion.major) || 0) < 16) {
+                // Ensure that npm 7 is at the beginning of the `$PATH`
+                spawnOpts.env.PATH = `/node16/bin-npm7:${spawnOpts.env.PATH}`;
+                console.log('Detected `package-lock.json` generated by npm 7...');
+            }
+        }
+        else if (cliType === 'pnpm') {
+            if (typeof lockfileVersion === 'number' && lockfileVersion === 5.4) {
+                // Ensure that pnpm 7 is at the beginning of the `$PATH`
+                spawnOpts.env.PATH = `/pnpm7/node_modules/.bin:${spawnOpts.env.PATH}`;
+                console.log('Detected `pnpm-lock.yaml` generated by pnpm 7...');
+            }
+        }
         if (meta.isDev) {
             build_utils_1.debug('Skipping dependency installation because dev mode is enabled');
         }
@@ -17107,20 +17124,10 @@ const build = async ({ files, entrypoint, workPath, config, meta = {}, }) => {
             else if (typeof installCommand === 'string') {
                 if (installCommand.trim()) {
                     console.log(`Running "install" command: \`${installCommand}\`...`);
-                    const { cliType, lockfileVersion } = await build_utils_1.scanParentDirs(entrypointDir);
                     const env = {
                         YARN_NODE_LINKER: 'node-modules',
                         ...spawnOpts.env,
                     };
-                    if (cliType === 'npm') {
-                        if (typeof lockfileVersion === 'number' &&
-                            lockfileVersion >= 2 &&
-                            ((nodeVersion === null || nodeVersion === void 0 ? void 0 : nodeVersion.major) || 0) < 16) {
-                            // Ensure that npm 7 is at the beginning of the `$PATH`
-                            env.PATH = `/node16/bin-npm7:${env.PATH}`;
-                            console.log('Detected `package-lock.json` generated by npm 7...');
-                        }
-                    }
                     await build_utils_1.execCommand(installCommand, {
                         ...spawnOpts,
                         // Yarn v2 PnP mode may be activated, so force

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/static-build",
-  "version": "0.24.2-canary.0",
+  "version": "0.25.0",
   "license": "MIT",
   "main": "./dist/index",
   "homepage": "https://vercel.com/docs/build-step",
@@ -36,7 +36,7 @@
     "@types/ms": "0.7.31",
     "@types/node-fetch": "2.5.4",
     "@types/promise-timeout": "1.3.0",
-    "@vercel/build-utils": "3.0.1-canary.1",
+    "@vercel/build-utils": "3.0.1",
     "@vercel/frameworks": "0.9.0",
     "@vercel/ncc": "0.24.0",
     "@vercel/routing-utils": "1.13.2",
@@ -47,5 +47,5 @@
     "node-fetch": "2.6.1",
     "rc9": "1.2.0"
   },
-  "gitHead": "4c20218e05122c439e5fa4f4997e9c5a5c7a93e2"
+  "gitHead": "5e66d4b2ccd80a7e6a21d53cf4be3b11f2861513"
 }