fixup! refactor(@angular/cli): remove old package manager utilities

Author: alan-agius4

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

@@ -8,7 +8,7 @@
 
 import { schema } from '@angular-devkit/core';
 import { readFileSync } from 'node:fs';
-import { join, posix } from 'node:path';
+import { join, posix, relative } from 'node:path';
 import type { ArgumentsCamelCase, Argv, CommandModule as YargsCommandModule } from 'yargs';
 import { Parser as yargsParser } from 'yargs/helpers';
 import { getAnalyticsUserId } from '../analytics/analytics';
@@ -73,9 +73,10 @@ export abstract class CommandModule<T extends {} = {}> implements CommandModuleI
           describe: this.describe,
           ...(this.longDescriptionPath
             ? {
-                longDescriptionRelativePath: path
-                  .relative(join(__dirname, '../../../../'), this.longDescriptionPath)
-                  .replace(/\\/g, posix.sep),
+                longDescriptionRelativePath: relative(
+                  join(__dirname, '../../../../'),
+                  this.longDescriptionPath,
+                ).replace(/\\/g, posix.sep),
                 longDescription: readFileSync(this.longDescriptionPath, 'utf8').replace(
                   /\r\n/g,
                   '\n',

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

@@ -64,13 +64,12 @@ export async function runCommand(args: string[], logger: logging.Logger): Promis
   }
 
   const root = workspace?.basePath ?? process.cwd();
-
-  const cacheConfig = getCacheConfig(workspace);
+  const cacheConfig = workspace && getCacheConfig(workspace);
   const packageManager = await createPackageManager({
     cwd: root,
     logger,
-    dryRun,
-    tempDirectory: cacheConfig.enabled ? cacheConfig.path : undefined,
+    dryRun: dryRun || help || jsonHelp || getYargsCompletions,
+    tempDirectory: cacheConfig?.enabled ? cacheConfig.path : undefined,
     configuredPackageManager: await getConfiguredPackageManager(
       root,
       workspace,

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

@@ -8,7 +8,7 @@
 
 import { logging } from '@angular-devkit/core';
 import type { Argv, CamelCaseKey } from 'yargs';
-import { PackageManager } from '../package-managers/package-manager';
+import type { PackageManager } from '../package-managers/package-manager';
 import { AngularWorkspace } from '../utilities/config';
 
 export enum CommandScope {

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

@@ -20,7 +20,7 @@ import {
   Options,
 } from '../../command-builder/command-module';
 import { SchematicEngineHost } from '../../command-builder/utilities/schematic-engine-host';
-import { InstalledPackage, PackageManager, PackageManifest } from '../../package-managers';
+import type { InstalledPackage, PackageManager, PackageManifest } from '../../package-managers';
 import { colors } from '../../utilities/color';
 import { disableVersionCheck } from '../../utilities/environment-options';
 import { assertIsError } from '../../utilities/error';

packages/angular/cli/src/commands/update/utilities/cli-version.ts

@@ -11,7 +11,7 @@ import { spawnSync } from 'node:child_process';
 import { existsSync, promises as fs } from 'node:fs';
 import { join, resolve } from 'node:path';
 import * as semver from 'semver';
-import { PackageManager } from '../../../package-managers';
+import type { PackageManager } from '../../../package-managers';
 import { VERSION } from '../../../utilities/version';
 import { ANGULAR_PACKAGES_REGEXP } from './constants';
 

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

@@ -56,7 +56,7 @@ export default class VersionCommandModule
    */
   async run(options: { json?: boolean }): Promise<void> {
     const { logger } = this.context;
-    const versionInfo = gatherVersionInfo(this.context);
+    const versionInfo = await gatherVersionInfo(this.context);
 
     if (options.json) {
       // eslint-disable-next-line no-console

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

@@ -7,6 +7,8 @@
  */
 
 import { createRequire } from 'node:module';
+import { CommandContext } from '../../command-builder/definitions';
+import { PackageManager } from '../../package-managers';
 import { VERSION } from '../../utilities/version';
 
 /**
@@ -81,10 +83,7 @@ const PACKAGE_PATTERNS = [
  * Gathers all the version information from the environment and workspace.
  * @returns An object containing all the version information.
  */
-export function gatherVersionInfo(context: {
-  packageManager: { name: string; version: string | undefined };
-  root: string;
-}): VersionInfo {
+export async function gatherVersionInfo(context: CommandContext): Promise<VersionInfo> {
   // Trailing slash is used to allow the path to be treated as a directory
   const workspaceRequire = createRequire(context.root + '/');
 
@@ -132,7 +131,7 @@ export function gatherVersionInfo(context: {
       },
       packageManager: {
         name: context.packageManager.name,
-        version: context.packageManager.version,
+        version: await context.packageManager.getVersion(),
       },
     },
     packages,