@angular/cli 13.1.0-next.0 → 13.1.0-rc.0

package/README.md

@@ -234,26 +234,26 @@ For more informations about Node.js debugging in VS Code, see the related [VS Co
 
 In order to investigate performance issues, CPU profiling is often useful.
 
-To capture a CPU profiling, you can:
+#### Creating a profile
 
-1. install the v8-profiler-node8 dependency: `npm install v8-profiler-node8 --no-save`
-1. set the NG_CLI_PROFILING Environment variable to the file name you want:
-   - on Unix systems (Linux & Mac OS X): ̀`export NG_CLI_PROFILING=my-profile`
-   - on Windows: ̀̀`setx NG_CLI_PROFILING my-profile`
+Node.js 16+ users can use the Node.js command line argument `--cpu-prof` to create a CPU profile.
 
-Then, just run the ng command on which you want to capture a CPU profile.
-You will then obtain a `my-profile.cpuprofile` file in the folder from which you ran the ng command.
+```bash
+node --cpu-prof node_modules/.bin/ng build
+```
+
+In addition to this one, another, more elaborated way to capture a CPU profile using the Chrome Devtools is detailed in https://github.com/angular/angular-cli/issues/8259#issue-269908550.
+
+#### Opening a profile
 
 You can use the Chrome Devtools to process it. To do so:
 
-1. open `chrome://inspect/#devices` in Chrome
+1. open `chrome://inspect` in Chrome
 1. click on "Open dedicated DevTools for Node"
 1. go to the "profiler" tab
-1. click on the "Load" button and select the generated .cpuprofile file
+1. click on the "Load" button and select the generated `.cpuprofile` file
 1. on the left panel, select the associated file
 
-In addition to this one, another, more elaborated way to capture a CPU profile using the Chrome Devtools is detailed in https://github.com/angular/angular-cli/issues/8259#issue-269908550.
-
 ## Documentation
 
 The documentation for the Angular CLI is located on our [documentation website](https://angular.io/cli).

package/commands/deploy-impl.d.ts

@@ -10,6 +10,6 @@ import { Arguments } from '../models/interface';
 import { Schema as DeployCommandSchema } from './deploy';
 export declare class DeployCommand extends ArchitectCommand<DeployCommandSchema> {
     readonly target = "deploy";
-    readonly missingTargetError = "\nCannot find \"deploy\" target for the specified project.\n\nYou should add a package that implements deployment capabilities for your\nfavorite platform.\n\nFor example:\n  ng add @angular/fire\n  ng add @azure/ng-deploy\n  ng add @zeit/ng-deploy\n\nFind more packages on npm https://www.npmjs.com/search?q=ng%20deploy\n";
+    readonly missingTargetError = "\nCannot find \"deploy\" target for the specified project.\n\nYou should add a package that implements deployment capabilities for your\nfavorite platform.\n\nFor example:\n  ng add @angular/fire\n  ng add @azure/ng-deploy\n\nFind more packages on npm https://www.npmjs.com/search?q=ng%20deploy\n";
     initialize(options: DeployCommandSchema & Arguments): Promise<number | void>;
 }

package/commands/deploy-impl.js

@@ -18,7 +18,6 @@ favorite platform.
 For example:
   ng add @angular/fire
   ng add @azure/ng-deploy
-  ng add @zeit/ng-deploy
 
 Find more packages on npm https://www.npmjs.com/search?q=ng%20deploy
 `;

package/commands/doc-impl.js

@@ -61,15 +61,11 @@ class DocCommand extends command_1.Command {
                 const currentNgVersion = (await Promise.resolve().then(() => __importStar(require('@angular/core')))).VERSION.major;
                 domain = `v${currentNgVersion}.angular.io`;
             }
-            catch (e) { }
+            catch { }
         }
-        let searchUrl = `https://${domain}/api?query=${options.keyword}`;
-        if (options.search) {
-            searchUrl = `https://${domain}/docs?search=${options.keyword}`;
-        }
-        await (0, open_1.default)(searchUrl, {
-            wait: false,
-        });
+        await (0, open_1.default)(options.search
+            ? `https://${domain}/api?query=${options.keyword}`
+            : `https://${domain}/docs?search=${options.keyword}`);
     }
 }
 exports.DocCommand = DocCommand;

package/commands/lint-impl.d.ts

@@ -11,6 +11,6 @@ import { Schema as LintCommandSchema } from './lint';
 export declare class LintCommand extends ArchitectCommand<LintCommandSchema> {
     readonly target = "lint";
     readonly multiTarget = true;
-    readonly missingTargetError = "\nCannot find \"lint\" target for the specified project.\n\nYou should add a package that implements linting capabilities.\n\nFor example:\n  ng add @angular-eslint/schematics\n";
     initialize(options: LintCommandSchema & Arguments): Promise<number | void>;
+    onMissingTarget(): Promise<void | number>;
 }

package/commands/lint-impl.js

@@ -6,9 +6,31 @@
  * 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
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LintCommand = void 0;
+const child_process_1 = require("child_process");
+const path = __importStar(require("path"));
 const architect_command_1 = require("../models/architect-command");
+const prompt_1 = require("../utilities/prompt");
 const MissingBuilder = `
 Cannot find "lint" target for the specified project.
 
@@ -22,12 +44,26 @@ class LintCommand extends architect_command_1.ArchitectCommand {
         super(...arguments);
         this.target = 'lint';
         this.multiTarget = true;
-        this.missingTargetError = MissingBuilder;
     }
     async initialize(options) {
         if (!options.help) {
             return super.initialize(options);
         }
     }
+    async onMissingTarget() {
+        this.logger.warn(MissingBuilder);
+        const shouldAdd = await (0, prompt_1.askConfirmation)('Would you like to add ESLint now?', true, false);
+        if (shouldAdd) {
+            // Run `ng add @angular-eslint/schematics`
+            const binPath = path.resolve(__dirname, '../bin/ng.js');
+            const { status, error } = (0, child_process_1.spawnSync)(process.execPath, [binPath, 'add', '@angular-eslint/schematics'], {
+                stdio: 'inherit',
+            });
+            if (error) {
+                throw error;
+            }
+            return status !== null && status !== void 0 ? status : 0;
+        }
+    }
 }
 exports.LintCommand = LintCommand;

package/commands/new.md

@@ -5,7 +5,7 @@ All prompts can safely be allowed to default.
 
 - The new workspace folder is given the specified project name, and contains configuration files at the top level.
 
-- By default, the files for a new initial application (with the same name as the workspace) are placed in the `src/` subfolder. Corresponding end-to-end tests are placed in the `e2e/` subfolder.
+- By default, the files for a new initial application (with the same name as the workspace) are placed in the `src/` subfolder.
 
 - The new application's configuration appears in the `projects` section of the `angular.json` workspace configuration file, under its project name.
 

package/commands/update-impl.d.ts

@@ -30,8 +30,9 @@ export declare class UpdateCommand extends Command<UpdateCommandSchema> {
     private commit;
     private checkCleanGit;
     /**
-     * Checks if the current installed CLI version is older than the latest version.
-     * @returns `true` when the installed version is older.
+     * Checks if the current installed CLI version is older or newer than a compatible version.
+     * @returns the version to install or null when there is no update to install.
      */
-    private checkCLILatestVersion;
+    private checkCLIVersion;
+    private getCLIUpdateRunnerVersion;
 }

package/commands/update-impl.js

@@ -48,8 +48,6 @@ 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 NG_VERSION_9_POST_MSG = color_1.colors.cyan('\nYour project has been updated to Angular version 9!\n' +
-    'For more info, please see: https://v9.angular.io/guide/updating-to-version-9');
 const UPDATE_SCHEMATIC_COLLECTION = path.join(__dirname, '../src/commands/update/schematic/collection.json');
 /**
  * Disable CLI version mismatch checks and forces usage of the invoked CLI
@@ -59,6 +57,7 @@ const disableVersionCheckEnv = process.env['NG_DISABLE_VERSION_CHECK'];
 const disableVersionCheck = disableVersionCheckEnv !== undefined &&
     disableVersionCheckEnv !== '0' &&
     disableVersionCheckEnv.toLowerCase() !== 'false';
+const ANGULAR_PACKAGES_REGEXP = /^@(?:angular|nguniversal)\//;
 class UpdateCommand extends command_1.Command {
     constructor() {
         super(...arguments);
@@ -217,10 +216,14 @@ class UpdateCommand extends command_1.Command {
     async run(options) {
         var _a;
         await (0, package_manager_1.ensureCompatibleNpm)(this.context.root);
-        // Check if the current installed CLI version is older than the latest version.
-        if (!disableVersionCheck && (await this.checkCLILatestVersion(options.verbose, options.next))) {
-            this.logger.warn(`The installed local Angular CLI version is older than the latest ${options.next ? 'pre-release' : 'stable'} version.\n` + 'Installing a temporary version to perform the update.');
-            return (0, install_package_1.runTempPackageBin)(`@angular/cli@${options.next ? 'next' : 'latest'}`, this.packageManager, process.argv.slice(2));
+        // Check if the current installed CLI version is older than the latest compatible version.
+        if (!disableVersionCheck) {
+            const cliVersionToInstall = await this.checkCLIVersion(options['--'], options.verbose, options.next);
+            if (cliVersionToInstall) {
+                this.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}`, this.packageManager, process.argv.slice(2));
+            }
         }
         const logVerbose = (message) => {
             if (options.verbose) {
@@ -346,8 +349,7 @@ class UpdateCommand extends command_1.Command {
             // Normalize slashes
             migrations = migrations.replace(/\\/g, '/');
             if (migrations.startsWith('../')) {
-                this.logger.error('Package contains an invalid migrations field. ' +
-                    'Paths outside the package root are not permitted.');
+                this.logger.error('Package contains an invalid migrations field. Paths outside the package root are not permitted.');
                 return 1;
             }
             // Check if it is a package-local location
@@ -371,9 +373,9 @@ class UpdateCommand extends command_1.Command {
                     return 1;
                 }
             }
-            let success = false;
+            let result;
             if (typeof options.migrateOnly == 'string') {
-                success = await this.executeMigration(packageName, migrations, options.migrateOnly, options.createCommits);
+                result = await this.executeMigration(packageName, migrations, options.migrateOnly, options.createCommits);
             }
             else {
                 const from = coerceVersionNumber(options.from);
@@ -381,18 +383,9 @@ class UpdateCommand extends command_1.Command {
                     this.logger.error(`"from" value [${options.from}] is not a valid version.`);
                     return 1;
                 }
-                success = await this.executeMigrations(packageName, migrations, from, options.to || packageNode.version, options.createCommits);
-            }
-            if (success) {
-                if (packageName === '@angular/core' &&
-                    options.from &&
-                    +options.from.split('.')[0] < 9 &&
-                    (options.to || packageNode.version).split('.')[0] === '9') {
-                    this.logger.info(NG_VERSION_9_POST_MSG);
-                }
-                return 0;
+                result = await this.executeMigrations(packageName, migrations, from, options.to || packageNode.version, options.createCommits);
             }
-            return 1;
+            return result ? 0 : 1;
         }
         const requests = [];
         // Validate packages actually are part of the workspace
@@ -467,7 +460,7 @@ class UpdateCommand extends command_1.Command {
                 this.logger.info(`Package '${packageName}' is already up to date.`);
                 continue;
             }
-            if (node.package && /^@(?:angular|nguniversal)\//.test(node.package.name)) {
+            if (node.package && ANGULAR_PACKAGES_REGEXP.test(node.package.name)) {
                 const { name, version } = node.package;
                 const toBeInstalledMajorVersion = +manifest.version.split('.')[0];
                 const currentMajorVersion = +version.split('.')[0];
@@ -598,11 +591,6 @@ class UpdateCommand extends command_1.Command {
                     return 0;
                 }
             }
-            if (migrations.some((m) => m.package === '@angular/core' &&
-                m.to.split('.')[0] === '9' &&
-                +m.from.split('.')[0] < 9)) {
-                this.logger.info(NG_VERSION_9_POST_MSG);
-            }
         }
         return success ? 0 : 1;
     }
@@ -667,16 +655,38 @@ class UpdateCommand extends command_1.Command {
         return true;
     }
     /**
-     * Checks if the current installed CLI version is older than the latest version.
-     * @returns `true` when the installed version is older.
+     * Checks if the current installed CLI version is older or newer than a compatible version.
+     * @returns the version to install or null when there is no update to install.
      */
-    async checkCLILatestVersion(verbose = false, next = false) {
-        const installedCLIVersion = version_1.VERSION.full;
-        const LatestCLIManifest = await (0, package_metadata_1.fetchPackageManifest)(`@angular/cli@${next ? 'next' : 'latest'}`, this.logger, {
+    async checkCLIVersion(packagesToUpdate, verbose = false, next = false) {
+        const { version } = await (0, package_metadata_1.fetchPackageManifest)(`@angular/cli@${this.getCLIUpdateRunnerVersion(packagesToUpdate, next)}`, this.logger, {
             verbose,
             usingYarn: this.packageManager === workspace_schema_1.PackageManager.Yarn,
         });
-        return semver.lt(installedCLIVersion, LatestCLIManifest.version);
+        return version_1.VERSION.full === version ? null : version;
+    }
+    getCLIUpdateRunnerVersion(packagesToUpdate, next) {
+        var _a, _b;
+        if (next) {
+            return 'next';
+        }
+        const updatingAngularPackage = packagesToUpdate === null || packagesToUpdate === void 0 ? void 0 : packagesToUpdate.find((r) => ANGULAR_PACKAGES_REGEXP.test(r));
+        if (updatingAngularPackage) {
+            // If we are updating any Angular package we can update the CLI to the target version because
+            // migrations for @angular/core@13 can be executed using Angular/cli@13.
+            // This is same behaviour as `npx @angular/cli@13 update @angular/core@13`.
+            // `@angular/cli@13` -> ['', 'angular/cli', '13']
+            // `@angular/cli` -> ['', 'angular/cli']
+            const tempVersion = coerceVersionNumber(updatingAngularPackage.split('@')[2]);
+            return (_b = (_a = semver.parse(tempVersion)) === null || _a === void 0 ? void 0 : _a.major) !== null && _b !== void 0 ? _b : 'latest';
+        }
+        // When not updating an Angular package we cannot determine which schematic runtime the migration should to be executed in.
+        // Typically, we can assume that the `@angular/cli` was updated previously.
+        // Example: Angular official packages are typically updated prior to NGRX etc...
+        // Therefore, we only update to the latest patch version of the installed major version of the Angular CLI.
+        // This is important because we might end up in a scenario where locally Angular v12 is installed, updating NGRX from 11 to 12.
+        // 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;
     }
 }
 exports.UpdateCommand = UpdateCommand;

package/lib/config/schema.json

@@ -597,6 +597,7 @@
         "name": {
           "description": "The name of the new app.",
           "type": "string",
+          "pattern": "^(?:@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*/)?[a-zA-Z0-9-~][a-zA-Z0-9-._~]*$",
           "$default": {
             "$source": "argv",
             "index": 0
@@ -1151,6 +1152,7 @@
         "name": {
           "type": "string",
           "description": "The name of the library.",
+          "pattern": "^(?:@[a-zA-Z0-9-*~][a-zA-Z0-9-*._~]*/)?[a-zA-Z0-9-~][a-zA-Z0-9-._~]*$",
           "$default": {
             "$source": "argv",
             "index": 0
@@ -1258,7 +1260,6 @@
         "name": {
           "description": "The name of the new workspace and initial project.",
           "type": "string",
-          "format": "html-selector",
           "$default": {
             "$source": "argv",
             "index": 0

package/lib/config/workspace-schema.d.ts

@@ -484,7 +484,7 @@ export interface LibraryOptionsSchema {
     /**
      * The name of the library.
      */
-    name?: string;
+    name: string;
     /**
      * A prefix to apply to generated selectors.
      */

package/lib/init.js

@@ -84,7 +84,9 @@ const config_1 = require("../utilities/config");
         if (isGlobalGreater) {
             // If using the update command and the global version is greater, use the newer update command
             // This allows improvements in update to be used in older versions that do not have bootstrapping
-            if (process.argv[2] === 'update') {
+            if (process.argv[2] === 'update' &&
+                cli.VERSION &&
+                cli.VERSION.major - globalVersion.major <= 1) {
                 cli = await Promise.resolve().then(() => __importStar(require('./cli')));
             }
             else if (await (0, config_1.isWarningEnabled)('versionMismatch')) {

package/models/architect-command.d.ts

@@ -24,7 +24,9 @@ export declare abstract class ArchitectCommand<T extends ArchitectCommandOptions
     protected multiTarget: boolean;
     target: string | undefined;
     missingTargetError: string | undefined;
+    protected onMissingTarget(projectName?: string): Promise<void | number>;
     initialize(options: T & Arguments): Promise<number | void>;
+    private warnOnMissingNodeModules;
     run(options: ArchitectCommandOptions & Arguments): Promise<number>;
     protected runSingleTarget(target: Target, targetOptions: string[]): Promise<0 | 1>;
     protected runArchitectTarget(options: ArchitectCommandOptions & Arguments): Promise<number>;

package/models/architect-command.js

@@ -6,12 +6,34 @@
  * 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
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (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 __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArchitectCommand = void 0;
 const architect_1 = require("@angular-devkit/architect");
 const node_1 = require("@angular-devkit/architect/node");
 const core_1 = require("@angular-devkit/core");
+const fs_1 = require("fs");
+const path = __importStar(require("path"));
 const json_schema_1 = require("../utilities/json-schema");
+const package_manager_1 = require("../utilities/package-manager");
 const analytics_1 = require("./analytics");
 const command_1 = require("./command");
 const parser_1 = require("./parser");
@@ -22,6 +44,20 @@ class ArchitectCommand extends command_1.Command {
         // If this command supports running multiple targets.
         this.multiTarget = false;
     }
+    async onMissingTarget(projectName) {
+        if (this.missingTargetError) {
+            this.logger.fatal(this.missingTargetError);
+            return 1;
+        }
+        if (projectName) {
+            this.logger.fatal(`Project '${projectName}' does not support the '${this.target}' target.`);
+        }
+        else {
+            this.logger.fatal(`No projects support the '${this.target}' target.`);
+        }
+        return 1;
+    }
+    // eslint-disable-next-line max-lines-per-function
     async initialize(options) {
         this._registry = new core_1.json.schema.CoreSchemaRegistry();
         this._registry.addPostTransform(core_1.json.schema.transforms.addUndefinedDefaults);
@@ -56,14 +92,11 @@ class ArchitectCommand extends command_1.Command {
                 targetProjectNames.push(name);
             }
         }
-        if (targetProjectNames.length === 0) {
-            this.logger.fatal(this.missingTargetError || `No projects support the '${this.target}' target.`);
-            return 1;
-        }
         if (projectName && !targetProjectNames.includes(projectName)) {
-            this.logger.fatal(this.missingTargetError ||
-                `Project '${projectName}' does not support the '${this.target}' target.`);
-            return 1;
+            return await this.onMissingTarget(projectName);
+        }
+        if (targetProjectNames.length === 0) {
+            return await this.onMissingTarget();
         }
         if (!projectName && commandLeftovers && commandLeftovers.length > 0) {
             const builderNames = new Set();
@@ -77,7 +110,18 @@ class ArchitectCommand extends command_1.Command {
                 if (this.multiTarget) {
                     builderNames.add(builderName);
                 }
-                const builderDesc = await this._architectHost.resolveBuilder(builderName);
+                let builderDesc;
+                try {
+                    builderDesc = await this._architectHost.resolveBuilder(builderName);
+                }
+                catch (e) {
+                    if (e.code === 'MODULE_NOT_FOUND') {
+                        await this.warnOnMissingNodeModules(this.workspace.basePath);
+                        this.logger.fatal(`Could not find the '${builderName}' builder's node package.`);
+                        return 1;
+                    }
+                    throw e;
+                }
                 const optionDefs = await (0, json_schema_1.parseJsonSchemaToOptions)(this._registry, builderDesc.optionSchema);
                 const parsedOptions = (0, parser_1.parseArguments)([...commandLeftovers], optionDefs);
                 const builderLeftovers = parsedOptions['--'] || [];
@@ -142,7 +186,18 @@ class ArchitectCommand extends command_1.Command {
             project: projectName || (targetProjectNames.length > 0 ? targetProjectNames[0] : ''),
             target: this.target,
         });
-        const builderDesc = await this._architectHost.resolveBuilder(builderConf);
+        let builderDesc;
+        try {
+            builderDesc = await this._architectHost.resolveBuilder(builderConf);
+        }
+        catch (e) {
+            if (e.code === 'MODULE_NOT_FOUND') {
+                await this.warnOnMissingNodeModules(this.workspace.basePath);
+                this.logger.fatal(`Could not find the '${builderConf}' builder's node package.`);
+                return 1;
+            }
+            throw e;
+        }
         this.description.options.push(...(await (0, json_schema_1.parseJsonSchemaToOptions)(this._registry, builderDesc.optionSchema)));
         // Update options to remove analytics from options if the builder isn't safelisted.
         for (const o of this.description.options) {
@@ -151,6 +206,32 @@ class ArchitectCommand extends command_1.Command {
             }
         }
     }
+    async warnOnMissingNodeModules(basePath) {
+        // Check for a `node_modules` directory (npm, yarn non-PnP, etc.)
+        if ((0, fs_1.existsSync)(path.resolve(basePath, 'node_modules'))) {
+            return;
+        }
+        // Check for yarn PnP files
+        if ((0, fs_1.existsSync)(path.resolve(basePath, '.pnp.js')) ||
+            (0, fs_1.existsSync)(path.resolve(basePath, '.pnp.cjs')) ||
+            (0, fs_1.existsSync)(path.resolve(basePath, '.pnp.mjs'))) {
+            return;
+        }
+        const packageManager = await (0, package_manager_1.getPackageManager)(basePath);
+        let installSuggestion = 'Try installing with ';
+        switch (packageManager) {
+            case 'npm':
+                installSuggestion += `'npm install'`;
+                break;
+            case 'yarn':
+                installSuggestion += `'yarn'`;
+                break;
+            default:
+                installSuggestion += `the project's package manager`;
+                break;
+        }
+        this.logger.warn(`Node packages may not be installed. ${installSuggestion}.`);
+    }
     async run(options) {
         return await this.runArchitectTarget(options);
     }
@@ -159,7 +240,19 @@ class ArchitectCommand extends command_1.Command {
         // overrides separately (getting the configuration builds the whole project, including
         // overrides).
         const builderConf = await this._architectHost.getBuilderNameForTarget(target);
-        const builderDesc = await this._architectHost.resolveBuilder(builderConf);
+        let builderDesc;
+        try {
+            builderDesc = await this._architectHost.resolveBuilder(builderConf);
+        }
+        catch (e) {
+            if (e.code === 'MODULE_NOT_FOUND') {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                await this.warnOnMissingNodeModules(this.workspace.basePath);
+                this.logger.fatal(`Could not find the '${builderConf}' builder's node package.`);
+                return 1;
+            }
+            throw e;
+        }
         const targetOptionArray = await (0, json_schema_1.parseJsonSchemaToOptions)(this._registry, builderDesc.optionSchema);
         const overrides = (0, parser_1.parseArguments)(targetOptions, targetOptionArray, this.logger);
         const allowAdditionalProperties = typeof builderDesc.optionSchema === 'object' && builderDesc.optionSchema.additionalProperties;

package/models/schematic-engine-host.js

@@ -109,9 +109,21 @@ function wrap(schematicFile, schematicDirectory, moduleCache, exportName) {
             return legacyModules[id];
         }
         else if (id.startsWith('@angular-devkit/') || id.startsWith('@schematics/')) {
+            // Files should not redirect `@angular/core` and instead use the direct
+            // dependency if available. This allows old major version migrations to continue to function
+            // even though the latest major version may have breaking changes in `@angular/core`.
+            if (id.startsWith('@angular-devkit/core')) {
+                try {
+                    return schematicRequire(id);
+                }
+                catch (e) {
+                    if (e.code !== 'MODULE_NOT_FOUND') {
+                        throw e;
+                    }
+                }
+            }
             // Resolve from inside the `@angular/cli` project
-            const packagePath = require.resolve(id);
-            return hostRequire(packagePath);
+            return hostRequire(id);
         }
         else if (id.startsWith('.') || id.startsWith('@angular/cdk')) {
             // Wrap relative files inside the schematic collection

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "13.1.0-next.0",
+  "version": "13.1.0-rc.0",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -28,13 +28,13 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1301.0-next.0",
-    "@angular-devkit/core": "13.1.0-next.0",
-    "@angular-devkit/schematics": "13.1.0-next.0",
-    "@schematics/angular": "13.1.0-next.0",
+    "@angular-devkit/architect": "0.1301.0-rc.0",
+    "@angular-devkit/core": "13.1.0-rc.0",
+    "@angular-devkit/schematics": "13.1.0-rc.0",
+    "@schematics/angular": "13.1.0-rc.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
-    "debug": "4.3.2",
+    "debug": "4.3.3",
     "ini": "2.0.0",
     "inquirer": "8.2.0",
     "jsonc-parser": "3.0.0",
@@ -51,12 +51,12 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "13.1.0-next.0",
-      "@angular-devkit/architect": "0.1301.0-next.0",
-      "@angular-devkit/build-angular": "13.1.0-next.0",
-      "@angular-devkit/build-webpack": "0.1301.0-next.0",
-      "@angular-devkit/core": "13.1.0-next.0",
-      "@angular-devkit/schematics": "13.1.0-next.0"
+      "@angular/cli": "13.1.0-rc.0",
+      "@angular-devkit/architect": "0.1301.0-rc.0",
+      "@angular-devkit/build-angular": "13.1.0-rc.0",
+      "@angular-devkit/build-webpack": "0.1301.0-rc.0",
+      "@angular-devkit/core": "13.1.0-rc.0",
+      "@angular-devkit/schematics": "13.1.0-rc.0"
     }
   },
   "engines": {

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

@@ -356,18 +356,13 @@ function _usageMessage(options, infoMap, logger) {
             target,
         };
     })
-        .filter(({ info, version, target }) => {
-        return target && semver.compare(info.installed.version, version) < 0;
-    })
-        .filter(({ target }) => {
-        return target['ng-update'];
-    })
+        .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, _b;
+        var _a;
         // Look for packageGroup.
-        const packageGroup = (_a = target['ng-update']) === null || _a === void 0 ? void 0 : _a['packageGroup'];
+        const packageGroup = target['ng-update']['packageGroup'];
         if (packageGroup) {
-            const packageGroupName = packageGroup === null || packageGroup === void 0 ? void 0 : packageGroup[0];
+            const packageGroupName = target['ng-update']['packageGroupName'] || packageGroup[0];
             if (packageGroupName) {
                 if (packageGroups.has(name)) {
                     return null;
@@ -379,7 +374,7 @@ function _usageMessage(options, infoMap, logger) {
         }
         let command = `ng update ${name}`;
         if (!tag) {
-            command += `@${((_b = semver.parse(version)) === null || _b === void 0 ? void 0 : _b.major) || version}`;
+            command += `@${((_a = semver.parse(version)) === null || _a === void 0 ? void 0 : _a.major) || version}`;
         }
         else if (tag == 'next') {
             command += ' --next';