@schematics/angular 8.0.0-rc.1 → 8.0.0

package/application/files/browserslist.template

@@ -5,12 +5,8 @@
 # You can see what browsers were selected by your queries by running:
 #   npx browserslist
 
-# Googlebot uses an older version of Chrome
-# For additional information see: https://developers.google.com/search/docs/guides/rendering
-
 > 0.5%
 last 2 versions
 Firefox ESR
-Chrome 41 # Support for Googlebot
 not dead
 not IE 9-11 # For IE 9-11 support, remove 'not'.

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',
@@ -176,7 +181,7 @@ function default_1(options) {
                 commonModule: false,
                 flat: true,
                 path: sourceDir,
-                project: options.name,
+                project: projectName,
             }),
             schematics_1.schematic('component', {
                 name: options.name,
@@ -186,13 +191,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/update-8/codelyzer-5.d.ts

@@ -7,4 +7,4 @@
  */
 import { Rule } from '@angular-devkit/schematics';
 export declare const updateTsLintConfig: () => Rule;
-export declare const updatePackageJson: () => (host: import("../../../../angular_devkit/schematics/src/tree/interface").Tree, context: import("../../../../angular_devkit/schematics/src/index").TypedSchematicContext<{}, {}>) => import("../../../../angular_devkit/schematics/src/tree/interface").Tree;
+export declare const updatePackageJson: () => (host: import("../../../../angular_devkit/schematics/src/tree/interface").Tree) => void;

package/migrations/update-8/codelyzer-5.js

@@ -8,7 +8,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@angular-devkit/core");
-const tasks_1 = require("@angular-devkit/schematics/tasks");
 const dependencies_1 = require("../../utility/dependencies");
 const json_utils_1 = require("../../utility/json-utils");
 const ruleMapping = {
@@ -61,7 +60,7 @@ exports.updateTsLintConfig = () => {
     };
 };
 exports.updatePackageJson = () => {
-    return (host, context) => {
+    return (host) => {
         const dependency = {
             type: dependencies_1.NodeDependencyType.Dev,
             name: 'codelyzer',
@@ -69,7 +68,5 @@ exports.updatePackageJson = () => {
             overwrite: true,
         };
         dependencies_1.addPackageJsonDependency(host, dependency);
-        context.addTask(new tasks_1.NodePackageInstallTask());
-        return host;
     };
 };

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

@@ -17,56 +17,15 @@ const browserslistContent = `# This file is used by the build system to adjust C
 # You can see what browsers were selected by your queries by running:
 #   npx browserslist
 
-# Googlebot uses an older version of Chrome
-# For additional information see: https://developers.google.com/search/docs/guides/rendering
-
 > 0.5%
 last 2 versions
 Firefox ESR
-Chrome 41 # Support for Googlebot
 not dead
 not IE 9-11 # For IE 9-11 support, remove 'not'.`;
 function updateES5Projects() {
-    return (host) => {
-        const tsConfigPath = '/tsconfig.json';
-        const buffer = host.read(tsConfigPath);
-        if (!buffer) {
-            return host;
-        }
-        const tsCfgAst = core_1.parseJsonAst(buffer.toString(), core_1.JsonParseMode.Loose);
-        if (tsCfgAst.kind !== 'object') {
-            return host;
-        }
-        const compilerOptions = json_utils_1.findPropertyInAstObject(tsCfgAst, 'compilerOptions');
-        if (!compilerOptions || compilerOptions.kind !== 'object') {
-            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 updateBrowserlist;
-    };
-}
-exports.updateES5Projects = updateES5Projects;
-function updateBrowserlist() {
     return (tree) => {
+        // update workspace tsconfig
+        updateTsConfig(tree, '/tsconfig.json');
         const angularConfigContent = tree.read('angular.json') || tree.read('.angular.json');
         if (!angularConfigContent) {
             return;
@@ -88,6 +47,24 @@ function updateBrowserlist() {
                 // Skip existing separate E2E projects
                 continue;
             }
+            // Older projects app and spec ts configs had script and module set in them.
+            const architect = project.architect;
+            if (!(core_1.isJsonObject(architect)
+                && core_1.isJsonObject(architect.build)
+                && architect.build.builder === '@angular-devkit/build-angular:browser')) {
+                // Skip projects who's build builder is not build-angular:browser
+                continue;
+            }
+            const buildOptionsConfig = architect.build.options;
+            if (core_1.isJsonObject(buildOptionsConfig) && typeof buildOptionsConfig.tsConfig === 'string') {
+                updateTsConfig(tree, buildOptionsConfig.tsConfig);
+            }
+            const testConfig = architect.test;
+            if (core_1.isJsonObject(testConfig)
+                && core_1.isJsonObject(testConfig.options)
+                && typeof testConfig.options.tsConfig === 'string') {
+                updateTsConfig(tree, testConfig.options.tsConfig);
+            }
             const browserslistPath = core_1.join(core_1.normalize(project.root), 'browserslist');
             if (typeof project.sourceRoot === 'string') {
                 // Move the CLI 7 style browserlist to root if it's there.
@@ -107,16 +84,53 @@ function updateBrowserlist() {
                     }
                 }
             }
-            const source = tree.read(browserslistPath);
-            if (!source) {
+            if (!tree.exists(browserslistPath)) {
                 tree.create(browserslistPath, browserslistContent);
             }
-            else if (!source.toString().toLowerCase().includes('chrome 41')) {
-                const recorder = tree.beginUpdate(browserslistPath);
-                recorder.insertRight(source.length, '\nChrome 41 # Googlebot');
-                tree.commitUpdate(recorder);
-            }
         }
         return tree;
     };
 }
+exports.updateES5Projects = updateES5Projects;
+function updateTsConfig(tree, tsConfigPath) {
+    const buffer = tree.read(tsConfigPath);
+    if (!buffer) {
+        return;
+    }
+    const tsCfgAst = core_1.parseJsonAst(buffer.toString(), core_1.JsonParseMode.Loose);
+    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;
+    }
+    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

@@ -8,11 +8,12 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const schematics_1 = require("@angular-devkit/schematics");
+const tasks_1 = require("@angular-devkit/schematics/tasks");
 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() {
@@ -22,8 +23,14 @@ 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'));
+                if (packageChanges) {
+                    context.addTask(new tasks_1.NodePackageInstallTask());
+                }
+            },
         ]);
     };
 }

package/migrations/update-8/remove-angular-http.d.ts

@@ -5,4 +5,4 @@
  * 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
  */
-export declare const removeAngularHttp: () => (host: import("../../../../angular_devkit/schematics/src/tree/interface").Tree, context: import("../../../../angular_devkit/schematics/src/index").TypedSchematicContext<{}, {}>) => import("../../../../angular_devkit/schematics/src/tree/interface").Tree;
+export declare const removeAngularHttp: () => (host: import("../../../../angular_devkit/schematics/src/tree/interface").Tree) => void;

package/migrations/update-8/remove-angular-http.js

@@ -7,12 +7,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const tasks_1 = require("@angular-devkit/schematics/tasks");
 const dependencies_1 = require("../../utility/dependencies");
 exports.removeAngularHttp = () => {
-    return (host, context) => {
+    return (host) => {
         dependencies_1.removePackageJsonDependency(host, '@angular/http');
-        context.addTask(new tasks_1.NodePackageInstallTask());
-        return host;
     };
 };

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}

@@ -1,14 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tasks_1 = require("@angular-devkit/schematics/tasks");
 const dependencies_1 = require("../../utility/dependencies");
 const latest_versions_1 = require("../../utility/latest-versions");
-function updateBuilders() {
-    return (host, context) => {
-        let updates = false;
+function updateDependencies() {
+    return (host) => {
         let current = dependencies_1.getPackageJsonDependency(host, '@angular-devkit/build-angular');
         if (current && current.version !== latest_versions_1.latestVersions.DevkitBuildAngular) {
-            updates = true;
             dependencies_1.addPackageJsonDependency(host, {
                 type: current.type,
                 name: '@angular-devkit/build-angular',
@@ -18,7 +15,6 @@ function updateBuilders() {
         }
         current = dependencies_1.getPackageJsonDependency(host, '@angular-devkit/build-ng-packagr');
         if (current && current.version !== latest_versions_1.latestVersions.DevkitBuildNgPackagr) {
-            updates = true;
             dependencies_1.addPackageJsonDependency(host, {
                 type: current.type,
                 name: '@angular-devkit/build-ng-packagr',
@@ -28,7 +24,6 @@ function updateBuilders() {
         }
         current = dependencies_1.getPackageJsonDependency(host, 'zone.js');
         if (current && current.version !== latest_versions_1.latestVersions.ZoneJs) {
-            updates = true;
             dependencies_1.addPackageJsonDependency(host, {
                 type: current.type,
                 name: 'zone.js',
@@ -36,9 +31,17 @@ function updateBuilders() {
                 overwrite: true,
             });
         }
-        if (updates) {
-            context.addTask(new tasks_1.NodePackageInstallTask());
+        // 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/migrations/update-8/update-lazy-module-paths.d.ts

@@ -6,4 +6,4 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { Rule } from '@angular-devkit/schematics';
-export declare const updateLazyModulePaths: () => Rule;
+export declare function updateLazyModulePaths(): Rule;

package/migrations/update-8/update-lazy-module-paths.js

@@ -1,17 +1,55 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tasks_1 = require("@angular-devkit/schematics/tasks");
-const path = require("path");
-exports.updateLazyModulePaths = () => {
-    return (_, context) => {
-        context.addTask(new tasks_1.TslintFixTask({
-            rulesDirectory: path.join(__dirname, 'rules'),
-            rules: {
-                'no-lazy-module-paths': [true],
-            },
-        }, {
-            includes: '**/*.ts',
-            silent: false,
-        }));
+const ts = require("../../third_party/github.com/Microsoft/TypeScript/lib/typescript");
+function* visit(directory) {
+    for (const path of directory.subfiles) {
+        if (path.endsWith('.ts') && !path.endsWith('.d.ts')) {
+            const entry = directory.file(path);
+            if (entry) {
+                const content = entry.content;
+                if (content.includes('loadChildren')) {
+                    const source = ts.createSourceFile(entry.path, content.toString(), ts.ScriptTarget.Latest, true);
+                    yield source;
+                }
+            }
+        }
+    }
+    for (const path of directory.subdirs) {
+        if (path === 'node_modules') {
+            continue;
+        }
+        yield* visit(directory.dir(path));
+    }
+}
+function updateLazyModulePaths() {
+    return tree => {
+        for (const sourceFile of visit(tree.root)) {
+            let recorder;
+            ts.forEachChild(sourceFile, function analyze(node) {
+                if (ts.isPropertyAssignment(node) &&
+                    (ts.isIdentifier(node.name) || ts.isStringLiteral(node.name)) &&
+                    node.name.text === 'loadChildren' &&
+                    ts.isStringLiteral(node.initializer)) {
+                    const valueNode = node.initializer;
+                    const parts = valueNode.text.split('#');
+                    const path = parts[0];
+                    const moduleName = parts[1] || 'default';
+                    const fix = `() => import('${path}').then(m => m.${moduleName})`;
+                    if (!recorder) {
+                        recorder = tree.beginUpdate(sourceFile.fileName);
+                    }
+                    const index = valueNode.getStart();
+                    const length = valueNode.getWidth();
+                    recorder
+                        .remove(index, length)
+                        .insertLeft(index, fix);
+                }
+                ts.forEachChild(node, analyze);
+            });
+            if (recorder) {
+                tree.commitUpdate(recorder);
+            }
+        }
     };
-};
+}
+exports.updateLazyModulePaths = updateLazyModulePaths;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "8.0.0-rc.1",
+  "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.1",
-    "@angular-devkit/schematics": "8.0.0-rc.1"
+    "@angular-devkit/core": "8.0.0",
+    "@angular-devkit/schematics": "8.0.0"
   },
   "repository": {
     "type": "git",

package/service/schema.d.ts

@@ -7,7 +7,7 @@ export interface Schema {
      */
     flat?: boolean;
     /**
-     * When true, applies lint fixes after generating the pipe.
+     * When true, applies lint fixes after generating the service.
      */
     lintFix?: boolean;
     /**

package/service/schema.json

@@ -47,11 +47,9 @@
     "lintFix": {
       "type": "boolean",
       "default": false,
-      "description": "When true, applies lint fixes after generating the pipe.",
+      "description": "When true, applies lint fixes after generating the service.",
       "x-user-analytics": 15
     }
   },
-  "required": [
-    "name"
-  ]
+  "required": ["name"]
 }

package/universal/index.js

@@ -155,7 +155,7 @@ function getTsConfigOutDir(host, tsConfigPath) {
         throw new schematics_1.SchematicsException(`Could not read ${tsConfigPath}`);
     }
     const tsConfigContent = tsConfigBuffer.toString();
-    const tsConfig = core_1.parseJson(tsConfigContent);
+    const tsConfig = core_1.parseJson(tsConfigContent, core_1.JsonParseMode.Loose);
     if (tsConfig === null || typeof tsConfig !== 'object' || Array.isArray(tsConfig) ||
         tsConfig.compilerOptions === null || typeof tsConfig.compilerOptions !== 'object' ||
         Array.isArray(tsConfig.compilerOptions)) {

package/utility/ast-utils.js

@@ -156,10 +156,7 @@ function nodesByPosition(first, second) {
 function insertAfterLastOccurrence(nodes, toInsert, file, fallbackPos, syntaxKind) {
     // sort() has a side effect, so make a copy so that we won't overwrite the parent's object.
     let lastItem = [...nodes].sort(nodesByPosition).pop();
-    if (!lastItem) {
-        throw new Error();
-    }
-    if (syntaxKind) {
+    if (syntaxKind && lastItem) {
         lastItem = findNodes(lastItem, syntaxKind).sort(nodesByPosition).pop();
     }
     if (!lastItem && fallbackPos == undefined) {
@@ -243,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.
@@ -254,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.1',
+    Angular: '~8.0.0',
     RxJs: '~6.4.0',
-    ZoneJs: '~0.9.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.1',
-    DevkitBuildNgPackagr: '~0.800.0-rc.1',
+    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/rules/noLazyModulePathsRule.d.ts

@@ -1,12 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. 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 { RuleFailure, Rules } from 'tslint';
-import * as ts from '../../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
-export declare class Rule extends Rules.AbstractRule {
-    apply(ast: ts.SourceFile): Array<RuleFailure>;
-}

package/migrations/update-8/rules/noLazyModulePathsRule.js

@@ -1,51 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-/**
- * @license
- * Copyright Google Inc. 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
- */
-const tslint_1 = require("tslint"); // tslint:disable-line:no-implicit-dependencies
-const ts = require("../../../third_party/github.com/Microsoft/TypeScript/lib/typescript");
-// Constants:
-const LOAD_CHILDREN_SPLIT = '#';
-const FAILURE_MESSAGE = 'Found magic `loadChildren` string. Use a function with `import` instead.';
-class Rule extends tslint_1.Rules.AbstractRule {
-    apply(ast) {
-        const ruleName = this.ruleName;
-        const changes = [];
-        // NOTE: This should ideally be excluded at a higher level to avoid parsing
-        if (ast.isDeclarationFile || /[\\\/]node_modules[\\\/]/.test(ast.fileName)) {
-            return [];
-        }
-        // Workaround mismatched tslint TS version and vendored TS version
-        // The TS SyntaxKind enum numeric values change between versions
-        const sourceFile = ts.createSourceFile(ast.fileName, ast.text, ast.languageVersion, true);
-        ts.forEachChild(sourceFile, function analyze(node) {
-            if (ts.isPropertyAssignment(node) &&
-                (ts.isIdentifier(node.name) || ts.isStringLiteral(node.name)) &&
-                node.name.text === 'loadChildren' &&
-                ts.isStringLiteral(node.initializer)) {
-                const valueNode = node.initializer;
-                const parts = valueNode.text.split(LOAD_CHILDREN_SPLIT);
-                const path = parts[0];
-                const moduleName = parts[1] || 'default';
-                let fix = `() => import('${path}').then(m => m.${moduleName})`;
-                // Try to fix indentation in replacement:
-                const { character } = ast.getLineAndCharacterOfPosition(node.getStart());
-                fix = fix.replace(/\n/g, `\n${' '.repeat(character)}`);
-                const replacement = new tslint_1.Replacement(valueNode.getStart(), valueNode.getWidth(), fix);
-                const start = node.getStart();
-                const end = node.getEnd();
-                const change = new tslint_1.RuleFailure(ast, start, end, FAILURE_MESSAGE, ruleName, replacement);
-                change.setRuleSeverity('warning');
-                changes.push(change);
-            }
-            ts.forEachChild(node, analyze);
-        });
-        return changes;
-    }
-}
-exports.Rule = Rule;

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

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