@nrwl/angular 13.10.2 → 14.0.0-beta.0

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

@@ -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

@@ -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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"}
+{"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

@@ -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;
+}

package/src/generators/ng-add/utilities/logger.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Logger = void 0;
+const devkit_1 = require("@nrwl/devkit");
+class Logger {
+    constructor(project) {
+        this.project = project;
+        this.message = (_, message) => `[${this.project}] ${message}`;
+    }
+    info(message) {
+        devkit_1.logger.info(this.message `${message}`);
+    }
+    warn(message) {
+        devkit_1.logger.warn(this.message `${message}`);
+    }
+    error(message) {
+        devkit_1.logger.error(this.message `${message}`);
+    }
+}
+exports.Logger = Logger;
+//# sourceMappingURL=logger.js.map

package/src/generators/ng-add/utilities/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/logger.ts"],"names":[],"mappings":";;;AAAA,yCAAsC;AAEtC,MAAa,MAAM;IAIjB,YAAoB,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;QAH3B,YAAO,GAAG,CAAC,CAAuB,EAAE,OAAe,EAAE,EAAE,CAC7D,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;IAEK,CAAC;IAEhC,IAAI,CAAC,OAAe;QACzB,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAA,GAAG,OAAO,EAAE,CAAC,CAAC;IACxC,CAAC;IAEM,IAAI,CAAC,OAAe;QACzB,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAA,GAAG,OAAO,EAAE,CAAC,CAAC;IACxC,CAAC;IAEM,KAAK,CAAC,OAAe;QAC1B,eAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAA,GAAG,OAAO,EAAE,CAAC,CAAC;IACzC,CAAC;CACF;AAjBD,wBAiBC"}

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

@@ -1,5 +1,6 @@
 import { ProjectConfiguration, Tree } from '@nrwl/devkit';
 import { GeneratorOptions } from '../schema';
+import { Logger } from './logger';
 import { MigrationProjectConfiguration, ValidationResult } from './types';
 export declare abstract class ProjectMigrator {
     protected readonly tree: Tree;
@@ -12,6 +13,7 @@ export declare abstract class ProjectMigrator {
         newRoot: string;
         newSourceRoot: string;
     };
+    protected logger: Logger;
     constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration, rootDir: string);
     abstract migrate(): Promise<void>;
     abstract validate(): ValidationResult;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectMigrator = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const path_1 = require("path");
+const logger_1 = require("./logger");
 class ProjectMigrator {
     constructor(tree, options, project, rootDir) {
         var _a, _b, _c;
@@ -16,6 +17,7 @@ class ProjectMigrator {
             newRoot: `${rootDir}/${project.name}`,
             newSourceRoot: `${rootDir}/${project.name}/src`,
         };
+        this.logger = new logger_1.Logger(this.project.name);
     }
     moveProjectRootFile(filePath, isRequired = true) {
         if (!filePath) {

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

@@ -1 +1 @@
-{"version":3,"file":"project.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/project.migrator.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,+BAAgC;AAIhC,MAAsB,eAAe;IAUnC,YACqB,IAAU,EACV,OAAyB,EAC5C,OAAsC,EACtC,OAAe;;QAHI,SAAI,GAAJ,IAAI,CAAM;QACV,YAAO,GAAP,OAAO,CAAkB;QAI5C,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE,MAAA,IAAI,CAAC,aAAa,CAAC,IAAI,mCAAI,EAAE;YACtC,aAAa,EACX,MAAA,MAAA,IAAI,CAAC,aAAa,CAAC,UAAU,mCAAI,IAAI,CAAC,aAAa,CAAC,IAAI,mCAAI,EAAE;YAChE,OAAO,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE;YACrC,aAAa,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,IAAI,MAAM;SAChD,CAAC;IACJ,CAAC;IAKS,mBAAmB,CAAC,QAAgB,EAAE,UAAU,GAAG,IAAI;QAC/D,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,eAAQ,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,GAAG,QAAQ,CAAC;QACtB,MAAM,EAAE,GAAG,IAAA,0BAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC7D,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;IACtC,CAAC;IAES,OAAO,CAAC,IAAY,EAAE,EAAU;QACxC,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;YAC7C,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC;IAES,QAAQ,CAAC,IAAY,EAAE,EAAU,EAAE,WAAoB,IAAI;QACnE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YAC3B,IAAI,QAAQ,EAAE;gBACZ,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,iBAAiB,CAAC,CAAC;aAC9C;SACF;aAAM,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;YAC/B,IAAI,QAAQ,EAAE;gBACZ,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;aAC5C;SACF;aAAM;YACL,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SACxB;IACH,CAAC;CACF;AA9DD,0CA8DC"}
+{"version":3,"file":"project.migrator.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/ng-add/utilities/project.migrator.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,+BAAgC;AAEhC,qCAAkC;AAGlC,MAAsB,eAAe;IAWnC,YACqB,IAAU,EACV,OAAyB,EAC5C,OAAsC,EACtC,OAAe;;QAHI,SAAI,GAAJ,IAAI,CAAM;QACV,YAAO,GAAP,OAAO,CAAkB;QAI5C,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG;YACb,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE,MAAA,IAAI,CAAC,aAAa,CAAC,IAAI,mCAAI,EAAE;YACtC,aAAa,EACX,MAAA,MAAA,IAAI,CAAC,aAAa,CAAC,UAAU,mCAAI,IAAI,CAAC,aAAa,CAAC,IAAI,mCAAI,EAAE;YAChE,OAAO,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE;YACrC,aAAa,EAAE,GAAG,OAAO,IAAI,OAAO,CAAC,IAAI,MAAM;SAChD,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAKS,mBAAmB,CAAC,QAAgB,EAAE,UAAU,GAAG,IAAI;QAC/D,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,eAAQ,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,GAAG,QAAQ,CAAC;QACtB,MAAM,EAAE,GAAG,IAAA,0BAAiB,EAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC7D,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,EAAE,UAAU,CAAC,CAAC;IACtC,CAAC;IAES,OAAO,CAAC,IAAY,EAAE,EAAU;QACxC,IAAA,6BAAoB,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;YAC7C,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;IACL,CAAC;IAES,QAAQ,CAAC,IAAY,EAAE,EAAU,EAAE,WAAoB,IAAI;QACnE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YAC3B,IAAI,QAAQ,EAAE;gBACZ,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,iBAAiB,CAAC,CAAC;aAC9C;SACF;aAAM,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;YAC/B,IAAI,QAAQ,EAAE;gBACZ,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;aAC5C;SACF;aAAM;YACL,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SACxB;IACH,CAAC;CACF;AAjED,0CAiEC"}

package/src/generators/ng-add/utilities/types.d.ts

@@ -7,4 +7,8 @@ export declare type WorkspaceProjects = {
     apps: MigrationProjectConfiguration[];
     libs: MigrationProjectConfiguration[];
 };
+export declare type WorkspaceCapabilities = {
+    karma: boolean;
+    eslint: boolean;
+};
 export declare type ValidationResult = string | null;

package/src/generators/ng-add/utilities/workspace.d.ts

@@ -1,12 +1,14 @@
 import { Tree } from '@nrwl/devkit';
 import { GeneratorOptions } from '../schema';
-import { WorkspaceProjects } from './types';
+import { WorkspaceCapabilities, WorkspaceProjects } from './types';
 export declare function validateWorkspace(tree: Tree, projects: WorkspaceProjects): void;
 export declare function createNxJson(tree: Tree, options: GeneratorOptions, setWorkspaceLayoutAsNewProjectRoot?: boolean): void;
 export declare function decorateAngularCli(tree: Tree): void;
 export declare function updateWorkspaceConfigDefaults(tree: Tree): void;
 export declare function updateRootTsConfig(tree: Tree): void;
 export declare function updatePackageJson(tree: Tree): void;
-export declare function updateTsLint(tree: Tree): void;
+export declare function updateRootEsLintConfig(tree: Tree, existingEsLintConfig: any | undefined): void;
+export declare function cleanupEsLintPackages(tree: Tree): void;
 export declare function createWorkspaceFiles(tree: Tree): Promise<void>;
 export declare function createRootKarmaConfig(tree: Tree): void;
+export declare function getWorkspaceCapabilities(tree: Tree, projects: WorkspaceProjects): WorkspaceCapabilities;

package/src/generators/ng-add/utilities/workspace.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRootKarmaConfig = exports.createWorkspaceFiles = exports.updateTsLint = exports.updatePackageJson = exports.updateRootTsConfig = exports.updateWorkspaceConfigDefaults = exports.decorateAngularCli = exports.createNxJson = exports.validateWorkspace = void 0;
+exports.getWorkspaceCapabilities = exports.createRootKarmaConfig = exports.createWorkspaceFiles = exports.cleanupEsLintPackages = exports.updateRootEsLintConfig = exports.updatePackageJson = exports.updateRootTsConfig = exports.updateWorkspaceConfigDefaults = exports.decorateAngularCli = exports.createNxJson = exports.validateWorkspace = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
+const linter_1 = require("@nrwl/linter");
 const workspace_1 = require("@nrwl/workspace/src/generators/workspace/workspace");
 const default_base_1 = require("@nrwl/workspace/src/utilities/default-base");
 const prettier_1 = require("@nrwl/workspace/src/utilities/prettier");
@@ -11,10 +12,6 @@ const versions_1 = require("@nrwl/workspace/src/utils/versions");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const versions_2 = require("../../../utils/versions");
-const e2e_utils_1 = require("./e2e-utils");
-// TODO: most of the validation here will be moved to the app migrator when
-// support for multiple apps is added. This will only contain workspace-wide
-// validation.
 function validateWorkspace(tree, projects) {
     try {
         if (!tree.exists('package.json')) {
@@ -28,29 +25,6 @@ function validateWorkspace(tree, projects) {
         if (projects.apps.length > 2 || projects.libs.length > 0) {
             throw new Error('Can only convert projects with one app');
         }
-        const e2eKey = (0, e2e_utils_1.getE2eKey)(projects);
-        const e2eApp = (0, e2e_utils_1.getE2eProject)(projects);
-        if (!e2eApp) {
-            return;
-        }
-        if ((0, e2e_utils_1.isProtractorE2eProject)(e2eApp.config)) {
-            if (tree.exists(e2eApp.config.targets.e2e.options.protractorConfig)) {
-                return;
-            }
-            console.info(`Make sure the "${e2eKey}.architect.e2e.options.protractorConfig" is valid or the "${e2eKey}" project is removed from "angular.json".`);
-            throw new Error(`An e2e project with Protractor was found but "${e2eApp.config.targets.e2e.options.protractorConfig}" could not be found.`);
-        }
-        if ((0, e2e_utils_1.isCypressE2eProject)(e2eApp.config)) {
-            const configFile = (0, e2e_utils_1.getCypressConfigFile)(e2eApp.config);
-            if (configFile && !tree.exists(configFile)) {
-                throw new Error(`An e2e project with Cypress was found but "${configFile}" could not be found.`);
-            }
-            if (!tree.exists('cypress')) {
-                throw new Error(`An e2e project with Cypress was found but the "cypress" directory could not be found.`);
-            }
-            return;
-        }
-        throw new Error(`An e2e project was found but it's using an unsupported executor "${e2eApp.config.targets.e2e.executor}".`);
     }
     catch (e) {
         console.error(e.message);
@@ -172,34 +146,72 @@ function updatePackageJson(tree) {
     });
 }
 exports.updatePackageJson = updatePackageJson;
-function updateTsLint(tree) {
-    if (!tree.exists(`tslint.json`)) {
+function updateRootEsLintConfig(tree, existingEsLintConfig) {
+    var _a, _b, _c;
+    if (tree.exists('.eslintrc.json')) {
+        /**
+         * If it still exists it means that there was no project at the root of the
+         * workspace, so it was not moved. In that case, we remove the file so the
+         * init generator do its work. We still receive the content of the file,
+         * so we update it after the init generator has run.
+         */
+        tree.delete('.eslintrc.json');
+    }
+    (0, linter_1.lintInitGenerator)(tree, { linter: linter_1.Linter.EsLint });
+    if (!existingEsLintConfig) {
+        // There was no eslint config in the root, so we keep the generated one as-is.
         return;
     }
-    (0, devkit_1.updateJson)(tree, 'tslint.json', (tslintJson) => {
+    existingEsLintConfig.ignorePatterns = ['**/*'];
+    existingEsLintConfig.plugins = Array.from(new Set([...((_a = existingEsLintConfig.plugins) !== null && _a !== void 0 ? _a : []), '@nrwl/nx']));
+    (_b = existingEsLintConfig.overrides) === null || _b === void 0 ? void 0 : _b.forEach((override) => {
         var _a;
-        [
-            'no-trailing-whitespace',
-            'one-line',
-            'quotemark',
-            'typedef-whitespace',
-            'whitespace',
-        ].forEach((key) => {
-            tslintJson[key] = undefined;
-        });
-        tslintJson.rulesDirectory = (_a = tslintJson.rulesDirectory) !== null && _a !== void 0 ? _a : [];
-        tslintJson.rulesDirectory.push('node_modules/@nrwl/workspace/src/tslint');
-        tslintJson.rules['nx-enforce-module-boundaries'] = [
-            true,
-            {
-                allow: [],
-                depConstraints: [{ sourceTag: '*', onlyDependOnLibsWithTags: ['*'] }],
+        if (!((_a = override.parserOptions) === null || _a === void 0 ? void 0 : _a.project)) {
+            return;
+        }
+        delete override.parserOptions.project;
+    });
+    // add the @nrwl/nx/enforce-module-boundaries rule
+    existingEsLintConfig.overrides = [
+        ...((_c = existingEsLintConfig.overrides) !== null && _c !== void 0 ? _c : []),
+        {
+            files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
+            rules: {
+                '@nrwl/nx/enforce-module-boundaries': [
+                    'error',
+                    {
+                        enforceBuildableLibDependency: true,
+                        allow: [],
+                        depConstraints: [
+                            { sourceTag: '*', onlyDependOnLibsWithTags: ['*'] },
+                        ],
+                    },
+                ],
             },
-        ];
-        return tslintJson;
+        },
+    ];
+    (0, devkit_1.writeJson)(tree, '.eslintrc.json', existingEsLintConfig);
+}
+exports.updateRootEsLintConfig = updateRootEsLintConfig;
+function cleanupEsLintPackages(tree) {
+    (0, devkit_1.updateJson)(tree, 'package.json', (json) => {
+        var _a, _b, _c, _d;
+        if ((_a = json.devDependencies) === null || _a === void 0 ? void 0 : _a['@angular-eslint/builder']) {
+            delete json.devDependencies['@angular-eslint/builder'];
+        }
+        if ((_b = json.dependencies) === null || _b === void 0 ? void 0 : _b['@angular-eslint/builder']) {
+            delete json.dependencies['@angular-eslint/builder'];
+        }
+        if ((_c = json.devDependencies) === null || _c === void 0 ? void 0 : _c['@angular-eslint/schematics']) {
+            delete json.devDependencies['@angular-eslint/schematics'];
+        }
+        if ((_d = json.dependencies) === null || _d === void 0 ? void 0 : _d['@angular-eslint/schematics']) {
+            delete json.dependencies['@angular-eslint/schematics'];
+        }
+        return json;
     });
 }
-exports.updateTsLint = updateTsLint;
+exports.cleanupEsLintPackages = cleanupEsLintPackages;
 function createWorkspaceFiles(tree) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         updateVsCodeRecommendedExtensions(tree);
@@ -218,6 +230,36 @@ function createRootKarmaConfig(tree) {
     });
 }
 exports.createRootKarmaConfig = createRootKarmaConfig;
+function getWorkspaceCapabilities(tree, projects) {
+    var _a, _b;
+    const capabilities = { eslint: false, karma: false };
+    if (tree.exists('.eslintrc.json')) {
+        capabilities.eslint = true;
+    }
+    if (tree.exists('karma.conf.js')) {
+        capabilities.karma = true;
+    }
+    if (capabilities.eslint && capabilities.karma) {
+        return capabilities;
+    }
+    for (const project of [...projects.apps, ...projects.libs]) {
+        if (!capabilities.eslint &&
+            (((_a = project.config.targets) === null || _a === void 0 ? void 0 : _a.lint) ||
+                tree.exists(`${project.config.root}/.eslintrc.json`))) {
+            capabilities.eslint = true;
+        }
+        if (!capabilities.karma &&
+            (((_b = project.config.targets) === null || _b === void 0 ? void 0 : _b.test) ||
+                tree.exists(`${project.config.root}/karma.conf.js`))) {
+            capabilities.karma = true;
+        }
+        if (capabilities.eslint && capabilities.karma) {
+            return capabilities;
+        }
+    }
+    return capabilities;
+}
+exports.getWorkspaceCapabilities = getWorkspaceCapabilities;
 function updateVsCodeRecommendedExtensions(tree) {
     const recommendations = [
         'nrwl.angular-console',