npm - @nrwl/angular - Versions diffs - 15.1.0-beta.1 → 15.1.0-beta.2 - Mend

@nrwl/angular 15.1.0-beta.1 → 15.1.0-beta.2

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 (28) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -3,6 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-# [15.1.0-beta.1](https://github.com/nrwl/nx/compare/15.0.7...15.1.0-beta.1) (2022-11-11)
+# [15.1.0-beta.2](https://github.com/nrwl/nx/compare/15.0.7...15.1.0-beta.2) (2022-11-14)
 **Note:** Version bump only for package @nrwl/angular

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@nrwl/angular",
-  "version": "15.1.0-beta.1",
+  "version": "15.1.0-beta.2",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Cypress, Karma, and Protractor. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -67,13 +67,13 @@
   },
   "dependencies": {
     "@angular-devkit/schematics": "~14.2.0",
-    "@nrwl/cypress": "15.1.0-beta.1",
-    "@nrwl/devkit": "15.1.0-beta.1",
-    "@nrwl/jest": "15.1.0-beta.1",
-    "@nrwl/linter": "15.1.0-beta.1",
-    "@nrwl/storybook": "15.1.0-beta.1",
-    "@nrwl/webpack": "15.1.0-beta.1",
-    "@nrwl/workspace": "15.1.0-beta.1",
+    "@nrwl/cypress": "15.1.0-beta.2",
+    "@nrwl/devkit": "15.1.0-beta.2",
+    "@nrwl/jest": "15.1.0-beta.2",
+    "@nrwl/linter": "15.1.0-beta.2",
+    "@nrwl/storybook": "15.1.0-beta.2",
+    "@nrwl/webpack": "15.1.0-beta.2",
+    "@nrwl/workspace": "15.1.0-beta.2",
     "@phenomnomnominal/tsquery": "4.1.1",
     "@schematics/angular": "~14.2.0",
     "chalk": "4.1.0",
@@ -99,5 +99,5 @@
   "fesm2015": "fesm2015/nrwl-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "16c3a2eb20902a34eda53e9f6c0dcb301b9ea70d"
+  "gitHead": "1a8bf7791bbbc7b512646a6fe31d3111927b9aee"
 }

package/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.d.ts ADDED Viewed

@@ -0,0 +1,13 @@
+import { ProjectConfiguration, Tree } from '@nrwl/devkit';
+import type { Logger, ProjectMigrationInfo, ValidationResult } from '../../utilities';
+import { BuilderMigrator } from './builder.migrator';
+export declare class AngularEslintLintMigrator extends BuilderMigrator {
+    private oldEsLintConfigPath;
+    private newEsLintConfigPath;
+    constructor(tree: Tree, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger);
+    migrate(): void;
+    validate(): ValidationResult;
+    private updateTargetConfiguration;
+    private updateEsLintConfig;
+    private convertEsLintConfigExtendToNewPath;
+}

package/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.js ADDED Viewed

@@ -0,0 +1,128 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AngularEslintLintMigrator = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const devkit_2 = require("@nrwl/devkit");
+const linter_1 = require("@nrwl/linter");
+const path_1 = require("path");
+const utilities_1 = require("../../utilities");
+const builder_migrator_1 = require("./builder.migrator");
+class AngularEslintLintMigrator extends builder_migrator_1.BuilderMigrator {
+    constructor(tree, project, projectConfig, logger) {
+        super(tree, '@angular-eslint/builder:lint', 'eslint', project, projectConfig, logger);
+    }
+    migrate() {
+        var _a, _b;
+        for (const [name, target] of this.targets) {
+            this.oldEsLintConfigPath =
+                (_b = (_a = target.options) === null || _a === void 0 ? void 0 : _a.eslintConfig) !== null && _b !== void 0 ? _b : (0, devkit_2.joinPathFragments)(this.project.oldRoot, '.eslintrc.json');
+            this.newEsLintConfigPath = this.convertRootPath(this.oldEsLintConfigPath);
+            this.moveProjectRootFile(this.oldEsLintConfigPath);
+            this.updateTargetConfiguration(name, target);
+            this.updateEsLintConfig();
+            this.updateCacheableOperations([name]);
+        }
+        if (!this.targets.size && this.projectConfig.root === '') {
+            // 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);
+            }
+        }
+    }
+    validate() {
+        const errors = [];
+        // TODO(leo): keeping restriction until the full refactor is done and we start
+        // expanding what's supported.
+        if (this.targets.size > 1) {
+            errors.push({
+                message: `There is more than one target using a builder that is used to lint the project (${(0, utilities_1.arrayToString)([...this.targets.keys()])}).`,
+                hint: `Make sure the project only has one target with a builder that is used to lint the project.`,
+            });
+        }
+        return errors.length ? errors : null;
+    }
+    updateTargetConfiguration(targetName, target) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            target.executor = '@nrwl/linter:eslint';
+            if (!target.options) {
+                this.logger.warn(`The target "${targetName}" 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.`);
+            }
+            target.options.eslintConfig =
+                target.options.eslintConfig && this.newEsLintConfigPath;
+            target.options.lintFilePatterns =
+                target.options.lintFilePatterns &&
+                    target.options.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_2.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_2.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 "${targetName}" target is not contained in the project root or source root. The pattern will not be updated.`);
+                        return pattern;
+                    });
+            if (existEsLintConfigPath) {
+                const eslintConfig = (0, devkit_2.readJson)(this.tree, this.newEsLintConfigPath);
+                if ((0, linter_1.hasRulesRequiringTypeChecking)(eslintConfig)) {
+                    target.options.hasTypeAwareRules = true;
+                }
+            }
+            (0, devkit_2.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
+        });
+    }
+    updateEsLintConfig() {
+        if (!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_2.joinPathFragments)((0, devkit_2.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;
+        });
+    }
+    convertEsLintConfigExtendToNewPath(eslintConfigPath, extendPath) {
+        if (!extendPath.startsWith('..')) {
+            // we only need to adjust paths that are on a different directory, files
+            // in the same directory are moved together so their relative paths are
+            // not changed
+            return extendPath;
+        }
+        return (0, devkit_2.joinPathFragments)((0, devkit_2.offsetFromRoot)(this.project.newRoot), (0, path_1.dirname)(eslintConfigPath), extendPath);
+    }
+}
+exports.AngularEslintLintMigrator = AngularEslintLintMigrator;
+//# sourceMappingURL=angular-eslint-lint.migrator.js.map

package/src/generators/ng-add/migrators/builders/angular-eslint-lint.migrator.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/src/generators/ng-add/migrators/builders/builder.migrator.d.ts CHANGED Viewed

@@ -4,7 +4,7 @@ import { Migrator } from '../migrator';
 export declare abstract class BuilderMigrator extends Migrator {
     readonly builderName: string;
     readonly rootFileType: WorkspaceRootFileType | undefined;
-    protected targets: Map<string, TargetConfiguration>;
+    targets: Map<string, TargetConfiguration>;
     constructor(tree: Tree, builderName: string, rootFileType: WorkspaceRootFileType | undefined, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger);
     isBuilderUsed(): boolean;
     protected collectBuilderTargets(): void;

package/src/generators/ng-add/migrators/builders/builder.migrator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"builder.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/builder.migrator.ts"],"names":[],"mappings":";;;AAUA,0CAAuC;AAEvC,MAAsB,eAAgB,SAAQ,mBAAQ;IAGpD,YACE,IAAU,EACM,WAAmB,EACnB,YAA+C,EAC/D,OAA6B,EAC7B,aAAmC,EACnC,MAAc;QAEd,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QANnB,gBAAW,GAAX,WAAW,CAAQ;QACnB,iBAAY,GAAZ,YAAY,CAAmC;~~QALvD~~,YAAO,GAAqC,IAAI,GAAG,EAAE,CAAC;~~QAY9D~~,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QAEnC,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC;IAC/B,CAAC;IAES,qBAAqB;;QAC7B,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CACzC,MAAA,IAAI,CAAC,aAAa,CAAC,OAAO,mCAAI,EAAE,CACjC,EAAE;YACD,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAC,WAAW,EAAE;gBACxC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAChC;SACF;IACH,CAAC;CACF;AAhCD,0CAgCC"}
1	+ {"version":3,"file":"builder.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/builder.migrator.ts"],"names":[],"mappings":";;;AAUA,0CAAuC;AAEvC,MAAsB,eAAgB,SAAQ,mBAAQ;IAGpD,YACE,IAAU,EACM,WAAmB,EACnB,YAA+C,EAC/D,OAA6B,EAC7B,aAAmC,EACnC,MAAc;QAEd,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,CAAC;QANnB,gBAAW,GAAX,WAAW,CAAQ;QACnB,iBAAY,GAAZ,YAAY,CAAmC;QALjE,YAAO,GAAqC,IAAI,GAAG,EAAE,CAAC;QAYpD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QAEnC,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC;IAC/B,CAAC;IAES,qBAAqB;;QAC7B,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CACzC,MAAA,IAAI,CAAC,aAAa,CAAC,OAAO,mCAAI,EAAE,CACjC,EAAE;YACD,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAC,WAAW,EAAE;gBACxC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aAChC;SACF;IACH,CAAC;CACF;AAhCD,0CAgCC"}

package/src/generators/ng-add/migrators/builders/index.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 export * from './angular-devkit-karma.migrator';
 export * from './angular-devkit-ng-packagr.migrator';
+export * from './angular-eslint-lint.migrator';
 export * from './builder-migrator-class.type';
 export * from './builder.migrator';

package/src/generators/ng-add/migrators/builders/index.js CHANGED Viewed

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./angular-devkit-karma.migrator"), exports);
 tslib_1.__exportStar(require("./angular-devkit-ng-packagr.migrator"), exports);
+tslib_1.__exportStar(require("./angular-eslint-lint.migrator"), exports);
 tslib_1.__exportStar(require("./builder-migrator-class.type"), exports);
 tslib_1.__exportStar(require("./builder.migrator"), exports);
 //# sourceMappingURL=index.js.map

package/src/generators/ng-add/migrators/builders/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/index.ts"],"names":[],"mappings":";;;AAAA,0EAAgD;AAChD,+EAAqD;AACrD,wEAA8C;AAC9C,6DAAmC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/index.ts"],"names":[],"mappings":";;;AAAA,0EAAgD;AAChD,+EAAqD;AACrD,yEAA+C;AAC/C,wEAA8C;AAC9C,6DAAmC"}

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

@@ -11,6 +11,7 @@ export declare abstract class Migrator {
     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;

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

@@ -18,6 +18,11 @@ class Migrator {
             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) {

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

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

@@ -2,22 +2,18 @@ import type { Tree } from '@nrwl/devkit';
 import type { GeneratorOptions } from '../../schema';
 import type { Logger, MigrationProjectConfiguration, ValidationResult } from '../../utilities';
 import { ProjectMigrator } from './project.migrator';
-declare type SupportedTargets = 'build' | 'e2e' | 'i18n' | 'lint' | 'prerender' | 'serve' | 'server' | 'serveSsr';
+declare 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 updateProjectConfiguration;
     private updateTsConfigs;
-    private updateEsLintConfig;
     private convertBuildOptions;
     private convertServerOptions;
     private updateBuildTargetConfiguration;
-    private updateLintTargetConfiguration;
     private updatePrerenderTargetConfiguration;
     private updateServerTargetConfiguration;
     private updateServeSsrTargetConfiguration;

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

@@ -3,7 +3,6 @@ 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 path_1 = require("path");
@@ -20,7 +19,6 @@ 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'] },
@@ -29,17 +27,15 @@ const supportedTargets = {
 // 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, supportedBuilderMigrators);
-        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);
-        }
+        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() {
         var _a;
@@ -51,12 +47,7 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
                 yield builderMigrator.migrate();
             }
             this.updateTsConfigs();
-            this.updateEsLintConfig();
-            this.updateCacheableOperations([
-                this.targetNames.build,
-                this.targetNames.lint,
-                this.targetNames.e2e,
-            ].filter(Boolean));
+            this.updateCacheableOperations([this.targetNames.build, this.targetNames.e2e].filter(Boolean));
         });
     }
     validate() {
@@ -86,18 +77,6 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
         if (this.targetNames.server) {
             this.moveFilePathsFromTargetToProjectRoot(this.projectConfig.targets[this.targetNames.server], ['tsConfig']);
         }
-        if (this.targetNames.lint) {
-            this.moveProjectRootFile(this.oldEsLintConfigPath);
-        }
-        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);
-            }
-        }
         this.moveDir(this.project.oldSourceRoot, this.project.newSourceRoot);
     }
     updateProjectConfiguration() {
@@ -110,7 +89,6 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
             }
             else {
                 this.updateBuildTargetConfiguration();
-                this.updateLintTargetConfiguration();
                 this.updateServerTargetConfiguration();
                 this.updatePrerenderTargetConfiguration();
                 this.updateServeSsrTargetConfiguration();
@@ -128,37 +106,6 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
         this.updateTsConfigFileUsedByBuildTarget(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 &&
@@ -230,48 +177,6 @@ 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) {
             return;

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

	@@ -1 +1 @@
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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"}
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/migrators/projects/lib.migrator.d.ts CHANGED Viewed

@@ -2,16 +2,10 @@ import type { Tree } from '@nrwl/devkit';
 import type { GeneratorOptions } from '../../schema';
 import type { Logger, MigrationProjectConfiguration, ValidationResult } from '../../utilities';
 import { ProjectMigrator } from './project.migrator';
-declare type SupportedTargets = 'lint';
-export declare class LibMigrator extends ProjectMigrator<SupportedTargets> {
-    private oldEsLintConfigPath;
-    private newEsLintConfigPath;
+export declare class LibMigrator extends ProjectMigrator {
     constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration, logger?: Logger);
     migrate(): Promise<void>;
     validate(): ValidationResult;
     private moveProjectFiles;
     private updateProjectConfiguration;
-    private updateEsLintConfig;
-    private updateLintTargetConfiguration;
 }
-export {};

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

@@ -3,27 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LibMigrator = 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 builders_1 = require("../builders");
 const project_migrator_1 = require("./project.migrator");
-const supportedTargets = {
-    lint: { builders: ['@angular-eslint/builder:lint'] },
-};
-// TODO(leo): this will replace `supportedTargets` once the full refactor is done.
 const supportedBuilderMigrators = [
     builders_1.AngularDevkitNgPackagrMigrator,
     builders_1.AngularDevkitKarmaMigrator,
+    builders_1.AngularEslintLintMigrator,
 ];
 class LibMigrator extends project_migrator_1.ProjectMigrator {
     constructor(tree, options, project, logger) {
-        var _a, _b;
-        super(tree, options, supportedTargets, project, 'libs', logger, supportedBuilderMigrators);
-        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, {}, project, 'libs', logger, supportedBuilderMigrators);
     }
     migrate() {
         var _a;
@@ -33,8 +23,6 @@ class LibMigrator extends project_migrator_1.ProjectMigrator {
             for (const builderMigrator of (_a = this.builderMigrators) !== null && _a !== void 0 ? _a : []) {
                 yield builderMigrator.migrate();
             }
-            this.updateEsLintConfig();
-            this.updateCacheableOperations([this.targetNames.lint].filter(Boolean));
         });
     }
     validate() {
@@ -56,9 +44,6 @@ class LibMigrator extends project_migrator_1.ProjectMigrator {
                 !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.');
             }
-            else {
-                this.updateLintTargetConfiguration();
-            }
             (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig));
             yield (0, generators_1.convertToNxProjectGenerator)(this.tree, {
                 project: this.project.name,
@@ -66,78 +51,6 @@ class LibMigrator extends project_migrator_1.ProjectMigrator {
             });
         });
     }
-    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;
-        });
-    }
-    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.oldEsLintConfigPath);
-        if (!existEsLintConfigPath) {
-            this.logger.warn(`The ESLint config file "${this.oldEsLintConfigPath}" could not be found. Skipping updating the file.`);
-        }
-        lintOptions.eslintConfig =
-            lintOptions.eslintConfig && this.newEsLintConfigPath;
-        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.oldEsLintConfigPath);
-        if ((0, linter_1.hasRulesRequiringTypeChecking)(eslintConfig)) {
-            lintOptions.hasTypeAwareRules = true;
-        }
-    }
 }
 exports.LibMigrator = LibMigrator;
 //# sourceMappingURL=lib.migrator.js.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"lib.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/lib.migrator.ts"],"names":[],"mappings":";;;;AACA,~~yCAMsB~~;~~AACtB~~,~~yCAA6D;AAC7D,~~2DAAyE;~~AAUzE~~,~~0CAGqB~~;AACrB,yDAAqD;~~AAGrD~~,MAAM,~~gBAAgB,GAAqC;IACzD,IAAI,EAAE,EAAE,QAAQ,EAAE,CAAC,8BAA8B,CAAC,EAAE;CACrD,CAAC;AACF,kFAAkF;AAClF,MAAM,~~yBAAyB,GAA+B;IAC5D,yCAA8B;IAC9B,qCAA0B;~~CAC3B~~,CAAC;AAEF,MAAa,WAAY,SAAQ,~~kCAAiC~~;~~IAIhE~~,YACE,IAAU,EACV,OAAyB,EACzB,OAAsC,EACtC,MAAe;;QAEf,KAAK,CACH,IAAI,EACJ,OAAO,EACP,~~gBAAgB~~,~~EAChB~~,OAAO,EACP,MAAM,EACN,MAAM,EACN,yBAAyB,CAC1B,CAAC;~~QAEF~~,~~IAAI,IAAI,~~CAAC~~,WAAW,CAAC,IAAI,EAAE~~;YACzB,IAAI,CAAC,mBAAmB;gBACtB,MAAA,MAAA,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,0CACrD,YAAY,mCAChB,IAAA,0BAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAC5D,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;SAC3E;IACH,CAAC;IAEc,OAAO;;;YACpB,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~~;YAED,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC1B,IAAI,CAAC,yBAAyB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC~~;;~~KACzE~~;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,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;~~iBAAM;gBACL,IAAI,CAAC,6BAA6B,EAAE,CAAC;aACtC;~~YAED,IAAA,mCAA0B,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,oBAClD,IAAI,CAAC,aAAa,EACrB,CAAC;YAEH,MAAM,IAAA,wCAA2B,EAAC,IAAI,CAAC,IAAI,EAAE;gBAC3C,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBAC1B,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;QACL,CAAC;KAAA;IAEO,kBAAkB;QACxB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE;YACzE,OAAO;SACR;QAED,IAAA,mBAAU,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,mBAAmB,EAAE,CAAC,IAAI,EAAE,EAAE;;YACvD,OAAO,IAAI,CAAC,IAAI,CAAC;YACjB,IAAI,CAAC,cAAc,GAAG,CAAC,OAAO,CAAC,CAAC;YAEhC,MAAM,4BAA4B,GAAG,IAAA,0BAAiB,EACpD,IAAA,uBAAc,EAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EACvC,gBAAgB,CACjB,CAAC;YACF,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;gBAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAc,EAAE,EAAE,CACjD,IAAI,CAAC,kCAAkC,CACrC,IAAI,CAAC,mBAAmB,EACxB,MAAM,CACP,CACF~~,CAAC~~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"}
1	+ {"version":3,"file":"lib.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/lib.migrator.ts"],"names":[],"mappings":";;;;AACA,yCAA0D;AAC1D,2DAAyE;AASzE,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,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,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;YAEH,MAAM,IAAA,wCAA2B,EAAC,IAAI,CAAC,IAAI,EAAE;gBAC3C,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;gBAC1B,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;QACL,CAAC;KAAA;CACF;AA/DD,kCA+DC"}

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

@@ -14,8 +14,6 @@ export declare abstract class ProjectMigrator<TargetType extends string = string
     constructor(tree: Tree, options: GeneratorOptions, targets: Record<TargetType, Target>, project: MigrationProjectConfiguration, rootDir: string, logger?: Logger, supportedBuilderMigrators?: BuilderMigratorClassType[]);
     getWorkspaceRootFileTypesInfo(): WorkspaceRootFileTypesInfo;
     validate(): ValidationResult;
-    protected convertEsLintConfigExtendToNewPath(eslintConfigPath: string, extendPath: string): string;
-    protected convertRootPath(originalPath: string): string;
     protected convertPath(originalPath: string): string;
     protected moveDir(from: string, to: string): void;
     private collectTargetNames;

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectMigrator = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const path_1 = require("path");
 const utilities_1 = require("../../utilities");
 const migrator_1 = require("../migrator");
 class ProjectMigrator extends migrator_1.Migrator {
@@ -114,20 +113,6 @@ class ProjectMigrator extends migrator_1.Migrator {
         });
         return errors.length ? errors : null;
     }
-    convertEsLintConfigExtendToNewPath(eslintConfigPath, extendPath) {
-        if (!extendPath.startsWith('..')) {
-            // we only need to adjust paths that are on a different directory, files
-            // in the same directory are moved together so their relative paths are
-            // not changed
-            return extendPath;
-        }
-        return (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(this.project.newRoot), (0, path_1.dirname)(eslintConfigPath), extendPath);
-    }
-    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;
-    }
     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, ''));

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

	@@ -1 +1 @@
1	- {"version":3,"file":"project.migrator.js","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/project.migrator.ts"],"names":[],"mappings":";;;AACA,yCAKsB;~~AACtB~~,+~~BAA+B;AAS/B,+~~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~~AA5PD~~,~~0CA4PC~~"}
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/migrations/update-14-2-0/update-router-initial-navigation.js CHANGED Viewed

@@ -48,7 +48,11 @@ function getProjectsWithAngularRouter(tree) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
         return Object.entries(projectGraph.dependencies)
-            .filter(([, dep]) => dep.some(({ target }) => target === 'npm:@angular/router'))
+            .filter(([node, dep]) => dep.some(({ target }) => {
+            var _a;
+            return target === 'npm:@angular/router' &&
+                !((_a = projectGraph.externalNodes) === null || _a === void 0 ? void 0 : _a[node]);
+        }))
             .map(([projectName]) => (0, devkit_1.readProjectConfiguration)(tree, projectName));
     });
 }

package/src/migrations/update-14-2-0/update-router-initial-navigation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update-router-initial-navigation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-14-2-0/update-router-initial-navigation.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,uDAAoD;AAOpD,2CAQoB;AAEpB,mBAA+B,IAAU;;QACvC,MAAM,OAAO,GAAG,IAAA,0BAAa,GAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,MAAM,4BAA4B,CAAC,IAAI,CAAC,CAAC;QAE1D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,IAAA,6BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACpD,sCAAsC;gBACtC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;oBAC7B,OAAO;iBACR;gBAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gBAC7C,MAAM,GAAG,GAAG,iBAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACjC,MAAM,uBAAuB,GAAG,0BAA0B,CAAC,GAAG,CAAC,CAAC;gBAChE,IAAI,CAAC,uBAAuB,EAAE;oBAC5B,OAAO;iBACR;gBAED,MAAM,2BAA2B,GAAG,8BAA8B,CAChE,uBAAuB,CAAC,SAAS,CAAC,CAAC,CAA4B,CAChE,CAAC;gBACF,IAAI,CAAC,2BAA2B,EAAE;oBAChC,OAAO;iBACR;gBAED,MAAM,kCAAkC,GAAG,OAAO,CAAC,SAAS,CAC1D,qBAAQ,CAAC,WAAW,EACpB,oBAAO,CAAC,wBAAwB,CAC9B,2BAA2B,EAC3B,2BAA2B,CAAC,IAAI,EAChC,oBAAO,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAC9C,EACD,2BAA2B,CAAC,aAAa,EAAE,CAC5C,CAAC;gBACF,MAAM,cAAc,GAAG,GAAG,OAAO,CAAC,KAAK,CACrC,CAAC,EACD,2BAA2B,CAAC,QAAQ,EAAE,CACvC,GAAG,kCAAkC,GAAG,OAAO,CAAC,KAAK,CACpD,2BAA2B,CAAC,MAAM,EAAE,CACrC,EAAE,CAAC;gBAEJ,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;YACvC,CAAC,CAAC,CAAC;SACJ;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA9CD,4BA8CC;AAED,SAAS,8BAA8B,CACrC,mBAA4C;IAE5C,KAAK,MAAM,IAAI,IAAI,mBAAmB,CAAC,UAAU,EAAE;QACjD,IACE,IAAA,iCAAoB,EAAC,IAAI,CAAC;YAC1B,CAAC,IAAA,yBAAY,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAA,gCAAmB,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC3D,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,mBAAmB;YACtC,cAAc,CAAC,IAAI,CAAC,EACpB;YACA,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAe,4BAA4B,CACzC,IAAU;;QAEV,MAAM,YAAY,GAAG,MAAM,IAAA,gCAAuB,GAAE,CAAC;QAErD,OAAO,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC;aAC7C,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,~~CAClB~~,GAAG,CAAC,IAAI,~~CAAC~~,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,~~CAAC~~,MAAM,KAAK,qBAAqB,CAAC,~~CAC3D~~;aACA,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,IAAA,iCAAwB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IACzE,CAAC;CAAA;AAED,SAAS,0BAA0B,CACjC,UAAsB;IAEtB,+BAA+B;IAC/B,MAAM,wBAAwB,GAAG,IAAA,iBAAO,EACtC,UAAU,EACV,+GAA+G,EAC/G,EAAE,gBAAgB,EAAE,IAAI,EAAE,CACP,CAAC;IAEtB,KAAK,MAAM,IAAI,IAAI,wBAAwB,EAAE;QAC3C,IACE,qBAAqB,CAAC,IAAI,CAAC;YAC3B,IAAI,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC;YAC1B,IAAA,sCAAyB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAC5C;YACA,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAoB;IACjD,4DAA4D;IAC5D,MAAM,6BAA6B,GAAG,IAAA,iBAAO,EAC3C,IAAI,CAAC,UAAU,EACf,sGAAsG,EACtG,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAC3B,CAAC,CAAC,CAAC,CAAC;IAEL,OAAO,CAAC,CAAC,6BAA6B,CAAC;AACzC,CAAC;AAED,SAAS,cAAc,CAAC,IAAwB;IAC9C,OAAO,CACL,IAAA,gCAAmB,EAAC,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,SAAS,CAC7E,CAAC;AACJ,CAAC"}
1	+ {"version":3,"file":"update-router-initial-navigation.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-14-2-0/update-router-initial-navigation.ts"],"names":[],"mappings":"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"}

package/src/migrations/update-14-2-0/update-tsconfig-target.js CHANGED Viewed

@@ -43,7 +43,7 @@ function collectTsConfigPaths(tree) {
         const uniqueTsConfigs = new Set([]);
         const projectGraph = yield (0, devkit_2.createProjectGraphAsync)();
         const angularProjects = Object.entries(projectGraph.dependencies)
-            .filter(([, dep]) => dep.some(({ target }) => target === 'npm:@angular/core'))
+            .filter(([node, dep]) => dep.some(({ target }) => { var _a; return target === 'npm:@angular/core' && !((_a = projectGraph.externalNodes) === null || _a === void 0 ? void 0 : _a[node]); }))
             .map(([projectName]) => ({
             projectName,
             project: (0, devkit_2.readProjectConfiguration)(tree, projectName),

package/src/migrations/update-14-2-0/update-tsconfig-target.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update-tsconfig-target.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-14-2-0/update-tsconfig-target.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,yCAOsB;AACtB,uDAAoD;AACpD,+BAA+B;AAG/B,MAAM,YAAY,GAAG,iBAAiB,CAAC;AACvC,MAAM,SAAS,GAAG;IAChB,uCAAuC;IACvC,qCAAqC;IACrC,0CAA0C;IAC1C,+BAA+B;IAC/B,8BAA8B;IAC9B,+BAA+B;IAC/B,uBAAuB;CACxB,CAAC;AACF,MAAM,WAAW,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAE7D,mBAA+B,IAAU;;QACvC,MAAM,aAAa,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAEvD,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;YACxC,IAAA,mBAAU,EACR,IAAI,EACJ,YAAY,EACZ,CAAC,IAAI,EAAE,EAAE;;gBACP,IACE,CAAC,CAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,MAAM,CAAA;oBAC7B,CAAC,CAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,MAAM;wBAC3B,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,EACnE;oBACA,MAAA,IAAI,CAAC,eAAe,oCAApB,IAAI,CAAC,eAAe,GAAK,EAAE,EAAC;oBAC5B,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,QAAQ,CAAC;iBACxC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,EACD;gBACE,kBAAkB,EAAE,IAAI;gBACxB,gBAAgB,EAAE,KAAK;aACxB,CACF,CAAC;SACH;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AA1BD,4BA0BC;AAED,SAAe,oBAAoB,CAAC,IAAU;;QAC5C,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,CAAC;QAEpC,MAAM,YAAY,GAAG,MAAM,IAAA,gCAAuB,GAAE,CAAC;QACrD,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC;aAC9D,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,~~CAClB~~,GAAG,CAAC,IAAI,~~CAAC~~,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,~~CAAC~~,MAAM,KAAK,mBAAmB,CAAC,~~CACzD~~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"}
1	+ {"version":3,"file":"update-tsconfig-target.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-14-2-0/update-tsconfig-target.ts"],"names":[],"mappings":"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"}

package/src/migrations/update-15-0-0/switch-to-jasmine-marbles.js CHANGED Viewed

@@ -24,7 +24,7 @@ function replaceJasmineMarbleUsagesInFiles(tree) {
             }
         })();
         const dirsToTraverse = Object.entries(projectGraph.dependencies)
-            .filter(([, dep]) => dep.some(({ target }) => target === 'npm:@nrwl/angular'))
+            .filter(([node, dep]) => dep.some(({ target }) => { var _a; return target === 'npm:@nrwl/angular' && !((_a = projectGraph.externalNodes) === null || _a === void 0 ? void 0 : _a[node]); }))
             .map(([projectName]) => (0, devkit_1.readProjectConfiguration)(tree, projectName).root);
         for (const dir of dirsToTraverse) {
             (0, devkit_1.visitNotIgnoredFiles)(tree, dir, (path) => {

package/src/migrations/update-15-0-0/switch-to-jasmine-marbles.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"switch-to-jasmine-marbles.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-0-0/switch-to-jasmine-marbles.ts"],"names":[],"mappings":";;;AACA,yCAOsB;AACtB,+BAA+B;AAC/B,uDAAoD;AACpD,mDAA6D;AAE7D,SAA8B,sBAAsB,CAAC,IAAU;;QAC7D,MAAM,kBAAkB,GAAG,MAAM,iCAAiC,CAAC,IAAI,CAAC,CAAC;QACzE,oCAAoC,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;IACjE,CAAC;CAAA;AAHD,yCAGC;AAED,SAAe,iCAAiC,CAAC,IAAU;;QACzD,IAAI,kBAAkB,GAAG,KAAK,CAAC;QAE/B,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,EAAE;YAC/B,IAAI;gBACF,OAAO,IAAA,+BAAsB,GAAE,CAAC;aACjC;YAAC,WAAM;gBACN,OAAO,IAAA,gCAAuB,GAAE,CAAC;aAClC;QACH,CAAC,CAAC,EAAE,CAAC;QAEL,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC;aAC7D,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,~~CAClB~~,GAAG,CAAC,IAAI,~~CAAC~~,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,~~CAAC~~,MAAM,KAAK,mBAAmB,CAAC,~~CACzD~~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"}
1	+ {"version":3,"file":"switch-to-jasmine-marbles.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-15-0-0/switch-to-jasmine-marbles.ts"],"names":[],"mappings":"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"}