@vercel/build-utils 7.2.3 → 7.2.5

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @vercel/build-utils
 
+## 7.2.5
+
+### Patch Changes
+
+- Remove Node.js v20 env var check ([#10834](https://github.com/vercel/vercel/pull/10834))
+
+## 7.2.4
+
+### Patch Changes
+
+- Select Node.js version based on what's available in build-container ([#10822](https://github.com/vercel/vercel/pull/10822))
+
 ## 7.2.3
 
 ### Patch Changes

package/dist/fs/node-version.d.ts

@@ -1,12 +1,74 @@
 import { NodeVersion } from '../types';
-export declare function getLatestNodeVersion(): {
+export type NodeVersionMajor = ReturnType<typeof getOptions>[number]['major'];
+declare function getOptions(): readonly [{
+    readonly major: 20;
+    readonly range: "20.x";
+    readonly runtime: "nodejs20.x";
+}, {
     readonly major: 18;
     readonly range: "18.x";
     readonly runtime: "nodejs18.x";
-} | {
+}, {
+    readonly major: 16;
+    readonly range: "16.x";
+    readonly runtime: "nodejs16.x";
+    readonly discontinueDate: Date;
+}, {
+    readonly major: 14;
+    readonly range: "14.x";
+    readonly runtime: "nodejs14.x";
+    readonly discontinueDate: Date;
+}, {
+    readonly major: 12;
+    readonly range: "12.x";
+    readonly runtime: "nodejs12.x";
+    readonly discontinueDate: Date;
+}, {
+    readonly major: 10;
+    readonly range: "10.x";
+    readonly runtime: "nodejs10.x";
+    readonly discontinueDate: Date;
+}, {
+    readonly major: 8;
+    readonly range: "8.10.x";
+    readonly runtime: "nodejs8.10";
+    readonly discontinueDate: Date;
+}];
+export declare function getAvailableNodeVersions(): NodeVersionMajor[];
+export declare function getLatestNodeVersion(availableVersions?: NodeVersionMajor[]): {
     readonly major: 20;
     readonly range: "20.x";
     readonly runtime: "nodejs20.x";
+} | {
+    readonly major: 18;
+    readonly range: "18.x";
+    readonly runtime: "nodejs18.x";
+} | {
+    readonly major: 16;
+    readonly range: "16.x";
+    readonly runtime: "nodejs16.x";
+    readonly discontinueDate: Date;
+} | {
+    readonly major: 14;
+    readonly range: "14.x";
+    readonly runtime: "nodejs14.x";
+    readonly discontinueDate: Date;
+} | {
+    readonly major: 12;
+    readonly range: "12.x";
+    readonly runtime: "nodejs12.x";
+    readonly discontinueDate: Date;
+} | {
+    readonly major: 10;
+    readonly range: "10.x";
+    readonly runtime: "nodejs10.x";
+    readonly discontinueDate: Date;
+} | {
+    readonly major: 8;
+    readonly range: "8.10.x";
+    readonly runtime: "nodejs8.10";
+    readonly discontinueDate: Date;
 };
 export declare function getDiscontinuedNodeVersions(): NodeVersion[];
-export declare function getSupportedNodeVersion(engineRange: string | undefined, isAuto?: boolean): Promise<NodeVersion>;
+export declare function getSupportedNodeVersion(engineRange: string | undefined, isAuto?: boolean, availableVersions?: NodeVersionMajor[]): Promise<NodeVersion>;
+export {};

package/dist/fs/node-version.js

@@ -28,16 +28,19 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var node_version_exports = {};
 __export(node_version_exports, {
+  getAvailableNodeVersions: () => getAvailableNodeVersions,
   getDiscontinuedNodeVersions: () => getDiscontinuedNodeVersions,
   getLatestNodeVersion: () => getLatestNodeVersion,
   getSupportedNodeVersion: () => getSupportedNodeVersion
 });
 module.exports = __toCommonJS(node_version_exports);
+var import_fs = require("fs");
 var import_semver = require("semver");
 var import_errors = require("../errors");
 var import_debug = __toESM(require("../debug"));
 function getOptions() {
   const options = [
+    { major: 20, range: "20.x", runtime: "nodejs20.x" },
     { major: 18, range: "18.x", runtime: "nodejs18.x" },
     {
       major: 16,
@@ -70,41 +73,59 @@ function getOptions() {
       discontinueDate: /* @__PURE__ */ new Date("2020-01-06")
     }
   ];
-  if (process.env.VERCEL_ALLOW_NODEJS20 === "1") {
-    return [
-      { major: 20, range: "20.x", runtime: "nodejs20.x" },
-      ...options
-    ];
-  }
   return options;
 }
-function getHint(isAuto = false) {
-  const { major, range } = getLatestNodeVersion();
+function isNodeVersionAvailable(version) {
+  try {
+    return (0, import_fs.statSync)(`/node${version.major}`).isDirectory();
+  } catch {
+  }
+  return false;
+}
+function getAvailableNodeVersions() {
+  return getOptions().filter(isNodeVersionAvailable).map((n) => n.major);
+}
+function getHint(isAuto = false, availableVersions) {
+  const { major, range } = getLatestNodeVersion(availableVersions);
   return isAuto ? `Please set Node.js Version to ${range} in your Project Settings to use Node.js ${major}.` : `Please set "engines": { "node": "${range}" } in your \`package.json\` file to use Node.js ${major}.`;
 }
-function getLatestNodeVersion() {
-  return getOptions()[0];
+function getLatestNodeVersion(availableVersions) {
+  const all = getOptions();
+  if (availableVersions) {
+    for (const version of all) {
+      for (const major of availableVersions) {
+        if (version.major === major) {
+          return version;
+        }
+      }
+    }
+  }
+  return all[0];
 }
 function getDiscontinuedNodeVersions() {
   return getOptions().filter(isDiscontinued);
 }
-async function getSupportedNodeVersion(engineRange, isAuto = false) {
-  let selection = getLatestNodeVersion();
+async function getSupportedNodeVersion(engineRange, isAuto = false, availableVersions) {
+  let selection;
   if (engineRange) {
     const found = (0, import_semver.validRange)(engineRange) && getOptions().some((o) => {
       selection = o;
-      return (0, import_semver.intersects)(o.range, engineRange);
+      return (0, import_semver.intersects)(o.range, engineRange) && (availableVersions?.length ? availableVersions.includes(o.major) : true);
     });
     if (!found) {
       throw new import_errors.NowBuildError({
         code: "BUILD_UTILS_NODE_VERSION_INVALID",
         link: "http://vercel.link/node-version",
         message: `Found invalid Node.js Version: "${engineRange}". ${getHint(
-          isAuto
+          isAuto,
+          availableVersions
         )}`
       });
     }
   }
+  if (!selection) {
+    selection = getLatestNodeVersion(availableVersions);
+  }
   if (isDiscontinued(selection)) {
     const intro = `Node.js Version "${selection.range}" is discontinued and must be upgraded.`;
     throw new import_errors.NowBuildError({
@@ -130,6 +151,7 @@ function isDiscontinued({ discontinueDate }) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getAvailableNodeVersions,
   getDiscontinuedNodeVersions,
   getLatestNodeVersion,
   getSupportedNodeVersion

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

@@ -74,7 +74,7 @@ export declare function getNodeBinPath({ cwd, }: {
 export declare function getNodeBinPaths({ start, base, }: TraverseUpDirectoriesProps): 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, nodeVersionFallback?: string | undefined, config?: Config, meta?: Meta): Promise<NodeVersion>;
+export declare function getNodeVersion(destPath: string, nodeVersionFallback?: string | undefined, config?: Config, meta?: Meta, availableVersions?: (20 | 10 | 16 | 18 | 14 | 12 | 8)[]): 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<boolean>;

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

@@ -171,8 +171,8 @@ function getSpawnOptions(meta, nodeVersion) {
   }
   return opts;
 }
-async function getNodeVersion(destPath, nodeVersionFallback = process.env.VERCEL_PROJECT_SETTINGS_NODE_VERSION, config = {}, meta = {}) {
-  const latest = (0, import_node_version.getLatestNodeVersion)();
+async function getNodeVersion(destPath, nodeVersionFallback = process.env.VERCEL_PROJECT_SETTINGS_NODE_VERSION, config = {}, meta = {}, availableVersions = (0, import_node_version.getAvailableNodeVersions)()) {
+  const latest = (0, import_node_version.getLatestNodeVersion)(availableVersions);
   if (meta.isDev) {
     return { ...latest, runtime: "nodejs" };
   }
@@ -197,7 +197,7 @@ async function getNodeVersion(destPath, nodeVersionFallback = process.env.VERCEL
     nodeVersion = node;
     isAuto = false;
   }
-  return (0, import_node_version.getSupportedNodeVersion)(nodeVersion, isAuto);
+  return (0, import_node_version.getSupportedNodeVersion)(nodeVersion, isAuto, availableVersions);
 }
 async function scanParentDirs(destPath, readPackageJson = false) {
   (0, import_assert.default)(import_path.default.isAbsolute(destPath));

package/dist/index.js

@@ -3548,8 +3548,8 @@ var require_copy_sync = __commonJS({
       return getStats(destStat, src, dest, opts);
     }
     function getStats(destStat, src, dest, opts) {
-      const statSync = opts.dereference ? fs5.statSync : fs5.lstatSync;
-      const srcStat = statSync(src);
+      const statSync2 = opts.dereference ? fs5.statSync : fs5.lstatSync;
+      const srcStat = statSync2(src);
       if (srcStat.isDirectory())
         return onDir(srcStat, destStat, src, dest, opts);
       else if (srcStat.isFile() || srcStat.isCharacterDevice() || srcStat.isBlockDevice())
@@ -21589,9 +21589,11 @@ var import_semver2 = __toESM(require_semver2());
 var import_util2 = require("util");
 
 // src/fs/node-version.ts
+var import_fs = require("fs");
 var import_semver = __toESM(require_semver2());
 function getOptions() {
   const options = [
+    { major: 20, range: "20.x", runtime: "nodejs20.x" },
     { major: 18, range: "18.x", runtime: "nodejs18.x" },
     {
       major: 16,
@@ -21624,41 +21626,59 @@ function getOptions() {
       discontinueDate: /* @__PURE__ */ new Date("2020-01-06")
     }
   ];
-  if (process.env.VERCEL_ALLOW_NODEJS20 === "1") {
-    return [
-      { major: 20, range: "20.x", runtime: "nodejs20.x" },
-      ...options
-    ];
-  }
   return options;
 }
-function getHint(isAuto = false) {
-  const { major, range } = getLatestNodeVersion();
+function isNodeVersionAvailable(version) {
+  try {
+    return (0, import_fs.statSync)(`/node${version.major}`).isDirectory();
+  } catch {
+  }
+  return false;
+}
+function getAvailableNodeVersions() {
+  return getOptions().filter(isNodeVersionAvailable).map((n) => n.major);
+}
+function getHint(isAuto = false, availableVersions) {
+  const { major, range } = getLatestNodeVersion(availableVersions);
   return isAuto ? `Please set Node.js Version to ${range} in your Project Settings to use Node.js ${major}.` : `Please set "engines": { "node": "${range}" } in your \`package.json\` file to use Node.js ${major}.`;
 }
-function getLatestNodeVersion() {
-  return getOptions()[0];
+function getLatestNodeVersion(availableVersions) {
+  const all = getOptions();
+  if (availableVersions) {
+    for (const version of all) {
+      for (const major of availableVersions) {
+        if (version.major === major) {
+          return version;
+        }
+      }
+    }
+  }
+  return all[0];
 }
 function getDiscontinuedNodeVersions() {
   return getOptions().filter(isDiscontinued);
 }
-async function getSupportedNodeVersion(engineRange, isAuto = false) {
-  let selection = getLatestNodeVersion();
+async function getSupportedNodeVersion(engineRange, isAuto = false, availableVersions) {
+  let selection;
   if (engineRange) {
     const found = (0, import_semver.validRange)(engineRange) && getOptions().some((o) => {
       selection = o;
-      return (0, import_semver.intersects)(o.range, engineRange);
+      return (0, import_semver.intersects)(o.range, engineRange) && (availableVersions?.length ? availableVersions.includes(o.major) : true);
     });
     if (!found) {
       throw new NowBuildError({
         code: "BUILD_UTILS_NODE_VERSION_INVALID",
         link: "http://vercel.link/node-version",
         message: `Found invalid Node.js Version: "${engineRange}". ${getHint(
-          isAuto
+          isAuto,
+          availableVersions
         )}`
       });
     }
   }
+  if (!selection) {
+    selection = getLatestNodeVersion(availableVersions);
+  }
   if (isDiscontinued(selection)) {
     const intro = `Node.js Version "${selection.range}" is discontinued and must be upgraded.`;
     throw new NowBuildError({
@@ -21853,8 +21873,8 @@ function getSpawnOptions(meta, nodeVersion) {
   }
   return opts;
 }
-async function getNodeVersion(destPath, nodeVersionFallback = process.env.VERCEL_PROJECT_SETTINGS_NODE_VERSION, config = {}, meta = {}) {
-  const latest = getLatestNodeVersion();
+async function getNodeVersion(destPath, nodeVersionFallback = process.env.VERCEL_PROJECT_SETTINGS_NODE_VERSION, config = {}, meta = {}, availableVersions = getAvailableNodeVersions()) {
+  const latest = getLatestNodeVersion(availableVersions);
   if (meta.isDev) {
     return { ...latest, runtime: "nodejs" };
   }
@@ -21879,7 +21899,7 @@ async function getNodeVersion(destPath, nodeVersionFallback = process.env.VERCEL
     nodeVersion = node;
     isAuto = false;
   }
-  return getSupportedNodeVersion(nodeVersion, isAuto);
+  return getSupportedNodeVersion(nodeVersion, isAuto, availableVersions);
 }
 async function scanParentDirs(destPath, readPackageJson = false) {
   (0, import_assert6.default)(import_path5.default.isAbsolute(destPath));
@@ -22279,23 +22299,23 @@ function getPrefixedEnvVars({
 
 // src/hard-link-dir.ts
 var import_path7 = __toESM(require("path"));
-var import_fs = require("fs");
+var import_fs2 = require("fs");
 async function hardLinkDir(src, destDirs) {
   if (destDirs.length === 0)
     return;
   destDirs = destDirs.filter((destDir) => import_path7.default.relative(destDir, src) !== "");
-  const files = await import_fs.promises.readdir(src);
+  const files = await import_fs2.promises.readdir(src);
   await Promise.all(
     files.map(async (file) => {
       if (file === "node_modules")
         return;
       const srcFile = import_path7.default.join(src, file);
-      if ((await import_fs.promises.lstat(srcFile)).isDirectory()) {
+      if ((await import_fs2.promises.lstat(srcFile)).isDirectory()) {
         const destSubdirs = await Promise.all(
           destDirs.map(async (destDir) => {
             const destSubdir = import_path7.default.join(destDir, file);
             try {
-              await import_fs.promises.mkdir(destSubdir, { recursive: true });
+              await import_fs2.promises.mkdir(destSubdir, { recursive: true });
             } catch (err) {
               if (err.code !== "EEXIST")
                 throw err;
@@ -22327,7 +22347,7 @@ async function linkOrCopyFile(srcFile, destFile) {
     await linkOrCopy(srcFile, destFile);
   } catch (err) {
     if (err.code === "ENOENT") {
-      await import_fs.promises.mkdir(import_path7.default.dirname(destFile), { recursive: true });
+      await import_fs2.promises.mkdir(import_path7.default.dirname(destFile), { recursive: true });
       await linkOrCopy(srcFile, destFile);
       return;
     }
@@ -22338,11 +22358,11 @@ async function linkOrCopyFile(srcFile, destFile) {
 }
 async function linkOrCopy(srcFile, destFile) {
   try {
-    await import_fs.promises.link(srcFile, destFile);
+    await import_fs2.promises.link(srcFile, destFile);
   } catch (err) {
     if (err.code !== "EXDEV")
       throw err;
-    await import_fs.promises.copyFile(srcFile, destFile);
+    await import_fs2.promises.copyFile(srcFile, destFile);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/build-utils",
-  "version": "7.2.3",
+  "version": "7.2.5",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",