@pnpm/global.commands 1100.0.2 → 1100.0.4

package/lib/globalAdd.js

@@ -8,6 +8,7 @@ import { isSubdir } from 'is-subdir';
 import { symlinkDir } from 'symlink-dir';
 import { checkGlobalBinConflicts } from './checkGlobalBinConflicts.js';
 import { installGlobalPackages } from './installGlobalPackages.js';
+import { promptApproveGlobalBuilds } from './promptApproveGlobalBuilds.js';
 import { readInstalledPackages } from './readInstalledPackages.js';
 export async function handleGlobalAdd(opts, params, commands) {
     // Resolve relative path selectors to absolute paths before the working
@@ -56,22 +57,13 @@ export async function handleGlobalAdd(opts, params, commands) {
         allowBuilds: builds,
     });
     const ignoredBuilds = await installGlobalPackages(makeInstallOpts(installDir, allowBuilds), params);
-    // If any packages had their builds skipped, prompt the user to approve them
-    // (reuses the same interactive flow as `pnpm approve-builds`)
-    if (ignoredBuilds?.size && process.stdin.isTTY) {
-        await commands['approve-builds']({
-            ...opts,
-            modulesDir: path.join(installDir, 'node_modules'),
-            dir: installDir,
-            lockfileDir: installDir,
-            rootProjectManifest: undefined,
-            rootProjectManifestDir: installDir,
-            workspaceDir: opts.globalPkgDir,
-            global: false,
-            pending: false,
-            allowBuilds,
-        }, [], commands);
-    }
+    await promptApproveGlobalBuilds({
+        globalPkgDir: globalDir,
+        installDir,
+        ignoredBuilds,
+        allowBuilds,
+        inheritedOpts: opts,
+    }, commands);
     // Read resolved aliases from the installed package.json
     const pkgJson = readPackageJsonFromDirRawSync(installDir);
     const aliases = Object.keys(pkgJson.dependencies ?? {});

package/lib/globalUpdate.js

@@ -7,6 +7,7 @@ import { isSubdir } from 'is-subdir';
 import { symlinkDir } from 'symlink-dir';
 import { checkGlobalBinConflicts } from './checkGlobalBinConflicts.js';
 import { installGlobalPackages } from './installGlobalPackages.js';
+import { promptApproveGlobalBuilds } from './promptApproveGlobalBuilds.js';
 import { readInstalledPackages } from './readInstalledPackages.js';
 export async function handleGlobalUpdate(opts, params, commands) {
     const globalDir = opts.globalPkgDir;
@@ -65,22 +66,13 @@ async function updateGlobalPackageGroup(opts, globalDir, globalBinDir, pkg, comm
         includeDirect: include,
         allowBuilds,
     }, depSpecs);
-    // If any packages had their builds skipped, prompt the user to approve them
-    // (reuses the same interactive flow as `pnpm approve-builds`)
-    if (ignoredBuilds?.size && process.stdin.isTTY) {
-        await commands['approve-builds']({
-            ...opts,
-            modulesDir: path.join(installDir, 'node_modules'),
-            dir: installDir,
-            lockfileDir: installDir,
-            rootProjectManifest: undefined,
-            rootProjectManifestDir: installDir,
-            workspaceDir: opts.globalPkgDir,
-            global: false,
-            pending: false,
-            allowBuilds,
-        }, [], commands);
-    }
+    await promptApproveGlobalBuilds({
+        globalPkgDir: globalDir,
+        installDir,
+        ignoredBuilds,
+        allowBuilds,
+        inheritedOpts: opts,
+    }, commands);
     // Check for bin name conflicts with other global packages
     const pkgs = await readInstalledPackages(installDir);
     let binsToSkip;

package/lib/promptApproveGlobalBuilds.d.ts

@@ -0,0 +1,24 @@
+import type { CommandHandlerMap } from '@pnpm/cli.command';
+import type { IgnoredBuilds } from '@pnpm/types';
+export interface PromptApproveGlobalBuildsOptions {
+    globalPkgDir: string;
+    installDir: string;
+    ignoredBuilds: IgnoredBuilds | undefined;
+    allowBuilds: Record<string, string | boolean>;
+    /** Inherited config opts from the global add/update handler. */
+    inheritedOpts: object;
+}
+/**
+ * If the previous global install left builds awaiting approval, run the
+ * interactive `approve-builds` flow against the install directory.
+ *
+ * `settingsDir` points at the global packages directory so the resulting
+ * allowBuilds update lands in its pnpm-workspace.yaml. The
+ * workspace-context fields (`workspaceDir`, `allProjects`,
+ * `selectedProjectsGraph`, `workspacePackagePatterns`) are explicitly
+ * cleared so that the install run by approve-builds in GVS mode operates
+ * only on the install directory — otherwise it would treat the global
+ * packages dir as a workspace and discover sibling install directories as
+ * workspace projects.
+ */
+export declare function promptApproveGlobalBuilds(opts: PromptApproveGlobalBuildsOptions, commands: CommandHandlerMap): Promise<void>;

package/lib/promptApproveGlobalBuilds.js

@@ -0,0 +1,35 @@
+import path from 'node:path';
+/**
+ * If the previous global install left builds awaiting approval, run the
+ * interactive `approve-builds` flow against the install directory.
+ *
+ * `settingsDir` points at the global packages directory so the resulting
+ * allowBuilds update lands in its pnpm-workspace.yaml. The
+ * workspace-context fields (`workspaceDir`, `allProjects`,
+ * `selectedProjectsGraph`, `workspacePackagePatterns`) are explicitly
+ * cleared so that the install run by approve-builds in GVS mode operates
+ * only on the install directory — otherwise it would treat the global
+ * packages dir as a workspace and discover sibling install directories as
+ * workspace projects.
+ */
+export async function promptApproveGlobalBuilds(opts, commands) {
+    if (!opts.ignoredBuilds?.size || !process.stdin.isTTY)
+        return;
+    await commands['approve-builds']({
+        ...opts.inheritedOpts,
+        workspaceDir: undefined,
+        allProjects: undefined,
+        selectedProjectsGraph: undefined,
+        workspacePackagePatterns: undefined,
+        modulesDir: path.join(opts.installDir, 'node_modules'),
+        dir: opts.installDir,
+        lockfileDir: opts.installDir,
+        rootProjectManifest: undefined,
+        rootProjectManifestDir: opts.installDir,
+        settingsDir: opts.globalPkgDir,
+        global: false,
+        pending: false,
+        allowBuilds: opts.allowBuilds,
+    }, [], commands);
+}
+//# sourceMappingURL=promptApproveGlobalBuilds.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/global.commands",
-  "version": "1100.0.2",
+  "version": "1100.0.4",
   "description": "Global package command handlers for pnpm",
   "keywords": [
     "pnpm",
@@ -29,21 +29,21 @@
     "is-subdir": "^2.0.0",
     "symlink-dir": "^10.0.1",
     "@pnpm/bins.linker": "1100.0.2",
-    "@pnpm/cli.utils": "1101.0.0",
-    "@pnpm/cli.command": "1100.0.0",
-    "@pnpm/config.matcher": "1100.0.0",
     "@pnpm/bins.resolver": "1100.0.1",
-    "@pnpm/error": "1100.0.0",
     "@pnpm/bins.remover": "1100.0.1",
-    "@pnpm/config.reader": "1101.0.0",
+    "@pnpm/cli.command": "1100.0.0",
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/config.matcher": "1100.0.0",
+    "@pnpm/cli.utils": "1101.0.0",
+    "@pnpm/config.reader": "1101.1.1",
     "@pnpm/global.packages": "1100.0.1",
-    "@pnpm/installing.deps-installer": "1100.0.2",
     "@pnpm/pkg-manifest.reader": "1100.0.1",
-    "@pnpm/store.connection-manager": "1100.0.2",
-    "@pnpm/types": "1101.0.0"
+    "@pnpm/installing.deps-installer": "1101.0.0",
+    "@pnpm/types": "1101.0.0",
+    "@pnpm/store.connection-manager": "1100.0.4"
   },
   "devDependencies": {
-    "@pnpm/global.commands": "1100.0.2"
+    "@pnpm/global.commands": "1100.0.4"
   },
   "engines": {
     "node": ">=22.13"