@vercel/build-utils 8.1.2 → 8.2.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @vercel/build-utils
 
+## 8.2.0
+
+### Minor Changes
+
+- fix corepack detection for package manager version determination ([#11596](https://github.com/vercel/vercel/pull/11596))
+
+### Patch Changes
+
+- Fix triggering of ignored project settings node version warning ([#11550](https://github.com/vercel/vercel/pull/11550))
+
+## 8.1.3
+
+### Patch Changes
+
+- [build-utils] log more around package manager detection ([#11594](https://github.com/vercel/vercel/pull/11594))
+
 ## 8.1.2
 
 ### Patch Changes

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, availableVersions?: number[]): Promise<NodeVersion>;
+export declare function getNodeVersion(destPath: string, fallbackVersion?: string | undefined, config?: Config, meta?: Meta, availableVersions?: number[]): Promise<NodeVersion>;
 export declare function scanParentDirs(destPath: string, readPackageJson?: boolean, base?: string): 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>;
@@ -82,9 +82,10 @@ export declare function runNpmInstall(destPath: string, args?: string[], spawnOp
  * Prepares the input environment based on the used package manager and lockfile
  * versions.
  */
-export declare function getEnvForPackageManager({ cliType, lockfileVersion, nodeVersion, env, }: {
+export declare function getEnvForPackageManager({ cliType, lockfileVersion, packageJsonPackageManager, nodeVersion, env, }: {
     cliType: CliType;
     lockfileVersion: number | undefined;
+    packageJsonPackageManager?: string | undefined;
     nodeVersion: NodeVersion | undefined;
     env: {
         [x: string]: string | undefined;
@@ -96,13 +97,11 @@ export declare function getEnvForPackageManager({ cliType, lockfileVersion, node
  * Helper to get the binary paths that link to the used package manager.
  * Note: Make sure it doesn't contain any `console.log` calls.
  */
-export declare function getPathOverrideForPackageManager({ cliType, lockfileVersion, nodeVersion, env, }: {
+export declare function getPathOverrideForPackageManager({ cliType, lockfileVersion, corepackEnabled, nodeVersion, }: {
     cliType: CliType;
     lockfileVersion: number | undefined;
+    corepackEnabled: boolean;
     nodeVersion: NodeVersion | undefined;
-    env: {
-        [x: string]: string | undefined;
-    };
 }): {
     /**
      * Which lockfile was detected.
@@ -121,6 +120,7 @@ export declare function getPathOverrideForPackageManager({ cliType, lockfileVers
 /**
  * Helper to get the binary paths that link to the used package manager.
  * Note: Make sure it doesn't contain any `console.log` calls.
+ * @deprecated use `getEnvForPackageManager` instead
  */
 export declare function getPathForPackageManager({ cliType, lockfileVersion, nodeVersion, env, }: {
     cliType: CliType;

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

@@ -173,33 +173,37 @@ function getSpawnOptions(meta, nodeVersion) {
   }
   return opts;
 }
-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);
+async function getNodeVersion(destPath, fallbackVersion = process.env.VERCEL_PROJECT_SETTINGS_NODE_VERSION, config = {}, meta = {}, availableVersions = (0, import_node_version.getAvailableNodeVersions)()) {
+  const latestVersion = (0, import_node_version.getLatestNodeVersion)(availableVersions);
   if (meta.isDev) {
-    return { ...latest, runtime: "nodejs" };
+    return { ...latestVersion, runtime: "nodejs" };
   }
   const { packageJson } = await scanParentDirs(destPath, true);
-  let nodeVersion = config.nodeVersion || nodeVersionFallback;
-  let isAuto = true;
+  const configuredVersion = config.nodeVersion || fallbackVersion;
+  const packageJsonVersion = packageJson?.engines?.node;
+  const supportedNodeVersion = await (0, import_node_version.getSupportedNodeVersion)(
+    packageJsonVersion || configuredVersion,
+    !packageJsonVersion,
+    availableVersions
+  );
   if (packageJson?.engines?.node) {
     const { node } = packageJson.engines;
-    if (nodeVersion && (0, import_semver.validRange)(node) && !(0, import_semver.intersects)(nodeVersion, node)) {
+    if (configuredVersion && !(0, import_semver.intersects)(configuredVersion, supportedNodeVersion.range)) {
       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`
+        `Warning: Due to "engines": { "node": "${node}" } in your \`package.json\` file, the Node.js Version defined in your Project Settings ("${configuredVersion}") will not apply. Learn More: http://vercel.link/node-version`
       );
-    } else if ((0, import_semver.coerce)(node)?.raw === node) {
+    }
+    if ((0, import_semver.coerce)(node)?.raw === node) {
       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 ((0, import_semver.validRange)(node) && (0, import_semver.intersects)(`${latest.major + 1}.x`, node)) {
+    } else if ((0, import_semver.validRange)(node) && (0, import_semver.intersects)(`${latestVersion.major + 1}.x`, node)) {
       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;
   }
-  return (0, import_node_version.getSupportedNodeVersion)(nodeVersion, isAuto, availableVersions);
+  return supportedNodeVersion;
 }
 async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
   (0, import_assert.default)(import_path.default.isAbsolute(destPath));
@@ -302,9 +306,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
   (0, import_assert.default)(import_path.default.isAbsolute(destPath));
   try {
     await runNpmInstallSema.acquire();
-    const { cliType, packageJsonPath, lockfileVersion } = await scanParentDirs(
-      destPath
-    );
+    const { cliType, packageJsonPath, packageJson, lockfileVersion } = await scanParentDirs(destPath, true);
     if (!packageJsonPath) {
       (0, import_debug.default)(
         `Skipping dependency installation because no package.json was found for ${destPath}`
@@ -333,6 +335,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
     opts.env = getEnvForPackageManager({
       cliType,
       lockfileVersion,
+      packageJsonPackageManager: packageJson?.packageManager,
       nodeVersion,
       env
     });
@@ -384,9 +387,12 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
 function getEnvForPackageManager({
   cliType,
   lockfileVersion,
+  packageJsonPackageManager,
   nodeVersion,
   env
 }) {
+  const corepackFlagged = env.ENABLE_EXPERIMENTAL_COREPACK === "1";
+  const corepackEnabled = corepackFlagged && Boolean(packageJsonPackageManager);
   const {
     detectedLockfile,
     detectedPackageManager,
@@ -394,12 +400,18 @@ function getEnvForPackageManager({
   } = getPathOverrideForPackageManager({
     cliType,
     lockfileVersion,
-    nodeVersion,
-    env
+    corepackEnabled,
+    nodeVersion
   });
-  (0, import_debug.default)(
-    `Detected ${detectedPackageManager} with lockfileVersion ${lockfileVersion} (${typeof lockfileVersion}): ${newPath}`
-  );
+  if (corepackEnabled) {
+    (0, import_debug.default)(
+      `Detected corepack use for "${packageJsonPackageManager}". Not overriding package manager version.`
+    );
+  } else {
+    (0, import_debug.default)(
+      `Detected ${detectedPackageManager}. Added "${newPath}" to path. Based on assumed package manager "${cliType}", lockfile "${detectedLockfile}", and lockfileVersion "${lockfileVersion}"`
+    );
+  }
   const newEnv = {
     ...env
   };
@@ -453,15 +465,14 @@ function shouldUseNpm7(lockfileVersion, nodeVersion) {
 function getPathOverrideForPackageManager({
   cliType,
   lockfileVersion,
-  nodeVersion,
-  env
+  corepackEnabled,
+  nodeVersion
 }) {
   const no_override = {
     detectedLockfile: void 0,
     detectedPackageManager: void 0,
     path: void 0
   };
-  const corepackEnabled = env.ENABLE_EXPERIMENTAL_COREPACK === "1";
   switch (cliType) {
     case "npm":
       switch (true) {
@@ -523,15 +534,13 @@ function getPathForPackageManager({
   nodeVersion,
   env
 }) {
+  const corepackEnabled = env.ENABLE_EXPERIMENTAL_COREPACK === "1";
   const overrides = getPathOverrideForPackageManager({
     cliType,
     lockfileVersion,
-    nodeVersion,
-    env
+    corepackEnabled,
+    nodeVersion
   });
-  (0, import_debug.default)(
-    `Detected ${overrides.detectedPackageManager} with lockfileVersion ${lockfileVersion} (${typeof lockfileVersion}): ${overrides.path}`
-  );
   const alreadyInPath = (newPath) => {
     const oldPath = env.PATH ?? "";
     return oldPath.split(import_path.default.delimiter).includes(newPath);
@@ -557,10 +566,14 @@ async function runCustomInstallCommand({
   spawnOpts
 }) {
   console.log(`Running "install" command: \`${installCommand}\`...`);
-  const { cliType, lockfileVersion } = await scanParentDirs(destPath);
+  const { cliType, lockfileVersion, packageJson } = await scanParentDirs(
+    destPath,
+    true
+  );
   const env = getEnvForPackageManager({
     cliType,
     lockfileVersion,
+    packageJsonPackageManager: packageJson?.packageManager,
     nodeVersion,
     env: spawnOpts?.env || {}
   });
@@ -591,6 +604,7 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
     env: getEnvForPackageManager({
       cliType,
       lockfileVersion,
+      packageJsonPackageManager: packageJson?.packageManager,
       nodeVersion: void 0,
       env: (0, import_clone_env.cloneEnv)(process.env, spawnOpts?.env)
     })

package/dist/index.js

@@ -21895,33 +21895,37 @@ function getSpawnOptions(meta, nodeVersion) {
   }
   return opts;
 }
-async function getNodeVersion(destPath, nodeVersionFallback = process.env.VERCEL_PROJECT_SETTINGS_NODE_VERSION, config = {}, meta = {}, availableVersions = getAvailableNodeVersions()) {
-  const latest = getLatestNodeVersion(availableVersions);
+async function getNodeVersion(destPath, fallbackVersion = process.env.VERCEL_PROJECT_SETTINGS_NODE_VERSION, config = {}, meta = {}, availableVersions = getAvailableNodeVersions()) {
+  const latestVersion = getLatestNodeVersion(availableVersions);
   if (meta.isDev) {
-    return { ...latest, runtime: "nodejs" };
+    return { ...latestVersion, runtime: "nodejs" };
   }
   const { packageJson } = await scanParentDirs(destPath, true);
-  let nodeVersion = config.nodeVersion || nodeVersionFallback;
-  let isAuto = true;
+  const configuredVersion = config.nodeVersion || fallbackVersion;
+  const packageJsonVersion = packageJson?.engines?.node;
+  const supportedNodeVersion = await getSupportedNodeVersion(
+    packageJsonVersion || configuredVersion,
+    !packageJsonVersion,
+    availableVersions
+  );
   if (packageJson?.engines?.node) {
     const { node } = packageJson.engines;
-    if (nodeVersion && (0, import_semver2.validRange)(node) && !(0, import_semver2.intersects)(nodeVersion, node)) {
+    if (configuredVersion && !(0, import_semver2.intersects)(configuredVersion, supportedNodeVersion.range)) {
       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`
+        `Warning: Due to "engines": { "node": "${node}" } in your \`package.json\` file, the Node.js Version defined in your Project Settings ("${configuredVersion}") will not apply. Learn More: http://vercel.link/node-version`
       );
-    } else if ((0, import_semver2.coerce)(node)?.raw === node) {
+    }
+    if ((0, import_semver2.coerce)(node)?.raw === node) {
       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 ((0, import_semver2.validRange)(node) && (0, import_semver2.intersects)(`${latest.major + 1}.x`, node)) {
+    } else if ((0, import_semver2.validRange)(node) && (0, import_semver2.intersects)(`${latestVersion.major + 1}.x`, node)) {
       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;
   }
-  return getSupportedNodeVersion(nodeVersion, isAuto, availableVersions);
+  return supportedNodeVersion;
 }
 async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
   (0, import_assert6.default)(import_path5.default.isAbsolute(destPath));
@@ -22024,9 +22028,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
   (0, import_assert6.default)(import_path5.default.isAbsolute(destPath));
   try {
     await runNpmInstallSema.acquire();
-    const { cliType, packageJsonPath, lockfileVersion } = await scanParentDirs(
-      destPath
-    );
+    const { cliType, packageJsonPath, packageJson, lockfileVersion } = await scanParentDirs(destPath, true);
     if (!packageJsonPath) {
       debug(
         `Skipping dependency installation because no package.json was found for ${destPath}`
@@ -22055,6 +22057,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
     opts.env = getEnvForPackageManager({
       cliType,
       lockfileVersion,
+      packageJsonPackageManager: packageJson?.packageManager,
       nodeVersion,
       env
     });
@@ -22106,9 +22109,12 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
 function getEnvForPackageManager({
   cliType,
   lockfileVersion,
+  packageJsonPackageManager,
   nodeVersion,
   env
 }) {
+  const corepackFlagged = env.ENABLE_EXPERIMENTAL_COREPACK === "1";
+  const corepackEnabled = corepackFlagged && Boolean(packageJsonPackageManager);
   const {
     detectedLockfile,
     detectedPackageManager,
@@ -22116,12 +22122,18 @@ function getEnvForPackageManager({
   } = getPathOverrideForPackageManager({
     cliType,
     lockfileVersion,
-    nodeVersion,
-    env
+    corepackEnabled,
+    nodeVersion
   });
-  debug(
-    `Detected ${detectedPackageManager} with lockfileVersion ${lockfileVersion} (${typeof lockfileVersion}): ${newPath}`
-  );
+  if (corepackEnabled) {
+    debug(
+      `Detected corepack use for "${packageJsonPackageManager}". Not overriding package manager version.`
+    );
+  } else {
+    debug(
+      `Detected ${detectedPackageManager}. Added "${newPath}" to path. Based on assumed package manager "${cliType}", lockfile "${detectedLockfile}", and lockfileVersion "${lockfileVersion}"`
+    );
+  }
   const newEnv = {
     ...env
   };
@@ -22175,15 +22187,14 @@ function shouldUseNpm7(lockfileVersion, nodeVersion) {
 function getPathOverrideForPackageManager({
   cliType,
   lockfileVersion,
-  nodeVersion,
-  env
+  corepackEnabled,
+  nodeVersion
 }) {
   const no_override = {
     detectedLockfile: void 0,
     detectedPackageManager: void 0,
     path: void 0
   };
-  const corepackEnabled = env.ENABLE_EXPERIMENTAL_COREPACK === "1";
   switch (cliType) {
     case "npm":
       switch (true) {
@@ -22245,15 +22256,13 @@ function getPathForPackageManager({
   nodeVersion,
   env
 }) {
+  const corepackEnabled = env.ENABLE_EXPERIMENTAL_COREPACK === "1";
   const overrides = getPathOverrideForPackageManager({
     cliType,
     lockfileVersion,
-    nodeVersion,
-    env
+    corepackEnabled,
+    nodeVersion
   });
-  debug(
-    `Detected ${overrides.detectedPackageManager} with lockfileVersion ${lockfileVersion} (${typeof lockfileVersion}): ${overrides.path}`
-  );
   const alreadyInPath = (newPath) => {
     const oldPath = env.PATH ?? "";
     return oldPath.split(import_path5.default.delimiter).includes(newPath);
@@ -22279,10 +22288,14 @@ async function runCustomInstallCommand({
   spawnOpts
 }) {
   console.log(`Running "install" command: \`${installCommand}\`...`);
-  const { cliType, lockfileVersion } = await scanParentDirs(destPath);
+  const { cliType, lockfileVersion, packageJson } = await scanParentDirs(
+    destPath,
+    true
+  );
   const env = getEnvForPackageManager({
     cliType,
     lockfileVersion,
+    packageJsonPackageManager: packageJson?.packageManager,
     nodeVersion,
     env: spawnOpts?.env || {}
   });
@@ -22313,6 +22326,7 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
     env: getEnvForPackageManager({
       cliType,
       lockfileVersion,
+      packageJsonPackageManager: packageJson?.packageManager,
       nodeVersion: void 0,
       env: cloneEnv(process.env, spawnOpts?.env)
     })

package/package.json

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