refactor(@angular/cli): add package manager in command context

Author: alan-agius4

packages/angular/cli/src/command-builder/architect-base-command-module.ts

@@ -12,7 +12,6 @@ import { json } from '@angular-devkit/core';
 import { existsSync } from 'fs';
 import { resolve } from 'path';
 import { isPackageNameSafeForAnalytics } from '../analytics/analytics';
-import { getPackageManager } from '../utilities/package-manager';
 import {
   CommandModule,
   CommandModuleError,
@@ -100,7 +99,7 @@ export abstract class ArchitectBaseCommandModule<T>
       builderDesc = await architectHost.resolveBuilder(builderConf);
     } catch (e) {
       if (e.code === 'MODULE_NOT_FOUND') {
-        await this.warnOnMissingNodeModules();
+        this.warnOnMissingNodeModules();
         throw new CommandModuleError(`Could not find the '${builderConf}' builder's node package.`);
       }
 
@@ -114,7 +113,7 @@ export abstract class ArchitectBaseCommandModule<T>
     );
   }
 
-  private async warnOnMissingNodeModules(): Promise<void> {
+  private warnOnMissingNodeModules(): void {
     const basePath = this.context.workspace?.basePath;
     if (!basePath) {
       return;
@@ -134,9 +133,8 @@ export abstract class ArchitectBaseCommandModule<T>
       return;
     }
 
-    const packageManager = await getPackageManager(basePath);
     this.context.logger.warn(
-      `Node packages may not be installed. Try installing with '${packageManager} install'.`,
+      `Node packages may not be installed. Try installing with '${this.context.packageManager} install'.`,
     );
   }
 }

packages/angular/cli/src/command-builder/command-runner.ts

@@ -28,6 +28,7 @@ import { UpdateCommandModule } from '../commands/update/cli';
 import { VersionCommandModule } from '../commands/version/cli';
 import { colors } from '../utilities/color';
 import { AngularWorkspace } from '../utilities/config';
+import { getPackageManager } from '../utilities/package-manager';
 import { CommandContext, CommandModuleError, CommandScope } from './command-module';
 import { addCommandModuleToYargs, demandCommandFailureMessage } from './utilities/command';
 import { jsonHelpUsage } from './utilities/json-help';
@@ -72,6 +73,7 @@ export async function runCommand(
     logger,
     currentDirectory: process.cwd(),
     root: workspace?.basePath ?? process.cwd(),
+    packageManager: await getPackageManager(workspace?.basePath ?? process.cwd()),
     args: {
       positional: positional.map((v) => v.toString()),
       options: {

packages/angular/cli/src/commands/version/cli.ts

@@ -12,7 +12,6 @@ import { resolve } from 'path';
 import { Argv } from 'yargs';
 import { CommandModule, CommandModuleImplementation } from '../../command-builder/command-module';
 import { colors } from '../../utilities/color';
-import { getPackageManager } from '../../utilities/package-manager';
 
 interface PartialPackageInfo {
   name: string;
@@ -126,7 +125,7 @@ export class VersionCommandModule extends CommandModule implements CommandModule
       `
       Angular CLI: ${ngCliVersion}
       Node: ${process.versions.node}${unsupportedNodeVersion ? ' (Unsupported)' : ''}
-      Package Manager: ${await this.getPackageManagerVersion()}
+      Package Manager: ${this.getPackageManagerVersion()}
       OS: ${process.platform} ${process.arch}
 
       Angular: ${angularCoreVersion}
@@ -194,9 +193,9 @@ export class VersionCommandModule extends CommandModule implements CommandModule
     return '<error>';
   }
 
-  private async getPackageManagerVersion(): Promise<string> {
+  private getPackageManagerVersion(): string {
     try {
-      const manager = await getPackageManager(this.context.root);
+      const manager = this.context.packageManager;
       const version = execSync(`${manager} --version`, {
         encoding: 'utf8',
         stdio: ['ignore', 'pipe', 'ignore'],