@vercel/build-utils 8.4.1 → 8.4.2

package/CHANGELOG.md

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

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

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

package/dist/index.js

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