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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "16.8.0-beta.4",
+  "version": "16.8.0-beta.5",
   "private": false,
   "description": "The Nx Plugin for Cypress contains executors and generators allowing your workspace to use the powerful Cypress integration testing capabilities.",
   "repository": {
@@ -34,10 +34,10 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/cypress": "16.8.0-beta.4",
-    "@nx/devkit": "16.8.0-beta.4",
-    "@nx/js": "16.8.0-beta.4",
-    "@nx/linter": "16.8.0-beta.4",
+    "@nrwl/cypress": "16.8.0-beta.5",
+    "@nx/devkit": "16.8.0-beta.5",
+    "@nx/js": "16.8.0-beta.5",
+    "@nx/linter": "16.8.0-beta.5",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
     "semver": "7.5.3",
@@ -55,5 +55,5 @@
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "c9aad2dc8c2b34531cf61549bff872e68c481e4e"
+  "gitHead": "ad2d1e8a55b2d1b358bb5e7483343d9757ff2c53"
 }

package/plugins/cypress-preset.js

@@ -8,7 +8,7 @@ const preprocessor_vite_1 = require("../src/plugins/preprocessor-vite");
 function nxBaseCypressPreset(pathToConfig, options) {
     // used to set babel settings for react CT.
     process.env.NX_CYPRESS_COMPONENT_TEST =
-        (options === null || options === void 0 ? void 0 : options.testingType) === 'component' ? 'true' : 'false';
+        options?.testingType === 'component' ? 'true' : 'false';
     // prevent from placing path outside the root of the workspace
     // if they pass in a file or directory
     const normalizedPath = (0, fs_1.lstatSync)(pathToConfig).isDirectory()
@@ -43,12 +43,21 @@ exports.nxBaseCypressPreset = nxBaseCypressPreset;
  * @param pathToConfig will be used to construct the output paths for videos and screenshots
  */
 function nxE2EPreset(pathToConfig, options) {
-    const basePath = (options === null || options === void 0 ? void 0 : options.cypressDir) || 'src';
-    const baseConfig = Object.assign(Object.assign({}, nxBaseCypressPreset(pathToConfig)), { fileServerFolder: '.', supportFile: `${basePath}/support/e2e.ts`, specPattern: `${basePath}/**/*.cy.{js,jsx,ts,tsx}`, fixturesFolder: `${basePath}/fixtures` });
-    if ((options === null || options === void 0 ? void 0 : options.bundler) === 'vite') {
-        return Object.assign(Object.assign({}, baseConfig), { setupNodeEvents(on) {
+    const basePath = options?.cypressDir || 'src';
+    const baseConfig = {
+        ...nxBaseCypressPreset(pathToConfig),
+        fileServerFolder: '.',
+        supportFile: `${basePath}/support/e2e.ts`,
+        specPattern: `${basePath}/**/*.cy.{js,jsx,ts,tsx}`,
+        fixturesFolder: `${basePath}/fixtures`,
+    };
+    if (options?.bundler === 'vite') {
+        return {
+            ...baseConfig,
+            setupNodeEvents(on) {
                 on('file:preprocessor', (0, preprocessor_vite_1.default)());
-            } });
+            },
+        };
     }
     return baseConfig;
 }

package/src/executors/cypress/cypress.impl.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const executor_utils_1 = require("nx/src/command-line/run/executor-utils");
 const fs_1 = require("fs");
@@ -9,48 +8,35 @@ const ct_helpers_1 = require("../../utils/ct-helpers");
 const cypress_version_1 = require("../../utils/cypress-version");
 const detectPort = require("detect-port");
 const Cypress = require('cypress'); // @NOTE: Importing via ES6 messes the whole test dependencies.
-function cypressExecutor(options, context) {
-    var _a, e_1, _b, _c;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        options = normalizeOptions(options, context);
-        // this is used by cypress component testing presets to build the executor contexts with the correct configuration options.
-        process.env.NX_CYPRESS_TARGET_CONFIGURATION = context.configurationName;
-        let success;
+async function cypressExecutor(options, context) {
+    options = normalizeOptions(options, context);
+    // this is used by cypress component testing presets to build the executor contexts with the correct configuration options.
+    process.env.NX_CYPRESS_TARGET_CONFIGURATION = context.configurationName;
+    let success;
+    for await (const devServerValues of startDevServer(options, context)) {
         try {
-            for (var _d = true, _e = tslib_1.__asyncValues(startDevServer(options, context)), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
-                _c = _f.value;
-                _d = false;
-                const devServerValues = _c;
-                try {
-                    success = yield runCypress(devServerValues.baseUrl, Object.assign(Object.assign({}, options), { portLockFilePath: devServerValues.portLockFilePath }));
-                    if (!options.watch)
-                        break;
-                }
-                catch (e) {
-                    devkit_1.logger.error(e.message);
-                    success = false;
-                    if (!options.watch)
-                        break;
-                }
-            }
+            success = await runCypress(devServerValues.baseUrl, {
+                ...options,
+                portLockFilePath: devServerValues.portLockFilePath,
+            });
+            if (!options.watch)
+                break;
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
-            }
-            finally { if (e_1) throw e_1.error; }
+        catch (e) {
+            devkit_1.logger.error(e.message);
+            success = false;
+            if (!options.watch)
+                break;
         }
-        return { success };
-    });
+    }
+    return { success };
 }
 exports.default = cypressExecutor;
 function normalizeOptions(options, context) {
-    var _a, _b, _c;
     options.env = options.env || {};
     if (options.testingType === 'component') {
-        const project = (_b = (_a = context === null || context === void 0 ? void 0 : context.projectGraph) === null || _a === void 0 ? void 0 : _a.nodes) === null || _b === void 0 ? void 0 : _b[context.projectName];
-        if ((_c = project === null || project === void 0 ? void 0 : project.data) === null || _c === void 0 ? void 0 : _c.root) {
+        const project = context?.projectGraph?.nodes?.[context.projectName];
+        if (project?.data?.root) {
             options.ctTailwindPath = (0, ct_helpers_1.getTempTailwindPath)(context);
         }
     }
@@ -104,202 +90,186 @@ A generator to migrate from v8 to v10 is provided. See https://nx.dev/cypress/v1
 `);
     }
 }
-function startDevServer(opts, context) {
-    var _a, _b, _c;
-    return tslib_1.__asyncGenerator(this, arguments, function* startDevServer_1() {
-        var _d, e_2, _e, _f;
-        // no dev server, return the provisioned base url
-        if (!opts.devServerTarget || opts.skipServe) {
-            yield yield tslib_1.__await({ baseUrl: opts.baseUrl });
-            return yield tslib_1.__await(void 0);
-        }
-        const parsedDevServerTarget = (0, devkit_1.parseTargetString)(opts.devServerTarget, context.projectGraph);
-        const [targetSupportsWatchOpt] = getValueFromSchema(context, parsedDevServerTarget, 'watch');
-        const overrides = Object.assign({}, (targetSupportsWatchOpt ? { watch: opts.watch } : {}));
-        if (opts.port === 'cypress-auto') {
-            const freePort = yield tslib_1.__await(getPortForProject(context, parsedDevServerTarget));
-            overrides['port'] = freePort;
-        }
-        else if (opts.port !== undefined) {
-            overrides['port'] = opts.port;
-            // zero is a special case that means any valid port so there is no reason to try to 'lock it'
-            if (opts.port !== 0) {
-                const didLock = attemptToLockPort(opts.port);
-                if (!didLock) {
-                    devkit_1.logger.warn((0, devkit_1.stripIndents) `${opts.port} is potentially already in use by another cypress run.
+async function* startDevServer(opts, context) {
+    // no dev server, return the provisioned base url
+    if (!opts.devServerTarget || opts.skipServe) {
+        yield { baseUrl: opts.baseUrl };
+        return;
+    }
+    const parsedDevServerTarget = (0, devkit_1.parseTargetString)(opts.devServerTarget, context.projectGraph);
+    const [targetSupportsWatchOpt] = getValueFromSchema(context, parsedDevServerTarget, 'watch');
+    const overrides = {
+        // @NOTE: Do not forward watch option if not supported by the target dev server,
+        //  this is relevant for running Cypress against dev server target that does not support this option,
+        //  for instance @nguniversal/builders:ssr-dev-server.
+        ...(targetSupportsWatchOpt ? { watch: opts.watch } : {}),
+    };
+    if (opts.port === 'cypress-auto') {
+        const freePort = await getPortForProject(context, parsedDevServerTarget);
+        overrides['port'] = freePort;
+    }
+    else if (opts.port !== undefined) {
+        overrides['port'] = opts.port;
+        // zero is a special case that means any valid port so there is no reason to try to 'lock it'
+        if (opts.port !== 0) {
+            const didLock = attemptToLockPort(opts.port);
+            if (!didLock) {
+                devkit_1.logger.warn((0, devkit_1.stripIndents) `${opts.port} is potentially already in use by another cypress run.
 If the port is in use, try using a different port value or passing --port='cypress-auto' to find a free port.`);
-                }
-            }
-        }
-        try {
-            for (var _g = true, _h = tslib_1.__asyncValues(yield tslib_1.__await((0, devkit_1.runExecutor)(parsedDevServerTarget, overrides, context))), _j; _j = yield tslib_1.__await(_h.next()), _d = _j.done, !_d; _g = true) {
-                _f = _j.value;
-                _g = false;
-                const output = _f;
-                if (!output.success && !opts.watch)
-                    throw new Error('Could not compile application files');
-                if (!opts.baseUrl &&
-                    !output.baseUrl &&
-                    !((_a = output.info) === null || _a === void 0 ? void 0 : _a.baseUrl) &&
-                    ((_b = output.info) === null || _b === void 0 ? void 0 : _b.port)) {
-                    output.baseUrl = `http://localhost:${output.info.port}`;
-                }
-                yield yield tslib_1.__await({
-                    baseUrl: opts.baseUrl || output.baseUrl || ((_c = output.info) === null || _c === void 0 ? void 0 : _c.baseUrl),
-                    portLockFilePath: overrides.port && (0, path_1.join)(__dirname, `${overrides.port}.txt`),
-                });
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (!_g && !_d && (_e = _h.return)) yield tslib_1.__await(_e.call(_h));
-            }
-            finally { if (e_2) throw e_2.error; }
+    }
+    for await (const output of await (0, devkit_1.runExecutor)(parsedDevServerTarget, overrides, context)) {
+        if (!output.success && !opts.watch)
+            throw new Error('Could not compile application files');
+        if (!opts.baseUrl &&
+            !output.baseUrl &&
+            !output.info?.baseUrl &&
+            output.info?.port) {
+            output.baseUrl = `http://localhost:${output.info.port}`;
         }
-    });
+        yield {
+            baseUrl: opts.baseUrl || output.baseUrl || output.info?.baseUrl,
+            portLockFilePath: overrides.port && (0, path_1.join)(__dirname, `${overrides.port}.txt`),
+        };
+    }
 }
 /**
  * @whatItDoes Initialize the Cypress test runner with the provided project configuration.
  * By default, Cypress will run tests from the CLI without the GUI and provide directly the results in the console output.
  * If `watch` is `true`: Open Cypress in the interactive GUI to interact directly with the application.
  */
-function runCypress(baseUrl, opts) {
-    var _a, _b;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const cypressVersion = (0, cypress_version_1.installedCypressVersion)();
-        // Cypress expects the folder where a cypress config is present
-        const projectFolderPath = (0, path_1.dirname)(opts.cypressConfig);
-        const options = {
-            project: projectFolderPath,
-            configFile: (0, path_1.basename)(opts.cypressConfig),
+async function runCypress(baseUrl, opts) {
+    const cypressVersion = (0, cypress_version_1.installedCypressVersion)();
+    // Cypress expects the folder where a cypress config is present
+    const projectFolderPath = (0, path_1.dirname)(opts.cypressConfig);
+    const options = {
+        project: projectFolderPath,
+        configFile: (0, path_1.basename)(opts.cypressConfig),
+    };
+    // If not, will use the `baseUrl` normally from `cypress.json`
+    if (baseUrl) {
+        options.config = { baseUrl };
+    }
+    if (opts.browser) {
+        options.browser = opts.browser;
+    }
+    if (opts.env) {
+        options.env = opts.env;
+    }
+    if (opts.spec) {
+        options.spec = opts.spec;
+    }
+    options.tag = opts.tag;
+    options.exit = opts.exit;
+    options.headed = opts.headed;
+    if (opts.headless) {
+        options.headless = opts.headless;
+    }
+    options.record = opts.record;
+    options.key = opts.key;
+    options.parallel = opts.parallel;
+    options.ciBuildId = opts.ciBuildId?.toString();
+    options.group = opts.group;
+    // renamed in cy 10
+    if (cypressVersion >= 10) {
+        options.config ??= {};
+        options.config[opts.testingType] = {
+            excludeSpecPattern: opts.ignoreTestFiles,
         };
-        // If not, will use the `baseUrl` normally from `cypress.json`
-        if (baseUrl) {
-            options.config = { baseUrl };
-        }
-        if (opts.browser) {
-            options.browser = opts.browser;
-        }
-        if (opts.env) {
-            options.env = opts.env;
-        }
-        if (opts.spec) {
-            options.spec = opts.spec;
-        }
-        options.tag = opts.tag;
-        options.exit = opts.exit;
-        options.headed = opts.headed;
-        if (opts.headless) {
-            options.headless = opts.headless;
-        }
-        options.record = opts.record;
-        options.key = opts.key;
-        options.parallel = opts.parallel;
-        options.ciBuildId = (_a = opts.ciBuildId) === null || _a === void 0 ? void 0 : _a.toString();
-        options.group = opts.group;
-        // renamed in cy 10
-        if (cypressVersion >= 10) {
-            (_b = options.config) !== null && _b !== void 0 ? _b : (options.config = {});
-            options.config[opts.testingType] = {
-                excludeSpecPattern: opts.ignoreTestFiles,
-            };
-        }
-        else {
-            options.ignoreTestFiles = opts.ignoreTestFiles;
-        }
-        if (opts.reporter) {
-            options.reporter = opts.reporter;
-        }
-        if (opts.reporterOptions) {
-            options.reporterOptions = opts.reporterOptions;
-        }
-        if (opts.quiet) {
-            options.quiet = opts.quiet;
-        }
-        options.testingType = opts.testingType;
-        const result = yield (opts.watch
-            ? Cypress.open(options)
-            : Cypress.run(options));
-        cleanupTmpFile(opts.ctTailwindPath);
-        cleanupTmpFile(opts.portLockFilePath);
-        if (process.env.NX_VERBOSE_LOGGING === 'true' && opts.portLockFilePath) {
-            (0, fs_1.readdirSync)((0, path_1.dirname)(opts.portLockFilePath)).forEach((f) => {
-                if (f.endsWith('.txt')) {
-                    devkit_1.logger.debug(`Lock file ${f} still present`);
-                }
-            });
-        }
-        /**
-         * `cypress.open` is returning `0` and is not of the same type as `cypress.run`.
-         * `cypress.open` is the graphical UI, so it will be obvious to know what wasn't
-         * working. Forcing the build to success when `cypress.open` is used.
-         */
-        return !result.totalFailed && !result.failures;
-    });
+    }
+    else {
+        options.ignoreTestFiles = opts.ignoreTestFiles;
+    }
+    if (opts.reporter) {
+        options.reporter = opts.reporter;
+    }
+    if (opts.reporterOptions) {
+        options.reporterOptions = opts.reporterOptions;
+    }
+    if (opts.quiet) {
+        options.quiet = opts.quiet;
+    }
+    options.testingType = opts.testingType;
+    const result = await (opts.watch
+        ? Cypress.open(options)
+        : Cypress.run(options));
+    cleanupTmpFile(opts.ctTailwindPath);
+    cleanupTmpFile(opts.portLockFilePath);
+    if (process.env.NX_VERBOSE_LOGGING === 'true' && opts.portLockFilePath) {
+        (0, fs_1.readdirSync)((0, path_1.dirname)(opts.portLockFilePath)).forEach((f) => {
+            if (f.endsWith('.txt')) {
+                devkit_1.logger.debug(`Lock file ${f} still present`);
+            }
+        });
+    }
+    /**
+     * `cypress.open` is returning `0` and is not of the same type as `cypress.run`.
+     * `cypress.open` is the graphical UI, so it will be obvious to know what wasn't
+     * working. Forcing the build to success when `cypress.open` is used.
+     */
+    return !result.totalFailed && !result.failures;
 }
 /**
  * try to find a free port for the project to run on
  * will return undefined if no port is found or the project doesn't have a port option
  **/
-function getPortForProject(context, target, defaultPort = 4200) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const fmtTarget = (0, devkit_1.targetToTargetString)(target);
-        const [hasPortOpt, schemaPortValue] = getValueFromSchema(context, target, 'port');
-        let freePort;
-        if (hasPortOpt) {
-            let normalizedPortValue;
-            if (!schemaPortValue) {
-                devkit_1.logger.info(`NX ${fmtTarget} did not have a defined port value, checking for free port with the default value of ${defaultPort}`);
-                normalizedPortValue = defaultPort;
-            }
-            else {
-                normalizedPortValue = Number(schemaPortValue);
-            }
-            if (isNaN(normalizedPortValue)) {
-                devkit_1.output.warn({
-                    title: `Port Not a Number`,
-                    bodyLines: [
-                        `The port value found was not a number or can't be parsed to a number`,
-                        `When reading the devServerTarget (${fmtTarget}) schema, expected ${schemaPortValue} to be a number but got NaN.`,
-                        `Nx will use the default value of ${defaultPort} instead.`,
-                        `You can manually specify a port by setting the 'port' option`,
-                    ],
-                });
-                normalizedPortValue = defaultPort;
-            }
-            try {
-                let attempts = 0;
-                // make sure when this check happens in parallel,
-                // we don't let the same port be used by multiple projects
-                do {
-                    freePort = yield detectPort(freePort || normalizedPortValue);
-                    if (attemptToLockPort(freePort)) {
-                        break;
-                    }
-                    attempts++;
-                    // increment port in case the lock file isn't cleaned up
-                    freePort++;
-                } while (attempts < 20);
-                devkit_1.logger.info(`NX Using port ${freePort} for ${fmtTarget}`);
-            }
-            catch (err) {
-                throw new Error((0, devkit_1.stripIndents) `Unable to find a free port for the dev server, ${fmtTarget}.
-You can disable auto port detection by specifing a port or not passing a value to --port`);
-            }
+async function getPortForProject(context, target, defaultPort = 4200) {
+    const fmtTarget = (0, devkit_1.targetToTargetString)(target);
+    const [hasPortOpt, schemaPortValue] = getValueFromSchema(context, target, 'port');
+    let freePort;
+    if (hasPortOpt) {
+        let normalizedPortValue;
+        if (!schemaPortValue) {
+            devkit_1.logger.info(`NX ${fmtTarget} did not have a defined port value, checking for free port with the default value of ${defaultPort}`);
+            normalizedPortValue = defaultPort;
         }
         else {
+            normalizedPortValue = Number(schemaPortValue);
+        }
+        if (isNaN(normalizedPortValue)) {
             devkit_1.output.warn({
-                title: `No Port Option Found`,
+                title: `Port Not a Number`,
                 bodyLines: [
-                    `The 'port' option is set to 'cypress-auto', but the devServerTarget (${fmtTarget}) does not have a port option.`,
-                    `Because of this, Nx is unable to verify the port is free before starting the dev server.`,
-                    `This might cause issues if the devServerTarget is trying to use a port that is already in use.`,
+                    `The port value found was not a number or can't be parsed to a number`,
+                    `When reading the devServerTarget (${fmtTarget}) schema, expected ${schemaPortValue} to be a number but got NaN.`,
+                    `Nx will use the default value of ${defaultPort} instead.`,
+                    `You can manually specify a port by setting the 'port' option`,
                 ],
             });
+            normalizedPortValue = defaultPort;
         }
-        return freePort;
-    });
+        try {
+            let attempts = 0;
+            // make sure when this check happens in parallel,
+            // we don't let the same port be used by multiple projects
+            do {
+                freePort = await detectPort(freePort || normalizedPortValue);
+                if (attemptToLockPort(freePort)) {
+                    break;
+                }
+                attempts++;
+                // increment port in case the lock file isn't cleaned up
+                freePort++;
+            } while (attempts < 20);
+            devkit_1.logger.info(`NX Using port ${freePort} for ${fmtTarget}`);
+        }
+        catch (err) {
+            throw new Error((0, devkit_1.stripIndents) `Unable to find a free port for the dev server, ${fmtTarget}.
+You can disable auto port detection by specifing a port or not passing a value to --port`);
+        }
+    }
+    else {
+        devkit_1.output.warn({
+            title: `No Port Option Found`,
+            bodyLines: [
+                `The 'port' option is set to 'cypress-auto', but the devServerTarget (${fmtTarget}) does not have a port option.`,
+                `Because of this, Nx is unable to verify the port is free before starting the dev server.`,
+                `This might cause issues if the devServerTarget is trying to use a port that is already in use.`,
+            ],
+        });
+    }
+    return freePort;
 }
 /**
  * Check if the given target has the given property in it's options.
@@ -307,7 +277,6 @@ You can disable auto port detection by specifing a port or not passing a value t
  * the value will be undefined even if it's in the executor schema.
  **/
 function getValueFromSchema(context, target, property) {
-    var _a, _b;
     let targetOpts;
     try {
         targetOpts = (0, devkit_1.readTargetOptions)(target, context);
@@ -322,7 +291,7 @@ ${e.message || e}`);
     if (!targetHasOpt) {
         // NOTE: readTargetOptions doesn't apply non defaulted values, i.e. @nx/vite has a port options but is optional
         // so we double check the schema if readTargetOptions didn't return a value for the property
-        const projectConfig = (_b = (_a = context.projectsConfigurations) === null || _a === void 0 ? void 0 : _a.projects) === null || _b === void 0 ? void 0 : _b[target.project];
+        const projectConfig = context.projectsConfigurations?.projects?.[target.project];
         const targetConfig = projectConfig.targets[target.target];
         const [collection, executor] = targetConfig.executor.split(':');
         const { schema } = (0, executor_utils_1.getExecutorInformation)(collection, executor, context.root);

package/src/generators/base-setup/base-setup.js

@@ -10,9 +10,15 @@ function addBaseCypressSetup(tree, options) {
         return;
     }
     const opts = normalizeOptions(tree, projectConfig, options);
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), projectConfig.root, Object.assign(Object.assign({}, opts), { offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root), offsetFromProjectRoot: opts.hasTsConfig ? opts.offsetFromProjectRoot : '', tsConfigPath: opts.hasTsConfig
+    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), projectConfig.root, {
+        ...opts,
+        offsetFromRoot: (0, devkit_1.offsetFromRoot)(projectConfig.root),
+        offsetFromProjectRoot: opts.hasTsConfig ? opts.offsetFromProjectRoot : '',
+        tsConfigPath: opts.hasTsConfig
             ? `${opts.offsetFromProjectRoot}tsconfig.json`
-            : (0, js_1.getRelativePathToRootTsConfig)(tree, projectConfig.root), ext: '' }));
+            : (0, js_1.getRelativePathToRootTsConfig)(tree, projectConfig.root),
+        ext: '',
+    });
     if (opts.hasTsConfig) {
         (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'), (json) => {
             // tsconfig doesn't have references so it shouldn't add them
@@ -35,12 +41,16 @@ function addBaseCypressSetup(tree, options) {
 }
 exports.addBaseCypressSetup = addBaseCypressSetup;
 function normalizeOptions(tree, projectConfig, options) {
-    var _a;
-    (_a = options.directory) !== null && _a !== void 0 ? _a : (options.directory = 'cypress');
+    options.directory ??= 'cypress';
     const offsetFromProjectRoot = options.directory
         .split('/')
         .map((_) => '..')
         .join('/');
     const hasTsConfig = tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json'));
-    return Object.assign(Object.assign({}, options), { projectConfig, offsetFromProjectRoot: `${offsetFromProjectRoot}/`, hasTsConfig });
+    return {
+        ...options,
+        projectConfig,
+        offsetFromProjectRoot: `${offsetFromProjectRoot}/`,
+        hasTsConfig,
+    };
 }