@vercel/build-utils 8.4.7 → 8.4.9

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @vercel/build-utils
 
+## 8.4.9
+
+### Patch Changes
+
+- Fix special version specifier handling for `turbo` ([#12249](https://github.com/vercel/vercel/pull/12249))
+
+## 8.4.8
+
+### Patch Changes
+
+- Revert "[build-utils] Fix corepack `packageManager` detection on monorepos" ([#12242](https://github.com/vercel/vercel/pull/12242))
+
 ## 8.4.7
 
 ### Patch Changes

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

@@ -26,12 +26,6 @@ export interface ScanParentDirsResult {
      * or `undefined` if not found.
      */
     lockfileVersion?: number;
-    /**
-     * The contents of the `packageManager` field from `package.json` if found.
-     * The value may come from a different `package.json` file than the one
-     * specified by `packageJsonPath`, in the case of a monorepo.
-     */
-    packageJsonPackageManager?: string;
     /**
      * Whether Turborepo supports the `COREPACK_HOME` environment variable.
      * `undefined` if not a Turborepo project.
@@ -87,6 +81,7 @@ export declare function runShellScript(fsPath: string, args?: string[], spawnOpt
 export declare function getSpawnOptions(meta: Meta, nodeVersion: NodeVersion): SpawnOptions;
 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 turboVersionSpecifierSupportsCorepack(turboVersionSpecifier: string): boolean;
 export declare function usingCorepack(env: {
     [x: string]: string | undefined;
 }, packageJsonPackageManager: string | undefined, turboSupportsCorepackHome: boolean | undefined): boolean;

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

@@ -49,6 +49,7 @@ __export(run_user_scripts_exports, {
   spawnAsync: () => spawnAsync,
   spawnCommand: () => spawnCommand,
   traverseUpDirectories: () => traverseUpDirectories,
+  turboVersionSpecifierSupportsCorepack: () => turboVersionSpecifierSupportsCorepack,
   usingCorepack: () => usingCorepack,
   walkParentDirs: () => walkParentDirs
 });
@@ -236,10 +237,7 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     filename: "package.json"
   });
   const packageJson = readPackageJson && pkgJsonPath ? JSON.parse(await import_fs_extra.default.readFile(pkgJsonPath, "utf8")) : void 0;
-  const {
-    paths: [yarnLockPath, npmLockPath, pnpmLockPath, bunLockPath],
-    packageJsonPackageManager
-  } = await walkParentDirsMulti({
+  const [yarnLockPath, npmLockPath, pnpmLockPath, bunLockPath] = await walkParentDirsMulti({
     base,
     start: destPath,
     filenames: [
@@ -287,16 +285,15 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     lockfilePath = bunLockPath;
     lockfileVersion = 0;
   } else {
-    cliType = detectPackageManagerNameWithoutLockfile(
-      packageJsonPackageManager,
+    cliType = packageJson && rootProjectInfo ? detectPackageManagerNameWithoutLockfile(
+      packageJson,
       turboSupportsCorepackHome
-    );
+    ) : "npm";
   }
   const packageJsonPath = pkgJsonPath || void 0;
   return {
     cliType,
     packageJson,
-    packageJsonPackageManager,
     lockfilePath,
     lockfileVersion,
     packageJsonPath,
@@ -304,7 +301,7 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
   };
 }
 async function checkTurboSupportsCorepack(turboVersionRange, rootDir) {
-  if (turboRangeSupportsCorepack(turboVersionRange)) {
+  if (turboVersionSpecifierSupportsCorepack(turboVersionRange)) {
     return true;
   }
   const turboJsonPath = import_path.default.join(rootDir, "turbo.json");
@@ -312,15 +309,19 @@ async function checkTurboSupportsCorepack(turboVersionRange, rootDir) {
   const turboJson = turboJsonExists ? JSON.parse(await import_fs_extra.default.readFile(turboJsonPath, "utf8")) : void 0;
   return turboJson?.globalPassThroughEnv?.includes("COREPACK_HOME") || false;
 }
-function turboRangeSupportsCorepack(turboVersionRange) {
+function turboVersionSpecifierSupportsCorepack(turboVersionSpecifier) {
+  if (!(0, import_semver.validRange)(turboVersionSpecifier)) {
+    return false;
+  }
   const versionSupportingCorepack = "2.1.3";
-  const minTurboBeingUsed = (0, import_semver.minVersion)(turboVersionRange);
+  const minTurboBeingUsed = (0, import_semver.minVersion)(turboVersionSpecifier);
   if (!minTurboBeingUsed) {
     return false;
   }
   return (0, import_semver.gte)(minTurboBeingUsed, versionSupportingCorepack);
 }
-function detectPackageManagerNameWithoutLockfile(packageJsonPackageManager, turboSupportsCorepackHome) {
+function detectPackageManagerNameWithoutLockfile(packageJson, turboSupportsCorepackHome) {
+  const packageJsonPackageManager = packageJson.packageManager;
   if (usingCorepack(
     process.env,
     packageJsonPackageManager,
@@ -377,26 +378,17 @@ async function walkParentDirsMulti({
   start,
   filenames
 }) {
-  let packageManager;
   for (const dir of traverseUpDirectories({ start, base })) {
     const fullPaths = filenames.map((f) => import_path.default.join(dir, f));
     const existResults = await Promise.all(
       fullPaths.map((f) => import_fs_extra.default.pathExists(f))
     );
     const foundOneOrMore = existResults.some((b) => b);
-    const packageJsonPath = import_path.default.join(dir, "package.json");
-    const packageJson = await import_fs_extra.default.readJSON(packageJsonPath).catch(() => null);
-    if (packageJson?.packageManager) {
-      packageManager = packageJson.packageManager;
-    }
     if (foundOneOrMore) {
-      return {
-        paths: fullPaths.map((f, i) => existResults[i] ? f : void 0),
-        packageJsonPackageManager: packageManager
-      };
+      return fullPaths.map((f, i) => existResults[i] ? f : void 0);
     }
   }
-  return { paths: [], packageJsonPackageManager: packageManager };
+  return [];
 }
 function isSet(v) {
   return v?.constructor?.name === "Set";
@@ -414,7 +406,6 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
       packageJsonPath,
       packageJson,
       lockfileVersion,
-      packageJsonPackageManager,
       turboSupportsCorepackHome
     } = await scanParentDirs(destPath, true);
     if (!packageJsonPath) {
@@ -445,7 +436,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
     opts.env = getEnvForPackageManager({
       cliType,
       lockfileVersion,
-      packageJsonPackageManager,
+      packageJsonPackageManager: packageJson?.packageManager,
       nodeVersion,
       env,
       packageJsonEngines: packageJson?.engines,
@@ -790,17 +781,11 @@ async function runCustomInstallCommand({
   spawnOpts
 }) {
   console.log(`Running "install" command: \`${installCommand}\`...`);
-  const {
-    cliType,
-    lockfileVersion,
-    packageJson,
-    packageJsonPackageManager,
-    turboSupportsCorepackHome
-  } = await scanParentDirs(destPath, true);
+  const { cliType, lockfileVersion, packageJson, turboSupportsCorepackHome } = await scanParentDirs(destPath, true);
   const env = getEnvForPackageManager({
     cliType,
     lockfileVersion,
-    packageJsonPackageManager,
+    packageJsonPackageManager: packageJson?.packageManager,
     nodeVersion,
     env: spawnOpts?.env || {},
     packageJsonEngines: packageJson?.engines,
@@ -815,13 +800,7 @@ async function runCustomInstallCommand({
 }
 async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
   (0, import_assert.default)(import_path.default.isAbsolute(destPath));
-  const {
-    packageJson,
-    cliType,
-    lockfileVersion,
-    packageJsonPackageManager,
-    turboSupportsCorepackHome
-  } = await scanParentDirs(destPath, true);
+  const { packageJson, cliType, lockfileVersion, turboSupportsCorepackHome } = await scanParentDirs(destPath, true);
   const scriptName = getScriptName(
     packageJson,
     typeof scriptNames === "string" ? [scriptNames] : scriptNames
@@ -836,7 +815,7 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
     env: getEnvForPackageManager({
       cliType,
       lockfileVersion,
-      packageJsonPackageManager,
+      packageJsonPackageManager: packageJson?.packageManager,
       nodeVersion: void 0,
       env: (0, import_clone_env.cloneEnv)(process.env, spawnOpts?.env),
       packageJsonEngines: packageJson?.engines,
@@ -916,6 +895,7 @@ const installDependencies = (0, import_util.deprecate)(
   spawnAsync,
   spawnCommand,
   traverseUpDirectories,
+  turboVersionSpecifierSupportsCorepack,
   usingCorepack,
   walkParentDirs
 });

package/dist/index.js

@@ -23606,10 +23606,7 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     filename: "package.json"
   });
   const packageJson = readPackageJson && pkgJsonPath ? JSON.parse(await import_fs_extra7.default.readFile(pkgJsonPath, "utf8")) : void 0;
-  const {
-    paths: [yarnLockPath, npmLockPath, pnpmLockPath, bunLockPath],
-    packageJsonPackageManager
-  } = await walkParentDirsMulti({
+  const [yarnLockPath, npmLockPath, pnpmLockPath, bunLockPath] = await walkParentDirsMulti({
     base,
     start: destPath,
     filenames: [
@@ -23657,16 +23654,15 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     lockfilePath = bunLockPath;
     lockfileVersion = 0;
   } else {
-    cliType = detectPackageManagerNameWithoutLockfile(
-      packageJsonPackageManager,
+    cliType = packageJson && rootProjectInfo ? detectPackageManagerNameWithoutLockfile(
+      packageJson,
       turboSupportsCorepackHome
-    );
+    ) : "npm";
   }
   const packageJsonPath = pkgJsonPath || void 0;
   return {
     cliType,
     packageJson,
-    packageJsonPackageManager,
     lockfilePath,
     lockfileVersion,
     packageJsonPath,
@@ -23674,7 +23670,7 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
   };
 }
 async function checkTurboSupportsCorepack(turboVersionRange, rootDir) {
-  if (turboRangeSupportsCorepack(turboVersionRange)) {
+  if (turboVersionSpecifierSupportsCorepack(turboVersionRange)) {
     return true;
   }
   const turboJsonPath = import_path5.default.join(rootDir, "turbo.json");
@@ -23682,15 +23678,19 @@ async function checkTurboSupportsCorepack(turboVersionRange, rootDir) {
   const turboJson = turboJsonExists ? JSON.parse(await import_fs_extra7.default.readFile(turboJsonPath, "utf8")) : void 0;
   return turboJson?.globalPassThroughEnv?.includes("COREPACK_HOME") || false;
 }
-function turboRangeSupportsCorepack(turboVersionRange) {
+function turboVersionSpecifierSupportsCorepack(turboVersionSpecifier) {
+  if (!(0, import_semver2.validRange)(turboVersionSpecifier)) {
+    return false;
+  }
   const versionSupportingCorepack = "2.1.3";
-  const minTurboBeingUsed = (0, import_semver2.minVersion)(turboVersionRange);
+  const minTurboBeingUsed = (0, import_semver2.minVersion)(turboVersionSpecifier);
   if (!minTurboBeingUsed) {
     return false;
   }
   return (0, import_semver2.gte)(minTurboBeingUsed, versionSupportingCorepack);
 }
-function detectPackageManagerNameWithoutLockfile(packageJsonPackageManager, turboSupportsCorepackHome) {
+function detectPackageManagerNameWithoutLockfile(packageJson, turboSupportsCorepackHome) {
+  const packageJsonPackageManager = packageJson.packageManager;
   if (usingCorepack(
     process.env,
     packageJsonPackageManager,
@@ -23747,26 +23747,17 @@ async function walkParentDirsMulti({
   start,
   filenames
 }) {
-  let packageManager;
   for (const dir of traverseUpDirectories({ start, base })) {
     const fullPaths = filenames.map((f) => import_path5.default.join(dir, f));
     const existResults = await Promise.all(
       fullPaths.map((f) => import_fs_extra7.default.pathExists(f))
     );
     const foundOneOrMore = existResults.some((b) => b);
-    const packageJsonPath = import_path5.default.join(dir, "package.json");
-    const packageJson = await import_fs_extra7.default.readJSON(packageJsonPath).catch(() => null);
-    if (packageJson?.packageManager) {
-      packageManager = packageJson.packageManager;
-    }
     if (foundOneOrMore) {
-      return {
-        paths: fullPaths.map((f, i) => existResults[i] ? f : void 0),
-        packageJsonPackageManager: packageManager
-      };
+      return fullPaths.map((f, i) => existResults[i] ? f : void 0);
     }
   }
-  return { paths: [], packageJsonPackageManager: packageManager };
+  return [];
 }
 function isSet(v) {
   return v?.constructor?.name === "Set";
@@ -23784,7 +23775,6 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
       packageJsonPath,
       packageJson,
       lockfileVersion,
-      packageJsonPackageManager,
       turboSupportsCorepackHome
     } = await scanParentDirs(destPath, true);
     if (!packageJsonPath) {
@@ -23815,7 +23805,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
     opts.env = getEnvForPackageManager({
       cliType,
       lockfileVersion,
-      packageJsonPackageManager,
+      packageJsonPackageManager: packageJson?.packageManager,
       nodeVersion,
       env,
       packageJsonEngines: packageJson?.engines,
@@ -24160,17 +24150,11 @@ async function runCustomInstallCommand({
   spawnOpts
 }) {
   console.log(`Running "install" command: \`${installCommand}\`...`);
-  const {
-    cliType,
-    lockfileVersion,
-    packageJson,
-    packageJsonPackageManager,
-    turboSupportsCorepackHome
-  } = await scanParentDirs(destPath, true);
+  const { cliType, lockfileVersion, packageJson, turboSupportsCorepackHome } = await scanParentDirs(destPath, true);
   const env = getEnvForPackageManager({
     cliType,
     lockfileVersion,
-    packageJsonPackageManager,
+    packageJsonPackageManager: packageJson?.packageManager,
     nodeVersion,
     env: spawnOpts?.env || {},
     packageJsonEngines: packageJson?.engines,
@@ -24185,13 +24169,7 @@ async function runCustomInstallCommand({
 }
 async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
   (0, import_assert6.default)(import_path5.default.isAbsolute(destPath));
-  const {
-    packageJson,
-    cliType,
-    lockfileVersion,
-    packageJsonPackageManager,
-    turboSupportsCorepackHome
-  } = await scanParentDirs(destPath, true);
+  const { packageJson, cliType, lockfileVersion, turboSupportsCorepackHome } = await scanParentDirs(destPath, true);
   const scriptName = getScriptName(
     packageJson,
     typeof scriptNames === "string" ? [scriptNames] : scriptNames
@@ -24206,7 +24184,7 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
     env: getEnvForPackageManager({
       cliType,
       lockfileVersion,
-      packageJsonPackageManager,
+      packageJsonPackageManager: packageJson?.packageManager,
       nodeVersion: void 0,
       env: cloneEnv(process.env, spawnOpts?.env),
       packageJsonEngines: packageJson?.engines,

package/package.json

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