@schematics/angular 9.0.0-rc.6 → 9.0.0

package/application/files/src/test.ts.template

@@ -7,7 +7,12 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
-declare const require: any;
+declare const require: {
+  context(path: string, deep?: boolean, filter?: RegExp): {
+    keys(): string[];
+    <T>(id: string): T;
+  };
+};
 
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(

package/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template

@@ -17,7 +17,7 @@ export class <%= classify(name) %><%= classify(type) %> implements OnInit {
 
   constructor() { }
 
-  ngOnInit() {
+  ngOnInit(): void {
   }
 
 }

package/e2e/files/src/app.po.ts.template

@@ -1,11 +1,11 @@
 import { browser, by, element } from 'protractor';
 
 export class AppPage {
-  navigateTo() {
-    return browser.get(browser.baseUrl) as Promise<any>;
+  navigateTo(): Promise<unknown> {
+    return browser.get(browser.baseUrl) as Promise<unknown>;
   }
 
-  getTitleText() {
+  getTitleText(): Promise<string> {
     return element(by.css('<%= rootSelector %> .content span')).getText() as Promise<string>;
   }
 }

package/library/files/src/test.ts.template

@@ -8,7 +8,12 @@ import {
   platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
-declare const require: any;
+declare const require: {
+  context(path: string, deep?: boolean, filter?: RegExp): {
+    keys(): string[];
+    <T>(id: string): T;
+  };
+};
 
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(

package/library/index.js

@@ -27,7 +27,7 @@ function updateJsonFile(host, path, callback) {
     }
     return host;
 }
-function updateTsConfig(packageName, distRoot) {
+function updateTsConfig(packageName, ...paths) {
     return (host) => {
         if (!host.exists('tsconfig.json')) {
             return host;
@@ -39,7 +39,7 @@ function updateTsConfig(packageName, distRoot) {
             if (!tsconfig.compilerOptions.paths[packageName]) {
                 tsconfig.compilerOptions.paths[packageName] = [];
             }
-            tsconfig.compilerOptions.paths[packageName].push(distRoot);
+            tsconfig.compilerOptions.paths[packageName].push(...paths);
         });
     };
 }
@@ -150,6 +150,7 @@ function default_1(options) {
         const folderName = `${scopeFolder}${core_1.strings.dasherize(options.name)}`;
         const projectRoot = core_1.join(core_1.normalize(newProjectRoot), folderName);
         const distRoot = `dist/${folderName}`;
+        const pathImportLib = `${distRoot}/${folderName.replace('/', '-')}`;
         const sourceDir = `${projectRoot}/src/lib`;
         const templateSource = schematics_1.apply(schematics_1.url('./files'), [
             schematics_1.applyTemplates({
@@ -170,7 +171,7 @@ function default_1(options) {
             schematics_1.mergeWith(templateSource),
             addLibToWorkspaceFile(options, projectRoot, projectName),
             options.skipPackageJson ? schematics_1.noop() : addDependenciesToPackageJson(),
-            options.skipTsConfig ? schematics_1.noop() : updateTsConfig(packageName, distRoot),
+            options.skipTsConfig ? schematics_1.noop() : updateTsConfig(packageName, pathImportLib, distRoot),
             schematics_1.schematic('module', {
                 name: options.name,
                 commonModule: false,

package/migrations/update-9/index.js

@@ -15,12 +15,14 @@ const ngsw_config_1 = require("./ngsw-config");
 const remove_tsickle_1 = require("./remove-tsickle");
 const update_app_tsconfigs_1 = require("./update-app-tsconfigs");
 const update_dependencies_1 = require("./update-dependencies");
+const update_i18n_1 = require("./update-i18n");
 const update_server_main_file_1 = require("./update-server-main-file");
 const update_workspace_config_1 = require("./update-workspace-config");
 function default_1() {
     return () => {
         return schematics_1.chain([
             update_workspace_config_1.updateWorkspaceConfig(),
+            update_i18n_1.updateI18nConfig(),
             ivy_libraries_1.updateLibraries(),
             ngsw_config_1.updateNGSWConfig(),
             update_app_tsconfigs_1.updateApplicationTsConfigs(),

package/migrations/update-9/ivy-libraries.js

@@ -1,5 +1,13 @@
 "use strict";
+/**
+ * @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
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@angular-devkit/core");
 const config_1 = require("../../utility/config");
 const json_utils_1 = require("../../utility/json-utils");
 const workspace_models_1 = require("../../utility/workspace-models");
@@ -23,7 +31,7 @@ function updateLibraries() {
                 break;
             }
             const configurations = json_utils_1.findPropertyInAstObject(target, 'configurations');
-            const tsConfig = `${projectRoot.value}/tsconfig.lib.prod.json`;
+            const tsConfig = core_1.join(core_1.normalize(projectRoot.value), 'tsconfig.lib.prod.json');
             if (!configurations || configurations.kind !== 'object') {
                 // Configurations doesn't exist.
                 json_utils_1.appendPropertyInAstObject(recorder, target, 'configurations', { production: { tsConfig } }, 10);

package/migrations/update-9/update-app-tsconfigs.js

@@ -83,13 +83,14 @@ function updateTsConfig(tree, builderConfig, builderName, logger) {
             const files = json_utils_1.findPropertyInAstObject(tsConfigAst, 'files');
             if (!files) {
                 const newFiles = [];
+                const tsConfigDir = path_1.dirname(utils_1.forwardSlashPath(tsConfigPath));
                 const mainOption = json_utils_1.findPropertyInAstObject(option, 'main');
                 if (mainOption && mainOption.kind === 'string') {
-                    newFiles.push(path_1.posix.relative(path_1.posix.dirname(tsConfigPath), mainOption.value));
+                    newFiles.push(utils_1.forwardSlashPath(path_1.relative(tsConfigDir, utils_1.forwardSlashPath(mainOption.value))));
                 }
                 const polyfillsOption = json_utils_1.findPropertyInAstObject(option, 'polyfills');
                 if (polyfillsOption && polyfillsOption.kind === 'string') {
-                    newFiles.push(path_1.posix.relative(path_1.posix.dirname(tsConfigPath), polyfillsOption.value));
+                    newFiles.push(utils_1.forwardSlashPath(path_1.relative(tsConfigDir, utils_1.forwardSlashPath(polyfillsOption.value))));
                 }
                 if (newFiles.length) {
                     recorder = tree.beginUpdate(tsConfigPath);

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const dependencies_1 = require("../../utility/dependencies");
 const latest_versions_1 = require("../../utility/latest-versions");
 function updateDependencies() {
-    return host => {
+    return (host, context) => {
         const dependenciesToUpdate = {
             '@angular-devkit/build-angular': latest_versions_1.latestVersions.DevkitBuildAngular,
             '@angular-devkit/build-ng-packagr': latest_versions_1.latestVersions.DevkitBuildNgPackagr,
@@ -28,6 +28,15 @@ function updateDependencies() {
         }
         // `@angular/pwa` package is only needed when running `ng-add`.
         dependencies_1.removePackageJsonDependency(host, '@angular/pwa');
+        // Check for @angular-devkit/schematics and @angular-devkit/core
+        for (const name of ['@angular-devkit/schematics', '@angular-devkit/core']) {
+            const current = dependencies_1.getPackageJsonDependency(host, name);
+            if (current) {
+                context.logger.info(`Package "${name}" found in the workspace package.json. ` +
+                    'This package typically does not need to be installed manually. ' +
+                    'If it is not being used by project code, it can be removed from the package.json.');
+            }
+        }
     };
 }
 exports.updateDependencies = updateDependencies;

package/migrations/update-9/update-i18n.d.ts

@@ -0,0 +1,2 @@
+import { Rule } from '@angular-devkit/schematics';
+export declare function updateI18nConfig(): Rule;

package/migrations/update-9/update-i18n.js

@@ -0,0 +1,224 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
+const config_1 = require("../../utility/config");
+const dependencies_1 = require("../../utility/dependencies");
+const json_utils_1 = require("../../utility/json-utils");
+const latest_versions_1 = require("../../utility/latest-versions");
+const workspace_models_1 = require("../../utility/workspace-models");
+const utils_1 = require("./utils");
+function updateI18nConfig() {
+    return (tree, context) => {
+        // this is whole process of partial change writing and repeat loading/looping is only necessary
+        // to workaround underlying issues with the recorder and ast helper functions
+        const workspacePath = config_1.getWorkspacePath(tree);
+        let workspaceAst = utils_1.getWorkspace(tree);
+        // Update extract targets
+        const extractTargets = utils_1.getTargets(workspaceAst, 'extract-i18n', workspace_models_1.Builders.ExtractI18n);
+        if (extractTargets.length > 0) {
+            const recorder = tree.beginUpdate(workspacePath);
+            for (const { target, project } of extractTargets) {
+                addProjectI18NOptions(recorder, tree, target, project);
+                removeExtracti18nDeprecatedOptions(recorder, target);
+            }
+            tree.commitUpdate(recorder);
+            // workspace was changed so need to reload
+            workspaceAst = utils_1.getWorkspace(tree);
+        }
+        // Update base HREF values for existing configurations
+        let recorder = tree.beginUpdate(workspacePath);
+        for (const { target } of utils_1.getTargets(workspaceAst, 'build', workspace_models_1.Builders.Browser)) {
+            updateBaseHrefs(recorder, target);
+        }
+        for (const { target } of utils_1.getTargets(workspaceAst, 'test', workspace_models_1.Builders.Karma)) {
+            updateBaseHrefs(recorder, target);
+        }
+        tree.commitUpdate(recorder);
+        // Remove i18n format option
+        workspaceAst = utils_1.getWorkspace(tree);
+        recorder = tree.beginUpdate(workspacePath);
+        for (const { target } of utils_1.getTargets(workspaceAst, 'build', workspace_models_1.Builders.Browser)) {
+            removeFormatOption(recorder, target);
+        }
+        for (const { target } of utils_1.getTargets(workspaceAst, 'test', workspace_models_1.Builders.Karma)) {
+            removeFormatOption(recorder, target);
+        }
+        tree.commitUpdate(recorder);
+        // Add new i18n options to build target configurations
+        workspaceAst = utils_1.getWorkspace(tree);
+        recorder = tree.beginUpdate(workspacePath);
+        for (const { target } of utils_1.getTargets(workspaceAst, 'build', workspace_models_1.Builders.Browser)) {
+            addBuilderI18NOptions(recorder, target, context.logger);
+        }
+        tree.commitUpdate(recorder);
+        // Add new i18n options to test target configurations
+        workspaceAst = utils_1.getWorkspace(tree);
+        recorder = tree.beginUpdate(workspacePath);
+        for (const { target } of utils_1.getTargets(workspaceAst, 'test', workspace_models_1.Builders.Karma)) {
+            addBuilderI18NOptions(recorder, target, context.logger);
+        }
+        tree.commitUpdate(recorder);
+        return tree;
+    };
+}
+exports.updateI18nConfig = updateI18nConfig;
+function addProjectI18NOptions(recorder, tree, builderConfig, projectConfig) {
+    const browserConfig = utils_1.getProjectTarget(projectConfig, 'build', workspace_models_1.Builders.Browser);
+    if (!browserConfig || browserConfig.kind !== 'object') {
+        return;
+    }
+    // browser builder options
+    let locales;
+    const options = utils_1.getAllOptions(browserConfig);
+    for (const option of options) {
+        const localeId = json_utils_1.findPropertyInAstObject(option, 'i18nLocale');
+        if (!localeId || localeId.kind !== 'string') {
+            continue;
+        }
+        const localeFile = json_utils_1.findPropertyInAstObject(option, 'i18nFile');
+        if (!localeFile || localeFile.kind !== 'string') {
+            continue;
+        }
+        const localIdValue = localeId.value;
+        const localeFileValue = localeFile.value;
+        const baseHref = json_utils_1.findPropertyInAstObject(option, 'baseHref');
+        let baseHrefValue;
+        if (baseHref) {
+            if (baseHref.kind === 'string' && baseHref.value !== `/${localIdValue}/`) {
+                baseHrefValue = baseHref.value;
+            }
+        }
+        else {
+            // If the configuration does not contain a baseHref, ensure the main option value is used.
+            baseHrefValue = '';
+        }
+        if (!locales) {
+            locales = {
+                [localIdValue]: baseHrefValue === undefined
+                    ? localeFileValue
+                    : {
+                        translation: localeFileValue,
+                        baseHref: baseHrefValue,
+                    },
+            };
+        }
+        else {
+            locales[localIdValue] =
+                baseHrefValue === undefined
+                    ? localeFileValue
+                    : {
+                        translation: localeFileValue,
+                        baseHref: baseHrefValue,
+                    };
+        }
+    }
+    if (locales) {
+        // Get sourceLocale from extract-i18n builder
+        const i18nOptions = utils_1.getAllOptions(builderConfig);
+        const sourceLocale = i18nOptions
+            .map(o => {
+            const sourceLocale = json_utils_1.findPropertyInAstObject(o, 'i18nLocale');
+            return sourceLocale && sourceLocale.value;
+        })
+            .find(x => !!x);
+        // Add i18n project configuration
+        json_utils_1.insertPropertyInAstObjectInOrder(recorder, projectConfig, 'i18n', {
+            locales,
+            // tslint:disable-next-line: no-any
+            sourceLocale: sourceLocale,
+        }, 6);
+        // Add @angular/localize if not already a dependency
+        if (!dependencies_1.getPackageJsonDependency(tree, '@angular/localize')) {
+            dependencies_1.addPackageJsonDependency(tree, {
+                name: '@angular/localize',
+                version: latest_versions_1.latestVersions.Angular,
+                type: dependencies_1.NodeDependencyType.Default,
+            });
+        }
+    }
+}
+function addBuilderI18NOptions(recorder, builderConfig, logger) {
+    const options = utils_1.getAllOptions(builderConfig);
+    for (const option of options) {
+        const localeId = json_utils_1.findPropertyInAstObject(option, 'i18nLocale');
+        const i18nFile = json_utils_1.findPropertyInAstObject(option, 'i18nFile');
+        const outputPath = json_utils_1.findPropertyInAstObject(option, 'outputPath');
+        if (localeId &&
+            localeId.kind === 'string' &&
+            i18nFile &&
+            outputPath &&
+            outputPath.kind === 'string') {
+            if (outputPath.value.match(new RegExp(`[/\\\\]${localeId.value}[/\\\\]?$`))) {
+                const newOutputPath = outputPath.value.replace(new RegExp(`[/\\\\]${localeId.value}[/\\\\]?$`), '');
+                const { start, end } = outputPath;
+                recorder.remove(start.offset, end.offset - start.offset);
+                recorder.insertLeft(start.offset, `"${newOutputPath}"`);
+            }
+            else {
+                logger.warn(`Output path value "${outputPath.value}" for locale "${localeId.value}" is not supported with the new localization system. ` +
+                    `With the current value, the localized output would be written to "${path_1.posix.join(outputPath.value, localeId.value)}". ` +
+                    `Keeping existing options for the target configuration of locale "${localeId.value}".`);
+                continue;
+            }
+        }
+        if (localeId && localeId.kind === 'string') {
+            // add new localize option
+            json_utils_1.insertPropertyInAstObjectInOrder(recorder, option, 'localize', [localeId.value], 12);
+            json_utils_1.removePropertyInAstObject(recorder, option, 'i18nLocale');
+        }
+        if (i18nFile) {
+            json_utils_1.removePropertyInAstObject(recorder, option, 'i18nFile');
+        }
+    }
+}
+function removeFormatOption(recorder, builderConfig) {
+    const options = utils_1.getAllOptions(builderConfig);
+    for (const option of options) {
+        // The format is always auto-detected now
+        const i18nFormat = json_utils_1.findPropertyInAstObject(option, 'i18nFormat');
+        if (i18nFormat) {
+            json_utils_1.removePropertyInAstObject(recorder, option, 'i18nFormat');
+        }
+    }
+}
+function updateBaseHrefs(recorder, builderConfig) {
+    const options = utils_1.getAllOptions(builderConfig);
+    const mainOptions = json_utils_1.findPropertyInAstObject(builderConfig, 'options');
+    const mainBaseHref = mainOptions &&
+        mainOptions.kind === 'object' &&
+        json_utils_1.findPropertyInAstObject(mainOptions, 'baseHref');
+    const hasMainBaseHref = !!mainBaseHref && mainBaseHref.kind === 'string' && mainBaseHref.value !== '/';
+    for (const option of options) {
+        const localeId = json_utils_1.findPropertyInAstObject(option, 'i18nLocale');
+        const i18nFile = json_utils_1.findPropertyInAstObject(option, 'i18nFile');
+        // localize base HREF values are controlled by the i18n configuration
+        const baseHref = json_utils_1.findPropertyInAstObject(option, 'baseHref');
+        if (localeId && i18nFile && baseHref) {
+            // if the main option set has a non-default base href,
+            // ensure that the augmented base href has the correct base value
+            if (hasMainBaseHref) {
+                const { start, end } = baseHref;
+                recorder.remove(start.offset, end.offset - start.offset);
+                recorder.insertLeft(start.offset, `"/"`);
+            }
+            else {
+                json_utils_1.removePropertyInAstObject(recorder, option, 'baseHref');
+            }
+        }
+    }
+}
+function removeExtracti18nDeprecatedOptions(recorder, builderConfig) {
+    const options = utils_1.getAllOptions(builderConfig);
+    for (const option of options) {
+        // deprecated options
+        json_utils_1.removePropertyInAstObject(recorder, option, 'i18nLocale');
+        const i18nFormat = option.properties.find(({ key }) => key.value === 'i18nFormat');
+        if (i18nFormat) {
+            // i18nFormat has been changed to format
+            const key = i18nFormat.key;
+            const offset = key.start.offset + 1;
+            recorder.remove(offset, key.value.length);
+            recorder.insertLeft(offset, 'format');
+        }
+    }
+}

package/migrations/update-9/update-workspace-config.js

@@ -1,10 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = require("path");
 const config_1 = require("../../utility/config");
-const dependencies_1 = require("../../utility/dependencies");
 const json_utils_1 = require("../../utility/json-utils");
-const latest_versions_1 = require("../../utility/latest-versions");
 const workspace_models_1 = require("../../utility/workspace-models");
 const utils_1 = require("./utils");
 exports.ANY_COMPONENT_STYLE_BUDGET = {
@@ -21,183 +18,19 @@ function updateWorkspaceConfig() {
             updateStyleOrScriptOption('scripts', recorder, target);
             addAnyComponentStyleBudget(recorder, target);
             updateAotOption(tree, recorder, target);
-            addBuilderI18NOptions(recorder, target, context.logger);
         }
         for (const { target } of utils_1.getTargets(workspace, 'test', workspace_models_1.Builders.Karma)) {
             updateStyleOrScriptOption('styles', recorder, target);
             updateStyleOrScriptOption('scripts', recorder, target);
-            addBuilderI18NOptions(recorder, target, context.logger);
         }
         for (const { target } of utils_1.getTargets(workspace, 'server', workspace_models_1.Builders.Server)) {
             updateOptimizationOption(recorder, target);
         }
-        for (const { target, project } of utils_1.getTargets(workspace, 'extract-i18n', workspace_models_1.Builders.ExtractI18n)) {
-            addProjectI18NOptions(recorder, tree, target, project);
-            removeExtracti18nDeprecatedOptions(recorder, target);
-        }
         tree.commitUpdate(recorder);
         return tree;
     };
 }
 exports.updateWorkspaceConfig = updateWorkspaceConfig;
-function addProjectI18NOptions(recorder, tree, builderConfig, projectConfig) {
-    const browserConfig = utils_1.getProjectTarget(projectConfig, 'build', workspace_models_1.Builders.Browser);
-    if (!browserConfig || browserConfig.kind !== 'object') {
-        return;
-    }
-    // browser builder options
-    let locales;
-    const options = utils_1.getAllOptions(browserConfig);
-    for (const option of options) {
-        const localeId = json_utils_1.findPropertyInAstObject(option, 'i18nLocale');
-        if (!localeId || localeId.kind !== 'string') {
-            continue;
-        }
-        const localeFile = json_utils_1.findPropertyInAstObject(option, 'i18nFile');
-        if (!localeFile || localeFile.kind !== 'string') {
-            continue;
-        }
-        const localIdValue = localeId.value;
-        const localeFileValue = localeFile.value;
-        const baseHref = json_utils_1.findPropertyInAstObject(option, 'baseHref');
-        let baseHrefValue;
-        if (baseHref) {
-            if (baseHref.kind === 'string' && baseHref.value !== `/${localIdValue}/`) {
-                baseHrefValue = baseHref.value;
-            }
-        }
-        else {
-            // If the configuration does not contain a baseHref, ensure the main option value is used.
-            baseHrefValue = '';
-        }
-        if (!locales) {
-            locales = {
-                [localIdValue]: baseHrefValue === undefined
-                    ? localeFileValue
-                    : {
-                        translation: localeFileValue,
-                        baseHref: baseHrefValue,
-                    },
-            };
-        }
-        else {
-            locales[localIdValue] =
-                baseHrefValue === undefined
-                    ? localeFileValue
-                    : {
-                        translation: localeFileValue,
-                        baseHref: baseHrefValue,
-                    };
-        }
-    }
-    if (locales) {
-        // Get sourceLocale from extract-i18n builder
-        const i18nOptions = utils_1.getAllOptions(builderConfig);
-        const sourceLocale = i18nOptions
-            .map(o => {
-            const sourceLocale = json_utils_1.findPropertyInAstObject(o, 'i18nLocale');
-            return sourceLocale && sourceLocale.value;
-        })
-            .find(x => !!x);
-        // Add i18n project configuration
-        json_utils_1.insertPropertyInAstObjectInOrder(recorder, projectConfig, 'i18n', {
-            locales,
-            // tslint:disable-next-line: no-any
-            sourceLocale: sourceLocale,
-        }, 6);
-        // Add @angular/localize if not already a dependency
-        if (!dependencies_1.getPackageJsonDependency(tree, '@angular/localize')) {
-            dependencies_1.addPackageJsonDependency(tree, {
-                name: '@angular/localize',
-                version: latest_versions_1.latestVersions.Angular,
-                type: dependencies_1.NodeDependencyType.Default,
-            });
-        }
-    }
-}
-function addBuilderI18NOptions(recorder, builderConfig, logger) {
-    const options = utils_1.getAllOptions(builderConfig);
-    const mainOptions = json_utils_1.findPropertyInAstObject(builderConfig, 'options');
-    const mainBaseHref = mainOptions &&
-        mainOptions.kind === 'object' &&
-        json_utils_1.findPropertyInAstObject(mainOptions, 'baseHref');
-    const hasMainBaseHref = !!mainBaseHref && mainBaseHref.kind === 'string' && mainBaseHref.value !== '/';
-    for (const option of options) {
-        const localeId = json_utils_1.findPropertyInAstObject(option, 'i18nLocale');
-        const i18nFile = json_utils_1.findPropertyInAstObject(option, 'i18nFile');
-        // The format is always auto-detected now
-        const i18nFormat = json_utils_1.findPropertyInAstObject(option, 'i18nFormat');
-        if (i18nFormat) {
-            json_utils_1.removePropertyInAstObject(recorder, option, 'i18nFormat');
-        }
-        const outputPath = json_utils_1.findPropertyInAstObject(option, 'outputPath');
-        if (localeId &&
-            localeId.kind === 'string' &&
-            i18nFile &&
-            outputPath &&
-            outputPath.kind === 'string') {
-            // This first block was intended to remove the redundant output path field
-            // but due to defects in the recorder, removing the option will cause malformed json
-            // if (
-            //   mainOutputPathValue &&
-            //   outputPath.value.match(
-            //     new RegExp(`[/\\\\]?${mainOutputPathValue}[/\\\\]${localeId.value}[/\\\\]?$`),
-            //   )
-            // ) {
-            //   removePropertyInAstObject(recorder, option, 'outputPath');
-            // } else
-            if (outputPath.value.match(new RegExp(`[/\\\\]${localeId.value}[/\\\\]?$`))) {
-                const newOutputPath = outputPath.value.replace(new RegExp(`[/\\\\]${localeId.value}[/\\\\]?$`), '');
-                const { start, end } = outputPath;
-                recorder.remove(start.offset, end.offset - start.offset);
-                recorder.insertLeft(start.offset, `"${newOutputPath}"`);
-            }
-            else {
-                logger.warn(`Output path value "${outputPath.value}" for locale "${localeId.value}" is not supported with the new localization system. ` +
-                    `With the current value, the localized output would be written to "${path_1.posix.join(outputPath.value, localeId.value)}". ` +
-                    `Keeping existing options for the target configuration of locale "${localeId.value}".`);
-                continue;
-            }
-        }
-        if (localeId && localeId.kind === 'string') {
-            // add new localize option
-            json_utils_1.insertPropertyInAstObjectInOrder(recorder, option, 'localize', [localeId.value], 12);
-            json_utils_1.removePropertyInAstObject(recorder, option, 'i18nLocale');
-        }
-        if (i18nFile) {
-            json_utils_1.removePropertyInAstObject(recorder, option, 'i18nFile');
-        }
-        // localize base HREF values are controlled by the i18n configuration
-        const baseHref = json_utils_1.findPropertyInAstObject(option, 'baseHref');
-        if (localeId && i18nFile && baseHref) {
-            // if the main option set has a non-default base href,
-            // ensure that the augmented base href has the correct base value
-            if (hasMainBaseHref) {
-                const { start, end } = baseHref;
-                recorder.remove(start.offset, end.offset - start.offset);
-                recorder.insertLeft(start.offset, `"/"`);
-            }
-            else {
-                json_utils_1.removePropertyInAstObject(recorder, option, 'baseHref');
-            }
-        }
-    }
-}
-function removeExtracti18nDeprecatedOptions(recorder, builderConfig) {
-    const options = utils_1.getAllOptions(builderConfig);
-    for (const option of options) {
-        // deprecated options
-        json_utils_1.removePropertyInAstObject(recorder, option, 'i18nLocale');
-        const i18nFormat = option.properties.find(({ key }) => key.value === 'i18nFormat');
-        if (i18nFormat) {
-            // i18nFormat has been changed to format
-            const key = i18nFormat.key;
-            const offset = key.start.offset + 1;
-            recorder.remove(offset, key.value.length);
-            recorder.insertLeft(offset, 'format');
-        }
-    }
-}
 function updateAotOption(tree, recorder, builderConfig) {
     const options = json_utils_1.findPropertyInAstObject(builderConfig, 'options');
     if (!options || options.kind !== 'object') {

package/migrations/update-9/utils.d.ts

@@ -19,3 +19,4 @@ export declare function getAllOptions(builderConfig: JsonAstObject, configuratio
 export declare function getWorkspace(host: Tree): JsonAstObject;
 export declare function readJsonFileAsAstObject(host: Tree, path: string): JsonAstObject | undefined;
 export declare function isIvyEnabled(tree: Tree, tsConfigPath: string): boolean;
+export declare function forwardSlashPath(path: string): string;

package/migrations/update-9/utils.js

@@ -113,3 +113,9 @@ function isIvyEnabled(tree, tsConfigPath) {
     return true;
 }
 exports.isIvyEnabled = isIvyEnabled;
+// TS represents paths internally with '/' and expects paths to be in this format.
+// angular.json expects paths with '/', but doesn't enforce them.
+function forwardSlashPath(path) {
+    return path.replace(/\\/g, '/');
+}
+exports.forwardSlashPath = forwardSlashPath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@schematics/angular",
-  "version": "9.0.0-rc.6",
+  "version": "9.0.0",
   "description": "Schematics specific to Angular",
   "keywords": [
     "angular",
@@ -14,8 +14,8 @@
   ],
   "schematics": "./collection.json",
   "dependencies": {
-    "@angular-devkit/core": "9.0.0-rc.6",
-    "@angular-devkit/schematics": "9.0.0-rc.6"
+    "@angular-devkit/core": "9.0.0",
+    "@angular-devkit/schematics": "9.0.0"
   },
   "repository": {
     "type": "git",
@@ -24,7 +24,6 @@
   "engines": {
     "node": ">= 10.13.0",
     "npm": ">= 6.11.0",
-    "pnpm": ">= 3.2.0",
     "yarn": ">= 1.13.0"
   },
   "author": "Angular Authors",

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

@@ -5,7 +5,7 @@ import { Pipe, PipeTransform } from '@angular/core';
 })
 export class <%= classify(name) %>Pipe implements PipeTransform {
 
-  transform(value: any, ...args: any[]): any {
+  transform(value: unknown, ...args: unknown[]): unknown {
     return null;
   }