@vercel/build-utils 2.15.2-canary.0 → 2.15.2-canary.1

package/dist/fs/run-user-scripts.d.ts

@@ -7,6 +7,11 @@ export interface ScanParentDirsResult {
      * "yarn", "npm", or "pnpm" depending on the presence of lockfiles.
      */
     cliType: CliType;
+    /**
+     * The file path of found `package.json` file, or `undefined` if none was
+     * found.
+     */
+    packageJsonPath?: string;
     /**
      * The contents of found `package.json` file, when the `readPackageJson`
      * option is enabled.
@@ -56,7 +61,7 @@ export declare function getSpawnOptions(meta: Meta, nodeVersion: NodeVersion): S
 export declare function getNodeVersion(destPath: string, _nodeVersion?: string, config?: Config, meta?: Meta): Promise<NodeVersion>;
 export declare function scanParentDirs(destPath: string, readPackageJson?: boolean): Promise<ScanParentDirsResult>;
 export declare function walkParentDirs({ base, start, filename, }: WalkParentDirsProps): Promise<string | null>;
-export declare function runNpmInstall(destPath: string, args?: string[], spawnOpts?: SpawnOptions, meta?: Meta, nodeVersion?: NodeVersion): Promise<void>;
+export declare function runNpmInstall(destPath: string, args?: string[], spawnOpts?: SpawnOptions, meta?: Meta, nodeVersion?: NodeVersion): Promise<boolean>;
 export declare function getEnvForPackageManager({ cliType, lockfileVersion, nodeVersion, env, }: {
     cliType: CliType;
     lockfileVersion: number | undefined;

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

@@ -7,12 +7,15 @@ exports.installDependencies = exports.getScriptName = exports.runPipInstall = ex
 const assert_1 = __importDefault(require("assert"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
-const debug_1 = __importDefault(require("../debug"));
+const async_sema_1 = __importDefault(require("async-sema"));
 const cross_spawn_1 = __importDefault(require("cross-spawn"));
 const util_1 = require("util");
+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");
+// Only allow one `runNpmInstall()` invocation to run concurrently
+const runNpmInstallSema = new async_sema_1.default(1);
 function spawnAsync(command, args, opts = {}) {
     return new Promise((resolve, reject) => {
         const stderrLogs = [];
@@ -151,11 +154,12 @@ async function scanParentDirs(destPath, readPackageJson = false) {
     assert_1.default(path_1.default.isAbsolute(destPath));
     let cliType = 'yarn';
     let packageJson;
+    let packageJsonPath;
     let currentDestPath = destPath;
     let lockfileVersion;
     // eslint-disable-next-line no-constant-condition
     while (true) {
-        const packageJsonPath = path_1.default.join(currentDestPath, 'package.json');
+        packageJsonPath = path_1.default.join(currentDestPath, 'package.json');
         // eslint-disable-next-line no-await-in-loop
         if (await fs_extra_1.default.pathExists(packageJsonPath)) {
             // Only read the contents of the *first* `package.json` file found,
@@ -199,7 +203,7 @@ async function scanParentDirs(destPath, readPackageJson = false) {
             break;
         currentDestPath = newDestPath;
     }
-    return { cliType, packageJson, lockfileVersion };
+    return { cliType, packageJson, lockfileVersion, packageJsonPath };
 }
 exports.scanParentDirs = scanParentDirs;
 async function walkParentDirs({ base, start, filename, }) {
@@ -217,46 +221,75 @@ async function walkParentDirs({ base, start, filename, }) {
     return null;
 }
 exports.walkParentDirs = walkParentDirs;
+function isSet(v) {
+    var _a;
+    return ((_a = v === null || v === void 0 ? void 0 : v.constructor) === null || _a === void 0 ? void 0 : _a.name) === 'Set';
+}
 async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion) {
     if (meta === null || meta === void 0 ? void 0 : meta.isDev) {
         debug_1.default('Skipping dependency installation because dev mode is enabled');
-        return;
+        return false;
     }
     assert_1.default(path_1.default.isAbsolute(destPath));
-    debug_1.default(`Installing to ${destPath}`);
-    const { cliType, lockfileVersion } = await scanParentDirs(destPath);
-    const opts = { cwd: destPath, ...spawnOpts };
-    const env = opts.env ? { ...opts.env } : { ...process.env };
-    delete env.NODE_ENV;
-    opts.env = getEnvForPackageManager({
-        cliType,
-        lockfileVersion,
-        nodeVersion,
-        env,
-    });
-    let commandArgs;
-    if (cliType === 'npm') {
-        opts.prettyCommand = 'npm install';
-        commandArgs = args
-            .filter(a => a !== '--prefer-offline')
-            .concat(['install', '--no-audit', '--unsafe-perm']);
-    }
-    else if (cliType === 'pnpm') {
-        // PNPM's install command is similar to NPM's but without the audit nonsense
-        // @see options https://pnpm.io/cli/install
-        opts.prettyCommand = 'pnpm install';
-        commandArgs = args
-            .filter(a => a !== '--prefer-offline')
-            .concat(['install', '--unsafe-perm']);
-    }
-    else {
-        opts.prettyCommand = 'yarn install';
-        commandArgs = ['install', ...args];
+    try {
+        await runNpmInstallSema.acquire();
+        const { cliType, packageJsonPath, lockfileVersion } = await scanParentDirs(destPath);
+        // Only allow `runNpmInstall()` to run once per `package.json`
+        // when doing a default install (no additional args)
+        if (meta && packageJsonPath && args.length === 0) {
+            if (!isSet(meta.runNpmInstallSet)) {
+                meta.runNpmInstallSet = new Set();
+            }
+            if (isSet(meta.runNpmInstallSet)) {
+                if (meta.runNpmInstallSet.has(packageJsonPath)) {
+                    return false;
+                }
+                else {
+                    meta.runNpmInstallSet.add(packageJsonPath);
+                }
+            }
+        }
+        const installTime = Date.now();
+        console.log('Installing dependencies...');
+        debug_1.default(`Installing to ${destPath}`);
+        const opts = { cwd: destPath, ...spawnOpts };
+        const env = opts.env ? { ...opts.env } : { ...process.env };
+        delete env.NODE_ENV;
+        opts.env = getEnvForPackageManager({
+            cliType,
+            lockfileVersion,
+            nodeVersion,
+            env,
+        });
+        let commandArgs;
+        if (cliType === 'npm') {
+            opts.prettyCommand = 'npm install';
+            commandArgs = args
+                .filter(a => a !== '--prefer-offline')
+                .concat(['install', '--no-audit', '--unsafe-perm']);
+        }
+        else if (cliType === 'pnpm') {
+            // PNPM's install command is similar to NPM's but without the audit nonsense
+            // @see options https://pnpm.io/cli/install
+            opts.prettyCommand = 'pnpm install';
+            commandArgs = args
+                .filter(a => a !== '--prefer-offline')
+                .concat(['install', '--unsafe-perm']);
+        }
+        else {
+            opts.prettyCommand = 'yarn install';
+            commandArgs = ['install', ...args];
+        }
+        if (process.env.NPM_ONLY_PRODUCTION) {
+            commandArgs.push('--production');
+        }
+        await spawnAsync(cliType, commandArgs, opts);
+        debug_1.default(`Install complete [${Date.now() - installTime}ms]`);
+        return true;
     }
-    if (process.env.NPM_ONLY_PRODUCTION) {
-        commandArgs.push('--production');
+    finally {
+        runNpmInstallSema.release();
     }
-    return spawnAsync(cliType, commandArgs, opts);
 }
 exports.runNpmInstall = runNpmInstall;
 function getEnvForPackageManager({ cliType, lockfileVersion, nodeVersion, env, }) {

package/dist/index.js

@@ -34621,12 +34621,15 @@ exports.installDependencies = exports.getScriptName = exports.runPipInstall = ex
 const assert_1 = __importDefault(__webpack_require__(2357));
 const fs_extra_1 = __importDefault(__webpack_require__(5392));
 const path_1 = __importDefault(__webpack_require__(5622));
-const debug_1 = __importDefault(__webpack_require__(1868));
+const async_sema_1 = __importDefault(__webpack_require__(5758));
 const cross_spawn_1 = __importDefault(__webpack_require__(7618));
 const util_1 = __webpack_require__(1669);
+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);
+// Only allow one `runNpmInstall()` invocation to run concurrently
+const runNpmInstallSema = new async_sema_1.default(1);
 function spawnAsync(command, args, opts = {}) {
     return new Promise((resolve, reject) => {
         const stderrLogs = [];
@@ -34765,11 +34768,12 @@ async function scanParentDirs(destPath, readPackageJson = false) {
     assert_1.default(path_1.default.isAbsolute(destPath));
     let cliType = 'yarn';
     let packageJson;
+    let packageJsonPath;
     let currentDestPath = destPath;
     let lockfileVersion;
     // eslint-disable-next-line no-constant-condition
     while (true) {
-        const packageJsonPath = path_1.default.join(currentDestPath, 'package.json');
+        packageJsonPath = path_1.default.join(currentDestPath, 'package.json');
         // eslint-disable-next-line no-await-in-loop
         if (await fs_extra_1.default.pathExists(packageJsonPath)) {
             // Only read the contents of the *first* `package.json` file found,
@@ -34813,7 +34817,7 @@ async function scanParentDirs(destPath, readPackageJson = false) {
             break;
         currentDestPath = newDestPath;
     }
-    return { cliType, packageJson, lockfileVersion };
+    return { cliType, packageJson, lockfileVersion, packageJsonPath };
 }
 exports.scanParentDirs = scanParentDirs;
 async function walkParentDirs({ base, start, filename, }) {
@@ -34831,46 +34835,75 @@ async function walkParentDirs({ base, start, filename, }) {
     return null;
 }
 exports.walkParentDirs = walkParentDirs;
+function isSet(v) {
+    var _a;
+    return ((_a = v === null || v === void 0 ? void 0 : v.constructor) === null || _a === void 0 ? void 0 : _a.name) === 'Set';
+}
 async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion) {
     if (meta === null || meta === void 0 ? void 0 : meta.isDev) {
         debug_1.default('Skipping dependency installation because dev mode is enabled');
-        return;
+        return false;
     }
     assert_1.default(path_1.default.isAbsolute(destPath));
-    debug_1.default(`Installing to ${destPath}`);
-    const { cliType, lockfileVersion } = await scanParentDirs(destPath);
-    const opts = { cwd: destPath, ...spawnOpts };
-    const env = opts.env ? { ...opts.env } : { ...process.env };
-    delete env.NODE_ENV;
-    opts.env = getEnvForPackageManager({
-        cliType,
-        lockfileVersion,
-        nodeVersion,
-        env,
-    });
-    let commandArgs;
-    if (cliType === 'npm') {
-        opts.prettyCommand = 'npm install';
-        commandArgs = args
-            .filter(a => a !== '--prefer-offline')
-            .concat(['install', '--no-audit', '--unsafe-perm']);
-    }
-    else if (cliType === 'pnpm') {
-        // PNPM's install command is similar to NPM's but without the audit nonsense
-        // @see options https://pnpm.io/cli/install
-        opts.prettyCommand = 'pnpm install';
-        commandArgs = args
-            .filter(a => a !== '--prefer-offline')
-            .concat(['install', '--unsafe-perm']);
-    }
-    else {
-        opts.prettyCommand = 'yarn install';
-        commandArgs = ['install', ...args];
+    try {
+        await runNpmInstallSema.acquire();
+        const { cliType, packageJsonPath, lockfileVersion } = await scanParentDirs(destPath);
+        // Only allow `runNpmInstall()` to run once per `package.json`
+        // when doing a default install (no additional args)
+        if (meta && packageJsonPath && args.length === 0) {
+            if (!isSet(meta.runNpmInstallSet)) {
+                meta.runNpmInstallSet = new Set();
+            }
+            if (isSet(meta.runNpmInstallSet)) {
+                if (meta.runNpmInstallSet.has(packageJsonPath)) {
+                    return false;
+                }
+                else {
+                    meta.runNpmInstallSet.add(packageJsonPath);
+                }
+            }
+        }
+        const installTime = Date.now();
+        console.log('Installing dependencies...');
+        debug_1.default(`Installing to ${destPath}`);
+        const opts = { cwd: destPath, ...spawnOpts };
+        const env = opts.env ? { ...opts.env } : { ...process.env };
+        delete env.NODE_ENV;
+        opts.env = getEnvForPackageManager({
+            cliType,
+            lockfileVersion,
+            nodeVersion,
+            env,
+        });
+        let commandArgs;
+        if (cliType === 'npm') {
+            opts.prettyCommand = 'npm install';
+            commandArgs = args
+                .filter(a => a !== '--prefer-offline')
+                .concat(['install', '--no-audit', '--unsafe-perm']);
+        }
+        else if (cliType === 'pnpm') {
+            // PNPM's install command is similar to NPM's but without the audit nonsense
+            // @see options https://pnpm.io/cli/install
+            opts.prettyCommand = 'pnpm install';
+            commandArgs = args
+                .filter(a => a !== '--prefer-offline')
+                .concat(['install', '--unsafe-perm']);
+        }
+        else {
+            opts.prettyCommand = 'yarn install';
+            commandArgs = ['install', ...args];
+        }
+        if (process.env.NPM_ONLY_PRODUCTION) {
+            commandArgs.push('--production');
+        }
+        await spawnAsync(cliType, commandArgs, opts);
+        debug_1.default(`Install complete [${Date.now() - installTime}ms]`);
+        return true;
     }
-    if (process.env.NPM_ONLY_PRODUCTION) {
-        commandArgs.push('--production');
+    finally {
+        runNpmInstallSema.release();
     }
-    return spawnAsync(cliType, commandArgs, opts);
 }
 exports.runNpmInstall = runNpmInstall;
 function getEnvForPackageManager({ cliType, lockfileVersion, nodeVersion, env, }) {

package/dist/types.d.ts

@@ -313,7 +313,28 @@ export interface Images {
     minimumCacheTTL?: number;
     formats?: ImageFormat[];
 }
-export interface BuildResultV2 {
+/**
+ * If a Builder ends up creating filesystem outputs conforming to
+ * the Build Output API, then the Builder should return this type.
+ */
+export interface BuildResultBuildOutput {
+    /**
+     * Version number of the Build Output API that was created.
+     * Currently only `3` is a valid value.
+     * @example 3
+     */
+    buildOutputVersion: 3;
+    /**
+     * Filesystem path to the Build Output directory.
+     * @example "/path/to/.vercel/output"
+     */
+    buildOutputPath: string;
+}
+/**
+ * When a Builder implements `version: 2`, the `build()` function is expected
+ * to return this type.
+ */
+export interface BuildResultV2Typical {
     routes?: any[];
     images?: Images;
     output: {
@@ -324,6 +345,7 @@ export interface BuildResultV2 {
         value: string;
     }>;
 }
+export declare type BuildResultV2 = BuildResultV2Typical | BuildResultBuildOutput;
 export interface BuildResultV3 {
     output: Lambda;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "2.15.2-canary.0",
+  "version": "2.15.2-canary.1",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",
@@ -49,5 +49,5 @@
     "typescript": "4.3.4",
     "yazl": "2.4.3"
   },
-  "gitHead": "e7f524defba3bbf2db750dea3235e6699584c424"
+  "gitHead": "71b83d5587b549a1458697b50596a5534cb783d3"
 }