@vercel/build-utils 8.4.0 → 8.4.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @vercel/build-utils
 
+## 8.4.1
+
+### Patch Changes
+
+- Revert "Revert "Fix corepack `packageManager` detection on monorepos"" ([#11871](https://github.com/vercel/vercel/pull/11871))
+
 ## 8.4.0
 
 ### Minor 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;
 }
 export interface TraverseUpDirectoriesProps {
     /**

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

@@ -219,7 +219,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: [
@@ -258,19 +261,21 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     lockfilePath = bunLockPath;
     lockfileVersion = 0;
   } else {
-    cliType = packageJson ? detectPackageManagerNameWithoutLockfile(packageJson) : "npm";
+    cliType = detectPackageManagerNameWithoutLockfile(
+      packageJsonPackageManager
+    );
   }
   const packageJsonPath = pkgJsonPath || void 0;
   return {
     cliType,
     packageJson,
+    packageJsonPackageManager,
     lockfilePath,
     lockfileVersion,
     packageJsonPath
   };
 }
-function detectPackageManagerNameWithoutLockfile(packageJson) {
-  const packageJsonPackageManager = packageJson.packageManager;
+function detectPackageManagerNameWithoutLockfile(packageJsonPackageManager) {
   if (usingCorepack(process.env, packageJsonPackageManager)) {
     const corepackPackageManager = validateVersionSpecifier(
       packageJsonPackageManager
@@ -315,17 +320,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";
@@ -338,7 +352,13 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
   (0, import_assert.default)(import_path.default.isAbsolute(destPath));
   try {
     await runNpmInstallSema.acquire();
-    const { cliType, packageJsonPath, packageJson, lockfileVersion } = await scanParentDirs(destPath, true);
+    const {
+      cliType,
+      packageJsonPath,
+      lockfileVersion,
+      packageJsonPackageManager,
+      packageJson
+    } = await scanParentDirs(destPath);
     if (!packageJsonPath) {
       (0, import_debug.default)(
         `Skipping dependency installation because no package.json was found for ${destPath}`
@@ -367,7 +387,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
     opts.env = getEnvForPackageManager({
       cliType,
       lockfileVersion,
-      packageJsonPackageManager: packageJson?.packageManager,
+      packageJsonPackageManager,
       nodeVersion,
       env,
       packageJsonEngines: packageJson?.engines
@@ -706,14 +726,11 @@ async function runCustomInstallCommand({
   spawnOpts
 }) {
   console.log(`Running "install" command: \`${installCommand}\`...`);
-  const { cliType, lockfileVersion, packageJson } = await scanParentDirs(
-    destPath,
-    true
-  );
+  const { cliType, lockfileVersion, packageJsonPackageManager, packageJson } = await scanParentDirs(destPath);
   const env = getEnvForPackageManager({
     cliType,
     lockfileVersion,
-    packageJsonPackageManager: packageJson?.packageManager,
+    packageJsonPackageManager,
     nodeVersion,
     env: spawnOpts?.env || {},
     packageJsonEngines: packageJson?.engines
@@ -727,10 +744,7 @@ async function runCustomInstallCommand({
 }
 async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
   (0, import_assert.default)(import_path.default.isAbsolute(destPath));
-  const { packageJson, cliType, lockfileVersion } = await scanParentDirs(
-    destPath,
-    true
-  );
+  const { packageJson, cliType, lockfileVersion, packageJsonPackageManager } = await scanParentDirs(destPath, true);
   const scriptName = getScriptName(
     packageJson,
     typeof scriptNames === "string" ? [scriptNames] : scriptNames
@@ -745,7 +759,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

@@ -21940,7 +21940,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: [
@@ -21979,19 +21982,21 @@ async function scanParentDirs(destPath, readPackageJson = false, base = "/") {
     lockfilePath = bunLockPath;
     lockfileVersion = 0;
   } else {
-    cliType = packageJson ? detectPackageManagerNameWithoutLockfile(packageJson) : "npm";
+    cliType = detectPackageManagerNameWithoutLockfile(
+      packageJsonPackageManager
+    );
   }
   const packageJsonPath = pkgJsonPath || void 0;
   return {
     cliType,
     packageJson,
+    packageJsonPackageManager,
     lockfilePath,
     lockfileVersion,
     packageJsonPath
   };
 }
-function detectPackageManagerNameWithoutLockfile(packageJson) {
-  const packageJsonPackageManager = packageJson.packageManager;
+function detectPackageManagerNameWithoutLockfile(packageJsonPackageManager) {
   if (usingCorepack(process.env, packageJsonPackageManager)) {
     const corepackPackageManager = validateVersionSpecifier(
       packageJsonPackageManager
@@ -22036,17 +22041,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";
@@ -22059,7 +22073,13 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
   (0, import_assert6.default)(import_path5.default.isAbsolute(destPath));
   try {
     await runNpmInstallSema.acquire();
-    const { cliType, packageJsonPath, packageJson, lockfileVersion } = await scanParentDirs(destPath, true);
+    const {
+      cliType,
+      packageJsonPath,
+      lockfileVersion,
+      packageJsonPackageManager,
+      packageJson
+    } = await scanParentDirs(destPath);
     if (!packageJsonPath) {
       debug(
         `Skipping dependency installation because no package.json was found for ${destPath}`
@@ -22088,7 +22108,7 @@ async function runNpmInstall(destPath, args = [], spawnOpts, meta, nodeVersion)
     opts.env = getEnvForPackageManager({
       cliType,
       lockfileVersion,
-      packageJsonPackageManager: packageJson?.packageManager,
+      packageJsonPackageManager,
       nodeVersion,
       env,
       packageJsonEngines: packageJson?.engines
@@ -22427,14 +22447,11 @@ async function runCustomInstallCommand({
   spawnOpts
 }) {
   console.log(`Running "install" command: \`${installCommand}\`...`);
-  const { cliType, lockfileVersion, packageJson } = await scanParentDirs(
-    destPath,
-    true
-  );
+  const { cliType, lockfileVersion, packageJsonPackageManager, packageJson } = await scanParentDirs(destPath);
   const env = getEnvForPackageManager({
     cliType,
     lockfileVersion,
-    packageJsonPackageManager: packageJson?.packageManager,
+    packageJsonPackageManager,
     nodeVersion,
     env: spawnOpts?.env || {},
     packageJsonEngines: packageJson?.engines
@@ -22448,10 +22465,7 @@ async function runCustomInstallCommand({
 }
 async function runPackageJsonScript(destPath, scriptNames, spawnOpts) {
   (0, import_assert6.default)(import_path5.default.isAbsolute(destPath));
-  const { packageJson, cliType, lockfileVersion } = await scanParentDirs(
-    destPath,
-    true
-  );
+  const { packageJson, cliType, lockfileVersion, packageJsonPackageManager } = await scanParentDirs(destPath, true);
   const scriptName = getScriptName(
     packageJson,
     typeof scriptNames === "string" ? [scriptNames] : scriptNames
@@ -22466,7 +22480,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.0",
+  "version": "8.4.1",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",