@angular/cli 13.0.4 → 13.1.0-next.3

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/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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "13.0.4",
+  "version": "13.1.0-next.3",
   "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.1300.4",
-    "@angular-devkit/core": "13.0.4",
-    "@angular-devkit/schematics": "13.0.4",
-    "@schematics/angular": "13.0.4",
+    "@angular-devkit/architect": "0.1301.0-next.3",
+    "@angular-devkit/core": "13.1.0-next.3",
+    "@angular-devkit/schematics": "13.1.0-next.3",
+    "@schematics/angular": "13.1.0-next.3",
     "@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.0.4",
-      "@angular-devkit/architect": "0.1300.4",
-      "@angular-devkit/build-angular": "13.0.4",
-      "@angular-devkit/build-webpack": "0.1300.4",
-      "@angular-devkit/core": "13.0.4",
-      "@angular-devkit/schematics": "13.0.4"
+      "@angular/cli": "13.1.0-next.3",
+      "@angular-devkit/architect": "0.1301.0-next.3",
+      "@angular-devkit/build-angular": "13.1.0-next.3",
+      "@angular-devkit/build-webpack": "0.1301.0-next.3",
+      "@angular-devkit/core": "13.1.0-next.3",
+      "@angular-devkit/schematics": "13.1.0-next.3"
     }
   },
   "engines": {