@vercel/build-utils 3.1.1 → 4.1.0

package/dist/detect-builders.js

@@ -18,7 +18,7 @@ function sortFiles(fileA, fileB) {
 exports.sortFiles = sortFiles;
 function detectApiExtensions(builders) {
     return new Set(builders
-        .filter((b) => { var _a; return Boolean(b.config && b.config.zeroConfig && ((_a = b.src) === null || _a === void 0 ? void 0 : _a.startsWith('api/'))); })
+        .filter((b) => Boolean(b.config && b.config.zeroConfig && b.src?.startsWith('api/')))
         .map(b => path_1.extname(b.src))
         .filter(Boolean));
 }
@@ -26,18 +26,17 @@ exports.detectApiExtensions = detectApiExtensions;
 function detectApiDirectory(builders) {
     // TODO: We eventually want to save the api directory to
     // builder.config.apiDirectory so it is only detected once
-    const found = builders.some(b => { var _a; return b.config && b.config.zeroConfig && ((_a = b.src) === null || _a === void 0 ? void 0 : _a.startsWith('api/')); });
+    const found = builders.some(b => b.config && b.config.zeroConfig && b.src?.startsWith('api/'));
     return found ? 'api' : null;
 }
 exports.detectApiDirectory = detectApiDirectory;
 // TODO: Replace this function with `config.outputDirectory`
 function getPublicBuilder(builders) {
-    var _a;
     for (const builder of builders) {
         if (typeof builder.src === 'string' &&
             _1.isOfficialRuntime('static', builder.use) &&
             /^.*\/\*\*\/\*$/.test(builder.src) &&
-            ((_a = builder.config) === null || _a === void 0 ? void 0 : _a.zeroConfig) === true) {
+            builder.config?.zeroConfig === true) {
             return builder;
         }
     }
@@ -51,7 +50,6 @@ function detectOutputDirectory(builders) {
 }
 exports.detectOutputDirectory = detectOutputDirectory;
 async function detectBuilders(files, pkg, options = {}) {
-    var _a;
     const errors = [];
     const warnings = [];
     const apiBuilders = [];
@@ -81,7 +79,7 @@ async function detectBuilders(files, pkg, options = {}) {
     const absolutePathCache = new Map();
     const { projectSettings = {} } = options;
     const { buildCommand, outputDirectory, framework } = projectSettings;
-    const ignoreRuntimes = new Set((_a = slugToFramework.get(framework || '')) === null || _a === void 0 ? void 0 : _a.ignoreRuntimes);
+    const ignoreRuntimes = new Set(slugToFramework.get(framework || '')?.ignoreRuntimes);
     const withTag = options.tag ? `@${options.tag}` : '';
     const apiMatches = getApiMatches()
         .filter(b => !ignoreRuntimes.has(b.use))
@@ -676,8 +674,7 @@ function createRouteFromPath(filePath, featHandleMiss, cleanUrls) {
     return { route, isDynamic };
 }
 function getRouteResult(pkg, apiRoutes, dynamicRoutes, outputDirectory, apiBuilders, frontendBuilder, options) {
-    var _a, _b;
-    const deps = Object.assign({}, pkg === null || pkg === void 0 ? void 0 : pkg.dependencies, pkg === null || pkg === void 0 ? void 0 : pkg.devDependencies);
+    const deps = Object.assign({}, pkg?.dependencies, pkg?.devDependencies);
     const defaultRoutes = [];
     const redirectRoutes = [];
     const rewriteRoutes = [];
@@ -687,9 +684,9 @@ function getRouteResult(pkg, apiRoutes, dynamicRoutes, outputDirectory, apiBuild
         redirectRoutes: [],
         rewriteRoutes: [],
     };
-    const framework = ((_a = frontendBuilder === null || frontendBuilder === void 0 ? void 0 : frontendBuilder.config) === null || _a === void 0 ? void 0 : _a.framework) || '';
-    const isNextjs = framework === 'nextjs' || _1.isOfficialRuntime('next', frontendBuilder === null || frontendBuilder === void 0 ? void 0 : frontendBuilder.use);
-    const ignoreRuntimes = (_b = slugToFramework.get(framework)) === null || _b === void 0 ? void 0 : _b.ignoreRuntimes;
+    const framework = frontendBuilder?.config?.framework || '';
+    const isNextjs = framework === 'nextjs' || _1.isOfficialRuntime('next', frontendBuilder?.use);
+    const ignoreRuntimes = slugToFramework.get(framework)?.ignoreRuntimes;
     if (apiRoutes && apiRoutes.length > 0) {
         if (options.featHandleMiss) {
             // Exclude extension names if the corresponding plugin is not found in package.json

package/dist/detect-file-system-api.js

@@ -14,7 +14,7 @@ const enableFileSystemApiFrameworks = new Set(['solidstart']);
  */
 async function detectFileSystemAPI({ files, projectSettings, builders, vercelConfig, pkg, tag, enableFlag = false, }) {
     const framework = projectSettings.framework || '';
-    const deps = Object.assign({}, pkg === null || pkg === void 0 ? void 0 : pkg.dependencies, pkg === null || pkg === void 0 ? void 0 : pkg.devDependencies);
+    const deps = Object.assign({}, pkg?.dependencies, pkg?.devDependencies);
     const plugins = Object.keys(deps).filter(dep => dep.startsWith('vercel-plugin-'));
     const hasDotOutput = Object.keys(files).some(file => file.startsWith('.output/'));
     const hasMiddleware = Boolean(files['_middleware.js'] || files['_middleware.ts']);
@@ -30,14 +30,14 @@ async function detectFileSystemAPI({ files, projectSettings, builders, vercelCon
     if (!isEnabled) {
         return { metadata, fsApiBuilder: null, reason: 'Flag not enabled.' };
     }
-    if ((vercelConfig === null || vercelConfig === void 0 ? void 0 : vercelConfig.builds) && vercelConfig.builds.length > 0) {
+    if (vercelConfig?.builds && vercelConfig.builds.length > 0) {
         return {
             metadata,
             fsApiBuilder: null,
             reason: 'Detected `builds` in vercel.json. Please remove it in favor of CLI plugins.',
         };
     }
-    if (Object.values((vercelConfig === null || vercelConfig === void 0 ? void 0 : vercelConfig.functions) || {}).some(fn => !!fn.runtime)) {
+    if (Object.values(vercelConfig?.functions || {}).some(fn => !!fn.runtime)) {
         return {
             metadata,
             fsApiBuilder: null,
@@ -107,7 +107,7 @@ async function detectFileSystemAPI({ files, projectSettings, builders, vercelCon
         // Use the old pipeline if a custom output directory was specified for Next.js
         // because `vercel build` cannot ensure that the directory will be in the same
         // location as `.output`, which can break imports (not just nft.json files).
-        if (projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.outputDirectory) {
+        if (projectSettings?.outputDirectory) {
             return {
                 metadata,
                 fsApiBuilder: null,
@@ -154,7 +154,7 @@ async function detectFileSystemAPI({ files, projectSettings, builders, vercelCon
     const frontendBuilder = builders.find(({ use }) => _1.isOfficialRuntime('next', use) ||
         _1.isOfficialRuntime('static', use) ||
         _1.isOfficialRuntime('static-build', use));
-    const config = (frontendBuilder === null || frontendBuilder === void 0 ? void 0 : frontendBuilder.config) || {};
+    const config = frontendBuilder?.config || {};
     const withTag = tag ? `@${tag}` : '';
     const fsApiBuilder = {
         use: `@vercelruntimes/file-system-api${withTag}`,

package/dist/fs/get-glob-fs.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="node" />
+import fs from 'fs';
+import { DetectorFilesystem } from '../detectors/filesystem';
+declare type GlobFs = typeof fs;
+export declare function getGlobFs(_fs: DetectorFilesystem): GlobFs;
+export {};

package/dist/fs/get-glob-fs.js

@@ -0,0 +1,71 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGlobFs = void 0;
+const fs_1 = __importDefault(require("fs"));
+function normalizePath(path) {
+    // on windows, this will return a path like
+    // D:/c/package.json
+    // since we abstract the filesystem, we need to remove windows specific info from the path
+    // and let the FS decide how to process the path
+    // D:/c/package.json => /c/package.json
+    return path.replace(/^[a-zA-Z]:/, '');
+}
+function getGlobFs(_fs) {
+    const readdir = (path, callback) => {
+        _fs
+            .readdir(normalizePath(String(path)))
+            .then(stats => callback(null, stats.map(stat => stat.name)))
+            .catch(err => callback(err, []));
+    };
+    const stat = (path, callback) => {
+        _fs
+            .isFile(normalizePath(String(path)))
+            .then(isPathAFile => {
+            callback(null, {
+                ino: 0,
+                mode: 0,
+                nlink: 0,
+                uid: 0,
+                gid: 0,
+                rdev: 0,
+                size: 0,
+                blksize: 0,
+                blocks: 0,
+                atimeMs: 0,
+                mtimeMs: 0,
+                ctimeMs: 0,
+                birthtimeMs: 0,
+                atime: new Date(),
+                mtime: new Date(),
+                ctime: new Date(),
+                birthtime: new Date(),
+                dev: 0,
+                isBlockDevice: () => false,
+                isCharacterDevice: () => false,
+                isDirectory: () => !isPathAFile,
+                isFIFO: () => false,
+                isFile: () => isPathAFile,
+                isSocket: () => false,
+                isSymbolicLink: () => false,
+            });
+        })
+            .catch(err => callback(err, null));
+    };
+    return new Proxy(fs_1.default, {
+        get(_target, prop) {
+            switch (prop) {
+                case 'readdir':
+                    return readdir;
+                case 'lstat':
+                case 'stat':
+                    return stat;
+                default:
+                    throw new Error('Not Implemented');
+            }
+        },
+    });
+}
+exports.getGlobFs = getGlobFs;

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

@@ -9,6 +9,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const async_sema_1 = __importDefault(require("async-sema"));
 const cross_spawn_1 = __importDefault(require("cross-spawn"));
+const semver_1 = require("semver");
 const util_1 = require("util");
 const debug_1 = __importDefault(require("../debug"));
 const errors_1 = require("../errors");
@@ -131,9 +132,9 @@ function getSpawnOptions(meta, nodeVersion) {
 }
 exports.getSpawnOptions = getSpawnOptions;
 async function getNodeVersion(destPath, _nodeVersion, config = {}, meta = {}) {
+    const latest = node_version_1.getLatestNodeVersion();
     if (meta && meta.isDev) {
         // Use the system-installed version of `node` in PATH for `vercel dev`
-        const latest = node_version_1.getLatestNodeVersion();
         return { ...latest, runtime: 'nodejs' };
     }
     const { packageJson } = await scanParentDirs(destPath, true);
@@ -141,9 +142,20 @@ async function getNodeVersion(destPath, _nodeVersion, config = {}, meta = {}) {
     let isAuto = true;
     if (packageJson && packageJson.engines && packageJson.engines.node) {
         const { node } = packageJson.engines;
-        if (nodeVersion && nodeVersion !== node && !meta.isDev) {
+        if (nodeVersion &&
+            semver_1.validRange(node) &&
+            !semver_1.intersects(nodeVersion, node) &&
+            !meta.isDev) {
             console.warn(`Warning: Due to "engines": { "node": "${node}" } in your \`package.json\` file, the Node.js Version defined in your Project Settings ("${nodeVersion}") will not apply. Learn More: http://vercel.link/node-version`);
         }
+        else if (semver_1.coerce(node)?.raw === node && !meta.isDev) {
+            console.warn(`Warning: Detected "engines": { "node": "${node}" } in your \`package.json\` with major.minor.patch, but only major Node.js Version can be selected. Learn More: http://vercel.link/node-version`);
+        }
+        else if (semver_1.validRange(node) &&
+            semver_1.intersects(`${latest.major + 1}.x`, node) &&
+            !meta.isDev) {
+            console.warn(`Warning: Detected "engines": { "node": "${node}" } in your \`package.json\` that will automatically upgrade when a new major Node.js Version is released. Learn More: http://vercel.link/node-version`);
+        }
         nodeVersion = node;
         isAuto = false;
     }
@@ -227,11 +239,10 @@ async function walkParentDirs({ base, start, filename, }) {
 }
 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';
+    return v?.constructor?.name === 'Set';
 }
 async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion) {
-    if (meta === null || meta === void 0 ? void 0 : meta.isDev) {
+    if (meta?.isDev) {
         debug_1.default('Skipping dependency installation because dev mode is enabled');
         return false;
     }
@@ -302,7 +313,7 @@ function getEnvForPackageManager({ cliType, lockfileVersion, nodeVersion, env, }
     if (cliType === 'npm') {
         if (typeof lockfileVersion === 'number' &&
             lockfileVersion >= 2 &&
-            ((nodeVersion === null || nodeVersion === void 0 ? void 0 : nodeVersion.major) || 0) < 16) {
+            (nodeVersion?.major || 0) < 16) {
             // 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...');
@@ -331,9 +342,9 @@ async function runCustomInstallCommand({ destPath, installCommand, nodeVersion,
         cliType,
         lockfileVersion,
         nodeVersion,
-        env: (spawnOpts === null || spawnOpts === void 0 ? void 0 : spawnOpts.env) || {},
+        env: spawnOpts?.env || {},
     });
-    debug_1.default(`Running with $PATH:`, (env === null || env === void 0 ? void 0 : env.PATH) || '');
+    debug_1.default(`Running with $PATH:`, env?.PATH || '');
     await execCommand(installCommand, {
         ...spawnOpts,
         env,
@@ -358,7 +369,7 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
             nodeVersion: undefined,
             env: {
                 ...process.env,
-                ...spawnOpts === null || spawnOpts === void 0 ? void 0 : spawnOpts.env,
+                ...spawnOpts?.env,
             },
         }),
     };
@@ -398,7 +409,7 @@ async function runPipInstall(destPath, args = [], spawnOpts, meta) {
 }
 exports.runPipInstall = runPipInstall;
 function getScriptName(pkg, possibleNames) {
-    if (pkg === null || pkg === void 0 ? void 0 : pkg.scripts) {
+    if (pkg?.scripts) {
         for (const name of possibleNames) {
             if (name in pkg.scripts) {
                 return name;

package/dist/index.d.ts

@@ -32,5 +32,6 @@ export * from './errors';
 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 } from './workspaces/get-workspaces';
+export { getWorkspaces, GetWorkspaceOptions, Workspace, WorkspaceType, } from './workspaces/get-workspaces';
+export { getWorkspacePackagePaths, GetWorkspacePackagePathsOptions, } from './workspaces/get-workspace-package-paths';
 export { monorepoManagers } from './monorepos/monorepo-managers';