@nrwl/angular 14.8.7 → 14.9.0-beta.1

package/src/generators/ng-add/migrators/migrator.d.ts

@@ -0,0 +1,23 @@
+import type { ProjectConfiguration, TargetConfiguration, Tree } from '@nrwl/devkit';
+import type { Logger } from '../utilities/logger';
+import type { ProjectMigrationInfo, ValidationResult } from '../utilities/types';
+export declare abstract class Migrator {
+    protected readonly tree: Tree;
+    protected projectConfig: ProjectConfiguration;
+    protected readonly logger: Logger;
+    protected project: ProjectMigrationInfo;
+    protected readonly originalProjectConfig: ProjectConfiguration;
+    constructor(tree: Tree, projectConfig: ProjectConfiguration, logger: Logger);
+    abstract migrate(): Promise<void> | void;
+    abstract validate(): ValidationResult;
+    protected convertAsset(asset: string | any): string | any;
+    protected convertRootPath(originalPath: string): string;
+    protected moveFile(from: string, to: string, required?: boolean): void;
+    protected moveFilePathsFromTargetToProjectRoot(target: TargetConfiguration, options: string[]): void;
+    protected moveProjectRootFile(filePath: string, isRequired?: boolean): void;
+    protected updateCacheableOperations(targetNames: string[]): void;
+    protected updateTsConfigFile(tsConfigPath: string, rootTsConfigFile: string, projectOffsetFromRoot: string): void;
+    private convertSourceRootPath;
+    private getTargetValuesForOption;
+    private getValueForOption;
+}

package/src/generators/ng-add/migrators/migrator.js

@@ -0,0 +1,124 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Migrator = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const path_1 = require("path");
+class Migrator {
+    constructor(tree, projectConfig, logger) {
+        this.tree = tree;
+        this.projectConfig = projectConfig;
+        this.logger = logger;
+        this.originalProjectConfig = Object.freeze(JSON.parse(JSON.stringify(this.projectConfig)));
+    }
+    convertAsset(asset) {
+        if (typeof asset === 'string') {
+            return this.convertSourceRootPath(asset);
+        }
+        else {
+            return Object.assign(Object.assign({}, asset), { input: this.convertSourceRootPath(asset.input) });
+        }
+    }
+    convertRootPath(originalPath) {
+        return (originalPath === null || originalPath === void 0 ? void 0 : originalPath.startsWith(this.project.oldRoot))
+            ? (0, devkit_1.joinPathFragments)(this.project.newRoot, originalPath.replace(this.project.oldRoot, ''))
+            : originalPath;
+    }
+    moveFile(from, to, required = true) {
+        if (!this.tree.exists(from)) {
+            if (required) {
+                this.logger.warn(`The path "${from}" does not exist. Skipping.`);
+            }
+        }
+        else if (this.tree.exists(to)) {
+            if (required) {
+                this.logger.warn(`The path "${to}" already exists. Skipping.`);
+            }
+        }
+        else {
+            const contents = this.tree.read(from);
+            this.tree.write(to, contents);
+            this.tree.delete(from);
+        }
+    }
+    moveFilePathsFromTargetToProjectRoot(target, options) {
+        options.forEach((option) => {
+            this.getTargetValuesForOption(target, option).forEach((path) => {
+                this.moveProjectRootFile(path);
+            });
+        });
+    }
+    moveProjectRootFile(filePath, isRequired = true) {
+        if (!filePath) {
+            return;
+        }
+        const filename = !!filePath ? (0, path_1.basename)(filePath) : '';
+        const from = filePath;
+        const to = (0, devkit_1.joinPathFragments)(this.project.newRoot, filename);
+        this.moveFile(from, to, isRequired);
+    }
+    // TODO(leo): This should be moved to BuilderMigrator once everything is split into builder migrators.
+    updateCacheableOperations(targetNames) {
+        var _a;
+        if (!targetNames.length) {
+            return;
+        }
+        const nxJson = (0, devkit_1.readNxJson)(this.tree);
+        Object.keys((_a = nxJson.tasksRunnerOptions) !== null && _a !== void 0 ? _a : {}).forEach((taskRunnerName) => {
+            var _a;
+            const taskRunner = nxJson.tasksRunnerOptions[taskRunnerName];
+            taskRunner.options.cacheableOperations = Array.from(new Set([
+                ...((_a = taskRunner.options.cacheableOperations) !== null && _a !== void 0 ? _a : []),
+                ...targetNames,
+            ]));
+        });
+        (0, devkit_1.updateNxJson)(this.tree, nxJson);
+    }
+    // TODO(leo): This should be moved to BuilderMigrator once everything is split into builder migrators.
+    updateTsConfigFile(tsConfigPath, rootTsConfigFile, projectOffsetFromRoot) {
+        (0, devkit_1.updateJson)(this.tree, tsConfigPath, (json) => {
+            var _a;
+            json.extends = `${projectOffsetFromRoot}${rootTsConfigFile}`;
+            json.compilerOptions = (_a = json.compilerOptions) !== null && _a !== void 0 ? _a : {};
+            json.compilerOptions.outDir = `${projectOffsetFromRoot}dist/out-tsc`;
+            return json;
+        });
+    }
+    convertSourceRootPath(originalPath) {
+        return (originalPath === null || originalPath === void 0 ? void 0 : originalPath.startsWith(this.project.oldSourceRoot))
+            ? (0, devkit_1.joinPathFragments)(this.project.newSourceRoot, originalPath.replace(this.project.oldSourceRoot, ''))
+            : originalPath;
+    }
+    getTargetValuesForOption(target, optionPath) {
+        var _a;
+        const values = new Set();
+        const value = this.getValueForOption(target.options, optionPath);
+        if (value) {
+            values.add(value);
+        }
+        for (const configuration of Object.values((_a = target.configurations) !== null && _a !== void 0 ? _a : {})) {
+            const value = this.getValueForOption(configuration, optionPath);
+            if (value) {
+                values.add(value);
+            }
+        }
+        return Array.from(values);
+    }
+    getValueForOption(options, optionPath) {
+        if (!options) {
+            return null;
+        }
+        const segments = optionPath.split('.');
+        let value = options;
+        for (const segment of segments) {
+            if (value && value[segment]) {
+                value = value[segment];
+            }
+            else {
+                return null;
+            }
+        }
+        return value;
+    }
+}
+exports.Migrator = Migrator;
+//# sourceMappingURL=migrator.js.map

package/src/generators/ng-add/migrators/migrator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/migrators/migrator.ts"],"names":[],"mappings":"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"}

package/src/generators/ng-add/{utilities → migrators/projects}/app.migrator.d.ts

@@ -1,31 +1,25 @@
-import { Tree } from '@nrwl/devkit';
-import { GeneratorOptions } from '../schema';
-import { Logger } from './logger';
+import type { Tree } from '@nrwl/devkit';
+import type { GeneratorOptions } from '../../schema';
+import type { Logger, MigrationProjectConfiguration, ValidationResult } from '../../utilities';
 import { ProjectMigrator } from './project.migrator';
-import { MigrationProjectConfiguration, ValidationResult } from './types';
-declare type SupportedTargets = 'build' | 'e2e' | 'i18n' | 'lint' | 'prerender' | 'serve' | 'server' | 'serveSsr' | 'test';
+type SupportedTargets = 'build' | 'e2e' | 'i18n' | 'prerender' | 'serve' | 'server' | 'serveSsr';
 export declare class AppMigrator extends ProjectMigrator<SupportedTargets> {
     private e2eMigrator;
-    private newEsLintConfigPath;
-    private oldEsLintConfigPath;
     constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration, logger?: Logger);
     migrate(): Promise<void>;
     validate(): ValidationResult;
     private moveProjectFiles;
+    private setCacheableOperations;
     private updateProjectConfiguration;
+    private updateProjectConfigurationTargets;
     private updateTsConfigs;
-    private updateEsLintConfig;
     private convertBuildOptions;
     private convertServerOptions;
-    private moveFilePathsFromTargetToProjectRoot;
     private updateBuildTargetConfiguration;
-    private updateLintTargetConfiguration;
     private updatePrerenderTargetConfiguration;
     private updateServerTargetConfiguration;
     private updateServeSsrTargetConfiguration;
-    private updateTestTargetConfiguration;
     private updateTsConfigFileUsedByBuildTarget;
     private updateTsConfigFileUsedByServerTarget;
-    private updateTsConfigFileUsedByTestTarget;
 }
 export {};

package/src/generators/ng-add/{utilities → migrators/projects}/app.migrator.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppMigrator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const linter_1 = require("@nrwl/linter");
-const generators_1 = require("@nrwl/workspace/generators");
-const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
+const js_1 = require("@nrwl/js");
 const path_1 = require("path");
+const utilities_1 = require("../../utilities");
+const builders_1 = require("../builders");
 const e2e_migrator_1 = require("./e2e.migrator");
 const project_migrator_1 = require("./project.migrator");
 const supportedTargets = {
@@ -19,50 +19,59 @@ const supportedTargets = {
         ],
     },
     i18n: { builders: ['@angular-devkit/build-angular:extract-i18n'] },
-    lint: { builders: ['@angular-eslint/builder:lint'] },
     prerender: { builders: ['@nguniversal/builders:prerender'] },
     serve: { builders: ['@angular-devkit/build-angular:dev-server'] },
     server: { builders: ['@angular-devkit/build-angular:server'] },
     serveSsr: { builders: ['@nguniversal/builders:ssr-dev-server'] },
-    test: { builders: ['@angular-devkit/build-angular:karma'] },
 };
+// TODO(leo): this will replace `supportedTargets` once the full refactor is done.
+const supportedBuilderMigrators = [
+    builders_1.AngularDevkitKarmaMigrator,
+    builders_1.AngularEslintLintMigrator,
+];
 class AppMigrator extends project_migrator_1.ProjectMigrator {
     constructor(tree, options, project, logger) {
-        var _a, _b;
-        super(tree, options, supportedTargets, project, 'apps', logger);
-        this.e2eMigrator = new e2e_migrator_1.E2eMigrator(tree, options, project, this.targetNames.lint);
-        if (this.targetNames.lint) {
-            this.oldEsLintConfigPath =
-                (_b = (_a = this.projectConfig.targets[this.targetNames.lint].options) === null || _a === void 0 ? void 0 : _a.eslintConfig) !== null && _b !== void 0 ? _b : (0, devkit_1.joinPathFragments)(this.project.oldRoot, '.eslintrc.json');
-            this.newEsLintConfigPath = this.convertRootPath(this.oldEsLintConfigPath);
-        }
+        super(tree, options, supportedTargets, project, 'apps', logger, supportedBuilderMigrators);
+        const eslintBuilderMigrator = this.builderMigrators[supportedBuilderMigrators.indexOf(builders_1.AngularEslintLintMigrator)];
+        this.e2eMigrator = new e2e_migrator_1.E2eMigrator(tree, options, project, eslintBuilderMigrator.targets.size
+            ? Object.keys(eslintBuilderMigrator.targets)[0]
+            : undefined);
     }
     migrate() {
+        const _super = Object.create(null, {
+            migrate: { get: () => super.migrate }
+        });
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (this.skipMigration === true) {
+                return;
+            }
+            yield _super.migrate.call(this);
+            this.updateProjectConfiguration();
             yield this.e2eMigrator.migrate();
             this.moveProjectFiles();
-            yield this.updateProjectConfiguration();
+            this.updateProjectConfigurationTargets();
+            for (const builderMigrator of (_a = this.builderMigrators) !== null && _a !== void 0 ? _a : []) {
+                yield builderMigrator.migrate();
+            }
             this.updateTsConfigs();
-            this.updateEsLintConfig();
-            this.updateCacheableOperations([
-                this.targetNames.build,
-                this.targetNames.lint,
-                this.targetNames.test,
-                this.targetNames.e2e,
-            ].filter(Boolean));
+            this.setCacheableOperations();
         });
     }
     validate() {
-        var _a, _b;
-        const result = [
+        var _a, _b, _c;
+        const errors = [
             ...((_a = super.validate()) !== null && _a !== void 0 ? _a : []),
             ...((_b = this.e2eMigrator.validate()) !== null && _b !== void 0 ? _b : []),
         ];
-        return result.length ? result : null;
+        for (const builderMigrator of this.builderMigrators) {
+            errors.push(...((_c = builderMigrator.validate()) !== null && _c !== void 0 ? _c : []));
+        }
+        return errors.length ? errors : null;
     }
     moveProjectFiles() {
         // project is self-contained and can be safely moved
-        if (this.projectConfig.root !== '') {
+        if (this.project.oldRoot !== '') {
             this.moveDir(this.project.oldRoot, this.project.newRoot);
             return;
         }
@@ -73,96 +82,49 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
         if (this.targetNames.build) {
             this.moveFilePathsFromTargetToProjectRoot(this.projectConfig.targets[this.targetNames.build], ['tsConfig', 'webWorkerTsConfig', 'ngswConfigPath']);
         }
-        if (this.targetNames.test) {
-            this.moveFilePathsFromTargetToProjectRoot(this.projectConfig.targets[this.targetNames.test], ['karmaConfig', 'tsConfig', 'webWorkerTsConfig']);
-        }
-        else {
-            // there could still be a karma.conf.js file in the root
-            // so move to new location
-            const karmaConfig = 'karma.conf.js';
-            if (this.tree.exists(karmaConfig)) {
-                this.logger.info('No "test" target was found, but a root Karma config file was found in the project root. The file will be moved to the new location.');
-                this.moveProjectRootFile(karmaConfig);
-            }
-        }
         if (this.targetNames.server) {
             this.moveFilePathsFromTargetToProjectRoot(this.projectConfig.targets[this.targetNames.server], ['tsConfig']);
         }
-        if (this.targetNames.lint) {
-            this.moveProjectRootFile(this.oldEsLintConfigPath);
+        this.moveDir(this.project.oldSourceRoot, this.project.newSourceRoot);
+    }
+    setCacheableOperations() {
+        const toCache = [];
+        if (this.targetNames.build &&
+            !this.shouldSkipTargetTypeMigration('build')) {
+            toCache.push(this.targetNames.build);
+        }
+        if (this.targetNames.e2e && !this.shouldSkipTargetTypeMigration('e2e')) {
+            toCache.push(this.targetNames.e2e);
         }
-        else {
-            // there could still be a .eslintrc.json file in the root
-            // so move to new location
-            const eslintConfig = '.eslintrc.json';
-            if (this.tree.exists(eslintConfig)) {
-                this.logger.info('No "lint" target was found, but an ESLint config file was found in the project root. The file will be moved to the new location.');
-                this.moveProjectRootFile(eslintConfig);
-            }
+        if (toCache.length) {
+            this.updateCacheableOperations(toCache);
         }
-        this.moveDir(this.project.oldSourceRoot, this.project.newSourceRoot);
     }
     updateProjectConfiguration() {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            this.projectConfig.root = this.project.newRoot;
-            this.projectConfig.sourceRoot = this.project.newSourceRoot;
-            if (!this.projectConfig.targets ||
-                !Object.keys(this.projectConfig.targets).length) {
-                this.logger.warn('The project does not have any targets configured. Skipping updating targets.');
-            }
-            else {
-                this.updateBuildTargetConfiguration();
-                this.updateLintTargetConfiguration();
-                this.updateTestTargetConfiguration();
-                this.updateServerTargetConfiguration();
-                this.updatePrerenderTargetConfiguration();
-                this.updateServeSsrTargetConfiguration();
-            }
-            (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
-            yield (0, generators_1.convertToNxProjectGenerator)(this.tree, {
-                project: this.project.name,
-                skipFormat: true,
-            });
-        });
+        (0, utilities_1.convertToNxProject)(this.tree, this.project.name);
+        this.moveFile((0, devkit_1.joinPathFragments)(this.project.oldRoot, 'project.json'), (0, devkit_1.joinPathFragments)(this.project.newRoot, 'project.json'));
+        this.projectConfig.root = this.project.newRoot;
+        this.projectConfig.sourceRoot = this.project.newSourceRoot;
+        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
+    }
+    updateProjectConfigurationTargets() {
+        if (!this.projectConfig.targets ||
+            !Object.keys(this.projectConfig.targets).length) {
+            this.logger.warn('The project does not have any targets configured. Skipping updating targets.');
+            return;
+        }
+        this.updateBuildTargetConfiguration();
+        this.updateServerTargetConfiguration();
+        this.updatePrerenderTargetConfiguration();
+        this.updateServeSsrTargetConfiguration();
+        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
     }
     updateTsConfigs() {
-        const rootTsConfigFile = (0, typescript_1.getRootTsConfigPathInTree)(this.tree);
+        const rootTsConfigFile = (0, js_1.getRootTsConfigPathInTree)(this.tree);
         const projectOffsetFromRoot = (0, devkit_1.offsetFromRoot)(this.projectConfig.root);
         this.updateTsConfigFileUsedByBuildTarget(rootTsConfigFile, projectOffsetFromRoot);
-        this.updateTsConfigFileUsedByTestTarget(rootTsConfigFile, projectOffsetFromRoot);
         this.updateTsConfigFileUsedByServerTarget(projectOffsetFromRoot);
     }
-    updateEsLintConfig() {
-        if (!this.targetNames.lint || !this.tree.exists(this.newEsLintConfigPath)) {
-            return;
-        }
-        (0, devkit_1.updateJson)(this.tree, this.newEsLintConfigPath, (json) => {
-            var _a;
-            delete json.root;
-            json.ignorePatterns = ['!**/*'];
-            const rootEsLintConfigRelativePath = (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(this.projectConfig.root), '.eslintrc.json');
-            if (Array.isArray(json.extends)) {
-                json.extends = json.extends.map((extend) => this.convertEsLintConfigExtendToNewPath(this.oldEsLintConfigPath, extend));
-                // it might have not been extending from the root config, make sure it does
-                if (!json.extends.includes(rootEsLintConfigRelativePath)) {
-                    json.extends.unshift(rootEsLintConfigRelativePath);
-                }
-            }
-            else {
-                json.extends = rootEsLintConfigRelativePath;
-            }
-            (_a = json.overrides) === null || _a === void 0 ? void 0 : _a.forEach((override) => {
-                var _a;
-                if (!((_a = override.parserOptions) === null || _a === void 0 ? void 0 : _a.project)) {
-                    return;
-                }
-                override.parserOptions.project = [
-                    `${this.projectConfig.root}/tsconfig.*?.json`,
-                ];
-            });
-            return json;
-        });
-    }
     convertBuildOptions(buildOptions) {
         buildOptions.outputPath =
             buildOptions.outputPath &&
@@ -172,7 +134,10 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
         buildOptions.main =
             buildOptions.main && this.convertAsset(buildOptions.main);
         buildOptions.polyfills =
-            buildOptions.polyfills && this.convertAsset(buildOptions.polyfills);
+            buildOptions.polyfills &&
+                (Array.isArray(buildOptions.polyfills)
+                    ? buildOptions.polyfills.map((asset) => this.convertAsset(asset))
+                    : this.convertAsset(buildOptions.polyfills));
         buildOptions.tsConfig =
             buildOptions.tsConfig &&
                 (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(buildOptions.tsConfig));
@@ -208,19 +173,15 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
                     with: this.convertAsset(replacement.with),
                 }));
     }
-    moveFilePathsFromTargetToProjectRoot(target, options) {
-        options.forEach((option) => {
-            this.getTargetValuesForOption(target, option).forEach((path) => {
-                this.moveProjectRootFile(path);
-            });
-        });
-    }
     updateBuildTargetConfiguration() {
         var _a, _b, _c, _d, _e, _f;
         if (!this.targetNames.build) {
             this.logger.warn('There is no build target in the project configuration. Skipping updating the build target configuration.');
             return;
         }
+        if (this.shouldSkipTargetTypeMigration('build')) {
+            return;
+        }
         const buildTarget = this.projectConfig.targets[this.targetNames.build];
         if (!buildTarget.options &&
             (!buildTarget.configurations ||
@@ -241,50 +202,9 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
         this.convertBuildOptions((_e = buildTarget.options) !== null && _e !== void 0 ? _e : {});
         Object.values((_f = buildTarget.configurations) !== null && _f !== void 0 ? _f : {}).forEach((config) => this.convertBuildOptions(config));
     }
-    updateLintTargetConfiguration() {
-        if (!this.targetNames.lint) {
-            return;
-        }
-        this.projectConfig.targets[this.targetNames.lint].executor =
-            '@nrwl/linter:eslint';
-        const lintOptions = this.projectConfig.targets[this.targetNames.lint].options;
-        if (!lintOptions) {
-            this.logger.warn(`The target "${this.targetNames.lint}" is not specifying any options. Skipping updating the target configuration.`);
-            return;
-        }
-        const existEsLintConfigPath = this.tree.exists(this.newEsLintConfigPath);
-        if (!existEsLintConfigPath) {
-            this.logger.warn(`The ESLint config file "${this.oldEsLintConfigPath}" could not be found. Skipping updating the file.`);
-        }
-        lintOptions.eslintConfig =
-            lintOptions.eslintConfig &&
-                (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(lintOptions.eslintConfig));
-        lintOptions.lintFilePatterns =
-            lintOptions.lintFilePatterns &&
-                lintOptions.lintFilePatterns.map((pattern) => {
-                    // replace the old source root with the new root, we want to lint all
-                    // matching files in the project, not just the ones in the source root
-                    if (pattern.startsWith(this.project.oldSourceRoot)) {
-                        return (0, devkit_1.joinPathFragments)(this.project.newRoot, pattern.replace(this.project.oldSourceRoot, ''));
-                    }
-                    // replace the old root with the new root
-                    if (pattern.startsWith(this.project.oldRoot)) {
-                        return (0, devkit_1.joinPathFragments)(this.project.newRoot, pattern.replace(this.project.oldRoot, ''));
-                    }
-                    // do nothing, warn about the pattern
-                    this.logger.warn(`The lint file pattern "${pattern}" specified in the "${this.targetNames.lint}" target is not contained in the project root or source root. The pattern will not be updated.`);
-                    return pattern;
-                });
-        if (!existEsLintConfigPath) {
-            return;
-        }
-        const eslintConfig = (0, devkit_1.readJson)(this.tree, this.newEsLintConfigPath);
-        if ((0, linter_1.hasRulesRequiringTypeChecking)(eslintConfig)) {
-            lintOptions.hasTypeAwareRules = true;
-        }
-    }
     updatePrerenderTargetConfiguration() {
-        if (!this.targetNames.prerender) {
+        if (!this.targetNames.prerender ||
+            this.shouldSkipTargetTypeMigration('prerender')) {
             return;
         }
         const prerenderTarget = this.projectConfig.targets[this.targetNames.prerender];
@@ -298,7 +218,8 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
     }
     updateServerTargetConfiguration() {
         var _a, _b, _c, _d, _e, _f;
-        if (!this.targetNames.server) {
+        if (!this.targetNames.server ||
+            this.shouldSkipTargetTypeMigration('server')) {
             return;
         }
         const serverTarget = this.projectConfig.targets[this.targetNames.server];
@@ -322,7 +243,8 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
         Object.values((_f = serverTarget.configurations) !== null && _f !== void 0 ? _f : {}).forEach((config) => this.convertServerOptions(config));
     }
     updateServeSsrTargetConfiguration() {
-        if (!this.targetNames.serveSsr) {
+        if (!this.targetNames.serveSsr ||
+            this.shouldSkipTargetTypeMigration('serveSsr')) {
             return;
         }
         const serveSsrTarget = this.projectConfig.targets[this.targetNames.serveSsr];
@@ -346,46 +268,10 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
             }
         });
     }
-    updateTestTargetConfiguration() {
-        if (!this.targetNames.test) {
-            return;
-        }
-        const testOptions = this.projectConfig.targets[this.targetNames.test].options;
-        if (!testOptions) {
-            this.logger.warn(`The target "${this.targetNames.test}" is not specifying any options. Skipping updating the target configuration.`);
-            return;
-        }
-        if (!testOptions.tsConfig) {
-            this.logger.warn(`The "${this.targetNames.test}" target does not have the "tsConfig" option configured. Skipping updating the tsConfig file.`);
-        }
-        else {
-            const newTestTsConfig = this.convertPath(testOptions.tsConfig);
-            if (!this.tree.exists(newTestTsConfig)) {
-                this.logger.warn(`The tsConfig file "${testOptions.tsConfig}" specified in the "${this.targetNames.test}" target could not be found. Skipping updating the tsConfig file.`);
-            }
-        }
-        testOptions.main = testOptions.main && this.convertAsset(testOptions.main);
-        testOptions.polyfills =
-            testOptions.polyfills && this.convertAsset(testOptions.polyfills);
-        testOptions.tsConfig =
-            testOptions.tsConfig &&
-                (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(testOptions.tsConfig));
-        testOptions.karmaConfig =
-            testOptions.karmaConfig &&
-                (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(testOptions.karmaConfig));
-        testOptions.assets =
-            testOptions.assets &&
-                testOptions.assets.map((asset) => this.convertAsset(asset));
-        testOptions.styles =
-            testOptions.styles &&
-                testOptions.styles.map((style) => this.convertAsset(style));
-        testOptions.scripts =
-            testOptions.scripts &&
-                testOptions.scripts.map((script) => this.convertAsset(script));
-    }
     updateTsConfigFileUsedByBuildTarget(rootTsConfigFile, projectOffsetFromRoot) {
         var _a, _b, _c, _d;
-        if (!this.targetNames.build) {
+        if (!this.targetNames.build ||
+            this.shouldSkipTargetTypeMigration('build')) {
             return;
         }
         const tsConfigPath = (_b = (_a = this.projectConfig.targets[this.targetNames.build].options) === null || _a === void 0 ? void 0 : _a.tsConfig) !== null && _b !== void 0 ? _b : (_d = (_c = this.projectConfig.targets[this.targetNames.build].configurations) === null || _c === void 0 ? void 0 : _c.development) === null || _d === void 0 ? void 0 : _d.tsConfig;
@@ -397,7 +283,8 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
     }
     updateTsConfigFileUsedByServerTarget(projectOffsetFromRoot) {
         var _a, _b, _c, _d;
-        if (!this.targetNames.server) {
+        if (!this.targetNames.server ||
+            this.shouldSkipTargetTypeMigration('server')) {
             return;
         }
         const tsConfigPath = (_b = (_a = this.projectConfig.targets[this.targetNames.server].options) === null || _a === void 0 ? void 0 : _a.tsConfig) !== null && _b !== void 0 ? _b : (_d = (_c = this.projectConfig.targets[this.targetNames.server].configurations) === null || _c === void 0 ? void 0 : _c.development) === null || _d === void 0 ? void 0 : _d.tsConfig;
@@ -412,18 +299,6 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
             return json;
         });
     }
-    updateTsConfigFileUsedByTestTarget(rootTsConfigFile, projectOffsetFromRoot) {
-        var _a;
-        if (!this.targetNames.test) {
-            return;
-        }
-        const tsConfig = (_a = this.projectConfig.targets[this.targetNames.test].options) === null || _a === void 0 ? void 0 : _a.tsConfig;
-        if (!tsConfig || !this.tree.exists(tsConfig)) {
-            // we already logged a warning for these cases, so just return
-            return;
-        }
-        this.updateTsConfigFile(tsConfig, rootTsConfigFile, projectOffsetFromRoot);
-    }
 }
 exports.AppMigrator = AppMigrator;
 //# sourceMappingURL=app.migrator.js.map

package/src/generators/ng-add/migrators/projects/app.migrator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/app.migrator.ts"],"names":[],"mappings":"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"}

package/src/generators/ng-add/{utilities → migrators/projects}/e2e.migrator.d.ts

@@ -1,9 +1,8 @@
-import { Tree } from '@nrwl/devkit';
-import { GeneratorOptions } from '../schema';
-import { Logger } from './logger';
+import type { Tree } from '@nrwl/devkit';
+import type { GeneratorOptions } from '../../schema';
+import type { Logger, MigrationProjectConfiguration, ValidationResult } from '../../utilities';
 import { ProjectMigrator } from './project.migrator';
-import { MigrationProjectConfiguration, ValidationResult } from './types';
-declare type SupportedTargets = 'e2e';
+type SupportedTargets = 'e2e';
 export declare class E2eMigrator extends ProjectMigrator<SupportedTargets> {
     private lintTargetName;
     private appConfig;