@vercel/build-utils 5.4.3 → 5.4.4

package/dist/clone-env.js

@@ -15,14 +15,18 @@ function cloneEnv(...envs) {
         if (env === undefined || env === null) {
             return obj;
         }
-        // the system path is called `Path` on Windows and Node.js will
-        // automatically return the system path when accessing `PATH`,
-        // however we lose this proxied value when we destructure and
-        // thus we must explicitly copy it
-        if (hasOwnProperty.call(env, 'PATH') || hasOwnProperty.call(env, 'Path')) {
-            obj.PATH = env.PATH;
+        // mixin the env first
+        obj = Object.assign(obj, env);
+        if (hasOwnProperty.call(env, 'Path')) {
+            // the system path is called `Path` on Windows and Node.js will
+            // automatically return the system path when accessing `PATH`,
+            // however we lose this proxied value when we destructure and
+            // thus we must explicitly copy it, but we must also remove the
+            // `Path` property since we can't have both a `PATH` and `Path`
+            obj.PATH = obj.Path;
+            delete obj.Path;
         }
-        return Object.assign(obj, env);
+        return obj;
     }, {});
 }
 exports.cloneEnv = cloneEnv;

package/dist/fs/run-user-scripts.js

@@ -304,14 +304,17 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
             env,
         });
         let commandArgs;
+        const isPotentiallyBrokenNpm = cliType === 'npm' &&
+            nodeVersion?.major === 16 &&
+            !args.includes('--legacy-peer-deps') &&
+            spawnOpts?.env?.ENABLE_EXPERIMENTAL_COREPACK !== '1';
         if (cliType === 'npm') {
             opts.prettyCommand = 'npm install';
             commandArgs = args
                 .filter(a => a !== '--prefer-offline')
                 .concat(['install', '--no-audit', '--unsafe-perm']);
-            if (nodeVersion?.major === 16 &&
-                spawnOpts?.env?.VERCEL_NPM_LEGACY_PEER_DEPS === '1' &&
-                spawnOpts?.env?.ENABLE_EXPERIMENTAL_COREPACK !== '1') {
+            if (isPotentiallyBrokenNpm &&
+                spawnOpts?.env?.VERCEL_NPM_LEGACY_PEER_DEPS === '1') {
                 // Starting in npm@8.6.0, if you ran `npm install --legacy-peer-deps`,
                 // and then later ran `npm install`, it would fail. So the only way
                 // to safely upgrade npm from npm@8.5.0 is to set this flag. The docs
@@ -336,7 +339,19 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
         if (process.env.NPM_ONLY_PRODUCTION) {
             commandArgs.push('--production');
         }
-        await spawnAsync(cliType, commandArgs, opts);
+        try {
+            await spawnAsync(cliType, commandArgs, opts);
+        }
+        catch (_) {
+            const potentialErrorPath = path_1.default.join(process.env.HOME || '/', '.npm', 'eresolve-report.txt');
+            if (isPotentiallyBrokenNpm &&
+                !commandArgs.includes('--legacy-peer-deps') &&
+                fs_extra_1.default.existsSync(potentialErrorPath)) {
+                console.warn('Warning: Retrying "Install Command" with `--legacy-peer-deps` which may accept a potentially broken dependency and slow install time.');
+                commandArgs.push('--legacy-peer-deps');
+                await spawnAsync(cliType, commandArgs, opts);
+            }
+        }
         debug_1.default(`Install complete [${Date.now() - installTime}ms]`);
         return true;
     }

package/dist/index.js

@@ -30131,14 +30131,18 @@ function cloneEnv(...envs) {
         if (env === undefined || env === null) {
             return obj;
         }
-        // the system path is called `Path` on Windows and Node.js will
-        // automatically return the system path when accessing `PATH`,
-        // however we lose this proxied value when we destructure and
-        // thus we must explicitly copy it
-        if (hasOwnProperty.call(env, 'PATH') || hasOwnProperty.call(env, 'Path')) {
-            obj.PATH = env.PATH;
-        }
-        return Object.assign(obj, env);
+        // mixin the env first
+        obj = Object.assign(obj, env);
+        if (hasOwnProperty.call(env, 'Path')) {
+            // the system path is called `Path` on Windows and Node.js will
+            // automatically return the system path when accessing `PATH`,
+            // however we lose this proxied value when we destructure and
+            // thus we must explicitly copy it, but we must also remove the
+            // `Path` property since we can't have both a `PATH` and `Path`
+            obj.PATH = obj.Path;
+            delete obj.Path;
+        }
+        return obj;
     }, {});
 }
 exports.cloneEnv = cloneEnv;
@@ -31172,14 +31176,17 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
             env,
         });
         let commandArgs;
+        const isPotentiallyBrokenNpm = cliType === 'npm' &&
+            nodeVersion?.major === 16 &&
+            !args.includes('--legacy-peer-deps') &&
+            spawnOpts?.env?.ENABLE_EXPERIMENTAL_COREPACK !== '1';
         if (cliType === 'npm') {
             opts.prettyCommand = 'npm install';
             commandArgs = args
                 .filter(a => a !== '--prefer-offline')
                 .concat(['install', '--no-audit', '--unsafe-perm']);
-            if (nodeVersion?.major === 16 &&
-                spawnOpts?.env?.VERCEL_NPM_LEGACY_PEER_DEPS === '1' &&
-                spawnOpts?.env?.ENABLE_EXPERIMENTAL_COREPACK !== '1') {
+            if (isPotentiallyBrokenNpm &&
+                spawnOpts?.env?.VERCEL_NPM_LEGACY_PEER_DEPS === '1') {
                 // Starting in npm@8.6.0, if you ran `npm install --legacy-peer-deps`,
                 // and then later ran `npm install`, it would fail. So the only way
                 // to safely upgrade npm from npm@8.5.0 is to set this flag. The docs
@@ -31204,7 +31211,19 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
         if (process.env.NPM_ONLY_PRODUCTION) {
             commandArgs.push('--production');
         }
-        await spawnAsync(cliType, commandArgs, opts);
+        try {
+            await spawnAsync(cliType, commandArgs, opts);
+        }
+        catch (_) {
+            const potentialErrorPath = path_1.default.join(process.env.HOME || '/', '.npm', 'eresolve-report.txt');
+            if (isPotentiallyBrokenNpm &&
+                !commandArgs.includes('--legacy-peer-deps') &&
+                fs_extra_1.default.existsSync(potentialErrorPath)) {
+                console.warn('Warning: Retrying "Install Command" with `--legacy-peer-deps` which may accept a potentially broken dependency and slow install time.');
+                commandArgs.push('--legacy-peer-deps');
+                await spawnAsync(cliType, commandArgs, opts);
+            }
+        }
         debug_1.default(`Install complete [${Date.now() - installTime}ms]`);
         return true;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "5.4.3",
+  "version": "5.4.4",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -47,5 +47,5 @@
     "typescript": "4.3.4",
     "yazl": "2.5.1"
   },
-  "gitHead": "619ca9342156758efdb0db8adaf20e0d4a1493e4"
+  "gitHead": "27f4034bdce427953fea094b1c4dfbfb00342b54"
 }