@nrwl/angular 13.10.3 → 14.0.0-beta.2

package/src/generators/ng-add/utilities/{e2e-project.migrator.d.ts → e2e.migrator.d.ts}

@@ -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.migrator.js

@@ -0,0 +1,298 @@
+"use strict";
+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 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.initialize();
+    }
+    migrate() {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            if (!this.project) {
+                this.logger.warn('No e2e project was migrated because there was none declared in angular.json.');
+                return;
+            }
+            if (this.isProtractorE2eProject()) {
+                yield this.migrateProtractorE2eProject();
+            }
+            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);
+            (0, devkit_1.updateJson)(this.tree, tsConfig, (json) => {
+                json.extends = `${rootOffset}${(0, typescript_1.getRootTsConfigPathInTree)(this.tree)}`;
+                json.compilerOptions = Object.assign(Object.assign({}, json.compilerOptions), { outDir: `${rootOffset}dist/out-tsc` });
+                return json;
+            });
+        });
+    }
+    validate() {
+        if (!this.project) {
+            return null;
+        }
+        if (this.isProtractorE2eProject()) {
+            if (this.tree.exists(this.projectConfig.targets.e2e.options.protractorConfig)) {
+                return null;
+            }
+            return [
+                {
+                    message: `The "e2e" target is using a Protractor builder but the Protractor config file ` +
+                        `"${this.projectConfig.targets.e2e.options.protractorConfig}" could not be found.`,
+                    hint: `Make sure the "${this.appName}.architect.e2e.options.protractorConfig" is set to a valid path ` +
+                        `or remove the "${this.appName}.architect.e2e" target if it is not valid.`,
+                },
+            ];
+        }
+        else if (this.isCypressE2eProject()) {
+            const configFile = this.getCypressConfigFile();
+            if (configFile && !this.tree.exists(configFile)) {
+                return [
+                    {
+                        message: `The "e2e" target is using a Cypress builder but the Cypress config file "${configFile}" could not be found.`,
+                        hint: `Make sure the "${this.appName}.architect.e2e.options.configFile" option is set to a valid path, ` +
+                            `or that a "cypress.json" file exists in the workspace root, ` +
+                            `or remove the "${this.appName}.architect.e2e" target if it its not valid.`,
+                    },
+                ];
+            }
+            if (!this.tree.exists('cypress')) {
+                return [
+                    {
+                        message: `The "e2e" target is using a Cypress builder but the "cypress" directory could not be found.`,
+                        hint: 'Make sure the "cypress" directory exists in the workspace root or remove the "e2e" target if it is not valid.',
+                    },
+                ];
+            }
+            return null;
+        }
+        return [
+            {
+                message: `The "e2e" target is using an unsupported builder "${this.projectConfig.targets.e2e.executor}".`,
+                hint: `The supported builders are "@cypress/schematic:cypress" and "@angular-devkit/build-angular:protractor".`,
+            },
+        ];
+    }
+    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);
+        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 (this.isCypressE2eProject()) {
+            this.project = Object.assign(Object.assign({}, this.project), { name, oldRoot: 'cypress', newRoot,
+                newSourceRoot });
+        }
+    }
+    migrateProtractorE2eProject() {
+        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, (0, path_1.basename)(this.projectConfig.targets.e2e.options.protractorConfig)) }) }),
+                },
+                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() {
+        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 {
+            cypressConfigFilePath = (0, devkit_1.joinPathFragments)(this.project.newRoot, 'cypress.json');
+            this.tree.write(cypressConfigFilePath, JSON.stringify({
+                fileServerFolder: '.',
+                fixturesFolder: './src/fixtures',
+                integrationFolder: './src/integration',
+                modifyObstructiveCode: false,
+                supportFile: './src/support/index.ts',
+                pluginsFile: './src/plugins/index.ts',
+                video: true,
+                videosFolder: `../../dist/cypress/${this.project.newRoot}/videos`,
+                screenshotsFolder: `../../dist/cypress/${this.project.newRoot}/screenshots`,
+                chromeWebSecurity: false,
+            }));
+        }
+        return cypressConfigFilePath;
+    }
+    updateCypressProjectConfiguration(cypressConfigPath) {
+        /**
+         * 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(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;
+        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;
+        }
+        else if (updatedTarget.options.headless === false &&
+            !updatedTarget.options.watch) {
+            updatedTarget.options.headed = true;
+        }
+        delete updatedTarget.options.headless;
+        return updatedTarget;
+    }
+    updateCypressConfigFilePaths(configFilePath) {
+        const srcFoldersAndFiles = [
+            'integrationFolder',
+            'supportFile',
+            'pluginsFile',
+            'fixturesFolder',
+        ];
+        const distFolders = ['videosFolder', 'screenshotsFolder'];
+        const stringOrArrayGlobs = ['ignoreTestFiles', 'testFiles'];
+        const cypressConfig = (0, devkit_1.readJson)(this.tree, configFilePath);
+        cypressConfig.fileServerFolder = '.';
+        srcFoldersAndFiles.forEach((folderOrFile) => {
+            if (cypressConfig[folderOrFile]) {
+                cypressConfig[folderOrFile] = `./src/${(0, path_1.relative)(this.project.oldRoot, cypressConfig[folderOrFile])}`;
+            }
+        });
+        distFolders.forEach((folder) => {
+            if (cypressConfig[folder]) {
+                cypressConfig[folder] = `../../dist/cypress/${this.project.newRoot}/${(0, path_1.relative)(this.project.oldRoot, cypressConfig[folder])}`;
+            }
+        });
+        stringOrArrayGlobs.forEach((stringOrArrayGlob) => {
+            if (!cypressConfig[stringOrArrayGlob]) {
+                return;
+            }
+            if (Array.isArray(cypressConfig[stringOrArrayGlob])) {
+                cypressConfig[stringOrArrayGlob] = cypressConfig[stringOrArrayGlob].map((glob) => this.replaceCypressGlobConfig(glob));
+            }
+            else {
+                cypressConfig[stringOrArrayGlob] = this.replaceCypressGlobConfig(cypressConfig[stringOrArrayGlob]);
+            }
+        });
+        (0, devkit_1.writeJson)(this.tree, configFilePath, cypressConfig);
+    }
+    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.migrator.js.map

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

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

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

@@ -0,0 +1,26 @@
+import { Tree } from '@nrwl/devkit';
+import { GeneratorOptions } from '../schema';
+import { Logger } from './logger';
+import { ProjectMigrator } from './project.migrator';
+import { MigrationProjectConfiguration, ValidationResult } from './types';
+export declare class LibMigrator extends ProjectMigrator {
+    private readonly supportedBuilders;
+    private readonly targetNames;
+    private oldEsLintConfigPath;
+    private newEsLintConfigPath;
+    constructor(tree: Tree, options: GeneratorOptions, project: MigrationProjectConfiguration, logger?: Logger);
+    migrate(): Promise<void>;
+    validate(): ValidationResult;
+    private collectTargetNames;
+    private moveProjectFiles;
+    private updateProjectConfiguration;
+    private updateNgPackageJson;
+    private updateTsConfigs;
+    private updateEsLintConfig;
+    private updateCacheableOperations;
+    private updateBuildTargetConfiguration;
+    private updateLintTargetConfiguration;
+    private updateTestTargetConfiguration;
+    private updateTsConfigFileUsedByBuildTarget;
+    private updateTsConfigFileUsedByTestTarget;
+}