@vercel/build-utils 4.2.1 → 5.0.1

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

@@ -61,7 +61,7 @@ export declare function spawnCommand(command: string, options?: SpawnOptions): i
 export declare function execCommand(command: string, options?: SpawnOptions): Promise<boolean>;
 export declare function getNodeBinPath({ cwd, }: {
     cwd: string;
-}): Promise<string | undefined>;
+}): Promise<string>;
 export declare function runShellScript(fsPath: string, args?: string[], spawnOpts?: SpawnOptions): Promise<boolean>;
 export declare function getSpawnOptions(meta: Meta, nodeVersion: NodeVersion): SpawnOptions;
 export declare function getNodeVersion(destPath: string, _nodeVersion?: string, config?: Config, meta?: Meta): Promise<NodeVersion>;

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

@@ -138,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;
 }
@@ -323,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';