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

package/src/utils/config.js

@@ -1,35 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addMountDefinition = exports.addDefaultCTConfig = exports.addDefaultE2EConfig = void 0;
-const tslib_1 = require("tslib");
 const TS_QUERY_EXPORT_CONFIG_PREFIX = ':matches(ExportAssignment, BinaryExpression:has(Identifier[name="module"]):has(Identifier[name="exports"]))';
-function addDefaultE2EConfig(cyConfigContents, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (!cyConfigContents) {
-            throw new Error('The passed in cypress config file is empty!');
-        }
-        const { tsquery } = yield Promise.resolve().then(() => require('@phenomnomnominal/tsquery'));
-        const testingTypeConfig = tsquery.query(cyConfigContents, `${TS_QUERY_EXPORT_CONFIG_PREFIX} PropertyAssignment:has(Identifier[name="e2e"])`);
-        let updatedConfigContents = cyConfigContents;
-        if (testingTypeConfig.length === 0) {
-            const configValue = options.bundler === 'vite'
-                ? `nxE2EPreset(__filename, { cypressDir: '${options.directory}', bundler: 'vite' })`
-                : `nxE2EPreset(__filename, { cypressDir: '${options.directory}' })`;
-            updatedConfigContents = tsquery.replace(cyConfigContents, `${TS_QUERY_EXPORT_CONFIG_PREFIX} ObjectLiteralExpression:first-child`, (node) => {
-                if (node.properties.length > 0) {
-                    return `{
+async function addDefaultE2EConfig(cyConfigContents, options) {
+    if (!cyConfigContents) {
+        throw new Error('The passed in cypress config file is empty!');
+    }
+    const { tsquery } = await Promise.resolve().then(() => require('@phenomnomnominal/tsquery'));
+    const testingTypeConfig = tsquery.query(cyConfigContents, `${TS_QUERY_EXPORT_CONFIG_PREFIX} PropertyAssignment:has(Identifier[name="e2e"])`);
+    let updatedConfigContents = cyConfigContents;
+    if (testingTypeConfig.length === 0) {
+        const configValue = options.bundler === 'vite'
+            ? `nxE2EPreset(__filename, { cypressDir: '${options.directory}', bundler: 'vite' })`
+            : `nxE2EPreset(__filename, { cypressDir: '${options.directory}' })`;
+        updatedConfigContents = tsquery.replace(cyConfigContents, `${TS_QUERY_EXPORT_CONFIG_PREFIX} ObjectLiteralExpression:first-child`, (node) => {
+            if (node.properties.length > 0) {
+                return `{
   ${node.properties.map((p) => p.getText()).join(',\n')},
   e2e: ${configValue} 
 }`;
-                }
-                return `{
+            }
+            return `{
   e2e: ${configValue}
 }`;
-            });
-            updatedConfigContents = `import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';\n${updatedConfigContents}`;
-        }
-        return updatedConfigContents;
-    });
+        });
+        updatedConfigContents = `import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';\n${updatedConfigContents}`;
+    }
+    return updatedConfigContents;
 }
 exports.addDefaultE2EConfig = addDefaultE2EConfig;
 /**
@@ -37,32 +34,30 @@ exports.addDefaultE2EConfig = addDefaultE2EConfig;
  * Make sure after calling this the correct import statement is addeda
  * to bring in the nxComponentTestingPreset function
  **/
-function addDefaultCTConfig(cyConfigContents, options = {}) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (!cyConfigContents) {
-            throw new Error('The passed in cypress config file is empty!');
-        }
-        const { tsquery } = yield Promise.resolve().then(() => require('@phenomnomnominal/tsquery'));
-        const testingTypeConfig = tsquery.query(cyConfigContents, `${TS_QUERY_EXPORT_CONFIG_PREFIX} PropertyAssignment:has(Identifier[name="component"])`);
-        let updatedConfigContents = cyConfigContents;
-        if (testingTypeConfig.length === 0) {
-            const configValue = (options === null || options === void 0 ? void 0 : options.bundler) === 'vite'
-                ? "nxComponentTestingPreset(__filename, { bundler: 'vite' })"
-                : 'nxComponentTestingPreset(__filename)';
-            updatedConfigContents = tsquery.replace(cyConfigContents, `${TS_QUERY_EXPORT_CONFIG_PREFIX} ObjectLiteralExpression:first-child`, (node) => {
-                if (node.properties.length > 0) {
-                    return `{
+async function addDefaultCTConfig(cyConfigContents, options = {}) {
+    if (!cyConfigContents) {
+        throw new Error('The passed in cypress config file is empty!');
+    }
+    const { tsquery } = await Promise.resolve().then(() => require('@phenomnomnominal/tsquery'));
+    const testingTypeConfig = tsquery.query(cyConfigContents, `${TS_QUERY_EXPORT_CONFIG_PREFIX} PropertyAssignment:has(Identifier[name="component"])`);
+    let updatedConfigContents = cyConfigContents;
+    if (testingTypeConfig.length === 0) {
+        const configValue = options?.bundler === 'vite'
+            ? "nxComponentTestingPreset(__filename, { bundler: 'vite' })"
+            : 'nxComponentTestingPreset(__filename)';
+        updatedConfigContents = tsquery.replace(cyConfigContents, `${TS_QUERY_EXPORT_CONFIG_PREFIX} ObjectLiteralExpression:first-child`, (node) => {
+            if (node.properties.length > 0) {
+                return `{
   ${node.properties.map((p) => p.getText()).join(',\n')},
   component: ${configValue} 
 }`;
-                }
-                return `{
+            }
+            return `{
   component: ${configValue}
 }`;
-            });
-        }
-        return updatedConfigContents;
-    });
+        });
+    }
+    return updatedConfigContents;
 }
 exports.addDefaultCTConfig = addDefaultCTConfig;
 /**
@@ -70,27 +65,24 @@ exports.addDefaultCTConfig = addDefaultCTConfig;
  * Make sure after calling this the correct import statement is added
  * to bring in the correct mount from cypress.
  **/
-function addMountDefinition(cmpCommandFileContents) {
-    var _a;
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        if (!cmpCommandFileContents) {
-            throw new Error('The passed in cypress component file is empty!');
-        }
-        const { tsquery } = yield Promise.resolve().then(() => require('@phenomnomnominal/tsquery'));
-        const hasMountCommand = ((_a = tsquery.query(cmpCommandFileContents, 'CallExpression StringLiteral[value="mount"]')) === null || _a === void 0 ? void 0 : _a.length) > 0;
-        if (hasMountCommand) {
-            return cmpCommandFileContents;
-        }
-        const mountCommand = `Cypress.Commands.add('mount', mount);`;
-        const updatedInterface = tsquery.replace(cmpCommandFileContents, 'InterfaceDeclaration', (node) => {
-            return `interface ${node.name.getText()}${node.typeParameters
-                ? `<${node.typeParameters.map((p) => p.getText()).join(', ')}>`
-                : ''} {
+async function addMountDefinition(cmpCommandFileContents) {
+    if (!cmpCommandFileContents) {
+        throw new Error('The passed in cypress component file is empty!');
+    }
+    const { tsquery } = await Promise.resolve().then(() => require('@phenomnomnominal/tsquery'));
+    const hasMountCommand = tsquery.query(cmpCommandFileContents, 'CallExpression StringLiteral[value="mount"]')?.length > 0;
+    if (hasMountCommand) {
+        return cmpCommandFileContents;
+    }
+    const mountCommand = `Cypress.Commands.add('mount', mount);`;
+    const updatedInterface = tsquery.replace(cmpCommandFileContents, 'InterfaceDeclaration', (node) => {
+        return `interface ${node.name.getText()}${node.typeParameters
+            ? `<${node.typeParameters.map((p) => p.getText()).join(', ')}>`
+            : ''} {
       ${node.members.map((m) => m.getText()).join('\n      ')}
       mount: typeof mount;
     }`;
-        });
-        return `${updatedInterface}\n${mountCommand}`;
     });
+    return `${updatedInterface}\n${mountCommand}`;
 }
 exports.addMountDefinition = addMountDefinition;

package/src/utils/ct-helpers.js

@@ -14,15 +14,14 @@ exports.CY_FILE_MATCHER = new RegExp(/\.cy\.[tj]sx?$/);
  * i.e. <context.root>/tmp/<project-root>/ct-styles.css
  */
 function getTempTailwindPath(context) {
-    var _a;
     if (!context.projectName) {
         throw new Error('No project name found in context');
     }
-    const project = context === null || context === void 0 ? void 0 : context.projectGraph.nodes[context.projectName];
+    const project = context?.projectGraph.nodes[context.projectName];
     if (!project) {
         throw new Error(`No project found in project graph for ${context.projectName}`);
     }
-    if ((_a = project === null || project === void 0 ? void 0 : project.data) === null || _a === void 0 ? void 0 : _a.root) {
+    if (project?.data?.root) {
         return (0, path_1.join)(context.root, 'tmp', project.data.root, 'ct-styles.css');
     }
 }
@@ -46,8 +45,6 @@ function isCtProjectUsingBuildProject(graph, parentProjectName, childProjectName
 }
 exports.isCtProjectUsingBuildProject = isCtProjectUsingBuildProject;
 function getProjectConfigByPath(graph, configPath) {
-    var _a, _b, _c;
-    var _d;
     const configFileFromWorkspaceRoot = (0, path_1.relative)(devkit_1.workspaceRoot, configPath);
     const normalizedPathFromWorkspaceRoot = (0, devkit_1.normalizePath)((0, fs_1.lstatSync)(configPath).isFile()
         ? configFileFromWorkspaceRoot.replace((0, path_1.extname)(configPath), '')
@@ -55,13 +52,14 @@ function getProjectConfigByPath(graph, configPath) {
     const projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(graph.nodes);
     const componentTestingProjectName = (0, find_project_for_path_1.findProjectForPath)(normalizedPathFromWorkspaceRoot, projectRootMappings);
     if (!componentTestingProjectName ||
-        !((_a = graph.nodes[componentTestingProjectName]) === null || _a === void 0 ? void 0 : _a.data)) {
+        !graph.nodes[componentTestingProjectName]?.data) {
         throw new Error((0, devkit_1.stripIndents) `Unable to find the project configuration that includes ${normalizedPathFromWorkspaceRoot}. 
       Found project name? ${componentTestingProjectName}. 
-      Graph has data? ${!!((_b = graph.nodes[componentTestingProjectName]) === null || _b === void 0 ? void 0 : _b.data)}`);
+      Graph has data? ${!!graph.nodes[componentTestingProjectName]?.data}`);
     }
     // make sure name is set since it can be undefined
-    (_c = (_d = graph.nodes[componentTestingProjectName].data).name) !== null && _c !== void 0 ? _c : (_d.name = componentTestingProjectName);
+    graph.nodes[componentTestingProjectName].data.name ??=
+        componentTestingProjectName;
     return graph.nodes[componentTestingProjectName].data;
 }
 exports.getProjectConfigByPath = getProjectConfigByPath;

package/src/utils/cypress-version.js

@@ -8,7 +8,7 @@ function installedCypressVersion() {
         try {
             cypressPackageJson = require('cypress/package.json');
         }
-        catch (_a) { }
+        catch { }
     }
     if (!cypressPackageJson) {
         return null;

package/src/utils/find-target-options.js

@@ -1,46 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findBuildConfig = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const configuration_1 = require("nx/src/config/configuration");
 const project_graph_1 = require("nx/src/project-graph/project-graph");
-function findBuildConfig(tree, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        try {
-            // attempt to use the provided target
-            const graph = yield (0, devkit_1.createProjectGraphAsync)();
-            if (options.buildTarget) {
-                return {
-                    target: options.buildTarget,
-                    config: findInTarget(tree, graph, options),
-                };
-            }
-            // check to see if there is a valid config in the given project
-            const selfProject = findTargetOptionsInProject(tree, graph, options.project, options);
-            if (selfProject) {
-                return selfProject;
-            }
-            // attempt to find any projects with the valid config in the graph that consumes this project
-            return yield findInGraph(tree, graph, options);
+async function findBuildConfig(tree, options) {
+    try {
+        // attempt to use the provided target
+        const graph = await (0, devkit_1.createProjectGraphAsync)();
+        if (options.buildTarget) {
+            return {
+                target: options.buildTarget,
+                config: findInTarget(tree, graph, options),
+            };
+        }
+        // check to see if there is a valid config in the given project
+        const selfProject = findTargetOptionsInProject(tree, graph, options.project, options);
+        if (selfProject) {
+            return selfProject;
         }
-        catch (e) {
-            devkit_1.logger.error(e);
-            throw new Error((0, devkit_1.stripIndents) `Error trying to find build configuration. ${options.buildTarget
-                ? 'Try using an app of the same framework for the --build-target.'
-                : 'Try manually specifying the build target with the --build-target flag.'}
+        // attempt to find any projects with the valid config in the graph that consumes this project
+        return await findInGraph(tree, graph, options);
+    }
+    catch (e) {
+        devkit_1.logger.error(e);
+        throw new Error((0, devkit_1.stripIndents) `Error trying to find build configuration. ${options.buildTarget
+            ? 'Try using an app of the same framework for the --build-target.'
+            : 'Try manually specifying the build target with the --build-target flag.'}
     Provided project? ${options.project}
     Provided build target? ${options.buildTarget}
     Provided Executors? ${[...options.validExecutorNames].join(', ')}`);
-        }
-    });
+    }
 }
 exports.findBuildConfig = findBuildConfig;
 function findInTarget(tree, graph, options) {
-    var _a, _b, _c, _d;
     const { project, target, configuration } = (0, devkit_1.parseTargetString)(options.buildTarget);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, project);
-    const executorName = (_b = (_a = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _a === void 0 ? void 0 : _a[target]) === null || _b === void 0 ? void 0 : _b.executor;
+    const executorName = projectConfig?.targets?.[target]?.executor;
     if (!options.validExecutorNames.has(executorName)) {
         devkit_1.logger.error((0, devkit_1.stripIndents) `NX The provided build target, ${options.buildTarget}, uses the '${executorName}' executor.
 But only the follow executors are allowed
@@ -58,7 +54,7 @@ If you do not have an app in the workspace to you can make a new app with 'nx g
 `);
         throw new Error('The provided --build-target does not use an executor in the allow list of executors defined.');
     }
-    const foundConfig = configuration || ((_d = (_c = projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.targets) === null || _c === void 0 ? void 0 : _c[target]) === null || _d === void 0 ? void 0 : _d.defaultConfiguration);
+    const foundConfig = configuration || projectConfig?.targets?.[target]?.defaultConfiguration;
     return (0, devkit_1.readTargetOptions)({ project, target, configuration: foundConfig }, createExecutorContext(graph, projectConfig.targets, project, target, foundConfig));
 }
 function frameworkHelperMessage(validExecutorNames, executorName) {
@@ -84,24 +80,22 @@ Try using @nx/${buildTargetFramework} instead.`;
     }
     return '';
 }
-function findInGraph(tree, graph, options) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const parents = findParentsOfProject(graph, options.project);
-        const potentialTargets = [];
-        for (const parent of parents) {
-            const parentProject = findTargetOptionsInProject(tree, graph, parent.target, options);
-            if (parentProject) {
-                potentialTargets.push(parentProject);
-            }
+async function findInGraph(tree, graph, options) {
+    const parents = findParentsOfProject(graph, options.project);
+    const potentialTargets = [];
+    for (const parent of parents) {
+        const parentProject = findTargetOptionsInProject(tree, graph, parent.target, options);
+        if (parentProject) {
+            potentialTargets.push(parentProject);
         }
-        if (potentialTargets.length > 1) {
-            devkit_1.logger.warn((0, devkit_1.stripIndents) `Multiple potential targets found for ${options.project}. Found ${potentialTargets.length}.
+    }
+    if (potentialTargets.length > 1) {
+        devkit_1.logger.warn((0, devkit_1.stripIndents) `Multiple potential targets found for ${options.project}. Found ${potentialTargets.length}.
     Using ${potentialTargets[0].target}.
     To specify a different target use the --build-target flag.
     `);
-        }
-        return potentialTargets[0];
-    });
+    }
+    return potentialTargets[0];
 }
 function findParentsOfProject(graph, projectName) {
     const reversedGraph = (0, devkit_1.reverse)(graph);

package/src/utils/versions.d.ts

@@ -2,7 +2,7 @@ export declare const nxVersion: any;
 export declare const eslintPluginCypressVersion = "^2.13.4";
 export declare const typesNodeVersion = "16.11.7";
 export declare const cypressViteDevServerVersion = "^2.2.1";
-export declare const cypressVersion = "^12.16.0";
+export declare const cypressVersion = "^13.0.0";
 export declare const cypressWebpackVersion = "^2.0.0";
 export declare const webpackHttpPluginVersion = "^5.5.0";
 export declare const viteVersion = "~4.3.9";

package/src/utils/versions.js

@@ -5,7 +5,7 @@ exports.nxVersion = require('../../package.json').version;
 exports.eslintPluginCypressVersion = '^2.13.4';
 exports.typesNodeVersion = '16.11.7';
 exports.cypressViteDevServerVersion = '^2.2.1';
-exports.cypressVersion = '^12.16.0';
+exports.cypressVersion = '^13.0.0';
 exports.cypressWebpackVersion = '^2.0.0';
 exports.webpackHttpPluginVersion = '^5.5.0';
 exports.viteVersion = '~4.3.9';