npm - @nrwl/angular - Versions diffs - 14.0.5 → 14.1.0-beta.1 - Mend

@nrwl/angular 14.0.5 → 14.1.0-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

package/src/generators/ng-add/utilities/e2e.migrator.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.E2eProjectMigrator = void 0;
+exports.E2eMigrator = void 0;
 const tslib_1 = require("tslib");
 const cypress_1 = require("@nrwl/cypress");
 const devkit_1 = require("@nrwl/devkit");
@@ -8,17 +8,32 @@ const linter_1 = require("@nrwl/linter");
 const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
 const path_1 = require("path");
 const project_migrator_1 = require("./project.migrator");
-class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
-    constructor(tree, options, project) {
-        super(tree, options, project, 'apps');
+const supportedTargets = {
+    e2e: {
+        acceptMultipleDefinitions: true,
+        builders: [
+            '@angular-devkit/build-angular:protractor',
+            '@cypress/schematic:cypress',
+        ],
+    },
+};
+class E2eMigrator extends project_migrator_1.ProjectMigrator {
+    constructor(tree, options, project, lintTargetName, logger) {
+        var _a;
+        super(tree, options, supportedTargets, project, 'apps', logger);
+        this.lintTargetName = lintTargetName;
         this.appConfig = project.config;
         this.appName = this.project.name;
+        // TODO(leo): temporary keep restriction to support projects with an "e2e" target,
+        // will be lifted soon when the migration is split per-builder and proper support
+        // for multiple targets for the same builder is added
+        this.targetNames.e2e = ((_a = this.appConfig.targets) === null || _a === void 0 ? void 0 : _a.e2e) ? 'e2e' : undefined;
         this.initialize();
     }
     migrate() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            if (!this.project) {
-                this.logger.warn('No e2e project was migrated because there was none declared in angular.json.');
+            if (!this.targetNames.e2e) {
+                this.logger.info('No e2e project was migrated because there was no "e2e" target declared in the "angular.json".');
                 return;
             }
             if (this.isProtractorE2eProject()) {
@@ -28,6 +43,10 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
                 yield this.migrateCypressE2eProject();
             }
             const tsConfig = (0, devkit_1.joinPathFragments)(this.projectConfig.root, 'tsconfig.json');
+            if (!this.tree.exists(tsConfig)) {
+                this.logger.warn('A "tsconfig.json" file could not be found for the e2e project. Skipping updating the tsConfig file.');
+                return;
+            }
             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)}`;
@@ -37,59 +56,82 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
         });
     }
     validate() {
-        if (!this.project) {
+        var _a;
+        if (!this.targetNames.e2e) {
             return null;
         }
-        if (this.isProtractorE2eProject()) {
-            if (this.tree.exists(this.projectConfig.targets.e2e.options.protractorConfig)) {
-                return null;
-            }
+        const e2eTarget = this.projectConfig.targets[this.targetNames.e2e];
+        if (!e2eTarget.options) {
             return [
                 {
-                    message: `The "e2e" target is using a Protractor builder but the Protractor config file ` +
-                        `"${this.projectConfig.targets.e2e.options.protractorConfig}" could not be found.`,
-                    hint: `Make sure the "${this.appName}.architect.e2e.options.protractorConfig" is set to a valid path ` +
+                    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.`,
                 },
             ];
         }
-        else if (this.isCypressE2eProject()) {
-            const configFile = this.getCypressConfigFile();
-            if (configFile && !this.tree.exists(configFile)) {
+        if (this.isProtractorE2eProject()) {
+            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.`,
+                    },
+                ];
+            }
+            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.`,
+                    },
+                ];
+            }
+            return null;
+        }
+        if (this.isCypressE2eProject()) {
+            const configFile = (_a = this.projectConfig.targets[this.targetNames.e2e].options) === null || _a === void 0 ? void 0 : _a.configFile;
+            if (configFile === undefined &&
+                !this.tree.exists((0, devkit_1.joinPathFragments)(this.project.oldRoot, 'cypress.json'))) {
                 return [
                     {
-                        message: `The "e2e" target is using a Cypress builder but the Cypress config file "${configFile}" could not be found.`,
+                        message: `The "e2e" target is using the "@cypress/schematic:cypress" builder but the "configFile" option is not specified ` +
+                            `and a "cypress.json" 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 "cypress.json" file exists in the workspace root, ` +
-                            `or remove the "${this.appName}.architect.e2e" target if it its not valid.`,
+                            `or that a "cypress.json" file exists at the project root, ` +
+                            `or remove the "${this.appName}.architect.e2e" target if it is not valid.`,
+                    },
+                ];
+            }
+            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.`,
                     },
                 ];
             }
-            if (!this.tree.exists('cypress')) {
+            if (!this.tree.exists((0, devkit_1.joinPathFragments)(this.project.oldRoot, 'cypress'))) {
                 return [
                     {
-                        message: `The "e2e" target is using a Cypress builder but the "cypress" directory could not be found.`,
-                        hint: 'Make sure the "cypress" directory exists in the workspace 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.`,
+                        hint: 'Make sure the "cypress" directory exists in the project root or remove the "e2e" target if it is not valid.',
                     },
                 ];
             }
             return null;
         }
-        return [
-            {
-                message: `The "e2e" target is using an unsupported builder "${this.projectConfig.targets.e2e.executor}".`,
-                hint: `The supported builders are "@cypress/schematic:cypress" and "@angular-devkit/build-angular:protractor".`,
-            },
-        ];
+        return null;
     }
     initialize() {
-        var _a;
-        if (!((_a = this.projectConfig.targets) === null || _a === void 0 ? void 0 : _a.e2e)) {
-            this.project = null;
+        if (!this.targetNames.e2e) {
             return;
         }
         this.isProjectUsingEsLint =
-            Boolean(this.appConfig.targets.lint) ||
+            Boolean(this.lintTargetName) ||
                 this.tree.exists((0, devkit_1.joinPathFragments)(this.appConfig.root, '.eslintrc.json'));
         const name = this.project.name.endsWith('-e2e')
             ? this.project.name
@@ -101,7 +143,7 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
                 newSourceRoot });
         }
         else if (this.isCypressE2eProject()) {
-            this.project = Object.assign(Object.assign({}, this.project), { name, oldRoot: 'cypress', newRoot,
+            this.project = Object.assign(Object.assign({}, this.project), { name, oldSourceRoot: (0, devkit_1.joinPathFragments)(this.project.oldRoot, 'cypress'), newRoot,
                 newSourceRoot });
         }
     }
@@ -110,13 +152,19 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
             this.moveDir(this.project.oldRoot, this.project.newRoot);
             this.projectConfig = {
                 root: this.project.newRoot,
+                sourceRoot: this.project.newSourceRoot,
                 projectType: 'application',
                 targets: {
-                    e2e: Object.assign(Object.assign({}, this.projectConfig.targets.e2e), { options: Object.assign(Object.assign({}, this.projectConfig.targets.e2e.options), { protractorConfig: (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(this.projectConfig.targets.e2e.options.protractorConfig)) }) }),
+                    e2e: Object.assign(Object.assign({}, this.projectConfig.targets[this.targetNames.e2e]), { options: Object.assign(Object.assign({}, this.projectConfig.targets[this.targetNames.e2e].options), { protractorConfig: this.convertRootPath(this.projectConfig.targets[this.targetNames.e2e].options
+                                .protractorConfig) }) }),
                 },
                 implicitDependencies: [this.appName],
                 tags: [],
             };
+            // remove e2e target from the app config
+            delete this.appConfig.targets[this.targetNames.e2e];
+            (0, devkit_1.updateProjectConfiguration)(this.tree, this.appName, Object.assign({}, this.appConfig));
+            // add e2e project config
             (0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig), true);
             if (this.isProjectUsingEsLint) {
                 yield (0, linter_1.lintProjectGenerator)(this.tree, {
@@ -129,9 +177,6 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
                     skipFormat: true,
                 });
             }
-            // remove e2e target from the app config
-            delete this.appConfig.targets.e2e;
-            (0, devkit_1.updateProjectConfiguration)(this.tree, this.appName, Object.assign({}, this.appConfig));
         });
     }
     migrateCypressE2eProject() {
@@ -149,12 +194,12 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
             // replace the generated tsconfig.json with the project one
             const newTsConfigPath = (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json');
             this.tree.delete(newTsConfigPath);
-            this.moveFile((0, devkit_1.joinPathFragments)(this.project.oldRoot, 'tsconfig.json'), newTsConfigPath);
+            this.moveFile((0, devkit_1.joinPathFragments)(this.project.oldSourceRoot, 'tsconfig.json'), newTsConfigPath);
             // replace the generated source with the project source
             (0, devkit_1.visitNotIgnoredFiles)(this.tree, this.project.newSourceRoot, (filePath) => {
                 this.tree.delete(filePath);
             });
-            this.moveDir(this.project.oldRoot, (0, devkit_1.joinPathFragments)(this.project.newSourceRoot));
+            this.moveDir(this.project.oldSourceRoot, (0, devkit_1.joinPathFragments)(this.project.newSourceRoot));
         });
     }
     updateOrCreateCypressConfigFile(configFile) {
@@ -167,7 +212,7 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
         }
         else {
             cypressConfigFilePath = (0, devkit_1.joinPathFragments)(this.project.newRoot, 'cypress.json');
-            this.tree.write(cypressConfigFilePath, JSON.stringify({
+            (0, devkit_1.writeJson)(this.tree, cypressConfigFilePath, {
                 fileServerFolder: '.',
                 fixturesFolder: './src/fixtures',
                 integrationFolder: './src/integration',
@@ -178,7 +223,7 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
                 videosFolder: `../../dist/cypress/${this.project.newRoot}/videos`,
                 screenshotsFolder: `../../dist/cypress/${this.project.newRoot}/screenshots`,
                 chromeWebSecurity: false,
-            }));
+            });
         }
         return cypressConfigFilePath;
     }
@@ -187,7 +232,7 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
          * The `cypressProjectGenerator` function normalizes the project name. The
          * migration keeps the names for existing projects as-is to avoid any
          * confusion. The e2e project is technically new, but it's associated
-         * to an existing application.
+         * to an existing application, so we keep it familiar.
          */
         const generatedProjectName = (0, devkit_1.names)(this.project.name).fileName;
         if (this.project.name !== generatedProjectName) {
@@ -202,40 +247,36 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
             this.projectConfig = (0, devkit_1.readProjectConfiguration)(this.tree, this.project.name);
         }
         if (this.isProjectUsingEsLint) {
-            this.projectConfig.targets.lint.options.lintFilePatterns =
-                this.projectConfig.targets.lint.options.lintFilePatterns.map((pattern) => pattern.replace(`apps/${generatedProjectName}`, this.project.newRoot));
+            // the generated cypress project always generates a "lint" target,
+            // in case the app was using a different name for it, we use it
+            const lintTarget = this.projectConfig.targets.lint;
+            if (this.lintTargetName && this.lintTargetName !== 'lint') {
+                this.projectConfig.targets[this.lintTargetName] =
+                    this.projectConfig.targets.lint;
+            }
+            lintTarget.options.lintFilePatterns =
+                lintTarget.options.lintFilePatterns.map((pattern) => pattern.replace(`apps/${generatedProjectName}`, this.project.newRoot));
         }
-        ['e2e', 'cypress-run', 'cypress-open'].forEach((target) => {
+        [this.targetNames.e2e, 'cypress-run', 'cypress-open'].forEach((target) => {
             if (this.appConfig.targets[target]) {
-                this.projectConfig.targets[target] = this.updateE2eCypressTarget(this.appConfig.targets[target], this.projectConfig.targets[target], cypressConfigPath);
+                this.projectConfig.targets[target] = this.updateE2eCypressTarget(this.appConfig.targets[target], cypressConfigPath);
             }
         });
         (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
         delete this.appConfig.targets['cypress-run'];
         delete this.appConfig.targets['cypress-open'];
-        delete this.appConfig.targets.e2e;
+        delete this.appConfig.targets[this.targetNames.e2e];
         (0, devkit_1.updateProjectConfiguration)(this.tree, this.appName, Object.assign({}, this.appConfig));
     }
-    updateE2eCypressTarget(existingTarget, generatedTarget, cypressConfig) {
+    updateE2eCypressTarget(existingTarget, cypressConfig) {
         const updatedTarget = Object.assign(Object.assign({}, existingTarget), { executor: '@nrwl/cypress:cypress', options: Object.assign(Object.assign({}, existingTarget.options), { cypressConfig }) });
         delete updatedTarget.options.configFile;
-        if (generatedTarget &&
-            !generatedTarget.options.tsConfig &&
-            updatedTarget.options.tsConfig) {
-            // if what we generate doesn't have a tsConfig, we don't need it
-            delete updatedTarget.options.tsConfig;
-        }
-        else if (updatedTarget.options.tsConfig) {
+        if (updatedTarget.options.tsConfig) {
             updatedTarget.options.tsConfig = (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json');
         }
-        if (updatedTarget.options.headless && updatedTarget.options.watch) {
-            updatedTarget.options.headed = false;
-        }
-        else if (updatedTarget.options.headless === false &&
-            !updatedTarget.options.watch) {
-            updatedTarget.options.headed = true;
+        else {
+            delete updatedTarget.options.tsConfig;
         }
-        delete updatedTarget.options.headless;
         return updatedTarget;
     }
     updateCypressConfigFilePaths(configFilePath) {
@@ -251,12 +292,12 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
         cypressConfig.fileServerFolder = '.';
         srcFoldersAndFiles.forEach((folderOrFile) => {
             if (cypressConfig[folderOrFile]) {
-                cypressConfig[folderOrFile] = `./src/${(0, path_1.relative)(this.project.oldRoot, cypressConfig[folderOrFile])}`;
+                cypressConfig[folderOrFile] = `./src/${(0, path_1.relative)(this.project.oldSourceRoot, cypressConfig[folderOrFile])}`;
             }
         });
         distFolders.forEach((folder) => {
             if (cypressConfig[folder]) {
-                cypressConfig[folder] = `../../dist/cypress/${this.project.newRoot}/${(0, path_1.relative)(this.project.oldRoot, cypressConfig[folder])}`;
+                cypressConfig[folder] = `../../dist/cypress/${this.project.newRoot}/${(0, path_1.relative)(this.project.oldSourceRoot, cypressConfig[folder])}`;
             }
         });
         stringOrArrayGlobs.forEach((stringOrArrayGlob) => {
@@ -273,10 +314,10 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
         (0, devkit_1.writeJson)(this.tree, configFilePath, cypressConfig);
     }
     replaceCypressGlobConfig(globPattern) {
-        return globPattern.replace(new RegExp(`^(\\.\\/|\\/)?${this.project.oldRoot}\\/`), './src/');
+        return globPattern.replace(new RegExp(`^(\\.\\/|\\/)?${this.project.oldSourceRoot}\\/`), './src/');
     }
     getCypressConfigFile() {
-        let cypressConfig = 'cypress.json';
+        let cypressConfig = (0, devkit_1.joinPathFragments)(this.project.oldRoot, 'cypress.json');
         const configFileOption = this.projectConfig.targets.e2e.options.configFile;
         if (configFileOption === false) {
             cypressConfig = undefined;
@@ -287,12 +328,13 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
         return cypressConfig;
     }
     isCypressE2eProject() {
-        return (this.projectConfig.targets.e2e.executor === '@cypress/schematic:cypress');
+        return (this.projectConfig.targets[this.targetNames.e2e].executor ===
+            '@cypress/schematic:cypress');
     }
     isProtractorE2eProject() {
-        return (this.projectConfig.targets.e2e.executor ===
+        return (this.projectConfig.targets[this.targetNames.e2e].executor ===
             '@angular-devkit/build-angular:protractor');
     }
 }
-exports.E2eProjectMigrator = E2eProjectMigrator;
+exports.E2eMigrator = E2eMigrator;
 //# sourceMappingURL=e2e.migrator.js.map

package/src/generators/ng-add/utilities/e2e.migrator.js.map CHANGED Viewed

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

package/src/generators/ng-add/utilities/lib.migrator.d.ts CHANGED Viewed

@@ -3,24 +3,22 @@ import { GeneratorOptions } from '../schema';
 import { Logger } from './logger';
 import { ProjectMigrator } from './project.migrator';
 import { MigrationProjectConfiguration, ValidationResult } from './types';
-export declare class LibMigrator extends ProjectMigrator {
-    private readonly supportedBuilders;
-    private readonly targetNames;
+declare type SupportedTargets = 'build' | 'test' | 'lint';
+export declare class LibMigrator extends ProjectMigrator<SupportedTargets> {
     private oldEsLintConfigPath;
     private newEsLintConfigPath;
     constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration, logger?: Logger);
     migrate(): Promise<void>;
     validate(): ValidationResult;
-    private collectTargetNames;
     private moveProjectFiles;
     private updateProjectConfiguration;
     private updateNgPackageJson;
     private updateTsConfigs;
     private updateEsLintConfig;
-    private updateCacheableOperations;
     private updateBuildTargetConfiguration;
     private updateLintTargetConfiguration;
     private updateTestTargetConfiguration;
     private updateTsConfigFileUsedByBuildTarget;
     private updateTsConfigFileUsedByTestTarget;
 }
+export {};

package/src/generators/ng-add/utilities/lib.migrator.js CHANGED Viewed

@@ -9,18 +9,15 @@ const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
 const path_1 = require("path");
 const dependencies_1 = require("../../utils/dependencies");
 const project_migrator_1 = require("./project.migrator");
-const validation_logging_1 = require("./validation-logging");
+const supportedTargets = {
+    build: { builders: ['@angular-devkit/build-angular:ng-packagr'] },
+    test: { builders: ['@angular-devkit/build-angular:karma'] },
+    lint: { builders: ['@angular-eslint/builder:lint'] },
+};
 class LibMigrator extends project_migrator_1.ProjectMigrator {
     constructor(tree, options, project, logger) {
         var _a, _b;
-        super(tree, options, project, 'libs', logger);
-        this.supportedBuilders = {
-            build: '@angular-devkit/build-angular:ng-packagr',
-            test: '@angular-devkit/build-angular:karma',
-            lint: '@angular-eslint/builder:lint',
-        };
-        this.targetNames = {};
-        this.collectTargetNames();
+        super(tree, options, supportedTargets, project, 'libs', logger);
         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');
@@ -34,91 +31,16 @@ class LibMigrator extends project_migrator_1.ProjectMigrator {
             this.updateNgPackageJson();
             this.updateTsConfigs();
             this.updateEsLintConfig();
-            this.updateCacheableOperations();
+            this.updateCacheableOperations([
+                this.targetNames.build,
+                this.targetNames.lint,
+                this.targetNames.test,
+            ].filter(Boolean));
             (0, dependencies_1.addBuildableLibrariesPostCssDependencies)(this.tree);
         });
     }
     validate() {
-        var _a, _b;
-        const result = [];
-        // check project root
-        if (!this.tree.exists(this.projectConfig.root)) {
-            result.push({
-                message: `The project root "${this.project.oldRoot}" could not be found.`,
-                hint: `Make sure the value for "projects.${this.project.name}.root" is correct ` +
-                    `or remove the project if it is not valid.`,
-            });
-        }
-        // check project source root
-        if (this.projectConfig.sourceRoot &&
-            !this.tree.exists(this.projectConfig.sourceRoot)) {
-            result.push({
-                message: `The project source root "${this.project.oldSourceRoot}" could not be found.`,
-                hint: `Make sure the value for "projects.${this.project.name}.sourceRoot" is correct ` +
-                    `or remove the project if it is not valid.`,
-            });
-        }
-        // check for usage of unsupported builders
-        const allSupportedBuilders = [
-            this.supportedBuilders.build,
-            this.supportedBuilders.test,
-            this.supportedBuilders.lint,
-        ];
-        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) {
-            result.push({
-                messageGroup: {
-                    title: 'Unsupported builders',
-                    messages: unsupportedBuilders.map(([target, builder]) => `The "${target}" target is using an unsupported builder "${builder}".`),
-                },
-                hint: `The supported builders for libraries are: ${(0, validation_logging_1.arrayToString)(allSupportedBuilders)}.`,
-            });
-        }
-        // check for multiple targets for the same type of target
-        const targetsByType = Object.entries((_b = this.projectConfig.targets) !== null && _b !== void 0 ? _b : {}).reduce((acc, [target, { executor }]) => {
-            if (this.supportedBuilders.build === executor) {
-                acc.build.push(target);
-            }
-            else if (this.supportedBuilders.test === executor) {
-                acc.test.push(target);
-            }
-            else if (this.supportedBuilders.lint === executor) {
-                acc.lint.push(target);
-            }
-            return acc;
-        }, { build: [], lint: [], test: [] });
-        ['build', 'lint', 'test'].forEach((targetType) => {
-            if (targetsByType[targetType].length <= 1) {
-                return;
-            }
-            result.push({
-                message: `There is more than one target using a builder that is used to ${targetType} the project (${(0, validation_logging_1.arrayToString)(targetsByType[targetType])}).`,
-                hint: `Make sure the project only has one target with a builder that is used to ${targetType} the project.`,
-            });
-        });
-        return result.length ? result : null;
-    }
-    collectTargetNames() {
-        var _a;
-        Object.entries((_a = this.projectConfig.targets) !== null && _a !== void 0 ? _a : {}).forEach(([targetName, target]) => {
-            if (!this.targetNames.build &&
-                this.supportedBuilders.build === target.executor) {
-                this.targetNames.build = targetName;
-            }
-            else if (!this.targetNames.test &&
-                this.supportedBuilders.test === target.executor) {
-                this.targetNames.test = targetName;
-            }
-            else if (!this.targetNames.lint &&
-                this.supportedBuilders.lint === target.executor) {
-                this.targetNames.lint = targetName;
-            }
-        });
+        return super.validate();
     }
     moveProjectFiles() {
         this.moveDir(this.project.oldRoot, this.project.newRoot);
@@ -196,23 +118,6 @@ class LibMigrator extends project_migrator_1.ProjectMigrator {
             return json;
         });
     }
-    updateCacheableOperations() {
-        var _a;
-        const workspaceConfig = (0, devkit_1.readWorkspaceConfiguration)(this.tree);
-        Object.keys((_a = workspaceConfig.tasksRunnerOptions) !== null && _a !== void 0 ? _a : {}).forEach((taskRunnerName) => {
-            var _a;
-            const taskRunner = workspaceConfig.tasksRunnerOptions[taskRunnerName];
-            taskRunner.options.cacheableOperations = Array.from(new Set([
-                ...((_a = taskRunner.options.cacheableOperations) !== null && _a !== void 0 ? _a : []),
-                ...[
-                    this.targetNames.build,
-                    this.targetNames.lint,
-                    this.targetNames.test,
-                ].filter(Boolean),
-            ]));
-        });
-        (0, devkit_1.updateWorkspaceConfiguration)(this.tree, workspaceConfig);
-    }
     updateBuildTargetConfiguration() {
         var _a, _b, _c, _d, _e;
         if (!this.targetNames.build) {
@@ -272,7 +177,20 @@ class LibMigrator extends project_migrator_1.ProjectMigrator {
                 (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(lintOptions.eslintConfig));
         lintOptions.lintFilePatterns =
             lintOptions.lintFilePatterns &&
-                lintOptions.lintFilePatterns.map((pattern) => this.convertPath(pattern));
+                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;
         }