@nrwl/angular 14.8.7 → 14.9.0-beta.1

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

@@ -7,13 +7,12 @@ const cypress_preset_1 = require("@nrwl/cypress/plugins/cypress-preset");
 const cypress_version_1 = require("@nrwl/cypress/src/utils/cypress-version");
 const devkit_1 = require("@nrwl/devkit");
 const linter_1 = require("@nrwl/linter");
-const ast_utils_1 = require("@nrwl/workspace/src/utilities/ast-utils");
-const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
-const tsquery_1 = require("@phenomnomnominal/tsquery");
+const js_1 = require("@nrwl/js");
 const path_1 = require("path");
-const typescript_2 = require("typescript");
-const file_change_recorder_1 = require("./file-change-recorder");
+const typescript_1 = require("typescript");
+const file_change_recorder_1 = require("../../../../utils/file-change-recorder");
 const project_migrator_1 = require("./project.migrator");
+const ensure_typescript_1 = require("@nrwl/js/src/utils/typescript/ensure-typescript");
 const supportedTargets = {
     e2e: {
         acceptMultipleDefinitions: true,
@@ -54,6 +53,9 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
                 this.logger.info('No e2e project was migrated because there was no "e2e" target declared in the "angular.json".');
                 return;
             }
+            if (this.shouldSkipTargetTypeMigration('e2e')) {
+                return;
+            }
             if (this.isProtractorE2eProject()) {
                 yield this.migrateProtractorE2eProject();
             }
@@ -67,7 +69,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             }
             const rootOffset = (0, devkit_1.offsetFromRoot)(this.project.newRoot);
             (0, devkit_1.updateJson)(this.tree, tsConfig, (json) => {
-                json.extends = `${rootOffset}${(0, typescript_1.getRootTsConfigPathInTree)(this.tree)}`;
+                json.extends = `${rootOffset}${(0, js_1.getRootTsConfigPathInTree)(this.tree)}`;
                 json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { outDir: `${rootOffset}dist/out-tsc` });
                 return json;
             });
@@ -82,9 +84,10 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         if (!e2eTarget.options) {
             return [
                 {
-                    message: `The "${this.targetNames.e2e}" target is not specifying any options.`,
-                    hint: `Make sure the "${this.appName}.architect.e2e.options" is correctly set ` +
-                        `or remove the "${this.appName}.architect.e2e" target if it is not valid.`,
+                    message: `The "${this.targetNames.e2e}" target is not specifying any options. The target will be skipped.`,
+                    hint: `Make sure to manually migrate the target configuration and any possible associated files. Alternatively, you could ` +
+                        `revert the migration, ensure the "${this.appName}.architect.e2e.options" is correctly set or remove the target if ` +
+                        `it is not valid, and run the migration again.`,
                 },
             ];
         }
@@ -92,18 +95,20 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             if (!e2eTarget.options.protractorConfig) {
                 return [
                     {
-                        message: 'The "e2e" target is using the "@angular-devkit/build-angular:protractor" builder but the Protractor config file is not specified.',
-                        hint: `Make sure the "${this.appName}.architect.e2e.options.protractorConfig" is correctly set ` +
-                            `or remove the "${this.appName}.architect.e2e" target if it is not valid.`,
+                        message: 'The "e2e" target is using the "@angular-devkit/build-angular:protractor" builder but the Protractor config file is not specified. The target will be skipped.',
+                        hint: `Make sure to manually migrate the target configuration and any possible associated files. Alternatively, you could ` +
+                            `revert the migration, ensure the "${this.appName}.architect.e2e.options.protractorConfig" is correctly set ` +
+                            `or remove the "${this.appName}.architect.e2e" target if it is not valid, and run the migration again.`,
                     },
                 ];
             }
             if (!this.tree.exists(e2eTarget.options.protractorConfig)) {
                 return [
                     {
-                        message: `The specified Protractor config file "${e2eTarget.options.protractorConfig}" in the "e2e" target could not be found.`,
-                        hint: `Make sure the "${this.appName}.architect.e2e.options.protractorConfig" is set to a valid path ` +
-                            `or remove the "${this.appName}.architect.e2e" target if it is not valid.`,
+                        message: `The specified Protractor config file "${e2eTarget.options.protractorConfig}" in the "e2e" target could not be found. The target will be skipped.`,
+                        hint: `Make sure to manually migrate the target configuration and any possible associated files. Alternatively, you could ` +
+                            `revert the migration, ensure the "${this.appName}.architect.e2e.options.protractorConfig" is set to a valid path ` +
+                            `or remove the "${this.appName}.architect.e2e" target if it is not valid, and run the migration again.`,
                     },
                 ];
             }
@@ -118,27 +123,31 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
                 return [
                     {
                         message: `The "e2e" target is using the "@cypress/schematic:cypress" builder but the "configFile" option is not specified ` +
-                            `and a "${expectedConfigFile}" file could not be found at the project root.`,
-                        hint: `Make sure the "${this.appName}.architect.e2e.options.configFile" option is set to a valid path, ` +
-                            `or that a "${expectedConfigFile}" file exists at the project root, ` +
-                            `or remove the "${this.appName}.architect.e2e" target if it is not valid.`,
+                            `and a "${expectedConfigFile}" file could not be found at the project root. The target will be skipped.`,
+                        hint: `Make sure to manually migrate the target configuration and any possible associated files. Alternatively, you could ` +
+                            `revert the migration, ensure the "${this.appName}.architect.e2e.options.configFile" option is set to a valid path ` +
+                            `or that a "${expectedConfigFile}" file exists at the project root or remove the "${this.appName}.architect.e2e" target ` +
+                            `if it is not valid, and run the migration again.`,
                     },
                 ];
             }
             else if (configFile && !this.tree.exists(configFile)) {
                 return [
                     {
-                        message: `The specified Cypress config file "${configFile}" in the "e2e" target could not be found.`,
-                        hint: `Make sure the "${this.appName}.architect.e2e.options.configFile" option is set to a valid path ` +
-                            `or remove the "${this.appName}.architect.e2e" target if it is not valid.`,
+                        message: `The specified Cypress config file "${configFile}" in the "e2e" target could not be found. The target will be skipped.`,
+                        hint: `Make sure to manually migrate the target configuration and any possible associated files. Alternatively, you could ` +
+                            `revert the migration, ensure the "${this.appName}.architect.e2e.options.configFile" option is set to a valid path ` +
+                            `or remove the "${this.appName}.architect.e2e" target if it is not valid, and run the migration again.`,
                     },
                 ];
             }
             if (!this.tree.exists((0, devkit_1.joinPathFragments)(this.project.oldRoot, 'cypress'))) {
                 return [
                     {
-                        message: `The "e2e" target is using the "@cypress/schematic:cypress" builder but the "cypress" directory could not be found at the project root.`,
-                        hint: 'Make sure the "cypress" directory exists in the project root or remove the "e2e" target if it is not valid.',
+                        message: `The "e2e" target is using the "@cypress/schematic:cypress" builder but the "cypress" directory could not be found at the project root. The target will be skipped.`,
+                        hint: `Make sure to manually migrate the target configuration and any possible associated files. Alternatively, you could ` +
+                            `revert the migration, ensure the "cypress" directory exists in the project root or remove the "e2e" target if it is not ` +
+                            `valid, and run the migration again.`,
                     },
                 ];
             }
@@ -340,11 +349,13 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             : undefined;
     }
     updateCypress10ConfigFile(configFilePath) {
+        (0, ensure_typescript_1.ensureTypescript)();
+        const { tsquery } = require('@phenomnomnominal/tsquery');
         this.cypressPreset = (0, cypress_preset_1.nxE2EPreset)(configFilePath);
         const fileContent = this.tree.read(configFilePath, 'utf-8');
-        let sourceFile = tsquery_1.tsquery.ast(fileContent);
+        let sourceFile = tsquery.ast(fileContent);
         const recorder = new file_change_recorder_1.FileChangeRecorder(this.tree, configFilePath);
-        const defineConfigExpression = tsquery_1.tsquery.query(sourceFile, 'CallExpression:has(Identifier[name=defineConfig]) > ObjectLiteralExpression')[0];
+        const defineConfigExpression = tsquery.query(sourceFile, 'CallExpression:has(Identifier[name=defineConfig]) > ObjectLiteralExpression')[0];
         if (!defineConfigExpression) {
             this.logger.warn(`Could not find a "defineConfig" expression in "${configFilePath}". Skipping updating the Cypress configuration.`);
             return;
@@ -353,15 +364,15 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         let componentNode;
         const globalConfig = {};
         defineConfigExpression.forEachChild((node) => {
-            if ((0, typescript_2.isPropertyAssignment)(node) && node.name.getText() === 'component') {
+            if ((0, typescript_1.isPropertyAssignment)(node) && node.name.getText() === 'component') {
                 componentNode = node;
                 return;
             }
-            if ((0, typescript_2.isPropertyAssignment)(node) && node.name.getText() === 'e2e') {
+            if ((0, typescript_1.isPropertyAssignment)(node) && node.name.getText() === 'e2e') {
                 e2eNode = node;
                 return;
             }
-            if ((0, typescript_2.isPropertyAssignment)(node)) {
+            if ((0, typescript_1.isPropertyAssignment)(node)) {
                 this.updateCypressConfigNodeValue(recorder, node, globalConfig);
             }
         });
@@ -373,20 +384,22 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         if (!componentNode) {
             return;
         }
-        if (!(0, typescript_2.isObjectLiteralExpression)(componentNode.initializer)) {
+        if (!(0, typescript_1.isObjectLiteralExpression)(componentNode.initializer)) {
             this.logger.warn('The automatic migration only supports having an object literal in the "component" option of the Cypress configuration. ' +
                 `The configuration won't be updated. Please make sure to update any paths you may have in the "component" option ` +
                 'manually to point to the new location.');
             return;
         }
         componentNode.initializer.properties.forEach((node) => {
-            if ((0, typescript_2.isPropertyAssignment)(node)) {
+            if ((0, typescript_1.isPropertyAssignment)(node)) {
                 this.updateCypressConfigNodeValue(recorder, node);
             }
         });
     }
     updateCypressE2EConfig(configFilePath, defineConfigNode, e2eNode, recorder, _a) {
         var globalConfig = tslib_1.__rest(_a, []);
+        (0, ensure_typescript_1.ensureTypescript)();
+        const { tsquery } = require('@phenomnomnominal/tsquery');
         const e2eConfig = {};
         const presetSpreadAssignment = `...nxE2EPreset(__dirname),`;
         if (!e2eNode) {
@@ -402,7 +415,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             recorder.insertRight(defineConfigNode.getStart() + 1, e2eAssignment);
         }
         else {
-            if (!(0, typescript_2.isObjectLiteralExpression)(e2eNode.initializer)) {
+            if (!(0, typescript_1.isObjectLiteralExpression)(e2eNode.initializer)) {
                 this.logger.warn('The automatic migration only supports having an object literal in the "e2e" option of the Cypress configuration. ' +
                     `The configuration won't be updated. Please make sure to update any paths you might have in the "e2e" option ` +
                     'manually to point to the new location.');
@@ -410,7 +423,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
             }
             recorder.insertRight(e2eNode.initializer.getStart() + 1, presetSpreadAssignment);
             e2eNode.initializer.properties.forEach((node) => {
-                if (!(0, typescript_2.isPropertyAssignment)(node)) {
+                if (!(0, typescript_1.isPropertyAssignment)(node)) {
                     return;
                 }
                 let change = { type: 'ignore' };
@@ -464,8 +477,8 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         }
         // apply changes so we can apply AST transformations
         recorder.applyChanges();
-        const sourceFile = tsquery_1.tsquery.ast(recorder.content);
-        (0, ast_utils_1.insertImport)(this.tree, sourceFile, configFilePath, 'nxE2EPreset', '@nrwl/cypress/plugins/cypress-preset');
+        const sourceFile = tsquery.ast(recorder.content);
+        (0, js_1.insertImport)(this.tree, sourceFile, configFilePath, 'nxE2EPreset', '@nrwl/cypress/plugins/cypress-preset');
         // update recorder with the new content from the file
         recorder.setContentToFileContent();
     }
@@ -489,7 +502,7 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         }
     }
     isValidPathLikePropertyWithStringLiteralValue(node, properties) {
-        if (!(0, typescript_2.isPropertyAssignment)(node)) {
+        if (!(0, typescript_1.isPropertyAssignment)(node)) {
             // TODO(leo): handle more scenarios (spread assignments, etc)
             return false;
         }
@@ -497,13 +510,13 @@ class E2eMigrator extends project_migrator_1.ProjectMigrator {
         if (!property) {
             return false;
         }
-        if (node.initializer.kind === typescript_2.SyntaxKind.UndefinedKeyword ||
-            node.initializer.kind === typescript_2.SyntaxKind.NullKeyword ||
-            node.initializer.kind === typescript_2.SyntaxKind.FalseKeyword) {
+        if (node.initializer.kind === typescript_1.SyntaxKind.UndefinedKeyword ||
+            node.initializer.kind === typescript_1.SyntaxKind.NullKeyword ||
+            node.initializer.kind === typescript_1.SyntaxKind.FalseKeyword) {
             return false;
         }
-        if (!(0, typescript_2.isStringLiteralLike)(node.initializer)) {
-            if ((0, typescript_2.isTemplateExpression)(node.initializer)) {
+        if (!(0, typescript_1.isStringLiteralLike)(node.initializer)) {
+            if ((0, typescript_1.isTemplateExpression)(node.initializer)) {
                 this.logger.warn(`The "${node.name.getText()}" in the Cypress configuration file is set to a template expression ("${node.initializer.getText()}"). ` +
                     `This is not supported by the automatic migration and its value won't be automatically migrated. ` +
                     `Please make sure to update its value to match the new location if needed.`);

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

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

package/src/generators/ng-add/migrators/projects/index.d.ts

@@ -0,0 +1,4 @@
+export * from './app.migrator';
+export * from './e2e.migrator';
+export * from './lib.migrator';
+export * from './project.migrator';

package/src/generators/ng-add/migrators/projects/index.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./app.migrator"), exports);
+tslib_1.__exportStar(require("./e2e.migrator"), exports);
+tslib_1.__exportStar(require("./lib.migrator"), exports);
+tslib_1.__exportStar(require("./project.migrator"), exports);
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/index.ts"],"names":[],"mappings":";;;AAAA,yDAA+B;AAC/B,yDAA+B;AAC/B,yDAA+B;AAC/B,6DAAmC"}

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

@@ -0,0 +1,11 @@
+import { Tree } from '@nrwl/devkit';
+import type { GeneratorOptions } from '../../schema';
+import type { Logger, MigrationProjectConfiguration, ValidationResult } from '../../utilities';
+import { ProjectMigrator } from './project.migrator';
+export declare class LibMigrator extends ProjectMigrator {
+    constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration, logger?: Logger);
+    migrate(): Promise<void>;
+    validate(): ValidationResult;
+    private moveProjectFiles;
+    private updateProjectConfiguration;
+}

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

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LibMigrator = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const devkit_2 = require("@nrwl/devkit");
+const utilities_1 = require("../../utilities");
+const builders_1 = require("../builders");
+const project_migrator_1 = require("./project.migrator");
+const supportedBuilderMigrators = [
+    builders_1.AngularDevkitNgPackagrMigrator,
+    builders_1.AngularDevkitKarmaMigrator,
+    builders_1.AngularEslintLintMigrator,
+];
+class LibMigrator extends project_migrator_1.ProjectMigrator {
+    constructor(tree, options, project, logger) {
+        super(tree, options, {}, project, 'libs', logger, supportedBuilderMigrators);
+    }
+    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);
+            yield this.updateProjectConfiguration();
+            this.moveProjectFiles();
+            for (const builderMigrator of (_a = this.builderMigrators) !== null && _a !== void 0 ? _a : []) {
+                yield builderMigrator.migrate();
+            }
+        });
+    }
+    validate() {
+        var _a, _b;
+        const errors = [...((_a = super.validate()) !== null && _a !== void 0 ? _a : [])];
+        for (const builderMigrator of this.builderMigrators) {
+            errors.push(...((_b = builderMigrator.validate()) !== null && _b !== void 0 ? _b : []));
+        }
+        return errors.length ? errors : null;
+    }
+    moveProjectFiles() {
+        this.moveDir(this.project.oldRoot, this.project.newRoot);
+    }
+    updateProjectConfiguration() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            (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;
+            if (!this.projectConfig.targets ||
+                !Object.keys(this.projectConfig.targets).length) {
+                this.logger.warn('The project does not have any targets configured. This might not be an issue. Skipping updating targets.');
+            }
+            (0, devkit_2.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
+        });
+    }
+}
+exports.LibMigrator = LibMigrator;
+//# sourceMappingURL=lib.migrator.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"lib.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/lib.migrator.ts"],"names":[],"mappings":";;;;AAAA,yCAAuD;AACvD,yCAA0D;AAQ1D,+CAAqD;AAErD,0CAIqB;AACrB,yDAAqD;AAErD,MAAM,yBAAyB,GAA+B;IAC5D,yCAA8B;IAC9B,qCAA0B;IAC1B,oCAAyB;CAC1B,CAAC;AAEF,MAAa,WAAY,SAAQ,kCAAe;IAC9C,YACE,IAAU,EACV,OAAyB,EACzB,OAAsC,EACtC,MAAe;QAEf,KAAK,CACH,IAAI,EACJ,OAAO,EACP,EAAE,EACF,OAAO,EACP,MAAM,EACN,MAAM,EACN,yBAAyB,CAC1B,CAAC;IACJ,CAAC;IAEc,OAAO;;;;;;YACpB,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE;gBAC/B,OAAO;aACR;YAED,MAAM,OAAM,OAAO,WAAE,CAAC;YAEtB,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;YACxC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAExB,KAAK,MAAM,eAAe,IAAI,MAAA,IAAI,CAAC,gBAAgB,mCAAI,EAAE,EAAE;gBACzD,MAAM,eAAe,CAAC,OAAO,EAAE,CAAC;aACjC;;KACF;IAEQ,QAAQ;;QACf,MAAM,MAAM,GAAsB,CAAC,GAAG,CAAC,MAAA,KAAK,CAAC,QAAQ,EAAE,mCAAI,EAAE,CAAC,CAAC,CAAC;QAEhE,KAAK,MAAM,eAAe,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACnD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAA,eAAe,CAAC,QAAQ,EAAE,mCAAI,EAAE,CAAC,CAAC,CAAC;SACpD;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IACvC,CAAC;IAEO,gBAAgB;QACtB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC;IAEa,0BAA0B;;YACtC,IAAA,8BAAkB,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjD,IAAI,CAAC,QAAQ,CACX,IAAA,0BAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,EACvD,IAAA,0BAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,CACxD,CAAC;YAEF,IAAI,CAAC,aAAa,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;YAC/C,IAAI,CAAC,aAAa,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC;YAE3D,IACE,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO;gBAC3B,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,MAAM,EAC/C;gBACA,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,0GAA0G,CAC3G,CAAC;aACH;YAED,IAAA,mCAA0B,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,oBAClD,IAAI,CAAC,aAAa,EACrB,CAAC;QACL,CAAC;KAAA;CACF;AAtED,kCAsEC"}

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

@@ -0,0 +1,25 @@
+import type { Tree } from '@nrwl/devkit';
+import type { GeneratorOptions } from '../../schema';
+import type { MigrationProjectConfiguration, Target, ValidationResult, WorkspaceRootFileTypesInfo } from '../../utilities';
+import { Logger } from '../../utilities';
+import type { BuilderMigrator, BuilderMigratorClassType } from '../builders';
+import { Migrator } from '../migrator';
+export declare class ProjectMigrator<TargetType extends string = string> extends Migrator {
+    protected readonly options: GeneratorOptions;
+    protected readonly targets: Record<TargetType, Target>;
+    get projectName(): string;
+    protected builderMigrators: BuilderMigrator[];
+    protected skipMigration: boolean | TargetType[];
+    protected readonly targetNames: Partial<Record<TargetType, string>>;
+    constructor(tree: Tree, options: GeneratorOptions, targets: Record<TargetType, Target>, project: MigrationProjectConfiguration, rootDir: string, logger?: Logger, supportedBuilderMigrators?: BuilderMigratorClassType[]);
+    getWorkspaceRootFileTypesInfo(): WorkspaceRootFileTypesInfo;
+    migrate(): void | Promise<void>;
+    validate(): ValidationResult;
+    protected convertPath(originalPath: string): string;
+    protected moveDir(from: string, to: string): void;
+    protected shouldSkipTargetTypeMigration(targetType: TargetType): boolean;
+    private collectTargetNames;
+    private createBuilderMigrators;
+    private skipProjectMigration;
+    private skipTargetTypeMigration;
+}

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

@@ -0,0 +1,185 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProjectMigrator = void 0;
+const devkit_1 = require("@nrwl/devkit");
+const utilities_1 = require("../../utilities");
+const migrator_1 = require("../migrator");
+class ProjectMigrator extends migrator_1.Migrator {
+    get projectName() {
+        return this.project.name;
+    }
+    constructor(tree, options, targets, project, rootDir, logger, 
+    // TODO(leo): this will replace `targets` and become required once the full
+    // refactor is done.
+    supportedBuilderMigrators) {
+        var _a, _b;
+        super(tree, project.config, logger !== null && logger !== void 0 ? logger : new utilities_1.Logger(project.name));
+        this.options = options;
+        this.targets = targets;
+        // TODO(leo): need to handle targets until all are converted to builder migrators,
+        // at that point, project migrators only care about skipping the whole project migration
+        // and each builder migrator will handle whether it should be skipped or not
+        this.skipMigration = false;
+        this.targetNames = {};
+        this.project = {
+            name: project.name,
+            oldRoot: (_a = this.projectConfig.root) !== null && _a !== void 0 ? _a : '',
+            oldSourceRoot: this.projectConfig.sourceRoot ||
+                (0, devkit_1.joinPathFragments)((_b = this.projectConfig.root) !== null && _b !== void 0 ? _b : '', 'src'),
+            newRoot: `${rootDir}/${project.name}`,
+            newSourceRoot: `${rootDir}/${project.name}/src`,
+        };
+        this.collectTargetNames();
+        this.createBuilderMigrators(supportedBuilderMigrators);
+    }
+    getWorkspaceRootFileTypesInfo() {
+        var _a;
+        const workspaceRootFileTypesInfo = {
+            eslint: Boolean((_a = this.projectConfig.targets) === null || _a === void 0 ? void 0 : _a.lint) ||
+                this.tree.exists(`${this.projectConfig.root}/.eslintrc.json`),
+            karma: this.builderMigrators.some((migrator) => migrator.rootFileType === 'karma' && migrator.isBuilderUsed()),
+        };
+        return workspaceRootFileTypesInfo;
+    }
+    migrate() {
+        const validationResult = this.validate();
+        if (!validationResult) {
+            return;
+        }
+        this.logger.warn((0, utilities_1.getProjectValidationResultMessage)(validationResult));
+    }
+    validate() {
+        var _a, _b;
+        const errors = [];
+        // check project root
+        if (this.projectConfig.root === undefined ||
+            this.projectConfig.root === null) {
+            errors.push({
+                message: 'The project root is not defined in the project configuration. The project will be skipped.',
+                hint: 'Make sure to manually migrate its configuration and files or remove the project if it is not valid. ' +
+                    `Alternatively, you could revert the migration, ensure the value for "projects.${this.project.name}.root" ` +
+                    'is set and run the migration again.',
+            });
+            this.skipProjectMigration();
+        }
+        else if (this.projectConfig.root !== '' &&
+            !this.tree.exists(this.projectConfig.root)) {
+            errors.push({
+                message: `The project root "${this.project.oldRoot}" could not be found. The project will be skipped.`,
+                hint: 'Make sure to manually migrate its configuration and files or remove the project if it is not valid. ' +
+                    `Alternatively, you could revert the migration, ensure the value for "projects.${this.project.name}.root" ` +
+                    'is correct and run the migration again.',
+            });
+            this.skipProjectMigration();
+        }
+        // check project source root
+        if (this.projectConfig.sourceRoot &&
+            !this.tree.exists(this.projectConfig.sourceRoot)) {
+            errors.push({
+                message: `The project source root "${this.project.oldSourceRoot}" could not be found. The project will be skipped.`,
+                hint: 'Make sure to manually migrate its configuration and files or remove the project if it is not valid. ' +
+                    `Alternatively, you could revert the migration, ensure the value for "projects.${this.project.name}.sourceRoot" ` +
+                    'is correct and run the migration again.',
+            });
+            this.skipProjectMigration();
+        }
+        // check for usage of unsupported builders
+        const allSupportedBuilders = [
+            ...Object.values(this.targets)
+                .map((x) => x.builders)
+                .flat(),
+        ];
+        allSupportedBuilders.push(...this.builderMigrators.map((migrator) => migrator.builderName));
+        const unsupportedBuilders = [];
+        Object.entries((_a = this.projectConfig.targets) !== null && _a !== void 0 ? _a : {}).forEach(([targetName, target]) => {
+            if (!allSupportedBuilders.includes(target.executor)) {
+                unsupportedBuilders.push([targetName, target.executor]);
+            }
+        });
+        if (unsupportedBuilders.length) {
+            errors.push({
+                messageGroup: {
+                    title: 'Unsupported builders',
+                    messages: unsupportedBuilders.map(([target, builder]) => `The "${target}" target is using a builder "${builder}" that's not currently supported by the automated migration. ` +
+                        'The target will be skipped.'),
+                },
+                hint: 'Make sure to manually migrate the target configuration and any possible associated files. Alternatively, you could ' +
+                    `revert the migration, change the builder to one of the builders supported by the automated migration (${(0, utilities_1.arrayToString)(allSupportedBuilders)}), and run the migration again.`,
+            });
+        }
+        // check for multiple targets for the same type of target
+        const targetTypes = Object.keys(this.targets);
+        const targetsByType = Object.entries((_b = this.projectConfig.targets) !== null && _b !== void 0 ? _b : {}).reduce((acc, [target, { executor }]) => {
+            targetTypes.forEach((targetType) => {
+                if (this.targets[targetType].builders.includes(executor)) {
+                    acc[targetType].push(target);
+                    return acc;
+                }
+            });
+            return acc;
+        }, targetTypes.reduce((acc, targetType) => (Object.assign(Object.assign({}, acc), { [targetType]: [] })), {}));
+        targetTypes.forEach((targetType) => {
+            if (this.targets[targetType].acceptMultipleDefinitions ||
+                targetsByType[targetType].length <= 1) {
+                return;
+            }
+            errors.push({
+                message: `There is more than one target using a builder that is used to ${targetType} the project (${(0, utilities_1.arrayToString)(targetsByType[targetType])}). This is not currently supported by the automated migration. These targets will be skipped.`,
+                hint: 'Make sure to manually migrate their configuration and any possible associated files.',
+            });
+            this.skipTargetTypeMigration(targetType);
+        });
+        return errors.length ? errors : null;
+    }
+    convertPath(originalPath) {
+        if (originalPath === null || originalPath === void 0 ? void 0 : originalPath.startsWith(this.project.oldSourceRoot)) {
+            return (0, devkit_1.joinPathFragments)(this.project.newSourceRoot, originalPath.replace(this.project.oldSourceRoot, ''));
+        }
+        if (originalPath === null || originalPath === void 0 ? void 0 : originalPath.startsWith(this.project.oldRoot)) {
+            return (0, devkit_1.joinPathFragments)(this.project.newRoot, originalPath.replace(this.project.oldRoot, ''));
+        }
+        return originalPath;
+    }
+    moveDir(from, to) {
+        (0, devkit_1.visitNotIgnoredFiles)(this.tree, from, (file) => {
+            this.moveFile(file, (0, devkit_1.normalizePath)(file).replace(from, to), true);
+        });
+    }
+    shouldSkipTargetTypeMigration(targetType) {
+        return (Array.isArray(this.skipMigration) &&
+            this.skipMigration.includes(targetType));
+    }
+    collectTargetNames() {
+        var _a;
+        const targetTypes = Object.keys(this.targets);
+        Object.entries((_a = this.projectConfig.targets) !== null && _a !== void 0 ? _a : {}).forEach(([targetName, target]) => {
+            targetTypes.forEach((targetType) => {
+                if (!this.targetNames[targetType] &&
+                    this.targets[targetType].builders.includes(target.executor)) {
+                    this.targetNames[targetType] = targetName;
+                }
+            });
+        });
+    }
+    createBuilderMigrators(supportedBuilderMigrators) {
+        if (!supportedBuilderMigrators) {
+            this.builderMigrators = [];
+            return;
+        }
+        this.builderMigrators = supportedBuilderMigrators.map((migratorClass) => new migratorClass(this.tree, this.project, this.projectConfig, this.logger));
+    }
+    skipProjectMigration() {
+        this.skipMigration = true;
+    }
+    skipTargetTypeMigration(targetType) {
+        if (this.skipMigration === true) {
+            return;
+        }
+        if (!Array.isArray(this.skipMigration)) {
+            this.skipMigration = [];
+        }
+        this.skipMigration.push(targetType);
+    }
+}
+exports.ProjectMigrator = ProjectMigrator;
+//# sourceMappingURL=project.migrator.js.map

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

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

package/src/generators/ng-add/schema.d.ts

@@ -5,7 +5,6 @@ import type { Styles } from '../utils/types';
 export interface GeneratorOptions {
   skipInstall?: boolean;
   npmScope?: string;
-  preserveAngularCliLayout?: boolean;
   defaultBase?: string;
 
   unitTestRunner?: UnitTestRunner;
@@ -14,6 +13,6 @@ export interface GeneratorOptions {
   skipInstall?: boolean;
   skipPostInstall?: boolean;
   style?: Styles;
-  linter?: Exclude<Linter, Linter.TsLint>;
+  linter?: Linter;
   skipPackageJson?: boolean;
 }