@angular/cli 21.1.2 → 21.2.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "21.1.2",
+  "version": "21.2.0-next.0",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,40 +25,39 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.2101.2",
-    "@angular-devkit/core": "21.1.2",
-    "@angular-devkit/schematics": "21.1.2",
+    "@angular-devkit/architect": "0.2102.0-next.0",
+    "@angular-devkit/core": "21.2.0-next.0",
+    "@angular-devkit/schematics": "21.2.0-next.0",
     "@inquirer/prompts": "7.10.1",
     "@listr2/prompt-adapter-inquirer": "3.0.5",
-    "@modelcontextprotocol/sdk": "1.25.2",
-    "@schematics/angular": "21.1.2",
+    "@modelcontextprotocol/sdk": "1.25.3",
+    "@schematics/angular": "21.2.0-next.0",
     "@yarnpkg/lockfile": "1.1.0",
-    "algoliasearch": "5.46.2",
+    "algoliasearch": "5.47.0",
     "ini": "6.0.0",
     "jsonc-parser": "3.3.1",
     "listr2": "9.0.5",
     "npm-package-arg": "13.0.2",
     "pacote": "21.0.4",
     "parse5-html-rewriting-stream": "8.0.0",
-    "resolve": "1.22.11",
     "semver": "7.7.3",
     "yargs": "18.0.0",
-    "zod": "4.3.5"
+    "zod": "4.3.6"
   },
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "21.1.2",
-      "@angular/build": "21.1.2",
-      "@angular/ssr": "21.1.2",
-      "@angular-devkit/architect": "0.2101.2",
-      "@angular-devkit/build-angular": "21.1.2",
-      "@angular-devkit/build-webpack": "0.2101.2",
-      "@angular-devkit/core": "21.1.2",
-      "@angular-devkit/schematics": "21.1.2"
+      "@angular/cli": "21.2.0-next.0",
+      "@angular/build": "21.2.0-next.0",
+      "@angular/ssr": "21.2.0-next.0",
+      "@angular-devkit/architect": "0.2102.0-next.0",
+      "@angular-devkit/build-angular": "21.2.0-next.0",
+      "@angular-devkit/build-webpack": "0.2102.0-next.0",
+      "@angular-devkit/core": "21.2.0-next.0",
+      "@angular-devkit/schematics": "21.2.0-next.0"
     }
   },
-  "packageManager": "pnpm@10.28.1",
+  "packageManager": "pnpm@10.28.2",
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",

package/src/analytics/analytics-collector.d.ts

@@ -5,14 +5,17 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
-import type { CommandContext } from '../command-builder/command-module';
+import { logging } from '@angular-devkit/core';
 import { EventCustomDimension, EventCustomMetric, PrimitiveTypes } from './analytics-parameters';
 export declare class AnalyticsCollector {
-    private context;
+    private logger;
     private trackingEventsQueue;
     private readonly requestParameterStringified;
     private readonly userParameters;
-    constructor(context: CommandContext, userId: string);
+    constructor(logger: logging.Logger, userId: string, packageManagerInfo: {
+        name: string;
+        version: string | undefined;
+    });
     reportWorkspaceInfoEvent(parameters: Partial<Record<EventCustomMetric, string | boolean | number | undefined>>): void;
     reportRebuildRunEvent(parameters: Partial<Record<EventCustomMetric & EventCustomDimension, string | boolean | number | undefined>>): void;
     reportBuildRunEvent(parameters: Partial<Record<EventCustomMetric & EventCustomDimension, string | boolean | number | undefined>>): void;

package/src/analytics/analytics-collector.js

@@ -53,12 +53,12 @@ const analytics_parameters_1 = require("./analytics-parameters");
 const TRACKING_ID_PROD = 'G-VETNJBW8L4';
 const TRACKING_ID_STAGING = 'G-TBMPRL1BTM';
 class AnalyticsCollector {
-    context;
+    logger;
     trackingEventsQueue;
     requestParameterStringified;
     userParameters;
-    constructor(context, userId) {
-        this.context = context;
+    constructor(logger, userId, packageManagerInfo) {
+        this.logger = logger;
         const requestParameters = {
             [analytics_parameters_1.RequestParameter.ProtocolVersion]: 2,
             [analytics_parameters_1.RequestParameter.ClientId]: userId,
@@ -81,7 +81,7 @@ class AnalyticsCollector {
         }
         this.requestParameterStringified = querystring.stringify(requestParameters);
         const parsedVersion = semver.parse(process.version);
-        const packageManagerVersion = context.packageManager.version;
+        const packageManagerVersion = packageManagerInfo.version;
         this.userParameters = {
             // While architecture is being collect by GA as UserAgentArchitecture.
             // It doesn't look like there is a way to query this. Therefore we collect this as a custom user dimension too.
@@ -92,7 +92,7 @@ class AnalyticsCollector {
                 ? `${parsedVersion.major}.${parsedVersion.minor}.${parsedVersion.patch}`
                 : 'other',
             [analytics_parameters_1.UserCustomDimension.NodeMajorVersion]: parsedVersion?.major,
-            [analytics_parameters_1.UserCustomDimension.PackageManager]: context.packageManager.name,
+            [analytics_parameters_1.UserCustomDimension.PackageManager]: packageManagerInfo.name,
             [analytics_parameters_1.UserCustomDimension.PackageManagerVersion]: packageManagerVersion,
             [analytics_parameters_1.UserCustomDimension.PackageManagerMajorVersion]: packageManagerVersion
                 ? +packageManagerVersion.split('.', 1)[0]
@@ -148,7 +148,7 @@ class AnalyticsCollector {
     }
     async flush() {
         const pendingTrackingEvents = this.trackingEventsQueue;
-        this.context.logger.debug(`Analytics flush size. ${pendingTrackingEvents?.length}.`);
+        this.logger.debug(`Analytics flush size. ${pendingTrackingEvents?.length}.`);
         if (!pendingTrackingEvents?.length) {
             return;
         }
@@ -161,7 +161,7 @@ class AnalyticsCollector {
         catch (error) {
             // Failure to report analytics shouldn't crash the CLI.
             (0, error_1.assertIsError)(error);
-            this.context.logger.debug(`Send analytics error. ${error.message}.`);
+            this.logger.debug(`Send analytics error. ${error.message}.`);
         }
     }
     async send(data) {

package/src/analytics/analytics-collector.js.map

@@ -1 +1 @@
-{"version":3,"file":"analytics-collector.js","sourceRoot":"","sources":["analytics-collector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"analytics-collector.js","sourceRoot":"","sources":["analytics-collector.ts"],"names":[],"mappings":"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"}

package/src/analytics/analytics.d.ts

@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
-import type { CommandContext } from '../command-builder/command-module';
+import type { CommandContext } from '../command-builder/definitions';
 /**
  * This is the ultimate safelist for checking if a package name is safe to report to analytics.
  */

package/src/command-builder/command-module.d.ts

@@ -5,43 +5,14 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
-import { logging } from '@angular-devkit/core';
-import type { ArgumentsCamelCase, Argv, CamelCaseKey, CommandModule as YargsCommandModule } from 'yargs';
+import type { ArgumentsCamelCase, Argv, CommandModule as YargsCommandModule } from 'yargs';
 import { AnalyticsCollector } from '../analytics/analytics-collector';
 import { EventCustomDimension, EventCustomMetric } from '../analytics/analytics-parameters';
 import { AngularWorkspace } from '../utilities/config';
-import { PackageManagerUtils } from '../utilities/package-manager';
+import { CommandContext, CommandScope, Options, OtherOptions } from './definitions';
 import { Option } from './utilities/json-schema';
-export type Options<T> = {
-    [key in keyof T as CamelCaseKey<key>]: T[key];
-};
-export declare enum CommandScope {
-    /** Command can only run inside an Angular workspace. */
-    In = 0,
-    /** Command can only run outside an Angular workspace. */
-    Out = 1,
-    /** Command can run inside and outside an Angular workspace. */
-    Both = 2
-}
-export interface CommandContext {
-    currentDirectory: string;
-    root: string;
-    workspace?: AngularWorkspace;
-    globalConfiguration: AngularWorkspace;
-    logger: logging.Logger;
-    packageManager: PackageManagerUtils;
-    yargsInstance: Argv<{}>;
-    /** Arguments parsed in free-from without parser configuration. */
-    args: {
-        positional: string[];
-        options: {
-            help: boolean;
-            jsonHelp: boolean;
-            getYargsCompletions: boolean;
-        } & Record<string, unknown>;
-    };
-}
-export type OtherOptions = Record<string, unknown>;
+export { CommandScope };
+export type { CommandContext, Options, OtherOptions };
 export interface CommandModuleImplementation<T extends {} = {}> extends Omit<YargsCommandModule<{}, T>, 'builder' | 'handler'> {
     /** Scope in which the command can be executed in. */
     scope: CommandScope;

package/src/command-builder/command-module.js

@@ -6,22 +6,6 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
     var useValue = arguments.length > 2;
     for (var i = 0; i < initializers.length; i++) {
@@ -56,44 +40,20 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
     if (target) Object.defineProperty(target, contextIn.name, descriptor);
     done = true;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandModuleError = exports.CommandModule = exports.CommandScope = void 0;
 const core_1 = require("@angular-devkit/core");
 const node_fs_1 = require("node:fs");
-const path = __importStar(require("node:path"));
+const node_path_1 = require("node:path");
 const helpers_1 = require("yargs/helpers");
 const analytics_1 = require("../analytics/analytics");
 const analytics_collector_1 = require("../analytics/analytics-collector");
 const analytics_parameters_1 = require("../analytics/analytics-parameters");
 const completion_1 = require("../utilities/completion");
 const memoize_1 = require("../utilities/memoize");
+const definitions_1 = require("./definitions");
+Object.defineProperty(exports, "CommandScope", { enumerable: true, get: function () { return definitions_1.CommandScope; } });
 const json_schema_1 = require("./utilities/json-schema");
-var CommandScope;
-(function (CommandScope) {
-    /** Command can only run inside an Angular workspace. */
-    CommandScope[CommandScope["In"] = 0] = "In";
-    /** Command can only run outside an Angular workspace. */
-    CommandScope[CommandScope["Out"] = 1] = "Out";
-    /** Command can run inside and outside an Angular workspace. */
-    CommandScope[CommandScope["Both"] = 2] = "Both";
-})(CommandScope || (exports.CommandScope = CommandScope = {}));
 let CommandModule = (() => {
     let _instanceExtraInitializers = [];
     let _getAnalytics_decorators;
@@ -106,7 +66,7 @@ let CommandModule = (() => {
         }
         context = __runInitializers(this, _instanceExtraInitializers);
         shouldReportAnalytics = true;
-        scope = CommandScope.Both;
+        scope = definitions_1.CommandScope.Both;
         optionsWithAnalytics = new Map();
         constructor(context) {
             this.context = context;
@@ -124,9 +84,7 @@ let CommandModule = (() => {
                     describe: this.describe,
                     ...(this.longDescriptionPath
                         ? {
-                            longDescriptionRelativePath: path
-                                .relative(path.join(__dirname, '../../../../'), this.longDescriptionPath)
-                                .replace(/\\/g, path.posix.sep),
+                            longDescriptionRelativePath: (0, node_path_1.relative)((0, node_path_1.join)(__dirname, '../../../../'), this.longDescriptionPath).replace(/\\/g, node_path_1.posix.sep),
                             longDescription: (0, node_fs_1.readFileSync)(this.longDescriptionPath, 'utf8').replace(/\r\n/g, '\n'),
                         }
                         : {}),
@@ -182,7 +140,12 @@ let CommandModule = (() => {
             const userId = await (0, analytics_1.getAnalyticsUserId)(this.context, 
             // Don't prompt on `ng update`, 'ng version' or `ng analytics`.
             ['version', 'update', 'analytics'].includes(this.commandName));
-            return userId ? new analytics_collector_1.AnalyticsCollector(this.context, userId) : undefined;
+            return userId
+                ? new analytics_collector_1.AnalyticsCollector(this.context.logger, userId, {
+                    name: this.context.packageManager.name,
+                    version: await this.context.packageManager.getVersion(),
+                })
+                : undefined;
         }
         /**
          * Adds schema options to a command also this keeps track of options that are required for analytics.

package/src/command-builder/command-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-module.js","sourceRoot":"","sources":["command-module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command-module.js","sourceRoot":"","sources":["command-module.ts"],"names":[],"mappings":"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"}

package/src/command-builder/command-runner.js

@@ -11,21 +11,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runCommand = runCommand;
+const core_1 = require("@angular-devkit/core");
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
 const yargs_1 = __importDefault(require("yargs"));
 const helpers_1 = require("yargs/helpers");
+const utilities_1 = require("../commands/cache/utilities");
 const command_config_1 = require("../commands/command-config");
+const package_managers_1 = require("../package-managers");
 const color_1 = require("../utilities/color");
 const config_1 = require("../utilities/config");
 const error_1 = require("../utilities/error");
-const package_manager_1 = require("../utilities/package-manager");
 const version_1 = require("../utilities/version");
 const command_module_1 = require("./command-module");
 const command_1 = require("./utilities/command");
 const json_help_1 = require("./utilities/json-help");
 const normalize_options_middleware_1 = require("./utilities/normalize-options-middleware");
 async function runCommand(args, logger) {
-    const { $0, _, help = false, jsonHelp = false, getYargsCompletions = false, ...rest } = (0, helpers_1.Parser)(args, {
-        boolean: ['help', 'json-help', 'get-yargs-completions'],
+    const { $0, _, help = false, dryRun = false, jsonHelp = false, getYargsCompletions = false, ...rest } = (0, helpers_1.Parser)(args, {
+        boolean: ['help', 'json-help', 'get-yargs-completions', 'dry-run'],
         alias: { 'collection': 'c' },
     });
     // When `getYargsCompletions` is true the scriptName 'ng' at index 0 is not removed.
@@ -44,6 +48,14 @@ async function runCommand(args, logger) {
         return 1;
     }
     const root = workspace?.basePath ?? process.cwd();
+    const cacheConfig = workspace && (0, utilities_1.getCacheConfig)(workspace);
+    const packageManager = await (0, package_managers_1.createPackageManager)({
+        cwd: root,
+        logger,
+        dryRun: dryRun || help || jsonHelp || getYargsCompletions,
+        tempDirectory: cacheConfig?.enabled ? cacheConfig.path : undefined,
+        configuredPackageManager: await getConfiguredPackageManager(root, workspace, globalConfiguration),
+    });
     const localYargs = (0, yargs_1.default)(args);
     const context = {
         globalConfiguration,
@@ -52,7 +64,7 @@ async function runCommand(args, logger) {
         currentDirectory: process.cwd(),
         yargsInstance: localYargs,
         root,
-        packageManager: new package_manager_1.PackageManagerUtils({ globalConfiguration, workspace, root }),
+        packageManager,
         args: {
             positional: positional.map((v) => v.toString()),
             options: {
@@ -137,4 +149,47 @@ async function getCommandsToRegister(commandName) {
     }
     return Promise.all(commands.map((command) => command.factory().then((m) => m.default)));
 }
+/**
+ * Gets the configured package manager by checking package.json, or the local and global angular.json files.
+ *
+ * @param root The root directory of the workspace.
+ * @param localWorkspace The local workspace.
+ * @param globalWorkspace The global workspace.
+ * @returns The package manager name and version.
+ */
+async function getConfiguredPackageManager(root, localWorkspace, globalWorkspace) {
+    let result;
+    try {
+        const packageJsonPath = (0, node_path_1.join)(root, 'package.json');
+        const pkgJson = JSON.parse(await (0, promises_1.readFile)(packageJsonPath, 'utf-8'));
+        result = getPackageManager(pkgJson);
+    }
+    catch { }
+    if (result) {
+        return result;
+    }
+    if (localWorkspace) {
+        const project = (0, config_1.getProjectByCwd)(localWorkspace);
+        if (project) {
+            result = getPackageManager(localWorkspace.projects.get(project)?.extensions['cli']);
+        }
+        result ??= getPackageManager(localWorkspace.extensions['cli']);
+    }
+    result ??= getPackageManager(globalWorkspace.extensions['cli']);
+    return result;
+}
+/**
+ * Get the package manager name from a JSON value.
+ * @param source The JSON value to get the package manager name from.
+ * @returns The package manager name and version.
+ */
+function getPackageManager(source) {
+    if (source && (0, core_1.isJsonObject)(source)) {
+        const value = source['packageManager'];
+        if (typeof value === 'string') {
+            return value.split('@', 2);
+        }
+    }
+    return undefined;
+}
 //# sourceMappingURL=command-runner.js.map

package/src/command-builder/command-runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-runner.js","sourceRoot":"","sources":["command-runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command-runner.js","sourceRoot":"","sources":["command-runner.ts"],"names":[],"mappings":"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"}

package/src/command-builder/definitions.d.ts

@@ -0,0 +1,41 @@
+/**
+ * @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.dev/license
+ */
+import { logging } from '@angular-devkit/core';
+import type { Argv, CamelCaseKey } from 'yargs';
+import type { PackageManager } from '../package-managers/package-manager';
+import { AngularWorkspace } from '../utilities/config';
+export declare enum CommandScope {
+    /** Command can only run inside an Angular workspace. */
+    In = 0,
+    /** Command can only run outside an Angular workspace. */
+    Out = 1,
+    /** Command can run inside and outside an Angular workspace. */
+    Both = 2
+}
+export interface CommandContext {
+    currentDirectory: string;
+    root: string;
+    workspace?: AngularWorkspace;
+    globalConfiguration: AngularWorkspace;
+    logger: logging.Logger;
+    packageManager: PackageManager;
+    yargsInstance: Argv<{}>;
+    /** Arguments parsed in free-from without parser configuration. */
+    args: {
+        positional: string[];
+        options: {
+            help: boolean;
+            jsonHelp: boolean;
+            getYargsCompletions: boolean;
+        } & Record<string, unknown>;
+    };
+}
+export type Options<T> = {
+    [key in keyof T as CamelCaseKey<key>]: T[key];
+};
+export type OtherOptions = Record<string, unknown>;

package/src/command-builder/definitions.js

@@ -0,0 +1,20 @@
+"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.dev/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommandScope = void 0;
+var CommandScope;
+(function (CommandScope) {
+    /** Command can only run inside an Angular workspace. */
+    CommandScope[CommandScope["In"] = 0] = "In";
+    /** Command can only run outside an Angular workspace. */
+    CommandScope[CommandScope["Out"] = 1] = "Out";
+    /** Command can run inside and outside an Angular workspace. */
+    CommandScope[CommandScope["Both"] = 2] = "Both";
+})(CommandScope || (exports.CommandScope = CommandScope = {}));
+//# sourceMappingURL=definitions.js.map

package/src/command-builder/definitions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["definitions.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAOH,IAAY,YASX;AATD,WAAY,YAAY;IACtB,wDAAwD;IACxD,2CAAE,CAAA;IAEF,yDAAyD;IACzD,6CAAG,CAAA;IAEH,+DAA+D;IAC/D,+CAAI,CAAA;AACN,CAAC,EATW,YAAY,4BAAZ,YAAY,QASvB"}

package/src/command-builder/schematics-command-module.js

@@ -87,6 +87,7 @@ const memoize_1 = require("../utilities/memoize");
 const tty_1 = require("../utilities/tty");
 const command_module_1 = require("./command-module");
 const json_schema_1 = require("./utilities/json-schema");
+const prettier_1 = require("./utilities/prettier");
 const schematic_engine_host_1 = require("./utilities/schematic-engine-host");
 const schematic_workflow_1 = require("./utilities/schematic-workflow");
 exports.DEFAULT_SCHEMATICS_COLLECTION = '@schematics/angular';
@@ -345,7 +346,19 @@ let SchematicsCommandModule = (() => {
                 }
                 if (executionOptions.dryRun) {
                     logger.warn(`\nNOTE: The "--dry-run" option means no changes were made.`);
+                    return 0;
                 }
+                if (files.size) {
+                    // Note: we could use a task executor to format the files but this is simpler.
+                    try {
+                        await (0, prettier_1.formatFiles)(this.context.root, files);
+                    }
+                    catch (error) {
+                        (0, error_1.assertIsError)(error);
+                        logger.warn(`WARNING: Formatting of files failed with the following error: ${error.message}`);
+                    }
+                }
+                return 0;
             }
             catch (err) {
                 // In case the workflow was not successful, show an appropriate error message.
@@ -362,7 +375,6 @@ let SchematicsCommandModule = (() => {
             finally {
                 unsubscribe();
             }
-            return 0;
         }
         getProjectName() {
             const { workspace } = this.context;

package/src/command-builder/schematics-command-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"schematics-command-module.js","sourceRoot":"","sources":["schematics-command-module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schematics-command-module.js","sourceRoot":"","sources":["schematics-command-module.ts"],"names":[],"mappings":"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"}