@vercel/build-utils 4.2.0 → 5.0.1-canary.0

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

@@ -44,6 +44,12 @@ export interface SpawnOptionsExtended extends SpawnOptions {
      * Pretty formatted command that is being spawned for logging purposes.
      */
     prettyCommand?: string;
+    /**
+     * Returns instead of throwing an error when the process exits with a
+     * non-0 exit code. When relevant, the returned object will include
+     * the error code, stdout and stderr.
+     */
+    ignoreNon0Exit?: boolean;
 }
 export declare function spawnAsync(command: string, args: string[], opts?: SpawnOptionsExtended): Promise<void>;
 export declare function execAsync(command: string, args: string[], opts?: SpawnOptionsExtended): Promise<{
@@ -53,7 +59,7 @@ export declare function execAsync(command: string, args: string[], opts?: SpawnO
 }>;
 export declare function spawnCommand(command: string, options?: SpawnOptions): import("child_process").ChildProcess;
 export declare function execCommand(command: string, options?: SpawnOptions): Promise<boolean>;
-export declare function getNodeBinPath({ cwd }: {
+export declare function getNodeBinPath({ cwd, }: {
     cwd: string;
 }): Promise<string>;
 export declare function runShellScript(fsPath: string, args?: string[], spawnOpts?: SpawnOptions): Promise<boolean>;

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

@@ -27,7 +27,7 @@ function spawnAsync(command, args, opts = {}) {
         }
         child.on('error', reject);
         child.on('close', (code, signal) => {
-            if (code === 0) {
+            if (code === 0 || opts.ignoreNon0Exit) {
                 return resolve();
             }
             const cmd = opts.prettyCommand
@@ -57,20 +57,20 @@ function execAsync(command, args, opts = {}) {
         });
         child.on('error', reject);
         child.on('close', (code, signal) => {
-            if (code !== 0) {
-                const cmd = opts.prettyCommand
-                    ? `Command "${opts.prettyCommand}"`
-                    : 'Command';
-                return reject(new errors_1.NowBuildError({
-                    code: `BUILD_UTILS_EXEC_${code || signal}`,
-                    message: `${cmd} exited with ${code || signal}`,
-                }));
+            if (code === 0 || opts.ignoreNon0Exit) {
+                return resolve({
+                    code,
+                    stdout: Buffer.concat(stdoutList).toString(),
+                    stderr: Buffer.concat(stderrList).toString(),
+                });
             }
-            return resolve({
-                code,
-                stdout: Buffer.concat(stdoutList).toString(),
-                stderr: Buffer.concat(stderrList).toString(),
-            });
+            const cmd = opts.prettyCommand
+                ? `Command "${opts.prettyCommand}"`
+                : 'Command';
+            return reject(new errors_1.NowBuildError({
+                code: `BUILD_UTILS_EXEC_${code || signal}`,
+                message: `${cmd} exited with ${code || signal}`,
+            }));
         });
     });
 }
@@ -94,9 +94,22 @@ async function execCommand(command, options = {}) {
     return true;
 }
 exports.execCommand = execCommand;
-async function getNodeBinPath({ cwd }) {
-    const { stdout } = await execAsync('npm', ['bin'], { cwd });
-    return stdout.trim();
+async function getNodeBinPath({ cwd, }) {
+    const { code, stdout, stderr } = await execAsync('npm', ['bin'], {
+        cwd,
+        prettyCommand: 'npm bin',
+        // in some rare cases, we saw `npm bin` exit with a non-0 code, but still
+        // output the right bin path, so we ignore the exit code
+        ignoreNon0Exit: true,
+    });
+    const nodeBinPath = stdout.trim();
+    if (path_1.default.isAbsolute(nodeBinPath)) {
+        return nodeBinPath;
+    }
+    throw new errors_1.NowBuildError({
+        code: `BUILD_UTILS_GET_NODE_BIN_PATH`,
+        message: `Running \`npm bin\` failed to return a valid bin path (code=${code}, stdout=${stdout}, stderr=${stderr})`,
+    });
 }
 exports.getNodeBinPath = getNodeBinPath;
 async function chmodPlusX(fsPath) {
@@ -125,8 +138,20 @@ function getSpawnOptions(meta, nodeVersion) {
         env: { ...process.env },
     };
     if (!meta.isDev) {
-        // Ensure that the selected Node version is at the beginning of the `$PATH`
-        opts.env.PATH = `/node${nodeVersion.major}/bin${path_1.default.delimiter}${opts.env.PATH || process.env.PATH}`;
+        let found = false;
+        const oldPath = opts.env.PATH || process.env.PATH || '';
+        const pathSegments = oldPath.split(path_1.default.delimiter).map(segment => {
+            if (/^\/node[0-9]+\/bin/.test(segment)) {
+                found = true;
+                return `/node${nodeVersion.major}/bin`;
+            }
+            return segment;
+        });
+        if (!found) {
+            // If we didn't find & replace, prepend at beginning of PATH
+            pathSegments.unshift(`/node${nodeVersion.major}/bin`);
+        }
+        opts.env.PATH = pathSegments.filter(Boolean).join(path_1.default.delimiter);
     }
     return opts;
 }
@@ -310,19 +335,28 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
 exports.runNpmInstall = runNpmInstall;
 function getEnvForPackageManager({ cliType, lockfileVersion, nodeVersion, env, }) {
     const newEnv = { ...env };
+    const oldPath = env.PATH + '';
+    const npm7 = '/node16/bin-npm7';
+    const pnpm7 = '/pnpm7/node_modules/.bin';
+    const corepackEnabled = env.ENABLE_EXPERIMENTAL_COREPACK === '1';
     if (cliType === 'npm') {
         if (typeof lockfileVersion === 'number' &&
             lockfileVersion >= 2 &&
-            (nodeVersion?.major || 0) < 16) {
+            (nodeVersion?.major || 0) < 16 &&
+            !oldPath.includes(npm7) &&
+            !corepackEnabled) {
             // Ensure that npm 7 is at the beginning of the `$PATH`
-            newEnv.PATH = `/node16/bin-npm7${path_1.default.delimiter}${env.PATH}`;
-            console.log('Detected `package-lock.json` generated by npm 7...');
+            newEnv.PATH = `${npm7}${path_1.default.delimiter}${oldPath}`;
+            console.log('Detected `package-lock.json` generated by npm 7+...');
         }
     }
     else if (cliType === 'pnpm') {
-        if (typeof lockfileVersion === 'number' && lockfileVersion === 5.4) {
+        if (typeof lockfileVersion === 'number' &&
+            lockfileVersion === 5.4 &&
+            !oldPath.includes(pnpm7) &&
+            !corepackEnabled) {
             // Ensure that pnpm 7 is at the beginning of the `$PATH`
-            newEnv.PATH = `/pnpm7/node_modules/.bin${path_1.default.delimiter}${env.PATH}`;
+            newEnv.PATH = `${pnpm7}${path_1.default.delimiter}${oldPath}`;
             console.log('Detected `pnpm-lock.yaml` generated by pnpm 7...');
         }
     }

package/dist/index.d.ts

@@ -16,23 +16,9 @@ import getIgnoreFilter from './get-ignore-filter';
 import { getPlatformEnv } from './get-platform-env';
 export { FileBlob, FileFsRef, FileRef, Lambda, NodejsLambda, createLambda, Prerender, download, 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, streamToBuffer, debug, isSymbolicLink, getLambdaOptionsFromFunction, scanParentDirs, getIgnoreFilter, };
 export { EdgeFunction } from './edge-function';
-export { detectBuilders, detectOutputDirectory, detectApiDirectory, detectApiExtensions, } from './detect-builders';
-export { detectFileSystemAPI } from './detect-file-system-api';
-export { detectFramework } from './detect-framework';
-export { getProjectPaths } from './get-project-paths';
-export { DetectorFilesystem } from './detectors/filesystem';
 export { readConfigFile } from './fs/read-config-file';
 export { normalizePath } from './fs/normalize-path';
 export * from './should-serve';
 export * from './schemas';
 export * from './types';
 export * from './errors';
-/**
- * Helper function to support both `@vercel` and legacy `@now` official Runtimes.
- */
-export declare const isOfficialRuntime: (desired: string, name?: string | undefined) => boolean;
-export declare const isStaticRuntime: (name?: string | undefined) => boolean;
-export { workspaceManagers } from './workspaces/workspace-managers';
-export { getWorkspaces, GetWorkspaceOptions, Workspace, WorkspaceType, } from './workspaces/get-workspaces';
-export { getWorkspacePackagePaths, GetWorkspacePackagePathsOptions, } from './workspaces/get-workspace-package-paths';
-export { monorepoManagers } from './monorepos/monorepo-managers';