@schematics/angular 8.0.0-rc.4 → 8.0.0

package/collection.json

@@ -102,7 +102,7 @@
       "description": "Generate a library project for Angular."
     },
     "webWorker": {
-      "aliases": ["web-worker", "worker"],
+      "aliases": ["web-worker"],
       "factory": "./web-worker",
       "schema": "./web-worker/schema.json",
       "description": "Create a Web Worker."

package/library/files/tsconfig.lib.json.template

@@ -12,6 +12,7 @@
     ]
   },
   "angularCompilerOptions": {
+    "annotateForClosureCompiler": true,
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
     "fullTemplateTypeCheck": true,

package/library/index.js

@@ -72,6 +72,11 @@ function addDependenciesToPackageJson() {
                 name: 'ng-packagr',
                 version: '^5.1.0',
             },
+            {
+                type: dependencies_1.NodeDependencyType.Dev,
+                name: 'tsickle',
+                version: '^0.35.0',
+            },
             {
                 type: dependencies_1.NodeDependencyType.Default,
                 name: 'tslib',

package/migrations/update-8/differential-loading.js

@@ -23,38 +23,9 @@ Firefox ESR
 not dead
 not IE 9-11 # For IE 9-11 support, remove 'not'.`;
 function updateES5Projects() {
-    return (host) => {
-        const tsConfigPath = '/tsconfig.json';
-        const compilerOptions = getCompilerOptionsAstObject(host, tsConfigPath);
-        if (!compilerOptions) {
-            return host;
-        }
-        const recorder = host.beginUpdate(tsConfigPath);
-        const scriptTarget = json_utils_1.findPropertyInAstObject(compilerOptions, 'target');
-        if (!scriptTarget) {
-            json_utils_1.insertPropertyInAstObjectInOrder(recorder, compilerOptions, 'target', 'es2015', 4);
-        }
-        else if (scriptTarget.value !== 'es2015') {
-            const { start, end } = scriptTarget;
-            recorder.remove(start.offset, end.offset - start.offset);
-            recorder.insertLeft(start.offset, '"es2015"');
-        }
-        const scriptModule = json_utils_1.findPropertyInAstObject(compilerOptions, 'module');
-        if (!scriptModule) {
-            json_utils_1.insertPropertyInAstObjectInOrder(recorder, compilerOptions, 'module', 'esnext', 4);
-        }
-        else if (scriptModule.value !== 'esnext') {
-            const { start, end } = scriptModule;
-            recorder.remove(start.offset, end.offset - start.offset);
-            recorder.insertLeft(start.offset, '"esnext"');
-        }
-        host.commitUpdate(recorder);
-        return updateProjects;
-    };
-}
-exports.updateES5Projects = updateES5Projects;
-function updateProjects() {
     return (tree) => {
+        // update workspace tsconfig
+        updateTsConfig(tree, '/tsconfig.json');
         const angularConfigContent = tree.read('angular.json') || tree.read('.angular.json');
         if (!angularConfigContent) {
             return;
@@ -84,26 +55,15 @@ function updateProjects() {
                 // Skip projects who's build builder is not build-angular:browser
                 continue;
             }
-            const tsConfigs = [];
             const buildOptionsConfig = architect.build.options;
             if (core_1.isJsonObject(buildOptionsConfig) && typeof buildOptionsConfig.tsConfig === 'string') {
-                tsConfigs.push(buildOptionsConfig.tsConfig);
+                updateTsConfig(tree, buildOptionsConfig.tsConfig);
             }
             const testConfig = architect.test;
             if (core_1.isJsonObject(testConfig)
                 && core_1.isJsonObject(testConfig.options)
                 && typeof testConfig.options.tsConfig === 'string') {
-                tsConfigs.push(testConfig.options.tsConfig);
-            }
-            for (const tsConfig of tsConfigs) {
-                const compilerOptions = getCompilerOptionsAstObject(tree, tsConfig);
-                if (!compilerOptions) {
-                    continue;
-                }
-                const recorder = tree.beginUpdate(tsConfig);
-                json_utils_1.removePropertyInAstObject(recorder, compilerOptions, 'target');
-                json_utils_1.removePropertyInAstObject(recorder, compilerOptions, 'module');
-                tree.commitUpdate(recorder);
+                updateTsConfig(tree, testConfig.options.tsConfig);
             }
             const browserslistPath = core_1.join(core_1.normalize(project.root), 'browserslist');
             if (typeof project.sourceRoot === 'string') {
@@ -131,8 +91,9 @@ function updateProjects() {
         return tree;
     };
 }
-function getCompilerOptionsAstObject(host, tsConfigPath) {
-    const buffer = host.read(tsConfigPath);
+exports.updateES5Projects = updateES5Projects;
+function updateTsConfig(tree, tsConfigPath) {
+    const buffer = tree.read(tsConfigPath);
     if (!buffer) {
         return;
     }
@@ -140,9 +101,36 @@ function getCompilerOptionsAstObject(host, tsConfigPath) {
     if (tsCfgAst.kind !== 'object') {
         return;
     }
+    const configExtends = json_utils_1.findPropertyInAstObject(tsCfgAst, 'extends');
+    const isExtendedConfig = configExtends && configExtends.kind === 'string';
     const compilerOptions = json_utils_1.findPropertyInAstObject(tsCfgAst, 'compilerOptions');
     if (!compilerOptions || compilerOptions.kind !== 'object') {
         return;
     }
-    return compilerOptions;
+    const recorder = tree.beginUpdate(tsConfigPath);
+    if (isExtendedConfig) {
+        json_utils_1.removePropertyInAstObject(recorder, compilerOptions, 'target');
+        json_utils_1.removePropertyInAstObject(recorder, compilerOptions, 'module');
+    }
+    else {
+        const scriptTarget = json_utils_1.findPropertyInAstObject(compilerOptions, 'target');
+        if (!scriptTarget) {
+            json_utils_1.insertPropertyInAstObjectInOrder(recorder, compilerOptions, 'target', 'es2015', 4);
+        }
+        else if (scriptTarget.value !== 'es2015') {
+            const { start, end } = scriptTarget;
+            recorder.remove(start.offset, end.offset - start.offset);
+            recorder.insertLeft(start.offset, '"es2015"');
+        }
+        const scriptModule = json_utils_1.findPropertyInAstObject(compilerOptions, 'module');
+        if (!scriptModule) {
+            json_utils_1.insertPropertyInAstObjectInOrder(recorder, compilerOptions, 'module', 'esnext', 4);
+        }
+        else if (scriptModule.value !== 'esnext') {
+            const { start, end } = scriptModule;
+            recorder.remove(start.offset, end.offset - start.offset);
+            recorder.insertLeft(start.offset, '"esnext"');
+        }
+    }
+    tree.commitUpdate(recorder);
 }

package/migrations/update-8/drop-es6-polyfills.js

@@ -64,11 +64,11 @@ function dropES2015PolyfillsFromFile(polyfillPath) {
         if (!source) {
             return;
         }
-        // normalize line endings to increase hash match chances
-        const content = source.toString().replace(/\r\n|\r/g, '\n');
+        const content = source.toString();
         // Check if file is unmodified, if so then replace and return
         const hash = crypto_1.createHash('md5');
-        hash.update(content);
+        // normalize line endings to increase hash match chances
+        hash.update(content.replace(/\r\n|\r/g, '\n'));
         const digest = hash.digest('hex');
         if (knownPolyfillHashes.includes(digest)) {
             // Replace with new project polyfills file

package/migrations/update-8/index.js

@@ -13,7 +13,7 @@ const codelyzer_5_1 = require("./codelyzer-5");
 const differential_loading_1 = require("./differential-loading");
 const drop_es6_polyfills_1 = require("./drop-es6-polyfills");
 const remove_angular_http_1 = require("./remove-angular-http");
-const update_builders_1 = require("./update-builders");
+const update_dependencies_1 = require("./update-dependencies");
 var update_lazy_module_paths_1 = require("./update-lazy-module-paths");
 exports.updateLazyModulePaths = update_lazy_module_paths_1.updateLazyModulePaths;
 function default_1() {
@@ -23,7 +23,7 @@ function default_1() {
             codelyzer_5_1.updatePackageJson(),
             drop_es6_polyfills_1.dropES2015Polyfills(),
             differential_loading_1.updateES5Projects(),
-            update_builders_1.updateBuilders(),
+            update_dependencies_1.updateDependencies(),
             remove_angular_http_1.removeAngularHttp(),
             (tree, context) => {
                 const packageChanges = tree.actions.some(a => a.path.endsWith('/package.json'));

package/migrations/update-8/update-dependencies.d.ts

@@ -0,0 +1 @@
+export declare function updateDependencies(): (host: import("../../../../angular_devkit/schematics/src/tree/interface").Tree) => void;

package/migrations/update-8/{update-builders.js → update-dependencies.js}

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const dependencies_1 = require("../../utility/dependencies");
 const latest_versions_1 = require("../../utility/latest-versions");
-function updateBuilders() {
+function updateDependencies() {
     return (host) => {
         let current = dependencies_1.getPackageJsonDependency(host, '@angular-devkit/build-angular');
         if (current && current.version !== latest_versions_1.latestVersions.DevkitBuildAngular) {
@@ -31,6 +31,17 @@ function updateBuilders() {
                 overwrite: true,
             });
         }
+        // FIXME: change to ^2.3.2 as soon as it's released with the pr208 fix
+        const webAnimationsJsVersion = 'github:angular/web-animations-js#release_pr208';
+        current = dependencies_1.getPackageJsonDependency(host, 'web-animations-js');
+        if (current && current.version !== webAnimationsJsVersion) {
+            dependencies_1.addPackageJsonDependency(host, {
+                type: current.type,
+                name: 'web-animations-js',
+                version: webAnimationsJsVersion,
+                overwrite: true,
+            });
+        }
     };
 }
-exports.updateBuilders = updateBuilders;
+exports.updateDependencies = updateDependencies;

package/package.json

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

package/utility/ast-utils.js

@@ -240,8 +240,7 @@ function getDecoratorMetadata(source, identifier, module) {
         .filter(expr => {
         if (expr.expression.kind == ts.SyntaxKind.Identifier) {
             const id = expr.expression;
-            return id.getFullText(source) == identifier
-                && angularImports[id.getFullText(source)] === module;
+            return id.text == identifier && angularImports[id.text] === module;
         }
         else if (expr.expression.kind == ts.SyntaxKind.PropertyAccessExpression) {
             // This covers foo.NgModule when importing * as foo.
@@ -251,7 +250,7 @@ function getDecoratorMetadata(source, identifier, module) {
                 return false;
             }
             const id = paExpr.name.text;
-            const moduleId = paExpr.expression.getText(source);
+            const moduleId = paExpr.expression.text;
             return id === identifier && (angularImports[moduleId + '.'] === module);
         }
         return false;

package/utility/latest-versions.js

@@ -9,12 +9,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.latestVersions = {
     // These versions should be kept up to date with latest Angular peer dependencies.
-    Angular: '~8.0.0-rc.4',
+    Angular: '~8.0.0',
     RxJs: '~6.4.0',
     ZoneJs: '~0.9.1',
     TypeScript: '~3.4.3',
     TsLib: '^1.9.0',
     // The versions below must be manually updated when making a new devkit release.
-    DevkitBuildAngular: '~0.800.0-rc.4',
-    DevkitBuildNgPackagr: '~0.800.0-rc.4',
+    DevkitBuildAngular: '~0.800.0',
+    DevkitBuildNgPackagr: '~0.800.0',
 };

package/web-worker/index.js

@@ -49,9 +49,11 @@ function addSnippet(options) {
         if (options.path === undefined) {
             return;
         }
+        const fileRegExp = new RegExp(`^${options.name}.*\.ts`);
         const siblingModules = host.getDir(options.path).subfiles
-            // Find all files that start with the same name, are ts files, and aren't spec files.
-            .filter(f => f.startsWith(options.name) && f.endsWith('.ts') && !f.endsWith('spec.ts'))
+            // Find all files that start with the same name, are ts files,
+            // and aren't spec or module files.
+            .filter(f => fileRegExp.test(f) && !/(module|spec)\.ts$/.test(f))
             // Sort alphabetically for consistency.
             .sort();
         if (siblingModules.length === 0) {

package/migrations/update-8/update-builders.d.ts

@@ -1 +0,0 @@
-export declare function updateBuilders(): (host: import("../../../../angular_devkit/schematics/src/tree/interface").Tree) => void;