@vercel/build-utils 2.13.1-canary.0 → 2.14.1-canary.0

package/.turbo/turbo-build.log

@@ -3,8 +3,8 @@ ncc: Version 0.24.0
 ncc: Compiling file index.js
 ncc: Using typescript@4.3.4 (local user-provided)
    0kB  dist/main/should-serve.d.ts
+   0kB  dist/main/get-platform-env.d.ts
    0kB  dist/main/get-ignore-filter.d.ts
-   0kB  dist/main/detect-framework.d.ts
    0kB  dist/main/fs/stream-to-buffer.d.ts
    0kB  dist/main/fs/rename.d.ts
    0kB  dist/main/fs/read-config-file.d.ts
@@ -13,9 +13,11 @@ ncc: Using typescript@4.3.4 (local user-provided)
    0kB  dist/main/fs/glob.d.ts
    0kB  dist/main/fs/get-writable-directory.d.ts
    0kB  dist/main/fs/download.d.ts
+   0kB  dist/main/detect-framework.d.ts
    0kB  dist/main/debug.d.ts
    1kB  dist/main/schemas.d.ts
    1kB  dist/main/prerender.d.ts
+   1kB  dist/main/nodejs-lambda.d.ts
    1kB  dist/main/lambda.d.ts
    1kB  dist/main/file-ref.d.ts
    1kB  dist/main/file-fs-ref.d.ts
@@ -23,10 +25,9 @@ ncc: Using typescript@4.3.4 (local user-provided)
    1kB  dist/main/errors.d.ts
    1kB  dist/main/detect-file-system-api.d.ts
    1kB  dist/main/detect-builders.d.ts
+   2kB  dist/main/index.d.ts
    2kB  dist/main/detectors/filesystem.d.ts
-   2kB  dist/main/convert-runtime-to-plugin.d.ts
-   3kB  dist/main/index.d.ts
-   3kB  dist/main/fs/run-user-scripts.d.ts
-   9kB  dist/main/types.d.ts
-1244kB  dist/main/index.js
-1272kB  [8092ms] - ncc 0.24.0
+   4kB  dist/main/fs/run-user-scripts.d.ts
+  10kB  dist/main/types.d.ts
+1231kB  dist/main/index.js
+1259kB  [7510ms] - ncc 0.24.0

package/dist/debug.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const _1 = require("./");
+const get_platform_env_1 = require("./get-platform-env");
 function debug(message, ...additional) {
-    if (_1.getPlatformEnv('BUILDER_DEBUG')) {
+    if (get_platform_env_1.getPlatformEnv('BUILDER_DEBUG')) {
         console.log(message, ...additional);
     }
 }

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

@@ -57,6 +57,22 @@ export declare function getNodeVersion(destPath: string, _nodeVersion?: string,
 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 getEnvForPackageManager({ cliType, lockfileVersion, nodeVersion, env, }: {
+    cliType: CliType;
+    lockfileVersion: number | undefined;
+    nodeVersion: NodeVersion | undefined;
+    env: {
+        [x: string]: string | undefined;
+    };
+}): {
+    [x: string]: string | undefined;
+};
+export declare function runCustomInstallCommand({ destPath, installCommand, nodeVersion, spawnOpts, }: {
+    destPath: string;
+    installCommand: string;
+    nodeVersion: NodeVersion;
+    spawnOpts?: SpawnOptions;
+}): Promise<void>;
 export declare function runPackageJsonScript(destPath: string, scriptNames: string | Iterable<string>, spawnOpts?: SpawnOptions): Promise<boolean>;
 export declare function runBundleInstall(destPath: string, args?: string[], spawnOpts?: SpawnOptions, meta?: Meta): Promise<void>;
 export declare function runPipInstall(destPath: string, args?: string[], spawnOpts?: SpawnOptions, meta?: Meta): Promise<void>;

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installDependencies = exports.getScriptName = exports.runPipInstall = exports.runBundleInstall = exports.runPackageJsonScript = exports.runNpmInstall = exports.walkParentDirs = exports.scanParentDirs = exports.getNodeVersion = exports.getSpawnOptions = exports.runShellScript = exports.getNodeBinPath = exports.execCommand = exports.spawnCommand = exports.execAsync = exports.spawnAsync = void 0;
+exports.installDependencies = exports.getScriptName = exports.runPipInstall = exports.runBundleInstall = exports.runPackageJsonScript = exports.runCustomInstallCommand = exports.getEnvForPackageManager = exports.runNpmInstall = exports.walkParentDirs = exports.scanParentDirs = exports.getNodeVersion = exports.getSpawnOptions = exports.runShellScript = exports.getNodeBinPath = exports.execCommand = exports.spawnCommand = exports.execAsync = exports.spawnAsync = void 0;
 const assert_1 = __importDefault(require("assert"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
@@ -221,36 +221,66 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
     const opts = { cwd: destPath, ...spawnOpts };
     const env = opts.env ? { ...opts.env } : { ...process.env };
     delete env.NODE_ENV;
-    opts.env = 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']);
-        // If the lockfile version is 2 or greater and the node version is less than 16 than we will force npm7 to be used
+    }
+    else {
+        opts.prettyCommand = 'yarn install';
+        commandArgs = ['install', ...args];
+    }
+    if (process.env.NPM_ONLY_PRODUCTION) {
+        commandArgs.push('--production');
+    }
+    return spawnAsync(cliType, commandArgs, opts);
+}
+exports.runNpmInstall = runNpmInstall;
+function getEnvForPackageManager({ cliType, lockfileVersion, nodeVersion, env, }) {
+    const newEnv = { ...env };
+    if (cliType === 'npm') {
         if (typeof lockfileVersion === 'number' &&
             lockfileVersion >= 2 &&
             ((nodeVersion === null || nodeVersion === void 0 ? void 0 : nodeVersion.major) || 0) < 16) {
             // Ensure that npm 7 is at the beginning of the `$PATH`
-            env.PATH = `/node16/bin-npm7:${env.PATH}`;
+            newEnv.PATH = `/node16/bin-npm7:${env.PATH}`;
             console.log('Detected `package-lock.json` generated by npm 7...');
         }
     }
     else {
-        opts.prettyCommand = 'yarn install';
-        commandArgs = ['install', ...args];
         // Yarn v2 PnP mode may be activated, so force "node-modules" linker style
         if (!env.YARN_NODE_LINKER) {
-            env.YARN_NODE_LINKER = 'node-modules';
+            newEnv.YARN_NODE_LINKER = 'node-modules';
         }
     }
-    if (process.env.NPM_ONLY_PRODUCTION) {
-        commandArgs.push('--production');
-    }
-    return spawnAsync(cliType, commandArgs, opts);
+    return newEnv;
 }
-exports.runNpmInstall = runNpmInstall;
+exports.getEnvForPackageManager = getEnvForPackageManager;
+async function runCustomInstallCommand({ destPath, installCommand, nodeVersion, spawnOpts, }) {
+    console.log(`Running "install" command: \`${installCommand}\`...`);
+    const { cliType, lockfileVersion } = await scanParentDirs(destPath);
+    const env = getEnvForPackageManager({
+        cliType,
+        lockfileVersion,
+        nodeVersion,
+        env: (spawnOpts === null || spawnOpts === void 0 ? void 0 : spawnOpts.env) || {},
+    });
+    debug_1.default(`Running with $PATH:`, (env === null || env === void 0 ? void 0 : env.PATH) || '');
+    await execCommand(installCommand, {
+        ...spawnOpts,
+        env,
+        cwd: destPath,
+    });
+}
+exports.runCustomInstallCommand = runCustomInstallCommand;
 async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
     assert_1.default(path_1.default.isAbsolute(destPath));
     const { packageJson, cliType, lockfileVersion } = await scanParentDirs(destPath, true);
@@ -259,21 +289,24 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
         return false;
     debug_1.default('Running user script...');
     const runScriptTime = Date.now();
-    const opts = { cwd: destPath, ...spawnOpts };
-    const env = (opts.env = { ...process.env, ...opts.env });
+    const opts = {
+        cwd: destPath,
+        ...spawnOpts,
+        env: getEnvForPackageManager({
+            cliType,
+            lockfileVersion,
+            nodeVersion: undefined,
+            env: {
+                ...process.env,
+                ...spawnOpts === null || spawnOpts === void 0 ? void 0 : spawnOpts.env,
+            },
+        }),
+    };
     if (cliType === 'npm') {
         opts.prettyCommand = `npm run ${scriptName}`;
-        if (typeof lockfileVersion === 'number' && lockfileVersion >= 2) {
-            // Ensure that npm 7 is at the beginning of the `$PATH`
-            env.PATH = `/node16/bin-npm7:${env.PATH}`;
-        }
     }
     else {
         opts.prettyCommand = `yarn run ${scriptName}`;
-        // Yarn v2 PnP mode may be activated, so force "node-modules" linker style
-        if (!env.YARN_NODE_LINKER) {
-            env.YARN_NODE_LINKER = 'node-modules';
-        }
     }
     console.log(`Running "${opts.prettyCommand}"`);
     await spawnAsync(cliType, ['run', scriptName], opts);

package/dist/get-platform-env.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Helper function to support both `VERCEL_` and legacy `NOW_` env vars.
+ * Throws an error if *both* env vars are defined.
+ */
+export declare const getPlatformEnv: (name: string) => string | undefined;

package/dist/get-platform-env.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPlatformEnv = void 0;
+const errors_1 = require("./errors");
+/**
+ * Helper function to support both `VERCEL_` and legacy `NOW_` env vars.
+ * Throws an error if *both* env vars are defined.
+ */
+const getPlatformEnv = (name) => {
+    const vName = `VERCEL_${name}`;
+    const nName = `NOW_${name}`;
+    const v = process.env[vName];
+    const n = process.env[nName];
+    if (typeof v === 'string') {
+        if (typeof n === 'string') {
+            throw new errors_1.NowBuildError({
+                code: 'CONFLICTING_ENV_VAR_NAMES',
+                message: `Both "${vName}" and "${nName}" env vars are defined. Please only define the "${vName}" env var.`,
+                link: 'https://vercel.link/combining-old-and-new-config',
+            });
+        }
+        return v;
+    }
+    return n;
+};
+exports.getPlatformEnv = getPlatformEnv;

package/dist/index.d.ts

@@ -2,25 +2,26 @@ import FileBlob from './file-blob';
 import FileFsRef from './file-fs-ref';
 import FileRef from './file-ref';
 import { Lambda, createLambda, getLambdaOptionsFromFunction } from './lambda';
+import { NodejsLambda } from './nodejs-lambda';
 import { Prerender } from './prerender';
 import download, { DownloadedFiles, isSymbolicLink } from './fs/download';
 import getWriteableDirectory from './fs/get-writable-directory';
 import glob, { GlobOptions } from './fs/glob';
 import rename from './fs/rename';
-import { execAsync, spawnAsync, execCommand, spawnCommand, walkParentDirs, getScriptName, installDependencies, runPackageJsonScript, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, getNodeVersion, getSpawnOptions, getNodeBinPath, scanParentDirs } from './fs/run-user-scripts';
+import { execAsync, spawnAsync, execCommand, spawnCommand, walkParentDirs, getScriptName, installDependencies, runPackageJsonScript, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, runCustomInstallCommand, getEnvForPackageManager, getNodeVersion, getSpawnOptions, getNodeBinPath, scanParentDirs } from './fs/run-user-scripts';
 import { getLatestNodeVersion, getDiscontinuedNodeVersions } from './fs/node-version';
 import streamToBuffer from './fs/stream-to-buffer';
 import shouldServe from './should-serve';
 import debug from './debug';
 import getIgnoreFilter from './get-ignore-filter';
-export { FileBlob, FileFsRef, FileRef, Lambda, createLambda, Prerender, download, DownloadedFiles, getWriteableDirectory, glob, GlobOptions, rename, execAsync, spawnAsync, getScriptName, installDependencies, runPackageJsonScript, execCommand, spawnCommand, walkParentDirs, getNodeBinPath, runNpmInstall, runBundleInstall, runPipInstall, runShellScript, getNodeVersion, getLatestNodeVersion, getDiscontinuedNodeVersions, getSpawnOptions, streamToBuffer, shouldServe, debug, isSymbolicLink, getLambdaOptionsFromFunction, scanParentDirs, getIgnoreFilter, };
+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, shouldServe, debug, isSymbolicLink, getLambdaOptionsFromFunction, scanParentDirs, getIgnoreFilter, };
 export { detectBuilders, detectOutputDirectory, detectApiDirectory, detectApiExtensions, } from './detect-builders';
 export { detectFileSystemAPI } from './detect-file-system-api';
 export { detectFramework } from './detect-framework';
 export { DetectorFilesystem } from './detectors/filesystem';
 export { readConfigFile } from './fs/read-config-file';
 export { normalizePath } from './fs/normalize-path';
-export { _experimental_convertRuntimeToPlugin, _experimental_updateFunctionsManifest, _experimental_updateRoutesManifest, } from './convert-runtime-to-plugin';
 export * from './schemas';
 export * from './types';
 export * from './errors';
@@ -29,8 +30,3 @@ export * from './errors';
  */
 export declare const isOfficialRuntime: (desired: string, name?: string | undefined) => boolean;
 export declare const isStaticRuntime: (name?: string | undefined) => boolean;
-/**
- * Helper function to support both `VERCEL_` and legacy `NOW_` env vars.
- * Throws an error if *both* env vars are defined.
- */
-export declare const getPlatformEnv: (name: string) => string | undefined;