@schematics/angular 12.0.0 → 12.0.4

package/application/index.js

@@ -67,16 +67,7 @@ function addAppToWorkspaceFile(options, appDir) {
         schematics['@schematics/angular:component'] = componentSchematicsOptions;
     }
     if (options.skipTests || options.minimal) {
-        [
-            'class',
-            'component',
-            'directive',
-            'guard',
-            'interceptor',
-            'module',
-            'pipe',
-            'service',
-        ].forEach((type) => {
+        ['class', 'component', 'directive', 'guard', 'interceptor', 'pipe', 'service'].forEach((type) => {
             if (!(`@schematics/angular:${type}` in schematics)) {
                 schematics[`@schematics/angular:${type}`] = {};
             }

package/component/index.js

@@ -77,7 +77,10 @@ function default_1(options) {
     return async (host) => {
         const workspace = await workspace_1.getWorkspace(host);
         const project = workspace.projects.get(options.project);
-        if (options.path === undefined && project) {
+        if (!project) {
+            throw new schematics_1.SchematicsException(`Project "${options.project}" does not exist.`);
+        }
+        if (options.path === undefined) {
             options.path = workspace_1.buildDefaultPath(project);
         }
         options.module = find_module_1.findModuleFromOptions(host, options);

package/directive/index.js

@@ -78,7 +78,7 @@ function default_1(options) {
         const workspace = await workspace_1.getWorkspace(host);
         const project = workspace.projects.get(options.project);
         if (!project) {
-            throw new schematics_1.SchematicsException(`Invalid project name (${options.project})`);
+            throw new schematics_1.SchematicsException(`Project "${options.project}" does not exist.`);
         }
         if (options.path === undefined) {
             options.path = workspace_1.buildDefaultPath(project);

package/library/index.js

@@ -149,7 +149,7 @@ function default_1(options) {
                 commonModule: false,
                 flat: true,
                 path: sourceDir,
-                project: options.name,
+                project: projectName,
             }),
             schematics_1.schematic('component', {
                 name: options.name,
@@ -159,13 +159,13 @@ function default_1(options) {
                 flat: true,
                 path: sourceDir,
                 export: true,
-                project: options.name,
+                project: projectName,
             }),
             schematics_1.schematic('service', {
                 name: options.name,
                 flat: true,
                 path: sourceDir,
-                project: options.name,
+                project: projectName,
             }),
             options.lintFix ? lint_fix_1.applyLintFix(sourceDir) : schematics_1.noop(),
             (_tree, context) => {

package/migrations/migration-collection.json

@@ -115,6 +115,11 @@
       "factory": "./update-12/update-web-workers",
       "description": "Updates Web Worker consumer usage to use the new syntax supported directly by Webpack 5."
     },
+    "schematic-options-12": {
+      "version": "12.0.1",
+      "factory": "./update-12/schematic-options",
+      "description": "Remove invalid 'skipTests' option in '@schematics/angular:module' Angular schematic options."
+    },
     "production-by-default": {
       "version": "9999.0.0",
       "factory": "./update-12/production-default-config",

package/migrations/update-12/schematic-options.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @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 { Rule } from '@angular-devkit/schematics';
+export default function (): Rule;

package/migrations/update-12/schematic-options.js

@@ -0,0 +1,38 @@
+"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 });
+const core_1 = require("@angular-devkit/core");
+const workspace_1 = require("../../utility/workspace");
+function default_1() {
+    return workspace_1.updateWorkspace((workspace) => {
+        // Update root level schematics options if present
+        const rootSchematics = workspace.extensions.schematics;
+        if (rootSchematics && core_1.json.isJsonObject(rootSchematics)) {
+            updateSchematicsField(rootSchematics);
+        }
+        // Update project level schematics options if present
+        for (const [, project] of workspace.projects) {
+            const projectSchematics = project.extensions.schematics;
+            if (projectSchematics && core_1.json.isJsonObject(projectSchematics)) {
+                updateSchematicsField(projectSchematics);
+            }
+        }
+    });
+}
+exports.default = default_1;
+function updateSchematicsField(schematics) {
+    for (const [schematicName, schematicOptions] of Object.entries(schematics)) {
+        if (!core_1.json.isJsonObject(schematicOptions)) {
+            continue;
+        }
+        if (schematicName === '@schematics/angular:module') {
+            delete schematicOptions.skipTests;
+        }
+    }
+}

package/migrations/update-12/update-angular-config.js

@@ -46,6 +46,13 @@ function default_1() {
 }
 exports.default = default_1;
 function updateOptions(target, optionsToUpdate) {
+    // This is a hacky way to make this migration idempotent.
+    // `defaultConfiguration` was only introduced in v12 projects and hence v11 projects do not have this property.
+    // Setting it as an empty string will not cause any side-effect.
+    if (typeof target.defaultConfiguration === 'string') {
+        return;
+    }
+    target.defaultConfiguration = '';
     if (!target.options) {
         target.options = {};
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "12.0.0",
+  "version": "12.0.4",
   "description": "Schematics specific to Angular",
   "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
@@ -15,8 +15,8 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "12.0.0",
-    "@angular-devkit/schematics": "12.0.0",
+    "@angular-devkit/core": "12.0.4",
+    "@angular-devkit/schematics": "12.0.4",
     "jsonc-parser": "3.0.0"
   },
   "repository": {
@@ -24,7 +24,7 @@
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": "^12.14.1 || ^14.0.0",
+    "node": "^12.14.1 || >=14.0.0",
     "npm": "^6.11.0 || ^7.5.6",
     "yarn": ">= 1.13.0"
   },

package/utility/latest-versions.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.latestVersions = void 0;
 exports.latestVersions = {
     // These versions should be kept up to date with latest Angular peer dependencies.
-    Angular: '~12.0.0',
+    Angular: '~12.0.4',
     RxJs: '~6.6.0',
     ZoneJs: '~0.11.4',
     TypeScript: '~4.2.3',

package/utility/workspace.js

@@ -68,7 +68,7 @@ async function createDefaultPath(tree, projectName) {
     const workspace = await getWorkspace(tree);
     const project = workspace.projects.get(projectName);
     if (!project) {
-        throw new Error('Specified project does not exist.');
+        throw new Error(`Project "${projectName}" does not exist.`);
     }
     return buildDefaultPath(project);
 }

package/web-worker/index.js

@@ -97,8 +97,7 @@ function default_1(options) {
         if (!projectTarget) {
             throw new Error(`Target is not defined for this project.`);
         }
-        const projectTargetOptions = (projectTarget.options ||
-            {});
+        const projectTargetOptions = (projectTarget.options || {});
         if (options.path === undefined) {
             options.path = workspace_1.buildDefaultPath(project);
         }
@@ -111,6 +110,16 @@ function default_1(options) {
             const workerConfigPath = core_1.join(core_1.normalize(root), 'tsconfig.worker.json');
             projectTargetOptions.webWorkerTsConfig = workerConfigPath;
         }
+        const projectTestTarget = project.targets.get('test');
+        if (projectTestTarget) {
+            const projectTestTargetOptions = (projectTestTarget.options ||
+                {});
+            const needWebWorkerConfig = !projectTestTargetOptions.webWorkerTsConfig;
+            if (needWebWorkerConfig) {
+                const workerConfigPath = core_1.join(core_1.normalize(root), 'tsconfig.worker.json');
+                projectTestTargetOptions.webWorkerTsConfig = workerConfigPath;
+            }
+        }
         const templateSource = schematics_1.apply(schematics_1.url('./files/worker'), [
             schematics_1.applyTemplates({ ...options, ...core_1.strings }),
             schematics_1.move(parsedPath.path),

package/workspace/files/README.md.template

@@ -12,7 +12,7 @@ Run `ng generate component component-name` to generate a new component. You can
 
 ## Build
 
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
 
 ## Running unit tests
 
@@ -20,7 +20,7 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
 
 ## Running end-to-end tests
 
-Run `ng e2e` to execute the end-to-end tests via a platform of your choice.
+Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities.
 
 ## Further help