@vercel/build-utils 5.4.2 → 5.4.4

package/dist/clone-env.d.ts

@@ -0,0 +1,10 @@
+import type { Env } from './types';
+/**
+ * Clones zero or more objects into a single new object while ensuring that the
+ * `PATH` environment variable is defined when the `PATH` or `Path` environment
+ * variables are defined.
+ *
+ * @param {Object} [...envs] Objects and/or `process.env` to clone and merge
+ * @returns {Object} The new object
+ */
+export declare function cloneEnv(...envs: (Env | undefined)[]): Env;

package/dist/clone-env.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cloneEnv = void 0;
+const { hasOwnProperty } = Object.prototype;
+/**
+ * Clones zero or more objects into a single new object while ensuring that the
+ * `PATH` environment variable is defined when the `PATH` or `Path` environment
+ * variables are defined.
+ *
+ * @param {Object} [...envs] Objects and/or `process.env` to clone and merge
+ * @returns {Object} The new object
+ */
+function cloneEnv(...envs) {
+    return envs.reduce((obj, env) => {
+        if (env === undefined || env === null) {
+            return obj;
+        }
+        // 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;

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

@@ -15,6 +15,7 @@ const debug_1 = __importDefault(require("../debug"));
 const errors_1 = require("../errors");
 const node_version_1 = require("./node-version");
 const read_config_file_1 = require("./read-config-file");
+const clone_env_1 = require("../clone-env");
 // Only allow one `runNpmInstall()` invocation to run concurrently
 const runNpmInstallSema = new async_sema_1.default(1);
 function spawnAsync(command, args, opts = {}) {
@@ -123,7 +124,7 @@ async function runShellScript(fsPath, args = [], spawnOpts) {
 exports.runShellScript = runShellScript;
 function getSpawnOptions(meta, nodeVersion) {
     const opts = {
-        env: { ...process.env },
+        env: clone_env_1.cloneEnv(process.env),
     };
     if (!meta.isDev) {
         let found = false;
@@ -294,7 +295,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
         console.log('Installing dependencies...');
         debug_1.default(`Installing to ${destPath}`);
         const opts = { cwd: destPath, ...spawnOpts };
-        const env = opts.env ? { ...opts.env } : { ...process.env };
+        const env = clone_env_1.cloneEnv(opts.env || process.env);
         delete env.NODE_ENV;
         opts.env = getEnvForPackageManager({
             cliType,
@@ -303,11 +304,25 @@ 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 (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
+                // say this flag is not recommended so its is behind a feature flag
+                // so we can remove it in node@18, which can introduce breaking changes.
+                // See https://docs.npmjs.com/cli/v8/using-npm/config#legacy-peer-deps
+                commandArgs.push('--legacy-peer-deps');
+            }
         }
         else if (cliType === 'pnpm') {
             // PNPM's install command is similar to NPM's but without the audit nonsense
@@ -324,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;
     }
@@ -401,10 +428,7 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
             cliType,
             lockfileVersion,
             nodeVersion: undefined,
-            env: {
-                ...process.env,
-                ...spawnOpts?.env,
-            },
+            env: clone_env_1.cloneEnv(process.env, spawnOpts?.env),
         }),
     };
     if (cliType === 'npm') {

package/dist/index.d.ts

@@ -15,7 +15,8 @@ import debug from './debug';
 import getIgnoreFilter from './get-ignore-filter';
 import { getPlatformEnv } from './get-platform-env';
 import { getPrefixedEnvVars } from './get-prefixed-env-vars';
-export { FileBlob, FileFsRef, FileRef, Lambda, NodejsLambda, createLambda, Prerender, download, downloadFile, DownloadedFiles, getWriteableDirectory, glob, GlobOptions, rename, execAsync, spawnAsync, getScriptName, installDependencies, runPackageJsonScript, execCommand, spawnCommand, walkParentDirs, getNodeBinPath, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getLatestNodeVersion, getDiscontinuedNodeVersions, getSpawnOptions, getPlatformEnv, getPrefixedEnvVars, streamToBuffer, debug, isSymbolicLink, getLambdaOptionsFromFunction, scanParentDirs, getIgnoreFilter, };
+import { cloneEnv } from './clone-env';
+export { FileBlob, FileFsRef, FileRef, Lambda, NodejsLambda, createLambda, Prerender, download, downloadFile, DownloadedFiles, getWriteableDirectory, glob, GlobOptions, rename, execAsync, spawnAsync, getScriptName, installDependencies, runPackageJsonScript, execCommand, spawnCommand, walkParentDirs, getNodeBinPath, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getLatestNodeVersion, getDiscontinuedNodeVersions, getSpawnOptions, getPlatformEnv, getPrefixedEnvVars, streamToBuffer, debug, isSymbolicLink, getLambdaOptionsFromFunction, scanParentDirs, getIgnoreFilter, cloneEnv, };
 export { EdgeFunction } from './edge-function';
 export { readConfigFile } from './fs/read-config-file';
 export { normalizePath } from './fs/normalize-path';

package/dist/index.js

@@ -30108,6 +30108,46 @@ exports.fromPromise = function (fn) {
 }
 
 
+/***/ }),
+
+/***/ 6548:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.cloneEnv = void 0;
+const { hasOwnProperty } = Object.prototype;
+/**
+ * Clones zero or more objects into a single new object while ensuring that the
+ * `PATH` environment variable is defined when the `PATH` or `Path` environment
+ * variables are defined.
+ *
+ * @param {Object} [...envs] Objects and/or `process.env` to clone and merge
+ * @returns {Object} The new object
+ */
+function cloneEnv(...envs) {
+    return envs.reduce((obj, env) => {
+        if (env === undefined || env === null) {
+            return obj;
+        }
+        // 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;
+
+
 /***/ }),
 
 /***/ 1868:
@@ -30847,6 +30887,7 @@ const debug_1 = __importDefault(__webpack_require__(1868));
 const errors_1 = __webpack_require__(3983);
 const node_version_1 = __webpack_require__(7903);
 const read_config_file_1 = __webpack_require__(7792);
+const clone_env_1 = __webpack_require__(6548);
 // Only allow one `runNpmInstall()` invocation to run concurrently
 const runNpmInstallSema = new async_sema_1.default(1);
 function spawnAsync(command, args, opts = {}) {
@@ -30955,7 +30996,7 @@ async function runShellScript(fsPath, args = [], spawnOpts) {
 exports.runShellScript = runShellScript;
 function getSpawnOptions(meta, nodeVersion) {
     const opts = {
-        env: { ...process.env },
+        env: clone_env_1.cloneEnv(process.env),
     };
     if (!meta.isDev) {
         let found = false;
@@ -31126,7 +31167,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
         console.log('Installing dependencies...');
         debug_1.default(`Installing to ${destPath}`);
         const opts = { cwd: destPath, ...spawnOpts };
-        const env = opts.env ? { ...opts.env } : { ...process.env };
+        const env = clone_env_1.cloneEnv(opts.env || process.env);
         delete env.NODE_ENV;
         opts.env = getEnvForPackageManager({
             cliType,
@@ -31135,11 +31176,25 @@ 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 (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
+                // say this flag is not recommended so its is behind a feature flag
+                // so we can remove it in node@18, which can introduce breaking changes.
+                // See https://docs.npmjs.com/cli/v8/using-npm/config#legacy-peer-deps
+                commandArgs.push('--legacy-peer-deps');
+            }
         }
         else if (cliType === 'pnpm') {
             // PNPM's install command is similar to NPM's but without the audit nonsense
@@ -31156,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;
     }
@@ -31233,10 +31300,7 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
             cliType,
             lockfileVersion,
             nodeVersion: undefined,
-            env: {
-                ...process.env,
-                ...spawnOpts?.env,
-            },
+            env: clone_env_1.cloneEnv(process.env, spawnOpts?.env),
         }),
     };
     if (cliType === 'npm') {
@@ -31499,7 +31563,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.normalizePath = exports.readConfigFile = exports.EdgeFunction = exports.getIgnoreFilter = exports.scanParentDirs = exports.getLambdaOptionsFromFunction = exports.isSymbolicLink = exports.debug = exports.streamToBuffer = exports.getPrefixedEnvVars = exports.getPlatformEnv = exports.getSpawnOptions = exports.getDiscontinuedNodeVersions = exports.getLatestNodeVersion = exports.getNodeVersion = exports.getEnvForPackageManager = exports.runCustomInstallCommand = exports.runShellScript = exports.runPipInstall = exports.runBundleInstall = exports.runNpmInstall = exports.getNodeBinPath = exports.walkParentDirs = exports.spawnCommand = exports.execCommand = exports.runPackageJsonScript = exports.installDependencies = exports.getScriptName = exports.spawnAsync = exports.execAsync = exports.rename = exports.glob = exports.getWriteableDirectory = exports.downloadFile = exports.download = exports.Prerender = exports.createLambda = exports.NodejsLambda = exports.Lambda = exports.FileRef = exports.FileFsRef = exports.FileBlob = void 0;
+exports.normalizePath = exports.readConfigFile = exports.EdgeFunction = exports.cloneEnv = exports.getIgnoreFilter = exports.scanParentDirs = exports.getLambdaOptionsFromFunction = exports.isSymbolicLink = exports.debug = exports.streamToBuffer = exports.getPrefixedEnvVars = exports.getPlatformEnv = exports.getSpawnOptions = exports.getDiscontinuedNodeVersions = exports.getLatestNodeVersion = exports.getNodeVersion = exports.getEnvForPackageManager = exports.runCustomInstallCommand = exports.runShellScript = exports.runPipInstall = exports.runBundleInstall = exports.runNpmInstall = exports.getNodeBinPath = exports.walkParentDirs = exports.spawnCommand = exports.execCommand = exports.runPackageJsonScript = exports.installDependencies = exports.getScriptName = exports.spawnAsync = exports.execAsync = exports.rename = exports.glob = exports.getWriteableDirectory = exports.downloadFile = exports.download = exports.Prerender = exports.createLambda = exports.NodejsLambda = exports.Lambda = exports.FileRef = exports.FileFsRef = exports.FileBlob = void 0;
 const file_blob_1 = __importDefault(__webpack_require__(2397));
 exports.FileBlob = file_blob_1.default;
 const file_fs_ref_1 = __importDefault(__webpack_require__(9331));
@@ -31556,6 +31620,8 @@ const get_platform_env_1 = __webpack_require__(4678);
 Object.defineProperty(exports, "getPlatformEnv", ({ enumerable: true, get: function () { return get_platform_env_1.getPlatformEnv; } }));
 const get_prefixed_env_vars_1 = __webpack_require__(6838);
 Object.defineProperty(exports, "getPrefixedEnvVars", ({ enumerable: true, get: function () { return get_prefixed_env_vars_1.getPrefixedEnvVars; } }));
+const clone_env_1 = __webpack_require__(6548);
+Object.defineProperty(exports, "cloneEnv", ({ enumerable: true, get: function () { return clone_env_1.cloneEnv; } }));
 var edge_function_1 = __webpack_require__(8038);
 Object.defineProperty(exports, "EdgeFunction", ({ enumerable: true, get: function () { return edge_function_1.EdgeFunction; } }));
 var read_config_file_1 = __webpack_require__(7792);

package/dist/types.d.ts

@@ -303,6 +303,7 @@ export interface BuilderV2 {
     version: 2;
     build: BuildV2;
     prepareCache?: PrepareCache;
+    shouldServe?: ShouldServe;
 }
 export interface BuilderV3 {
     version: 3;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "5.4.2",
+  "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": "d5537500d8957985c1ffb3798659a611cc2e5d5d"
+  "gitHead": "27f4034bdce427953fea094b1c4dfbfb00342b54"
 }