@angular/cli 14.0.0-next.6 → 14.0.0-next.7

package/src/commands/cache/settings/cli.js

@@ -0,0 +1,42 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CacheEnableModule = exports.CacheDisableModule = void 0;
+const command_module_1 = require("../../../command-builder/command-module");
+const utilities_1 = require("../utilities");
+class CacheDisableModule extends command_module_1.CommandModule {
+    constructor() {
+        super(...arguments);
+        this.command = 'disable';
+        this.aliases = 'off';
+        this.describe = 'Disables persistent disk cache for all projects in the workspace.';
+    }
+    builder(localYargs) {
+        return localYargs;
+    }
+    run() {
+        (0, utilities_1.updateCacheConfig)('enabled', false);
+    }
+}
+exports.CacheDisableModule = CacheDisableModule;
+class CacheEnableModule extends command_module_1.CommandModule {
+    constructor() {
+        super(...arguments);
+        this.command = 'enable';
+        this.aliases = 'on';
+        this.describe = 'Enables disk cache for all projects in the workspace.';
+    }
+    builder(localYargs) {
+        return localYargs;
+    }
+    run() {
+        (0, utilities_1.updateCacheConfig)('enabled', true);
+    }
+}
+exports.CacheEnableModule = CacheEnableModule;

package/src/commands/cache/utilities.d.ts

@@ -0,0 +1,11 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+import { Cache } from '../../../lib/config/workspace-schema';
+import { AngularWorkspace } from '../../utilities/config';
+export declare function updateCacheConfig<K extends keyof Cache>(key: K, value: Cache[K]): void;
+export declare function getCacheConfig(workspace: AngularWorkspace | undefined): Required<Cache>;

package/src/commands/cache/utilities.js

@@ -0,0 +1,50 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCacheConfig = exports.updateCacheConfig = void 0;
+const core_1 = require("@angular-devkit/core");
+const path_1 = require("path");
+const workspace_schema_1 = require("../../../lib/config/workspace-schema");
+const config_1 = require("../../utilities/config");
+function updateCacheConfig(key, value) {
+    const [localWorkspace] = (0, config_1.getWorkspaceRaw)('local');
+    if (!localWorkspace) {
+        throw new Error('Cannot find workspace configuration file.');
+    }
+    localWorkspace.modify(['cli', 'cache', key], value);
+    localWorkspace.save();
+}
+exports.updateCacheConfig = updateCacheConfig;
+function getCacheConfig(workspace) {
+    if (!workspace) {
+        throw new Error(`Cannot retrieve cache configuration as workspace is not defined.`);
+    }
+    const defaultSettings = {
+        path: (0, path_1.resolve)(workspace.basePath, '.angular/cache'),
+        environment: workspace_schema_1.Environment.Local,
+        enabled: true,
+    };
+    const cliSetting = workspace.extensions['cli'];
+    if (!cliSetting || !(0, core_1.isJsonObject)(cliSetting)) {
+        return defaultSettings;
+    }
+    const cacheSettings = cliSetting['cache'];
+    if (!(0, core_1.isJsonObject)(cacheSettings)) {
+        return defaultSettings;
+    }
+    const { path = defaultSettings.path, environment = defaultSettings.environment, enabled = defaultSettings.enabled,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+     } = cacheSettings;
+    return {
+        path: (0, path_1.resolve)(workspace.basePath, path),
+        environment,
+        enabled,
+    };
+}
+exports.getCacheConfig = getCacheConfig;

package/src/commands/config/cli.d.ts

@@ -8,7 +8,7 @@
 import { Argv } from 'yargs';
 import { CommandModule, CommandModuleImplementation, Options } from '../../command-builder/command-module';
 interface ConfigCommandArgs {
-    'json-path': string;
+    'json-path'?: string;
     value?: string;
     global?: boolean;
 }

package/src/commands/config/cli.js

@@ -16,7 +16,7 @@ const json_file_1 = require("../../utilities/json-file");
 class ConfigCommandModule extends command_module_1.CommandModule {
     constructor() {
         super(...arguments);
-        this.command = 'config <json-path> [value]';
+        this.command = 'config [json-path] [value]';
         this.describe = 'Retrieves or sets Angular configuration values in the angular.json file for the workspace.';
         this.longDescriptionPath = (0, path_1.join)(__dirname, 'long-description.md');
     }
@@ -26,7 +26,6 @@ class ConfigCommandModule extends command_module_1.CommandModule {
             description: `The configuration key to set or query, in JSON path format. ` +
                 `For example: "a[3].foo.bar[2]". If no new value is provided, returns the current value of this key.`,
             type: 'string',
-            demandOption: true,
         })
             .positional('value', {
             description: 'If provided, a new value for the given configuration key.',
@@ -79,6 +78,7 @@ class ConfigCommandModule extends command_module_1.CommandModule {
         const validCliPaths = new Map([
             ['cli.warnings.versionMismatch', undefined],
             ['cli.defaultCollection', undefined],
+            ['cli.schematicCollections', undefined],
             ['cli.packageManager', undefined],
             ['cli.analytics', undefined],
             ['cli.analyticsSharing.tracking', undefined],

package/src/commands/doc/cli.d.ts

@@ -16,7 +16,7 @@ export declare class DocCommandModule extends CommandModule<DocCommandArgs> impl
     command: string;
     aliases: string[];
     describe: string;
-    longDescriptionPath?: string | undefined;
+    longDescriptionPath?: string;
     builder(localYargs: Argv): Argv<DocCommandArgs>;
     run(options: Options<DocCommandArgs>): Promise<number | void>;
 }

package/src/commands/e2e/cli.d.ts

@@ -13,5 +13,5 @@ export declare class E2eCommandModule extends ArchitectCommandModule implements
     command: string;
     aliases: string[];
     describe: string;
-    longDescriptionPath?: string | undefined;
+    longDescriptionPath?: string;
 }

package/src/commands/e2e/cli.js

@@ -16,14 +16,14 @@ class E2eCommandModule extends architect_command_module_1.ArchitectCommandModule
         this.multiTarget = true;
         this.missingErrorTarget = core_1.tags.stripIndents `
   Cannot find "e2e" target for the specified project.
-  
+
   You should add a package that implements end-to-end testing capabilities.
-  
+
   For example:
     Cypress: ng add @cypress/schematic
     Nightwatch: ng add @nightwatch/schematics
     WebdriverIO: ng add @wdio/schematics
-  
+
   More options will be added to the list as they become available.
   `;
         this.command = 'e2e [project]';

package/src/commands/generate/cli.d.ts

@@ -18,12 +18,22 @@ export declare class GenerateCommandModule extends SchematicsCommandModule imple
     longDescriptionPath?: string | undefined;
     builder(argv: Argv): Promise<Argv<GenerateCommandArgs>>;
     run(options: Options<GenerateCommandArgs> & OtherOptions): Promise<number | void>;
-    private getCollectionName;
+    private getCollectionNames;
     /**
      * Generate a command string to be passed to the command builder.
      *
      * @example `component [name]` or `@schematics/angular:component [name]`.
      */
     private generateCommandString;
+    /**
+     * Get schematics that can to be registered as subcommands.
+     */
+    private getSchematics;
+    /**
+     * Get schematics that should to be registered as subcommands.
+     *
+     * @returns a sorted list of schematic that needs to be registered as subcommands.
+     */
+    private getSchematicsToRegister;
 }
 export {};

package/src/commands/generate/cli.js

@@ -9,6 +9,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenerateCommandModule = void 0;
 const core_1 = require("@angular-devkit/core");
+const command_module_1 = require("../../command-builder/command-module");
 const schematics_command_module_1 = require("../../command-builder/schematics-command-module");
 const command_1 = require("../../command-builder/utilities/command");
 class GenerateCommandModule extends schematics_command_module_1.SchematicsCommandModule {
@@ -31,26 +32,14 @@ class GenerateCommandModule extends schematics_command_module_1.SchematicsComman
                 .strict(),
             handler: (options) => this.handler(options),
         });
-        const collectionName = await this.getCollectionName();
-        const workflow = this.getOrCreateWorkflowForBuilder(collectionName);
-        const collection = workflow.engine.createCollection(collectionName);
-        const schematicsInCollection = collection.description.schematics;
-        // We cannot use `collection.listSchematicNames()` as this doesn't return hidden schematics.
-        const schematicNames = new Set(Object.keys(schematicsInCollection).sort());
-        const [, schematicNameFromArgs] = this.parseSchematicInfo(
-        // positional = [generate, component] or [generate]
-        this.context.args.positional[1]);
-        if (schematicNameFromArgs && schematicNames.has(schematicNameFromArgs)) {
-            // No need to process all schematics since we know which one the user invoked.
-            schematicNames.clear();
-            schematicNames.add(schematicNameFromArgs);
-        }
-        for (const schematicName of schematicNames) {
-            const { description: { schemaJson, aliases: schematicAliases, hidden: schematicHidden }, } = collection.createSchematic(schematicName, true);
+        for (const [schematicName, collectionName] of await this.getSchematicsToRegister()) {
+            const workflow = this.getOrCreateWorkflowForBuilder(collectionName);
+            const collection = workflow.engine.createCollection(collectionName);
+            const { description: { schemaJson, aliases: schematicAliases, hidden: schematicHidden, description: schematicDescription, }, } = collection.createSchematic(schematicName, true);
             if (!schemaJson) {
                 continue;
             }
-            const { description, 'x-deprecated': xDeprecated, aliases = schematicAliases, hidden = schematicHidden, } = schemaJson;
+            const { 'x-deprecated': xDeprecated, description = schematicDescription, aliases = schematicAliases, hidden = schematicHidden, } = schemaJson;
             const options = await this.getSchematicOptions(collection, schematicName, workflow);
             localYargs = localYargs.command({
                 command: await this.generateCommandString(collectionName, schematicName, options),
@@ -66,7 +55,10 @@ class GenerateCommandModule extends schematics_command_module_1.SchematicsComman
     }
     async run(options) {
         const { dryRun, schematic, defaults, force, interactive, ...schematicOptions } = options;
-        const [collectionName = await this.getCollectionName(), schematicName = ''] = this.parseSchematicInfo(schematic);
+        const [collectionName, schematicName] = this.parseSchematicInfo(schematic);
+        if (!collectionName || !schematicName) {
+            throw new command_module_1.CommandModuleError('A collection and schematic is required during execution.');
+        }
         return this.runSchematic({
             collectionName,
             schematicName,
@@ -79,11 +71,11 @@ class GenerateCommandModule extends schematics_command_module_1.SchematicsComman
             },
         });
     }
-    async getCollectionName() {
-        const [collectionName = await this.getDefaultSchematicCollection()] = this.parseSchematicInfo(
+    async getCollectionNames() {
+        const [collectionName] = this.parseSchematicInfo(
         // positional = [generate, component] or [generate]
         this.context.args.positional[1]);
-        return collectionName;
+        return collectionName ? [collectionName] : [...(await this.getSchematicCollections())];
     }
     /**
      * Generate a command string to be passed to the command builder.
@@ -95,10 +87,13 @@ class GenerateCommandModule extends schematics_command_module_1.SchematicsComman
         // positional = [generate, component] or [generate]
         this.context.args.positional[1]);
         const dasherizedSchematicName = core_1.strings.dasherize(schematicName);
-        // Only add the collection name as part of the command when it's not the default collection or when it has been provided via the CLI.
+        const schematicCollectionsFromConfig = await this.getSchematicCollections();
+        const collectionNames = await this.getCollectionNames();
+        // Only add the collection name as part of the command when it's not a known
+        // schematics collection or when it has been provided via the CLI.
         // Ex:`ng generate @schematics/angular:component`
         const commandName = !!collectionNameFromArgs ||
-            (await this.getDefaultSchematicCollection()) !== (await this.getCollectionName())
+            !collectionNames.some((c) => schematicCollectionsFromConfig.has(c))
             ? collectionName + ':' + dasherizedSchematicName
             : dasherizedSchematicName;
         const positionalArgs = options
@@ -110,5 +105,41 @@ class GenerateCommandModule extends schematics_command_module_1.SchematicsComman
             .join(' ');
         return `${commandName}${positionalArgs ? ' ' + positionalArgs : ''}`;
     }
+    /**
+     * Get schematics that can to be registered as subcommands.
+     */
+    async *getSchematics() {
+        const seenNames = new Set();
+        for (const collectionName of await this.getCollectionNames()) {
+            const workflow = this.getOrCreateWorkflowForBuilder(collectionName);
+            const collection = workflow.engine.createCollection(collectionName);
+            for (const schematicName of collection.listSchematicNames(true /** includeHidden */)) {
+                // If a schematic with this same name is already registered skip.
+                if (!seenNames.has(schematicName)) {
+                    seenNames.add(schematicName);
+                    yield { schematicName, collectionName };
+                }
+            }
+        }
+    }
+    /**
+     * Get schematics that should to be registered as subcommands.
+     *
+     * @returns a sorted list of schematic that needs to be registered as subcommands.
+     */
+    async getSchematicsToRegister() {
+        const schematicsToRegister = [];
+        const [, schematicNameFromArgs] = this.parseSchematicInfo(
+        // positional = [generate, component] or [generate]
+        this.context.args.positional[1]);
+        for await (const { schematicName, collectionName } of this.getSchematics()) {
+            if (schematicName === schematicNameFromArgs) {
+                return [[schematicName, collectionName]];
+            }
+            schematicsToRegister.push([schematicName, collectionName]);
+        }
+        // Didn't find the schematic or no schematic name was provided Ex: `ng generate --help`.
+        return schematicsToRegister.sort(([nameA], [nameB]) => nameA.localeCompare(nameB, undefined, { sensitivity: 'accent' }));
+    }
 }
 exports.GenerateCommandModule = GenerateCommandModule;

package/src/commands/new/cli.d.ts

@@ -21,5 +21,7 @@ export declare class NewCommandModule extends SchematicsCommandModule implements
     longDescriptionPath?: string | undefined;
     builder(argv: Argv): Promise<Argv<NewCommandArgs>>;
     run(options: Options<NewCommandArgs> & OtherOptions): Promise<number | void>;
+    /** Find a collection from config that has an `ng-new` schematic. */
+    private getCollectionFromConfig;
 }
 export {};

package/src/commands/new/cli.js

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NewCommandModule = void 0;
 const command_module_1 = require("../../command-builder/command-module");
 const schematics_command_module_1 = require("../../command-builder/schematics-command-module");
-const package_manager_1 = require("../../utilities/package-manager");
 const version_1 = require("../../utilities/version");
 class NewCommandModule extends schematics_command_module_1.SchematicsCommandModule {
     constructor() {
@@ -30,7 +29,7 @@ class NewCommandModule extends schematics_command_module_1.SchematicsCommandModu
         const { options: { collectionNameFromArgs }, } = this.context.args;
         const collectionName = typeof collectionNameFromArgs === 'string'
             ? collectionNameFromArgs
-            : await this.getDefaultSchematicCollection();
+            : await this.getCollectionFromConfig();
         const workflow = await this.getOrCreateWorkflowForBuilder(collectionName);
         const collection = workflow.engine.createCollection(collectionName);
         const options = await this.getSchematicOptions(collection, this.schematicName, workflow);
@@ -39,7 +38,7 @@ class NewCommandModule extends schematics_command_module_1.SchematicsCommandModu
     async run(options) {
         var _a;
         // Register the version of the CLI in the registry.
-        const collectionName = (_a = options.collection) !== null && _a !== void 0 ? _a : (await this.getDefaultSchematicCollection());
+        const collectionName = (_a = options.collection) !== null && _a !== void 0 ? _a : (await this.getCollectionFromConfig());
         const workflow = await this.getOrCreateWorkflowForExecution(collectionName, options);
         workflow.registry.addSmartDefaultProvider('ng-cli-version', () => version_1.VERSION.full);
         const { dryRun, force, interactive, defaults, collection, ...schematicOptions } = options;
@@ -47,7 +46,7 @@ class NewCommandModule extends schematics_command_module_1.SchematicsCommandModu
         if (collectionName === '@schematics/angular' &&
             !schematicOptions.skipInstall &&
             (schematicOptions.packageManager === undefined || schematicOptions.packageManager === 'npm')) {
-            await (0, package_manager_1.ensureCompatibleNpm)(this.context.root);
+            this.context.packageManager.ensureCompatibility();
         }
         return this.runSchematic({
             collectionName,
@@ -61,6 +60,18 @@ class NewCommandModule extends schematics_command_module_1.SchematicsCommandModu
             },
         });
     }
+    /** Find a collection from config that has an `ng-new` schematic. */
+    async getCollectionFromConfig() {
+        for (const collectionName of await this.getSchematicCollections()) {
+            const workflow = this.getOrCreateWorkflowForBuilder(collectionName);
+            const collection = workflow.engine.createCollection(collectionName);
+            const schematicsInCollection = collection.description.schematics;
+            if (Object.keys(schematicsInCollection).includes(this.schematicName)) {
+                return collectionName;
+            }
+        }
+        return schematics_command_module_1.DEFAULT_SCHEMATICS_COLLECTION;
+    }
 }
 exports.NewCommandModule = NewCommandModule;
 NewCommandModule.scope = command_module_1.CommandScope.Out;

package/src/commands/update/cli.d.ts

@@ -50,5 +50,6 @@ export declare class UpdateCommandModule extends CommandModule<UpdateCommandArgs
      */
     private checkCLIVersion;
     private getCLIUpdateRunnerVersion;
+    private runTempBinary;
 }
 export {};

package/src/commands/update/cli.js

@@ -48,20 +48,11 @@ const command_module_1 = require("../../command-builder/command-module");
 const schematic_engine_host_1 = require("../../command-builder/utilities/schematic-engine-host");
 const schematic_workflow_1 = require("../../command-builder/utilities/schematic-workflow");
 const color_1 = require("../../utilities/color");
-const install_package_1 = require("../../utilities/install-package");
+const environment_options_1 = require("../../utilities/environment-options");
 const log_file_1 = require("../../utilities/log-file");
-const package_manager_1 = require("../../utilities/package-manager");
 const package_metadata_1 = require("../../utilities/package-metadata");
 const package_tree_1 = require("../../utilities/package-tree");
 const version_1 = require("../../utilities/version");
-/**
- * Disable CLI version mismatch checks and forces usage of the invoked CLI
- * instead of invoking the local installed version.
- */
-const disableVersionCheckEnv = process.env['NG_DISABLE_VERSION_CHECK'];
-const disableVersionCheck = disableVersionCheckEnv !== undefined &&
-    disableVersionCheckEnv !== '0' &&
-    disableVersionCheckEnv.toLowerCase() !== 'false';
 const ANGULAR_PACKAGES_REGEXP = /^@(?:angular|nguniversal)\//;
 const UPDATE_SCHEMATIC_COLLECTION = path.join(__dirname, 'schematic/collection.json');
 class UpdateCommandModule extends command_module_1.CommandModule {
@@ -156,14 +147,14 @@ class UpdateCommandModule extends command_module_1.CommandModule {
     async run(options) {
         var _a, _b;
         const { logger, packageManager } = this.context;
-        await (0, package_manager_1.ensureCompatibleNpm)(this.context.root);
+        packageManager.ensureCompatibility();
         // Check if the current installed CLI version is older than the latest compatible version.
-        if (!disableVersionCheck) {
+        if (!environment_options_1.disableVersionCheck) {
             const cliVersionToInstall = await this.checkCLIVersion(options.packages, options.verbose, options.next);
             if (cliVersionToInstall) {
                 logger.warn('The installed Angular CLI version is outdated.\n' +
                     `Installing a temporary Angular CLI versioned ${cliVersionToInstall} to perform the update.`);
-                return (0, install_package_1.runTempPackageBin)(`@angular/cli@${cliVersionToInstall}`, packageManager, process.argv.slice(2));
+                return this.runTempBinary(`@angular/cli@${cliVersionToInstall}`, process.argv.slice(2));
             }
         }
         const packages = [];
@@ -193,12 +184,12 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                 return 1;
             }
         }
-        logger.info(`Using package manager: '${packageManager}'`);
+        logger.info(`Using package manager: ${color_1.colors.grey(packageManager.name)}`);
         logger.info('Collecting installed dependencies...');
         const rootDependencies = await (0, package_tree_1.getProjectDependencies)(this.context.root);
         logger.info(`Found ${rootDependencies.size} dependencies.`);
         const workflow = new tools_1.NodeWorkflow(this.context.root, {
-            packageManager: this.context.packageManager,
+            packageManager: packageManager.name,
             packageManagerForce: options.force,
             // __dirname -> favor @schematics/update from this package
             // Otherwise, use packages from the active workspace (migrations)
@@ -212,7 +203,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                 force: options.force,
                 next: options.next,
                 verbose: options.verbose,
-                packageManager,
+                packageManager: packageManager.name,
                 packages: [],
             });
             return success ? 0 : 1;
@@ -509,7 +500,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
             verbose: options.verbose,
             force: options.force,
             next: options.next,
-            packageManager: this.context.packageManager,
+            packageManager: this.context.packageManager.name,
             packages: packagesToUpdate,
         });
         if (success) {
@@ -521,9 +512,9 @@ class UpdateCommandModule extends command_module_1.CommandModule {
                 });
             }
             catch { }
-            const result = await (0, install_package_1.installAllPackages)(this.context.packageManager, options.force ? ['--force'] : [], this.context.root);
-            if (result !== 0) {
-                return result;
+            const installationSuccess = await this.context.packageManager.installAll(options.force ? ['--force'] : [], this.context.root);
+            if (!installationSuccess) {
+                return 1;
             }
         }
         if (success && options.createCommits) {
@@ -667,7 +658,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
     async checkCLIVersion(packagesToUpdate, verbose = false, next = false) {
         const { version } = await (0, package_metadata_1.fetchPackageManifest)(`@angular/cli@${this.getCLIUpdateRunnerVersion(typeof packagesToUpdate === 'string' ? [packagesToUpdate] : packagesToUpdate, next)}`, this.context.logger, {
             verbose,
-            usingYarn: this.context.packageManager === workspace_schema_1.PackageManager.Yarn,
+            usingYarn: this.context.packageManager.name === workspace_schema_1.PackageManager.Yarn,
         });
         return version_1.VERSION.full === version ? null : version;
     }
@@ -694,6 +685,44 @@ class UpdateCommandModule extends command_module_1.CommandModule {
         // We end up using Angular ClI v13 to run the migrations if we run the migrations using the CLI installed major version + 1 logic.
         return version_1.VERSION.major;
     }
+    async runTempBinary(packageName, args = []) {
+        const { success, tempNodeModules } = await this.context.packageManager.installTemp(packageName);
+        if (!success) {
+            return 1;
+        }
+        // Remove version/tag etc... from package name
+        // Ex: @angular/cli@latest -> @angular/cli
+        const packageNameNoVersion = packageName.substring(0, packageName.lastIndexOf('@'));
+        const pkgLocation = (0, path_1.join)(tempNodeModules, packageNameNoVersion);
+        const packageJsonPath = (0, path_1.join)(pkgLocation, 'package.json');
+        // Get a binary location for this package
+        let binPath;
+        if ((0, fs_1.existsSync)(packageJsonPath)) {
+            const content = await fs_1.promises.readFile(packageJsonPath, 'utf-8');
+            if (content) {
+                const { bin = {} } = JSON.parse(content);
+                const binKeys = Object.keys(bin);
+                if (binKeys.length) {
+                    binPath = (0, path_1.resolve)(pkgLocation, bin[binKeys[0]]);
+                }
+            }
+        }
+        if (!binPath) {
+            throw new Error(`Cannot locate bin for temporary package: ${packageNameNoVersion}.`);
+        }
+        const { status, error } = (0, child_process_1.spawnSync)(process.execPath, [binPath, ...args], {
+            stdio: 'inherit',
+            env: {
+                ...process.env,
+                NG_DISABLE_VERSION_CHECK: 'true',
+                NG_CLI_ANALYTICS: 'false',
+            },
+        });
+        if (status === null && error) {
+            throw error;
+        }
+        return status !== null && status !== void 0 ? status : 0;
+    }
 }
 exports.UpdateCommandModule = UpdateCommandModule;
 UpdateCommandModule.scope = command_module_1.CommandScope.In;

package/src/commands/update/schematic/index.js

@@ -286,6 +286,7 @@ function _getUpdateMetadata(packageJson, logger) {
         }
         else if (typeof packageGroup == 'object' &&
             packageGroup &&
+            !Array.isArray(packageGroup) &&
             Object.values(packageGroup).every((x) => typeof x == 'string')) {
             result.packageGroup = packageGroup;
         }
@@ -362,23 +363,26 @@ function _usageMessage(options, infoMap, logger) {
     })
         .filter(({ info, version, target }) => (target === null || target === void 0 ? void 0 : target['ng-update']) && semver.compare(info.installed.version, version) < 0)
         .map(({ name, info, version, tag, target }) => {
-        var _a;
+        var _a, _b, _c;
         // Look for packageGroup.
-        const packageGroup = target['ng-update']['packageGroup'];
+        const packageGroup = (_a = target['ng-update']) === null || _a === void 0 ? void 0 : _a['packageGroup'];
         if (packageGroup) {
-            const packageGroupName = target['ng-update']['packageGroupName'] || packageGroup[0];
+            const packageGroupNames = Array.isArray(packageGroup)
+                ? packageGroup
+                : Object.keys(packageGroup);
+            const packageGroupName = ((_b = target['ng-update']) === null || _b === void 0 ? void 0 : _b['packageGroupName']) || packageGroupNames[0];
             if (packageGroupName) {
                 if (packageGroups.has(name)) {
                     return null;
                 }
-                packageGroup.forEach((x) => packageGroups.set(x, packageGroupName));
+                packageGroupNames.forEach((x) => packageGroups.set(x, packageGroupName));
                 packageGroups.set(packageGroupName, packageGroupName);
                 name = packageGroupName;
             }
         }
         let command = `ng update ${name}`;
         if (!tag) {
-            command += `@${((_a = semver.parse(version)) === null || _a === void 0 ? void 0 : _a.major) || version}`;
+            command += `@${((_c = semver.parse(version)) === null || _c === void 0 ? void 0 : _c.major) || version}`;
         }
         else if (tag == 'next') {
             command += ' --next';
@@ -508,29 +512,34 @@ function _addPackageGroup(tree, packages, allDependencies, npmPackageJson, logge
     if (!ngUpdateMetadata) {
         return;
     }
-    let packageGroup = ngUpdateMetadata['packageGroup'];
+    const packageGroup = ngUpdateMetadata['packageGroup'];
     if (!packageGroup) {
         return;
     }
+    let packageGroupNormalized = {};
     if (Array.isArray(packageGroup) && !packageGroup.some((x) => typeof x != 'string')) {
-        packageGroup = packageGroup.reduce((acc, curr) => {
+        packageGroupNormalized = packageGroup.reduce((acc, curr) => {
             acc[curr] = maybePackage;
             return acc;
         }, {});
     }
-    // Only need to check if it's an object because we set it right the time before.
-    if (typeof packageGroup != 'object' ||
-        packageGroup === null ||
-        Object.values(packageGroup).some((v) => typeof v != 'string')) {
-        logger.warn(`packageGroup metadata of package ${npmPackageJson.name} is malformed.`);
+    else if (typeof packageGroup == 'object' &&
+        packageGroup &&
+        !Array.isArray(packageGroup) &&
+        Object.values(packageGroup).every((x) => typeof x == 'string')) {
+        packageGroupNormalized = packageGroup;
+    }
+    else {
+        logger.warn(`packageGroup metadata of package ${npmPackageJson.name} is malformed. Ignoring.`);
         return;
     }
-    Object.keys(packageGroup)
-        .filter((name) => !packages.has(name)) // Don't override names from the command line.
-        .filter((name) => allDependencies.has(name)) // Remove packages that aren't installed.
-        .forEach((name) => {
-        packages.set(name, packageGroup[name]);
-    });
+    for (const [name, value] of Object.entries(packageGroupNormalized)) {
+        // Don't override names from the command line.
+        // Remove packages that aren't installed.
+        if (!packages.has(name) && allDependencies.has(name)) {
+            packages.set(name, value);
+        }
+    }
 }
 /**
  * Add peer dependencies of packages on the command line to the list of packages to update.

package/src/commands/version/cli.d.ts

@@ -15,5 +15,4 @@ export declare class VersionCommandModule extends CommandModule implements Comma
     builder(localYargs: Argv): Argv;
     run(): Promise<void>;
     private getVersion;
-    private getPackageManagerVersion;
 }