@nx/cypress 16.8.0-beta.4 → 16.8.0-beta.6

package/src/generators/component-configuration/component-configuration.js

@@ -1,36 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compat = exports.updateTsConfigForComponentTesting = exports.componentConfigurationGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const cypress_version_1 = require("../../utils/cypress-version");
 const versions_1 = require("../../utils/versions");
 const base_setup_1 = require("../base-setup/base-setup");
-function componentConfigurationGenerator(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const opts = normalizeOptions(options);
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, opts.project);
-        const installDepsTask = updateDeps(tree, opts);
-        addProjectFiles(tree, projectConfig, opts);
-        addTargetToProject(tree, projectConfig, opts);
-        updateNxJsonConfiguration(tree);
-        updateTsConfigForComponentTesting(tree, projectConfig);
-        if (!opts.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return () => {
-            installDepsTask();
-        };
-    });
+async function componentConfigurationGenerator(tree, options) {
+    const opts = normalizeOptions(options);
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, opts.project);
+    const installDepsTask = updateDeps(tree, opts);
+    addProjectFiles(tree, projectConfig, opts);
+    addTargetToProject(tree, projectConfig, opts);
+    updateNxJsonConfiguration(tree);
+    updateTsConfigForComponentTesting(tree, projectConfig);
+    if (!opts.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return () => {
+        installDepsTask();
+    };
 }
 exports.componentConfigurationGenerator = componentConfigurationGenerator;
 function normalizeOptions(options) {
-    var _a;
     const cyVersion = (0, cypress_version_1.installedCypressVersion)();
     if (cyVersion && cyVersion < 10) {
         throw new Error('Cypress version of 10 or higher is required to use component testing. See the migration guide to upgrade. https://nx.dev/cypress/v11-migration-guide');
     }
-    return Object.assign(Object.assign({}, options), { directory: (_a = options.directory) !== null && _a !== void 0 ? _a : 'cypress' });
+    return {
+        ...options,
+        directory: options.directory ?? 'cypress',
+    };
 }
 function updateDeps(tree, opts) {
     const devDeps = {
@@ -50,7 +49,12 @@ function addProjectFiles(tree, projectConfig, opts) {
         project: opts.project,
         directory: opts.directory,
     });
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), projectConfig.root, Object.assign(Object.assign({}, opts), { projectRoot: projectConfig.root, offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root), ext: '' }));
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), projectConfig.root, {
+        ...opts,
+        projectRoot: projectConfig.root,
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root),
+        ext: '',
+    });
 }
 function addTargetToProject(tree, projectConfig, opts) {
     projectConfig.targets['component-test'] = {
@@ -63,16 +67,24 @@ function addTargetToProject(tree, projectConfig, opts) {
     (0, devkit_1.updateProjectConfiguration)(tree, opts.project, projectConfig);
 }
 function updateNxJsonConfiguration(tree) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-    var _m, _o;
     const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.tasksRunnerOptions = Object.assign(Object.assign({}, nxJson === null || nxJson === void 0 ? void 0 : nxJson.tasksRunnerOptions), { default: Object.assign(Object.assign({}, (_a = nxJson === null || nxJson === void 0 ? void 0 : nxJson.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a.default), { options: Object.assign(Object.assign({}, (_c = (_b = nxJson === null || nxJson === void 0 ? void 0 : nxJson.tasksRunnerOptions) === null || _b === void 0 ? void 0 : _b.default) === null || _c === void 0 ? void 0 : _c.options), { cacheableOperations: Array.from(new Set([
-                    ...((_g = (_f = (_e = (_d = nxJson === null || nxJson === void 0 ? void 0 : nxJson.tasksRunnerOptions) === null || _d === void 0 ? void 0 : _d.default) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? void 0 : _f.cacheableOperations) !== null && _g !== void 0 ? _g : []),
+    nxJson.tasksRunnerOptions = {
+        ...nxJson?.tasksRunnerOptions,
+        default: {
+            ...nxJson?.tasksRunnerOptions?.default,
+            options: {
+                ...nxJson?.tasksRunnerOptions?.default?.options,
+                cacheableOperations: Array.from(new Set([
+                    ...(nxJson?.tasksRunnerOptions?.default?.options
+                        ?.cacheableOperations ?? []),
                     'component-test',
-                ])) }) }) });
+                ])),
+            },
+        },
+    };
     if (nxJson.namedInputs) {
-        (_h = nxJson.targetDefaults) !== null && _h !== void 0 ? _h : (nxJson.targetDefaults = {});
-        const productionFileSet = (_j = nxJson.namedInputs) === null || _j === void 0 ? void 0 : _j.production;
+        nxJson.targetDefaults ??= {};
+        const productionFileSet = nxJson.namedInputs?.production;
         if (productionFileSet) {
             nxJson.namedInputs.production = Array.from(new Set([
                 ...productionFileSet,
@@ -81,11 +93,11 @@ function updateNxJsonConfiguration(tree) {
                 '!{projectRoot}/cypress.config.[jt]s',
             ]));
         }
-        (_k = (_m = nxJson.targetDefaults)['component-test']) !== null && _k !== void 0 ? _k : (_m['component-test'] = {});
-        (_l = (_o = nxJson.targetDefaults['component-test']).inputs) !== null && _l !== void 0 ? _l : (_o.inputs = [
+        nxJson.targetDefaults['component-test'] ??= {};
+        nxJson.targetDefaults['component-test'].inputs ??= [
             'default',
             productionFileSet ? '^production' : '^default',
-        ]);
+        ];
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }

package/src/generators/configuration/configuration.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compat = exports.configurationGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const linter_1 = require("@nx/linter");
@@ -12,30 +11,30 @@ const cypress_version_1 = require("../../utils/cypress-version");
 const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
 const base_setup_1 = require("../base-setup/base-setup");
-function configurationGenerator(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const opts = normalizeOptions(tree, options);
-        const tasks = [];
-        if (!(0, cypress_version_1.installedCypressVersion)()) {
-            tasks.push(yield (0, init_1.default)(tree, opts));
-        }
-        if (opts.bundler === 'vite') {
-            tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { vite: versions_1.viteVersion }));
-        }
-        yield addFiles(tree, opts);
-        addTarget(tree, opts);
-        (0, add_linter_1.addLinterToCyProject)(tree, Object.assign(Object.assign({}, opts), { cypressDir: opts.directory }));
-        if (!opts.skipFormat) {
-            yield (0, devkit_1.formatFiles)(tree);
-        }
-        return (0, devkit_1.runTasksInSerial)(...tasks);
+async function configurationGenerator(tree, options) {
+    const opts = normalizeOptions(tree, options);
+    const tasks = [];
+    if (!(0, cypress_version_1.installedCypressVersion)()) {
+        tasks.push(await (0, init_1.default)(tree, opts));
+    }
+    if (opts.bundler === 'vite') {
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { vite: versions_1.viteVersion }));
+    }
+    await addFiles(tree, opts);
+    addTarget(tree, opts);
+    (0, add_linter_1.addLinterToCyProject)(tree, {
+        ...opts,
+        cypressDir: opts.directory,
     });
+    if (!opts.skipFormat) {
+        await (0, devkit_1.formatFiles)(tree);
+    }
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.configurationGenerator = configurationGenerator;
 function normalizeOptions(tree, options) {
-    var _a, _b, _c, _d, _e;
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    if ((_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _a === void 0 ? void 0 : _a.e2e) {
+    if (projectConfig?.targets?.e2e) {
         throw new Error(`Project ${options.project} already has an e2e target.
 Rename or remove the existing e2e target.`);
     }
@@ -45,57 +44,68 @@ Rename or remove the existing e2e target.`);
         throw new Error(`The project ${options.project} does not have a 'serve' target.
 In this case you need to provide a devServerTarget,'<projectName>:<targetName>[:<configName>]', or a baseUrl option`);
     }
-    (_b = options.directory) !== null && _b !== void 0 ? _b : (options.directory = 'src');
-    return Object.assign(Object.assign({}, options), { bundler: (_c = options.bundler) !== null && _c !== void 0 ? _c : 'webpack', rootProject: projectConfig.root === '.', linter: (_d = options.linter) !== null && _d !== void 0 ? _d : linter_1.Linter.EsLint, devServerTarget: (_e = options.devServerTarget) !== null && _e !== void 0 ? _e : (projectConfig.targets.serve ? `${options.project}:serve` : undefined) });
+    options.directory ??= 'src';
+    return {
+        ...options,
+        bundler: options.bundler ?? 'webpack',
+        rootProject: projectConfig.root === '.',
+        linter: options.linter ?? linter_1.Linter.EsLint,
+        devServerTarget: options.devServerTarget ??
+            (projectConfig.targets.serve ? `${options.project}:serve` : undefined),
+    };
 }
-function addFiles(tree, options) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-        const cyVersion = (0, cypress_version_1.installedCypressVersion)();
-        const filesToUse = cyVersion && cyVersion < 10 ? 'v9' : 'v10';
-        const hasTsConfig = tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'));
-        const offsetFromProjectRoot = options.directory
-            .split('/')
-            .map((_) => '..')
-            .join('/');
-        const fileOpts = Object.assign(Object.assign({}, options), { dir: (_a = options.directory) !== null && _a !== void 0 ? _a : 'src', ext: options.js ? 'js' : 'ts', offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root), offsetFromProjectRoot, tsConfigPath: hasTsConfig
-                ? `${offsetFromProjectRoot}/tsconfig.json`
-                : (0, js_1.getRelativePathToRootTsConfig)(tree, projectConfig.root), tmpl: '' });
-        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files', filesToUse), projectConfig.root, fileOpts);
-        if (filesToUse === 'v10') {
-            (0, base_setup_1.addBaseCypressSetup)(tree, {
-                project: options.project,
-                directory: options.directory,
-            });
-            const cyFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
-            const updatedCyConfig = yield (0, config_1.addDefaultE2EConfig)(tree.read(cyFile, 'utf-8'), {
-                directory: options.directory,
-                bundler: options.bundler,
-            });
-            tree.write(cyFile, updatedCyConfig);
-        }
-        if (cyVersion &&
-            cyVersion < 7 &&
-            tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, 'src', 'plugins', 'index.js'))) {
-            (0, devkit_1.updateJson)(tree, (0, path_1.join)(projectConfig.root, 'cypress.json'), (json) => {
-                json.pluginsFile = './src/plugins/index';
-                return json;
-            });
-        }
-        else if (cyVersion < 10) {
-            const pluginPath = (0, path_1.join)(projectConfig.root, 'src/plugins/index.js');
-            if (tree.exists(pluginPath)) {
-                tree.delete(pluginPath);
-            }
-        }
-        if (options.js) {
-            (0, devkit_1.toJS)(tree);
+async function addFiles(tree, options) {
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    const cyVersion = (0, cypress_version_1.installedCypressVersion)();
+    const filesToUse = cyVersion && cyVersion < 10 ? 'v9' : 'v10';
+    const hasTsConfig = tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'));
+    const offsetFromProjectRoot = options.directory
+        .split('/')
+        .map((_) => '..')
+        .join('/');
+    const fileOpts = {
+        ...options,
+        dir: options.directory ?? 'src',
+        ext: options.js ? 'js' : 'ts',
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root),
+        offsetFromProjectRoot,
+        tsConfigPath: hasTsConfig
+            ? `${offsetFromProjectRoot}/tsconfig.json`
+            : (0, js_1.getRelativePathToRootTsConfig)(tree, projectConfig.root),
+        tmpl: '',
+    };
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files', filesToUse), projectConfig.root, fileOpts);
+    if (filesToUse === 'v10') {
+        (0, base_setup_1.addBaseCypressSetup)(tree, {
+            project: options.project,
+            directory: options.directory,
+        });
+        const cyFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress.config.ts');
+        const updatedCyConfig = await (0, config_1.addDefaultE2EConfig)(tree.read(cyFile, 'utf-8'), {
+            directory: options.directory,
+            bundler: options.bundler,
+        });
+        tree.write(cyFile, updatedCyConfig);
+    }
+    if (cyVersion &&
+        cyVersion < 7 &&
+        tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, 'src', 'plugins', 'index.js'))) {
+        (0, devkit_1.updateJson)(tree, (0, path_1.join)(projectConfig.root, 'cypress.json'), (json) => {
+            json.pluginsFile = './src/plugins/index';
+            return json;
+        });
+    }
+    else if (cyVersion < 10) {
+        const pluginPath = (0, path_1.join)(projectConfig.root, 'src/plugins/index.js');
+        if (tree.exists(pluginPath)) {
+            tree.delete(pluginPath);
         }
-    });
+    }
+    if (options.js) {
+        (0, devkit_1.toJS)(tree);
+    }
 }
 function addTarget(tree, opts) {
-    var _a;
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, opts.project);
     const cyVersion = (0, cypress_version_1.installedCypressVersion)();
     projectConfig.targets.e2e = {
@@ -106,18 +116,25 @@ function addTarget(tree, opts) {
         },
     };
     if (opts.baseUrl) {
-        projectConfig.targets.e2e.options = Object.assign(Object.assign({}, projectConfig.targets.e2e.options), { baseUrl: opts.baseUrl });
+        projectConfig.targets.e2e.options = {
+            ...projectConfig.targets.e2e.options,
+            baseUrl: opts.baseUrl,
+        };
     }
     else if (opts.devServerTarget) {
         const parsedTarget = (0, devkit_1.parseTargetString)(opts.devServerTarget);
-        projectConfig.targets.e2e.options = Object.assign(Object.assign({}, projectConfig.targets.e2e.options), { devServerTarget: opts.devServerTarget, port: opts.port });
+        projectConfig.targets.e2e.options = {
+            ...projectConfig.targets.e2e.options,
+            devServerTarget: opts.devServerTarget,
+            port: opts.port,
+        };
         projectConfig.targets.e2e.configurations = {
             [parsedTarget.configuration || 'production']: {
                 devServerTarget: `${opts.devServerTarget}${parsedTarget.configuration ? '' : ':production'}`,
             },
         };
         const devServerProjectConfig = (0, devkit_1.readProjectConfiguration)(tree, parsedTarget.project);
-        if ((_a = devServerProjectConfig.targets) === null || _a === void 0 ? void 0 : _a['serve-static']) {
+        if (devServerProjectConfig.targets?.['serve-static']) {
             projectConfig.targets.e2e.configurations.ci = {
                 devServerTarget: `${parsedTarget.project}:serve-static`,
             };

package/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.js

@@ -1,91 +1,88 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.conversionSchematic = exports.conversionGenerator = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const linter_1 = require("@nx/linter");
 const add_linter_1 = require("../../utils/add-linter");
 /**
  * @deprecated This generator will be removed in v17
  */
-function conversionGenerator(host, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        /**
-         * The ProjectConverter instance encapsulates all the standard operations we need
-         * to perform in order to convert a project from TSLint to ESLint, as well as some
-         * extensibility points for adjusting the behavior on a per package basis.
-         *
-         * E.g. @nx/angular projects might need to make different changes to the final
-         * ESLint config when compared with @nx/next projects.
-         *
-         * See the ProjectConverter implementation for a full breakdown of what it does.
-         */
-        const projectConverter = new linter_1.ProjectConverter({
-            host,
-            projectName: options.project,
-            ignoreExistingTslintConfig: options.ignoreExistingTslintConfig,
-            eslintInitializer: ({ projectName, projectConfig }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                yield (0, add_linter_1.addLinterToCyProject)(host, {
-                    linter: linter_1.Linter.EsLint,
-                    project: projectName,
-                    /**
-                     * We set the parserOptions.project config just in case the converted config uses
-                     * rules which require type-checking. Later in the conversion we check if it actually
-                     * does and remove the config again if it doesn't, so that it is most efficient.
-                     */
-                    setParserOptionsProject: true,
-                    cypressDir: 'src',
-                    overwriteExisting: true,
-                });
-            }),
-        });
-        /**
-         * If root eslint configuration already exists it will not be recreated
-         * but we also don't want to re-run the tslint config conversion
-         * as it was likely already done
-         */
-        const rootEslintConfigExists = host.exists('.eslintrc.json');
-        /**
-         * Create the standard (which is applicable to the current package) ESLint setup
-         * for converting the project.
-         */
-        const eslintInitInstallTask = yield projectConverter.initESLint();
-        /**
-         * Convert the root tslint.json and apply the converted rules to the root .eslintrc.json.
-         */
-        const rootConfigInstallTask = yield projectConverter.convertRootTSLintConfig((json) => removeCodelyzerRelatedRules(json), rootEslintConfigExists);
-        /**
-         * Convert the project's tslint.json to an equivalent ESLint config.
-         */
-        const projectConfigInstallTask = yield projectConverter.convertProjectConfig((json) => json);
-        /**
-         * Clean up the original TSLint configuration for the project.
-         */
-        projectConverter.removeProjectTSLintFile();
-        // Only project shouldn't be added as a default
-        const { project } = options, defaults = tslib_1.__rest(options, ["project"]);
-        /**
-         * Store user preferences for the collection
-         */
-        projectConverter.setDefaults('@nx/cypress', defaults);
-        /**
-         * Based on user preference and remaining usage, remove TSLint from the workspace entirely.
-         */
-        let uninstallTSLintTask = () => Promise.resolve(undefined);
-        if (options.removeTSLintIfNoMoreTSLintTargets &&
-            !projectConverter.isTSLintUsedInWorkspace()) {
-            uninstallTSLintTask = projectConverter.removeTSLintFromWorkspace();
-        }
-        if (!options.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            yield eslintInitInstallTask();
-            yield rootConfigInstallTask();
-            yield projectConfigInstallTask();
-            yield uninstallTSLintTask();
-        });
+async function conversionGenerator(host, options) {
+    /**
+     * The ProjectConverter instance encapsulates all the standard operations we need
+     * to perform in order to convert a project from TSLint to ESLint, as well as some
+     * extensibility points for adjusting the behavior on a per package basis.
+     *
+     * E.g. @nx/angular projects might need to make different changes to the final
+     * ESLint config when compared with @nx/next projects.
+     *
+     * See the ProjectConverter implementation for a full breakdown of what it does.
+     */
+    const projectConverter = new linter_1.ProjectConverter({
+        host,
+        projectName: options.project,
+        ignoreExistingTslintConfig: options.ignoreExistingTslintConfig,
+        eslintInitializer: async ({ projectName, projectConfig }) => {
+            await (0, add_linter_1.addLinterToCyProject)(host, {
+                linter: linter_1.Linter.EsLint,
+                project: projectName,
+                /**
+                 * We set the parserOptions.project config just in case the converted config uses
+                 * rules which require type-checking. Later in the conversion we check if it actually
+                 * does and remove the config again if it doesn't, so that it is most efficient.
+                 */
+                setParserOptionsProject: true,
+                cypressDir: 'src',
+                overwriteExisting: true,
+            });
+        },
     });
+    /**
+     * If root eslint configuration already exists it will not be recreated
+     * but we also don't want to re-run the tslint config conversion
+     * as it was likely already done
+     */
+    const rootEslintConfigExists = host.exists('.eslintrc.json');
+    /**
+     * Create the standard (which is applicable to the current package) ESLint setup
+     * for converting the project.
+     */
+    const eslintInitInstallTask = await projectConverter.initESLint();
+    /**
+     * Convert the root tslint.json and apply the converted rules to the root .eslintrc.json.
+     */
+    const rootConfigInstallTask = await projectConverter.convertRootTSLintConfig((json) => removeCodelyzerRelatedRules(json), rootEslintConfigExists);
+    /**
+     * Convert the project's tslint.json to an equivalent ESLint config.
+     */
+    const projectConfigInstallTask = await projectConverter.convertProjectConfig((json) => json);
+    /**
+     * Clean up the original TSLint configuration for the project.
+     */
+    projectConverter.removeProjectTSLintFile();
+    // Only project shouldn't be added as a default
+    const { project, ...defaults } = options;
+    /**
+     * Store user preferences for the collection
+     */
+    projectConverter.setDefaults('@nx/cypress', defaults);
+    /**
+     * Based on user preference and remaining usage, remove TSLint from the workspace entirely.
+     */
+    let uninstallTSLintTask = () => Promise.resolve(undefined);
+    if (options.removeTSLintIfNoMoreTSLintTargets &&
+        !projectConverter.isTSLintUsedInWorkspace()) {
+        uninstallTSLintTask = projectConverter.removeTSLintFromWorkspace();
+    }
+    if (!options.skipFormat) {
+        await (0, devkit_1.formatFiles)(host);
+    }
+    return async () => {
+        await eslintInitInstallTask();
+        await rootConfigInstallTask();
+        await projectConfigInstallTask();
+        await uninstallTSLintTask();
+    };
 }
 exports.conversionGenerator = conversionGenerator;
 exports.conversionSchematic = (0, devkit_1.convertNxGenerator)(conversionGenerator);