@schematics/angular 10.0.0-rc.5 → 10.0.3

package/application/files/.browserslistrc.template

@@ -11,8 +11,10 @@
 last 1 Chrome version
 last 1 Firefox version
 last 2 Edge major versions
-last 2 Safari major version
+last 2 Safari major versions
 last 2 iOS major versions
 Firefox ESR<% if (legacyBrowsers) { %>
-IE 9-11<% } else { %>
-not IE 9-11 # For IE 9-11 support, remove 'not'.<% } %>
+IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11.
+IE 11<% } else { %>
+not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line.
+not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.<% } %>

package/e2e/index.js

@@ -52,9 +52,6 @@ function default_1(options) {
                 }),
                 schematics_1.move(root),
             ])),
-            tsconfig_1.addTsConfigProjectReferences([
-                e2eTsConfig,
-            ]),
         ]);
     };
 }

package/migrations/migration-collection.json

@@ -58,12 +58,12 @@
     "tslint-version-6": {
       "version": "10.0.0-beta.0",
       "factory": "./update-10/update-tslint",
-      "description": "Update tslint to version 6."
+      "description": "Update tslint to version 6 and adjust rules to maintain existing behavior."
     },
     "rename-browserslist-config": {
       "version": "10.0.0-beta.0",
       "factory": "./update-10/rename-browserslist-config",
-      "description": "Update Browserslist configurations to '.browserslistrc'."
+      "description": "Update Browserslist configuration file name to '.browserslistrc' from deprecated 'browserslist'."
     },
     "remove-es5-browser-support-option": {
       "version": "10.0.0-beta.2",
@@ -73,37 +73,37 @@
     "schematic-options-10": {
       "version": "10.0.0-beta.2",
       "factory": "./update-9/schematic-options",
-      "description": "Replace deprecated 'styleext' and 'spec' Angular schematic options."
+      "description": "Replace deprecated and removed 'styleext' and 'spec' Angular schematic options with 'style' and 'skipTests', respectively."
     },
     "update-angular-config": {
       "version": "10.0.0-beta.6",
       "factory": "./update-10/update-angular-config",
-      "description": "Remove various deprecated builders options from 'angular.json'."
+      "description": "Remove deprecated options from 'angular.json' that are no longer present in v10."
     },
     "tslint-add-deprecation-rule": {
       "version": "10.0.0-beta.7",
       "factory": "./update-10/add-deprecation-rule-tslint",
-      "description": "Adds the tslint deprecation rule to tslint JSON configuration files."
+      "description": "Add the tslint deprecation rule to tslint JSON configuration files."
     },
     "update-libraries-tslib": {
       "version": "10.0.0-beta.7",
       "factory": "./update-10/update-libraries-tslib",
-      "description": "Update library projects to use tslib version 2 as a direct dependency."
+      "description": "Update library projects to use tslib version 2 as a direct dependency. Read more about this here: https://v10.angular.io/guide/migration-update-libraries-tslib"
     },
     "solution-style-tsconfig": {
       "version": "10.0.0-beta.7",
       "factory": "./update-10/solution-style-tsconfig",
-      "description": "Adding \"Solution Style\" tsconfig.json. This improves developer experience using editors powered by TypeScript’s language server."
-    },
-    "update-module-and-target-compiler-options": {
-      "version": "10.0.0-rc.1",
-      "factory": "./update-10/update-module-and-target-compiler-options",
-      "description": "Update 'module' and 'target' TypeScript compiler options."
+      "description": "Add \"Solution Style\" TypeScript configuration file support. This improves developer experience using editors powered by TypeScript’s language server. Read more about this here: https://v10.angular.io/guide/migration-solution-style-tsconfig"
     },
     "update-workspace-dependencies": {
       "version": "10.0.0-rc.2",
       "factory": "./update-10/update-dependencies",
-      "description": "Workspace dependencies updates."
+      "description": "Update workspace dependencies to match a new v10 project."
+    },
+    "update-module-and-target-compiler-options": {
+      "version": "10.0.1",
+      "factory": "./update-10/update-module-and-target-compiler-options",
+      "description": "Update 'module' and 'target' TypeScript compiler options. Read more about this here: https://v10.angular.io/guide/migration-update-module-and-target-compiler-options"
     }
   }
 }

package/migrations/update-10/solution-style-tsconfig.js

@@ -18,16 +18,28 @@ const SOLUTIONS_TS_CONFIG_HEADER = `/*
   To learn more about this file see: https://angular.io/config/solution-tsconfig.
 */
 `;
-function* visitExtendedJsonFiles(directory) {
+function* visitExtendedJsonFiles(directory, logger) {
     for (const path of directory.subfiles) {
         if (!path.endsWith('.json')) {
             continue;
         }
         const entry = directory.file(path);
-        if (!entry) {
+        const content = entry === null || entry === void 0 ? void 0 : entry.content.toString();
+        if (!content) {
+            continue;
+        }
+        let jsonAst;
+        try {
+            jsonAst = core_1.parseJsonAst(content, core_1.JsonParseMode.Loose);
+        }
+        catch (error) {
+            let jsonFilePath = `${core_1.join(directory.path, path)}`;
+            jsonFilePath = jsonFilePath.startsWith('/') ? jsonFilePath.substr(1) : jsonFilePath;
+            const msg = error instanceof Error ? error.message : error;
+            logger.warn(`Failed to parse "${jsonFilePath}" as JSON AST Object. ${msg}\n` +
+                'If this is a TypeScript configuration file you will need to update the "extends" value manually.');
             continue;
         }
-        const jsonAst = core_1.parseJsonAst(entry.content.toString(), core_1.JsonParseMode.Loose);
         if (jsonAst.kind !== 'object') {
             continue;
         }
@@ -42,18 +54,18 @@ function* visitExtendedJsonFiles(directory) {
         if (path === 'node_modules' || path.startsWith('.')) {
             continue;
         }
-        yield* visitExtendedJsonFiles(directory.dir(path));
+        yield* visitExtendedJsonFiles(directory.dir(path), logger);
     }
 }
 function updateTsconfigExtendsRule() {
-    return host => {
+    return (host, context) => {
         if (!host.exists('tsconfig.json')) {
             return;
         }
         // Rename workspace tsconfig to base tsconfig.
         host.rename('tsconfig.json', 'tsconfig.base.json');
         // Iterate over all tsconfig files and change the extends from 'tsconfig.json' 'tsconfig.base.json'
-        for (const [tsconfigPath, extendsAst] of visitExtendedJsonFiles(host.root)) {
+        for (const [tsconfigPath, extendsAst] of visitExtendedJsonFiles(host.root, context.logger)) {
             const tsConfigDir = core_1.dirname(core_1.normalize(tsconfigPath));
             if ('/tsconfig.json' !== core_1.resolve(tsConfigDir, core_1.normalize(extendsAst.value))) {
                 // tsconfig extends doesn't refer to the workspace tsconfig path.

package/migrations/update-10/update-dependencies.js

@@ -6,6 +6,7 @@ const latest_versions_1 = require("../../utility/latest-versions");
 function default_1() {
     return (host, context) => {
         const dependenciesToUpdate = {
+            'codelyzer': '^6.0.0',
             'jasmine-core': '~3.5.0',
             'jasmine-spec-reporter': '~5.0.0',
             'karma': '~5.0.0',

package/migrations/update-10/update-module-and-target-compiler-options.js

@@ -16,7 +16,7 @@ function default_1() {
     return async (host) => {
         var _a;
         // Workspace level tsconfig
-        updateModuleAndTarget(host, 'tsconfig.json', {
+        updateModuleAndTarget(host, 'tsconfig.base.json', {
             oldModule: 'esnext',
             newModule: 'es2020',
         });

package/module/files/__name@dasherize@if-flat__/__name@dasherize__-routing.module.ts.template

@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-<% if (lazyRoute) { %>
+import { Routes, RouterModule } from '@angular/router';<% if (lazyRoute) { %>
+
 import { <%= classify(name) %>Component } from './<%= dasherize(name) %>.component';<% } %>
 
 const routes: Routes = [<% if (lazyRoute) { %>{ path: '', component: <%= classify(name) %>Component }<% } %>];

package/ng-new/index.js

@@ -9,10 +9,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
+const validation_1 = require("../utility/validation");
 function default_1(options) {
     if (!options.name) {
         throw new schematics_1.SchematicsException(`Invalid options, "name" is required.`);
     }
+    validation_1.validateProjectName(options.name);
     if (!options.directory) {
         options.directory = options.name;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "10.0.0-rc.5",
+  "version": "10.0.3",
   "description": "Schematics specific to Angular",
   "keywords": [
     "angular",
@@ -14,8 +14,8 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "10.0.0-rc.5",
-    "@angular-devkit/schematics": "10.0.0-rc.5"
+    "@angular-devkit/core": "10.0.3",
+    "@angular-devkit/schematics": "10.0.3"
   },
   "repository": {
     "type": "git",

package/service-worker/files/ngsw-config.json.template

@@ -14,7 +14,8 @@
           "/*.js"
         ]
       }
-    }, {
+    },
+    {
       "name": "assets",
       "installMode": "lazy",
       "updateMode": "prefetch",

package/utility/ast-utils.d.ts

@@ -30,7 +30,7 @@ export declare function findNodes(node: ts.Node, kind: ts.SyntaxKind, max?: numb
 /**
  * Get all the nodes from a source.
  * @param sourceFile The source file object.
- * @returns {Observable<ts.Node>} An observable of all the nodes in the source.
+ * @returns {Array<ts.Node>} An array of all the nodes in the source.
  */
 export declare function getSourceNodes(sourceFile: ts.SourceFile): ts.Node[];
 export declare function findNode(node: ts.Node, kind: ts.SyntaxKind, text: string): ts.Node | null;

package/utility/ast-utils.js

@@ -107,7 +107,7 @@ exports.findNodes = findNodes;
 /**
  * Get all the nodes from a source.
  * @param sourceFile The source file object.
- * @returns {Observable<ts.Node>} An observable of all the nodes in the source.
+ * @returns {Array<ts.Node>} An array of all the nodes in the source.
  */
 function getSourceNodes(sourceFile) {
     const nodes = [sourceFile];

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: '~10.0.0-rc.6',
+    Angular: '~10.0.4',
     RxJs: '~6.5.5',
     ZoneJs: '~0.10.3',
     TypeScript: '~3.9.5',
@@ -19,8 +19,8 @@ exports.latestVersions = {
     // For our e2e tests, these versions must match the latest tag present on the branch.
     // During RC periods they will not match the latest RC until there's a new git tag, and
     // should not be updated.
-    DevkitBuildAngular: '~0.1000.0-rc.5',
-    DevkitBuildNgPackagr: '~0.1000.0-rc.5',
-    DevkitBuildWebpack: '~0.1000.0-rc.5',
-    ngPackagr: '^10.0.0-rc.0',
+    DevkitBuildAngular: '~0.1000.3',
+    DevkitBuildNgPackagr: '~0.1000.3',
+    DevkitBuildWebpack: '~0.1000.3',
+    ngPackagr: '^10.0.0',
 };

package/workspace/files/package.json.template

@@ -29,7 +29,7 @@
     "@types/node": "^12.11.1",<% if (!minimal) { %>
     "@types/jasmine": "~3.5.0",
     "@types/jasminewd2": "~2.0.3",
-    "codelyzer": "^6.0.0-next.1",
+    "codelyzer": "^6.0.0",
     "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.0",
     "karma": "~5.0.0",