npm - @nrwl/angular - Versions diffs - 13.10.0 → 14.0.0-beta.0 - Mend

@nrwl/angular 13.10.0 → 14.0.0-beta.0

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

package/src/generators/ng-add/migrate-from-angular-cli.js CHANGED Viewed

@@ -26,8 +26,21 @@ function migrateFromAngularCli(tree, rawOptions) {
                 ...projects.apps.map((app) => new app_migrator_1.AppMigrator(tree, options, app)),
                 // TODO: add libraries migrator when support for libs is added
             ];
-            // TODO: validate all projects and collect errors before migrating when
-            // multiple projects are supported
+            // validate all projects
+            for (const migrator of migrators) {
+                // TODO: validator will throw on their own until multiple project are supported
+                migrator.validate();
+            }
+            const workspaceCapabilities = (0, workspace_1.getWorkspaceCapabilities)(tree, projects);
+            /**
+             * Keep a copy of the root eslint config to restore it later. We need to
+             * do this because the root config can also be the config for the app at
+             * the root of the Angular CLI workspace and it will be moved as part of
+             * the app migration.
+             */
+            let eslintConfig = workspaceCapabilities.eslint && tree.exists('.eslintrc.json')
+                ? (0, devkit_1.readJson)(tree, '.eslintrc.json')
+                : undefined;
             // create and update root files and configurations
             (0, devkit_1.updateJson)(tree, 'angular.json', (json) => (Object.assign(Object.assign({}, json), { version: 2, $schema: undefined })));
             (0, workspace_1.createNxJson)(tree, options);
@@ -35,17 +48,23 @@ function migrateFromAngularCli(tree, rawOptions) {
             (0, workspace_1.updateRootTsConfig)(tree);
             (0, workspace_1.updatePackageJson)(tree);
             (0, workspace_1.decorateAngularCli)(tree);
-            // TODO: check later if it's still needed
-            (0, workspace_1.updateTsLint)(tree);
             yield (0, workspace_1.createWorkspaceFiles)(tree);
             // migrate all projects
             for (const migrator of migrators) {
                 yield migrator.migrate();
             }
-            // needs to be done last because the Angular CLI workspace can have one
-            // in the root for the root application, so we wait until that root Karma
-            // config is moved when the projects are migrated before creating this one
-            (0, workspace_1.createRootKarmaConfig)(tree);
+            /**
+             * This needs to be done last because the Angular CLI workspace can have
+             * these files in the root for the root application, so we wait until
+             * those root config files are moved when the projects are migrated.
+             */
+            if (workspaceCapabilities.karma) {
+                (0, workspace_1.createRootKarmaConfig)(tree);
+            }
+            if (workspaceCapabilities.eslint) {
+                (0, workspace_1.updateRootEsLintConfig)(tree, eslintConfig);
+                (0, workspace_1.cleanupEsLintPackages)(tree);
+            }
             yield (0, devkit_1.formatFiles)(tree);
         }
         if (!options.skipInstall) {

package/src/generators/ng-add/migrate-from-angular-cli.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;AAAA,~~yCAMsB~~;AACtB,mDAAiD;AAEjD,2DAAuD;AACvD,mEAA8D;AAC9D,qEAAiE;AAEjE,~~qDAU~~+B;AAE/B,SAAsB,qBAAqB,CACzC,IAAU,EACV,UAA4B;;QAE5B,MAAM,QAAQ,GAAG,IAAA,iCAAc,EAAC,IAAI,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAE7D,IAAI,OAAO,CAAC,wBAAwB,EAAE;YACpC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,EAAE,EAAE,oBAAS;gBACb,iBAAiB,EAAE,oBAAS;aAC7B,CACF,CAAC;YACF,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAClC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;SAC1B;aAAM;YACL,IAAA,6BAAiB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAElC,MAAM,SAAS,GAAsB;gBACnC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,0BAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;gBAClE,8DAA8D;aAC/D,CAAC;YAEF,~~uEAAuE~~;~~YACvE~~,~~kCAAkC~~;~~YAElC~~,kDAAkD;YAClD,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACtC,IAAI,KACP,OAAO,EAAE,CAAC,EACV,OAAO,EAAE,SAAS,IAClB,CAAC,CAAC;YACJ,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC5B,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC;YACpC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;YACxB,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,~~yCAAyC;YACzC,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;YACnB,~~MAAM,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;YAEjC,uBAAuB;YACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;aAC1B;YAED,~~uEAAuE~~;~~YACvE~~,~~yEAAyE~~;~~YACzE~~,~~0EAA0E~~;~~YAC1E~~,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;~~YAE5B~~,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YACxB,OAAO,GAAG,EAAE;gBACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;YAC5B,CAAC,CAAC;SACH;IACH,CAAC;CAAA;~~AA9DD~~,~~sDA8DC~~"}
1	+ {"version":3,"file":"migrate-from-angular-cli.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/ng-add/migrate-from-angular-cli.ts"],"names":[],"mappings":";;;;AAAA,yCAOsB;AACtB,mDAAiD;AAEjD,2DAAuD;AACvD,mEAA8D;AAC9D,qEAAiE;AAEjE,qDAY+B;AAE/B,SAAsB,qBAAqB,CACzC,IAAU,EACV,UAA4B;;QAE5B,MAAM,QAAQ,GAAG,IAAA,iCAAc,EAAC,IAAI,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,IAAA,oCAAgB,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAE7D,IAAI,OAAO,CAAC,wBAAwB,EAAE;YACpC,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,EAAE,EAAE,oBAAS;gBACb,iBAAiB,EAAE,oBAAS;aAC7B,CACF,CAAC;YACF,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAClC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;SAC1B;aAAM;YACL,IAAA,6BAAiB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAElC,MAAM,SAAS,GAAsB;gBACnC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,0BAAW,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;gBAClE,8DAA8D;aAC/D,CAAC;YAEF,wBAAwB;YACxB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,+EAA+E;gBAC/E,QAAQ,CAAC,QAAQ,EAAE,CAAC;aACrB;YAED,MAAM,qBAAqB,GAAG,IAAA,oCAAwB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEvE;;;;;eAKG;YACH,IAAI,YAAY,GACd,qBAAqB,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;gBAC3D,CAAC,CAAC,IAAA,iBAAQ,EAAC,IAAI,EAAE,gBAAgB,CAAC;gBAClC,CAAC,CAAC,SAAS,CAAC;YAEhB,kDAAkD;YAClD,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,iCACtC,IAAI,KACP,OAAO,EAAE,CAAC,EACV,OAAO,EAAE,SAAS,IAClB,CAAC,CAAC;YACJ,IAAA,wBAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC5B,IAAA,yCAA6B,EAAC,IAAI,CAAC,CAAC;YACpC,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;YACxB,IAAA,8BAAkB,EAAC,IAAI,CAAC,CAAC;YACzB,MAAM,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;YAEjC,uBAAuB;YACvB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;gBAChC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;aAC1B;YAED;;;;eAIG;YACH,IAAI,qBAAqB,CAAC,KAAK,EAAE;gBAC/B,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;aAC7B;YACD,IAAI,qBAAqB,CAAC,MAAM,EAAE;gBAChC,IAAA,kCAAsB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;gBAC3C,IAAA,iCAAqB,EAAC,IAAI,CAAC,CAAC;aAC7B;YAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;YACxB,OAAO,GAAG,EAAE;gBACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;YAC5B,CAAC,CAAC;SACH;IACH,CAAC;CAAA;AApFD,sDAoFC"}

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

@@ -10,7 +10,8 @@ export declare class AppMigrator extends ProjectMigrator {
     private moveProjectFiles;
     private updateProjectConfiguration;
     private updateTsConfigs;
-    private updateProjectTsLint;
+    private updateEsLintConfig;
+    private convertEsLintConfigExtendToNewPath;
     private convertBuildOptions;
     private convertServerOptions;
     private convertAsset;

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

@@ -3,8 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppMigrator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
+const linter_1 = require("@nrwl/linter");
 const generators_1 = require("@nrwl/workspace/generators");
 const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
+const path_1 = require("path");
 const e2e_project_migrator_1 = require("./e2e-project.migrator");
 const project_migrator_1 = require("./project.migrator");
 class AppMigrator extends project_migrator_1.ProjectMigrator {
@@ -18,15 +20,24 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
             this.moveProjectFiles();
             yield this.updateProjectConfiguration();
             this.updateTsConfigs();
-            // TODO: check later if it's still needed
-            this.updateProjectTsLint();
+            this.updateEsLintConfig();
         });
     }
     validate() {
-        // TODO: implement validation when multiple apps are supported
+        // TODO: properly return the validation results once we support multiple projects
+        if (this.projectConfig.targets.lint &&
+            this.projectConfig.targets.lint.executor !==
+                '@angular-eslint/builder:lint') {
+            throw new Error(`The "${this.project.name}" project is using an unsupported executor "${this.projectConfig.targets.lint.executor}".`);
+        }
+        const result = this.e2eMigrator.validate();
+        if (result) {
+            throw new Error(result);
+        }
         return null;
     }
     moveProjectFiles() {
+        var _a;
         // it is not required to have a browserslist
         this.moveProjectRootFile((0, devkit_1.joinPathFragments)(this.project.oldRoot, 'browserslist'), false);
         this.moveProjectRootFile((0, devkit_1.joinPathFragments)(this.project.oldRoot, '.browserslistrc'), false);
@@ -38,17 +49,31 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
         else {
             // there could still be a karma.conf.js file in the root
             // so move to new location
-            if (this.tree.exists('karma.conf.js')) {
-                console.info('No test configuration, but root Karma config file found');
-                this.moveProjectRootFile('karma.conf.js');
+            const karmaConfig = (0, devkit_1.joinPathFragments)(this.project.oldRoot, 'karma.conf.js');
+            if (this.tree.exists(karmaConfig)) {
+                this.logger.info('No "test" target was found, but a root Karma config file was found in the project root. The file will be moved to the new location.');
+                this.moveProjectRootFile(karmaConfig);
             }
         }
         if (this.projectConfig.targets.server) {
             this.moveProjectRootFile(this.projectConfig.targets.server.options.tsConfig);
         }
+        if (this.projectConfig.targets.lint) {
+            this.moveProjectRootFile((_a = this.projectConfig.targets.lint.options.eslintConfig) !== null && _a !== void 0 ? _a : (0, devkit_1.joinPathFragments)(this.project.oldRoot, '.eslintrc.json'));
+        }
+        else {
+            // there could still be a .eslintrc.json file in the root
+            // so move to new location
+            const eslintConfig = (0, devkit_1.joinPathFragments)(this.project.oldRoot, '.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() {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             this.projectConfig.root = this.project.newRoot;
             this.projectConfig.sourceRoot = this.project.newSourceRoot;
@@ -73,10 +98,19 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
                         testOptions.scripts.map((script) => this.convertAsset(script));
             }
             if (this.projectConfig.targets.lint) {
-                this.projectConfig.targets.lint.options.tsConfig = [
-                    (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.app.json'),
-                    (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.spec.json'),
-                ];
+                this.projectConfig.targets.lint.executor = '@nrwl/linter:eslint';
+                const lintOptions = this.projectConfig.targets.lint.options;
+                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) => this.convertAsset(pattern));
+                const eslintConfigPath = (_a = lintOptions.eslintConfig) !== null && _a !== void 0 ? _a : (0, devkit_1.joinPathFragments)(this.project.newRoot, '.eslintrc.json');
+                const eslintConfig = (0, devkit_1.readJson)(this.tree, eslintConfigPath);
+                if ((0, linter_1.hasRulesRequiringTypeChecking)(eslintConfig)) {
+                    lintOptions.hasTypeAwareRules = true;
+                }
             }
             if (this.projectConfig.targets.server) {
                 const serverOptions = this.projectConfig.targets.server.options;
@@ -118,13 +152,46 @@ class AppMigrator extends project_migrator_1.ProjectMigrator {
             });
         }
     }
-    updateProjectTsLint() {
-        if (this.tree.exists(`${this.project.newRoot}/tslint.json`)) {
-            (0, devkit_1.updateJson)(this.tree, `${this.project.newRoot}/tslint.json`, (json) => {
-                json.extends = '../../tslint.json';
-                return json;
+    updateEsLintConfig() {
+        var _a, _b, _c;
+        const eslintConfigPath = (_c = (_b = (_a = this.projectConfig.targets.lint) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.eslintConfig) !== null && _c !== void 0 ? _c : (0, devkit_1.joinPathFragments)(this.project.newRoot, '.eslintrc.json');
+        if (!this.tree.exists(eslintConfigPath)) {
+            return;
+        }
+        (0, devkit_1.updateJson)(this.tree, eslintConfigPath, (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(extend));
+                // it might have not been extending from the root config, make sure it does
+                if (!json.extends.includes(rootEsLintConfigRelativePath)) {
+                    json.extends.push(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(pathToFile) {
+        if (!pathToFile.startsWith('..')) {
+            // we only need to adjust paths that are on a different directory,
+            // files in the same directory should be moved together
+            return pathToFile;
         }
+        return (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(this.projectConfig.root), (0, path_1.basename)(pathToFile));
     }
     convertBuildOptions(buildOptions) {
         buildOptions.outputPath =

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

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

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

@@ -5,10 +5,11 @@ import { MigrationProjectConfiguration, ValidationResult } from './types';
 export declare class E2eProjectMigrator extends ProjectMigrator {
     private appConfig;
     private appName;
+    private isProjectUsingEsLint;
     constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration);
     migrate(): Promise<void>;
     validate(): ValidationResult;
-    private initializeProject;
+    private initialize;
     private migrateProtractorE2eProject;
     private migrateCypressE2eProject;
     private updateOrCreateCypressConfigFile;
@@ -16,4 +17,7 @@ export declare class E2eProjectMigrator extends ProjectMigrator {
     private updateE2eCypressTarget;
     private updateCypressConfigFilePaths;
     private replaceCypressGlobConfig;
+    private getCypressConfigFile;
+    private isCypressE2eProject;
+    private isProtractorE2eProject;
 }

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

@@ -2,29 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.E2eProjectMigrator = void 0;
 const tslib_1 = require("tslib");
+const cypress_1 = require("@nrwl/cypress");
 const devkit_1 = require("@nrwl/devkit");
+const linter_1 = require("@nrwl/linter");
 const typescript_1 = require("@nrwl/workspace/src/utilities/typescript");
 const path_1 = require("path");
-const e2e_utils_1 = require("./e2e-utils");
 const project_migrator_1 = require("./project.migrator");
 class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
     constructor(tree, options, project) {
         super(tree, options, project, 'apps');
         this.appConfig = project.config;
         this.appName = this.project.name;
-        this.initializeProject();
+        this.initialize();
     }
     migrate() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (!this.project) {
-                console.warn('No e2e project was migrated because there was none declared in angular.json.');
+                this.logger.warn('No e2e project was migrated because there was none declared in angular.json.');
                 return;
             }
-            if ((0, e2e_utils_1.isProtractorE2eProject)(this.projectConfig)) {
-                this.migrateProtractorE2eProject();
+            if (this.isProtractorE2eProject()) {
+                yield this.migrateProtractorE2eProject();
             }
-            else if ((0, e2e_utils_1.isCypressE2eProject)(this.projectConfig)) {
-                this.migrateCypressE2eProject();
+            else if (this.isCypressE2eProject()) {
+                yield this.migrateCypressE2eProject();
             }
             const tsConfig = (0, devkit_1.joinPathFragments)(this.projectConfig.root, 'tsconfig.json');
             const rootOffset = (0, devkit_1.offsetFromRoot)(this.project.newRoot);
@@ -36,58 +37,111 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
         });
     }
     validate() {
-        // TODO: implement validation when multiple apps are supported
+        if (!this.project) {
+            return null;
+        }
+        if (this.isProtractorE2eProject()) {
+            if (this.tree.exists(this.projectConfig.targets.e2e.options.protractorConfig)) {
+                return;
+            }
+            return (`An e2e project with Protractor was found but "${this.projectConfig.targets.e2e.options.protractorConfig}" could not be found.\n` +
+                `Make sure the "${this.appName}.architect.e2e.options.protractorConfig" is valid or the "${this.appName}" project is removed from "angular.json".`);
+        }
+        else if (this.isCypressE2eProject()) {
+            const configFile = this.getCypressConfigFile();
+            if (configFile && !this.tree.exists(configFile)) {
+                return `An e2e project with Cypress was found but "${configFile}" could not be found.`;
+            }
+            if (!this.tree.exists('cypress')) {
+                return `An e2e project with Cypress was found but the "cypress" directory could not be found.`;
+            }
+        }
+        else {
+            return `An e2e project was found but it's using an unsupported executor "${this.projectConfig.targets.e2e.executor}".`;
+        }
         return null;
     }
-    initializeProject() {
+    initialize() {
         var _a;
         if (!((_a = this.projectConfig.targets) === null || _a === void 0 ? void 0 : _a.e2e)) {
             this.project = null;
             return;
         }
+        this.isProjectUsingEsLint =
+            Boolean(this.appConfig.targets.lint) ||
+                this.tree.exists((0, devkit_1.joinPathFragments)(this.appConfig.root, '.eslintrc.json'));
         const name = this.project.name.endsWith('-e2e')
             ? this.project.name
             : `${this.project.name}-e2e`;
         const newRoot = (0, devkit_1.joinPathFragments)('apps', name);
-        if ((0, e2e_utils_1.isProtractorE2eProject)(this.projectConfig)) {
-            this.project = Object.assign(Object.assign({}, this.project), { name, oldRoot: (0, devkit_1.joinPathFragments)(this.project.oldRoot, 'e2e'), newRoot });
+        const newSourceRoot = (0, devkit_1.joinPathFragments)('apps', name, 'src');
+        if (this.isProtractorE2eProject()) {
+            this.project = Object.assign(Object.assign({}, this.project), { name, oldRoot: (0, devkit_1.joinPathFragments)(this.project.oldRoot, 'e2e'), newRoot,
+                newSourceRoot });
         }
-        else if ((0, e2e_utils_1.isCypressE2eProject)(this.projectConfig)) {
-            this.project = Object.assign(Object.assign({}, this.project), { name, oldRoot: 'cypress', newRoot });
+        else if (this.isCypressE2eProject()) {
+            this.project = Object.assign(Object.assign({}, this.project), { name, oldRoot: 'cypress', newRoot,
+                newSourceRoot });
         }
     }
     migrateProtractorE2eProject() {
-        this.moveDir(this.project.oldRoot, this.project.newRoot);
-        this.projectConfig = {
-            root: this.project.newRoot,
-            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, 'protractor.conf.js') }) }),
-                lint: {
-                    executor: '@angular-devkit/build-angular:tslint',
-                    options: Object.assign(Object.assign({}, this.projectConfig.targets.lint), { tsConfig: (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json') }),
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            this.moveDir(this.project.oldRoot, this.project.newRoot);
+            this.projectConfig = {
+                root: this.project.newRoot,
+                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, 'protractor.conf.js') }) }),
                 },
-            },
-            implicitDependencies: [this.appName],
-            tags: [],
-        };
-        (0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig), 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));
+                implicitDependencies: [this.appName],
+                tags: [],
+            };
+            (0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig), true);
+            if (this.isProjectUsingEsLint) {
+                yield (0, linter_1.lintProjectGenerator)(this.tree, {
+                    project: this.project.name,
+                    linter: linter_1.Linter.EsLint,
+                    eslintFilePatterns: [`${this.project.newRoot}/**/*.{js,ts}`],
+                    tsConfigPaths: [
+                        (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json'),
+                    ],
+                    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() {
-        const oldCypressConfigFilePath = (0, e2e_utils_1.getCypressConfigFile)(this.projectConfig);
-        const cypressConfigFilePath = this.updateOrCreateCypressConfigFile(oldCypressConfigFilePath);
-        this.moveFile((0, devkit_1.joinPathFragments)(this.project.oldRoot, 'tsconfig.json'), (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json'));
-        this.moveDir(this.project.oldRoot, (0, devkit_1.joinPathFragments)(this.project.newRoot, 'src'));
-        this.updateCypressProjectConfiguration(cypressConfigFilePath);
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const oldCypressConfigFilePath = this.getCypressConfigFile();
+            yield (0, cypress_1.cypressProjectGenerator)(this.tree, {
+                name: this.project.name,
+                project: this.appName,
+                linter: this.isProjectUsingEsLint ? linter_1.Linter.EsLint : linter_1.Linter.None,
+                standaloneConfig: true,
+                skipFormat: true,
+            });
+            const cypressConfigFilePath = this.updateOrCreateCypressConfigFile(oldCypressConfigFilePath);
+            this.updateCypressProjectConfiguration(cypressConfigFilePath);
+            // 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);
+            // 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));
+        });
     }
     updateOrCreateCypressConfigFile(configFile) {
         let cypressConfigFilePath;
         if (configFile) {
             cypressConfigFilePath = (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(configFile));
             this.updateCypressConfigFilePaths(configFile);
+            this.tree.delete(cypressConfigFilePath);
             this.moveFile(configFile, cypressConfigFilePath);
         }
         else {
@@ -108,32 +162,51 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
         return cypressConfigFilePath;
     }
     updateCypressProjectConfiguration(cypressConfigPath) {
-        this.projectConfig = {
-            root: this.project.newRoot,
-            sourceRoot: (0, devkit_1.joinPathFragments)(this.project.newRoot, 'src'),
-            projectType: 'application',
-            targets: {
-                e2e: this.updateE2eCypressTarget(this.projectConfig.targets.e2e, cypressConfigPath),
-            },
-            implicitDependencies: [this.appName],
-            tags: [],
-        };
-        if (this.appConfig.targets['cypress-run']) {
-            this.projectConfig.targets['cypress-run'] = this.updateE2eCypressTarget(this.appConfig.targets['cypress-run'], cypressConfigPath);
-        }
-        if (this.appConfig.targets['cypress-open']) {
-            this.projectConfig.targets['cypress-open'] = this.updateE2eCypressTarget(this.appConfig.targets['cypress-open'], cypressConfigPath);
-        }
-        (0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig), true);
+        /**
+         * 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.
+         */
+        const generatedProjectName = (0, devkit_1.names)(this.project.name).fileName;
+        if (this.project.name !== generatedProjectName) {
+            // If the names are different, we "rename" the newly added project.
+            this.projectConfig = (0, devkit_1.readProjectConfiguration)(this.tree, generatedProjectName);
+            this.projectConfig.root = this.project.newRoot;
+            this.projectConfig.sourceRoot = this.project.newSourceRoot;
+            (0, devkit_1.removeProjectConfiguration)(this.tree, generatedProjectName);
+            (0, devkit_1.addProjectConfiguration)(this.tree, this.project.name, Object.assign({}, this.projectConfig), true);
+        }
+        else {
+            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));
+        }
+        ['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);
+            }
+        });
+        (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;
         (0, devkit_1.updateProjectConfiguration)(this.tree, this.appName, Object.assign({}, this.appConfig));
     }
-    updateE2eCypressTarget(target, cypressConfig) {
-        const updatedTarget = Object.assign(Object.assign({}, target), { executor: '@nrwl/cypress:cypress', options: Object.assign(Object.assign({}, target.options), { cypressConfig }) });
+    updateE2eCypressTarget(existingTarget, generatedTarget, cypressConfig) {
+        const updatedTarget = Object.assign(Object.assign({}, existingTarget), { executor: '@nrwl/cypress:cypress', options: Object.assign(Object.assign({}, existingTarget.options), { cypressConfig }) });
         delete updatedTarget.options.configFile;
-        delete updatedTarget.options.tsConfig;
+        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) {
+            updatedTarget.options.tsConfig = (0, devkit_1.joinPathFragments)(this.project.newRoot, 'tsconfig.json');
+        }
         if (updatedTarget.options.headless && updatedTarget.options.watch) {
             updatedTarget.options.headed = false;
         }
@@ -181,6 +254,24 @@ class E2eProjectMigrator extends project_migrator_1.ProjectMigrator {
     replaceCypressGlobConfig(globPattern) {
         return globPattern.replace(new RegExp(`^(\\.\\/|\\/)?${this.project.oldRoot}\\/`), './src/');
     }
+    getCypressConfigFile() {
+        let cypressConfig = 'cypress.json';
+        const configFileOption = this.projectConfig.targets.e2e.options.configFile;
+        if (configFileOption === false) {
+            cypressConfig = undefined;
+        }
+        else if (typeof configFileOption === 'string') {
+            cypressConfig = (0, path_1.basename)(configFileOption);
+        }
+        return cypressConfig;
+    }
+    isCypressE2eProject() {
+        return (this.projectConfig.targets.e2e.executor === '@cypress/schematic:cypress');
+    }
+    isProtractorE2eProject() {
+        return (this.projectConfig.targets.e2e.executor ===
+            '@angular-devkit/build-angular:protractor');
+    }
 }
 exports.E2eProjectMigrator = E2eProjectMigrator;
 //# sourceMappingURL=e2e-project.migrator.js.map

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

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

package/src/generators/ng-add/utilities/logger.d.ts ADDED Viewed

@@ -0,0 +1,8 @@
+export declare class Logger {
+    private project;
+    private message;
+    constructor(project: string);
+    info(message: string): void;
+    warn(message: string): void;
+    error(message: string): void;
+}