@vercel/build-utils 8.4.10 → 8.4.11

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @vercel/build-utils
 
+## 8.4.11
+
+### Patch Changes
+
+- Improve parsing of `turbo.json` ([#12266](https://github.com/vercel/vercel/pull/12266))
+
+- Fix corepack `packageManager` detection on monorepos ([#12258](https://github.com/vercel/vercel/pull/12258))
+
 ## 8.4.10
 
 ### Patch Changes

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

@@ -26,6 +26,12 @@ 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.

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

@@ -238,7 +238,10 @@ 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 [yarnLockPath, npmLockPath, pnpmLockPath, bunLockPath] = await walkParentDirsMulti({
+  const {
+    paths: [yarnLockPath, npmLockPath, pnpmLockPath, bunLockPath],
+    packageJsonPackageManager
+  } = await walkParentDirsMulti({
     base,
     start: destPath,
     filenames: [
@@ -286,15 +289,16 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     lockfilePath = bunLockPath;
     lockfileVersion = 0;
   } else {
-    cliType = packageJson && rootProjectInfo ? detectPackageManagerNameWithoutLockfile(
-      packageJson,
+    cliType = detectPackageManagerNameWithoutLockfile(
+      packageJsonPackageManager,
       turboSupportsCorepackHome
-    ) : "npm";
+    );
   }
   const packageJsonPath = pkgJsonPath || void 0;
   return {
     cliType,
     packageJson,
+    packageJsonPackageManager,
     lockfilePath,
     lockfileVersion,
     packageJsonPath,
@@ -307,8 +311,16 @@ async function checkTurboSupportsCorepack(turboVersionRange, rootDir) {
   }
   const turboJsonPath = import_path.default.join(rootDir, "turbo.json");
   const turboJsonExists = await import_fs_extra.default.pathExists(turboJsonPath);
-  const turboJson = turboJsonExists ? import_json5.default.parse(await import_fs_extra.default.readFile(turboJsonPath, "utf8")) : void 0;
-  return turboJson?.globalPassThroughEnv?.includes("COREPACK_HOME") || false;
+  let turboJson = null;
+  if (turboJsonExists) {
+    try {
+      turboJson = import_json5.default.parse(await import_fs_extra.default.readFile(turboJsonPath, "utf8"));
+    } catch (err) {
+      console.warn(`WARNING: Failed to parse turbo.json`);
+    }
+  }
+  const turboJsonIncludesCorepackHome = turboJson !== null && typeof turboJson === "object" && "globalPassThroughEnv" in turboJson && Array.isArray(turboJson.globalPassThroughEnv) && turboJson.globalPassThroughEnv.includes("COREPACK_HOME");
+  return turboJsonIncludesCorepackHome;
 }
 function turboVersionSpecifierSupportsCorepack(turboVersionSpecifier) {
   if (!(0, import_semver.validRange)(turboVersionSpecifier)) {
@@ -321,8 +333,7 @@ function turboVersionSpecifierSupportsCorepack(turboVersionSpecifier) {
   }
   return (0, import_semver.gte)(minTurboBeingUsed, versionSupportingCorepack);
 }
-function detectPackageManagerNameWithoutLockfile(packageJson, turboSupportsCorepackHome) {
-  const packageJsonPackageManager = packageJson.packageManager;
+function detectPackageManagerNameWithoutLockfile(packageJsonPackageManager, turboSupportsCorepackHome) {
   if (usingCorepack(
     process.env,
     packageJsonPackageManager,
@@ -379,17 +390,26 @@ 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 fullPaths.map((f, i) => existResults[i] ? f : void 0);
+      return {
+        paths: fullPaths.map((f, i) => existResults[i] ? f : void 0),
+        packageJsonPackageManager: packageManager
+      };
     }
   }
-  return [];
+  return { paths: [], packageJsonPackageManager: packageManager };
 }
 function isSet(v) {
   return v?.constructor?.name === "Set";
@@ -407,6 +427,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
       packageJsonPath,
       packageJson,
       lockfileVersion,
+      packageJsonPackageManager,
       turboSupportsCorepackHome
     } = await scanParentDirs(destPath, true);
     if (!packageJsonPath) {
@@ -437,7 +458,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
     opts.env = getEnvForPackageManager({
       cliType,
       lockfileVersion,
-      packageJsonPackageManager: packageJson?.packageManager,
+      packageJsonPackageManager,
       nodeVersion,
       env,
       packageJsonEngines: packageJson?.engines,
@@ -782,11 +803,17 @@ async function runCustomInstallCommand({
   spawnOpts
 }) {
   console.log(`Running "install" command: \`${installCommand}\`...`);
-  const { cliType, lockfileVersion, packageJson, turboSupportsCorepackHome } = await scanParentDirs(destPath, true);
+  const {
+    cliType,
+    lockfileVersion,
+    packageJson,
+    packageJsonPackageManager,
+    turboSupportsCorepackHome
+  } = await scanParentDirs(destPath, true);
   const env = getEnvForPackageManager({
     cliType,
     lockfileVersion,
-    packageJsonPackageManager: packageJson?.packageManager,
+    packageJsonPackageManager,
     nodeVersion,
     env: spawnOpts?.env || {},
     packageJsonEngines: packageJson?.engines,
@@ -801,7 +828,13 @@ async function runCustomInstallCommand({
 }
 async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
   (0, import_assert.default)(import_path.default.isAbsolute(destPath));
-  const { packageJson, cliType, lockfileVersion, turboSupportsCorepackHome } = await scanParentDirs(destPath, true);
+  const {
+    packageJson,
+    cliType,
+    lockfileVersion,
+    packageJsonPackageManager,
+    turboSupportsCorepackHome
+  } = await scanParentDirs(destPath, true);
   const scriptName = getScriptName(
     packageJson,
     typeof scriptNames === "string" ? [scriptNames] : scriptNames
@@ -816,7 +849,7 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
     env: getEnvForPackageManager({
       cliType,
       lockfileVersion,
-      packageJsonPackageManager: packageJson?.packageManager,
+      packageJsonPackageManager,
       nodeVersion: void 0,
       env: (0, import_clone_env.cloneEnv)(process.env, spawnOpts?.env),
       packageJsonEngines: packageJson?.engines,

package/dist/index.js

@@ -24719,7 +24719,10 @@ 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 [yarnLockPath, npmLockPath, pnpmLockPath, bunLockPath] = await walkParentDirsMulti({
+  const {
+    paths: [yarnLockPath, npmLockPath, pnpmLockPath, bunLockPath],
+    packageJsonPackageManager
+  } = await walkParentDirsMulti({
     base,
     start: destPath,
     filenames: [
@@ -24767,15 +24770,16 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     lockfilePath = bunLockPath;
     lockfileVersion = 0;
   } else {
-    cliType = packageJson && rootProjectInfo ? detectPackageManagerNameWithoutLockfile(
-      packageJson,
+    cliType = detectPackageManagerNameWithoutLockfile(
+      packageJsonPackageManager,
       turboSupportsCorepackHome
-    ) : "npm";
+    );
   }
   const packageJsonPath = pkgJsonPath || void 0;
   return {
     cliType,
     packageJson,
+    packageJsonPackageManager,
     lockfilePath,
     lockfileVersion,
     packageJsonPath,
@@ -24788,8 +24792,16 @@ async function checkTurboSupportsCorepack(turboVersionRange, rootDir) {
   }
   const turboJsonPath = import_path5.default.join(rootDir, "turbo.json");
   const turboJsonExists = await import_fs_extra7.default.pathExists(turboJsonPath);
-  const turboJson = turboJsonExists ? import_json5.default.parse(await import_fs_extra7.default.readFile(turboJsonPath, "utf8")) : void 0;
-  return turboJson?.globalPassThroughEnv?.includes("COREPACK_HOME") || false;
+  let turboJson = null;
+  if (turboJsonExists) {
+    try {
+      turboJson = import_json5.default.parse(await import_fs_extra7.default.readFile(turboJsonPath, "utf8"));
+    } catch (err) {
+      console.warn(`WARNING: Failed to parse turbo.json`);
+    }
+  }
+  const turboJsonIncludesCorepackHome = turboJson !== null && typeof turboJson === "object" && "globalPassThroughEnv" in turboJson && Array.isArray(turboJson.globalPassThroughEnv) && turboJson.globalPassThroughEnv.includes("COREPACK_HOME");
+  return turboJsonIncludesCorepackHome;
 }
 function turboVersionSpecifierSupportsCorepack(turboVersionSpecifier) {
   if (!(0, import_semver2.validRange)(turboVersionSpecifier)) {
@@ -24802,8 +24814,7 @@ function turboVersionSpecifierSupportsCorepack(turboVersionSpecifier) {
   }
   return (0, import_semver2.gte)(minTurboBeingUsed, versionSupportingCorepack);
 }
-function detectPackageManagerNameWithoutLockfile(packageJson, turboSupportsCorepackHome) {
-  const packageJsonPackageManager = packageJson.packageManager;
+function detectPackageManagerNameWithoutLockfile(packageJsonPackageManager, turboSupportsCorepackHome) {
   if (usingCorepack(
     process.env,
     packageJsonPackageManager,
@@ -24860,17 +24871,26 @@ 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 fullPaths.map((f, i) => existResults[i] ? f : void 0);
+      return {
+        paths: fullPaths.map((f, i) => existResults[i] ? f : void 0),
+        packageJsonPackageManager: packageManager
+      };
     }
   }
-  return [];
+  return { paths: [], packageJsonPackageManager: packageManager };
 }
 function isSet(v) {
   return v?.constructor?.name === "Set";
@@ -24888,6 +24908,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
       packageJsonPath,
       packageJson,
       lockfileVersion,
+      packageJsonPackageManager,
       turboSupportsCorepackHome
     } = await scanParentDirs(destPath, true);
     if (!packageJsonPath) {
@@ -24918,7 +24939,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
     opts.env = getEnvForPackageManager({
       cliType,
       lockfileVersion,
-      packageJsonPackageManager: packageJson?.packageManager,
+      packageJsonPackageManager,
       nodeVersion,
       env,
       packageJsonEngines: packageJson?.engines,
@@ -25263,11 +25284,17 @@ async function runCustomInstallCommand({
   spawnOpts
 }) {
   console.log(`Running "install" command: \`${installCommand}\`...`);
-  const { cliType, lockfileVersion, packageJson, turboSupportsCorepackHome } = await scanParentDirs(destPath, true);
+  const {
+    cliType,
+    lockfileVersion,
+    packageJson,
+    packageJsonPackageManager,
+    turboSupportsCorepackHome
+  } = await scanParentDirs(destPath, true);
   const env = getEnvForPackageManager({
     cliType,
     lockfileVersion,
-    packageJsonPackageManager: packageJson?.packageManager,
+    packageJsonPackageManager,
     nodeVersion,
     env: spawnOpts?.env || {},
     packageJsonEngines: packageJson?.engines,
@@ -25282,7 +25309,13 @@ async function runCustomInstallCommand({
 }
 async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
   (0, import_assert6.default)(import_path5.default.isAbsolute(destPath));
-  const { packageJson, cliType, lockfileVersion, turboSupportsCorepackHome } = await scanParentDirs(destPath, true);
+  const {
+    packageJson,
+    cliType,
+    lockfileVersion,
+    packageJsonPackageManager,
+    turboSupportsCorepackHome
+  } = await scanParentDirs(destPath, true);
   const scriptName = getScriptName(
     packageJson,
     typeof scriptNames === "string" ? [scriptNames] : scriptNames
@@ -25297,7 +25330,7 @@ async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
     env: getEnvForPackageManager({
       cliType,
       lockfileVersion,
-      packageJsonPackageManager: packageJson?.packageManager,
+      packageJsonPackageManager,
       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.10",
+  "version": "8.4.11",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",