@nx/cypress 17.2.0-beta.6 → 17.2.0-beta.9

package/migrations.json

@@ -47,11 +47,6 @@
       "version": "16.8.0-beta.4",
       "description": "Update to Cypress v13. Most noteable change is video recording is off by default. This migration will only update if the workspace is already on Cypress v12. https://docs.cypress.io/guides/references/migration-guide#Migrating-to-Cypress-130",
       "implementation": "./src/migrations/update-16-8-0/cypress-13"
-    },
-    "add-nx-metadata": {
-      "version": "17.2.0-beta.0",
-      "description": "Add devServerTargets into cypress.config.ts files for @nx/cypress/plugin",
-      "implementation": "./src/migrations/update-17-2-0/add-dev-server-targets-to-cypress-configs"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "17.2.0-beta.6",
+  "version": "17.2.0-beta.9",
   "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,15 +34,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "17.2.0-beta.6",
-    "@nx/eslint": "17.2.0-beta.6",
-    "@nx/js": "17.2.0-beta.6",
+    "@nx/devkit": "17.2.0-beta.9",
+    "@nx/eslint": "17.2.0-beta.9",
+    "@nx/js": "17.2.0-beta.9",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "detect-port": "^1.5.1",
-    "string-argv": "^0.3.2",
     "semver": "7.5.3",
     "tslib": "^2.3.0",
-    "@nrwl/cypress": "17.2.0-beta.6"
+    "@nrwl/cypress": "17.2.0-beta.9"
   },
   "peerDependencies": {
     "cypress": ">= 3 < 14"

package/plugins/cypress-preset.js

@@ -62,6 +62,7 @@ function nxE2EPreset(pathToConfig, options) {
         specPattern: `${basePath}/**/*.cy.{js,jsx,ts,tsx}`,
         fixturesFolder: `${basePath}/fixtures`,
         env: {
+            webServerCommand: options?.webServerCommands?.default,
             webServerCommands: options?.webServerCommands,
             ciWebServerCommand: options?.ciWebServerCommand,
         },

package/src/generators/configuration/configuration.js

@@ -148,13 +148,7 @@ function addTarget(tree, opts) {
             testingType: 'e2e',
         },
     };
-    if (opts.baseUrl) {
-        projectConfig.targets.e2e.options = {
-            ...projectConfig.targets.e2e.options,
-            baseUrl: opts.baseUrl,
-        };
-    }
-    else if (opts.devServerTarget) {
+    if (opts.devServerTarget) {
         const parsedTarget = (0, devkit_1.parseTargetString)(opts.devServerTarget);
         projectConfig.targets.e2e.options = {
             ...projectConfig.targets.e2e.options,
@@ -178,6 +172,12 @@ function addTarget(tree, opts) {
             };
         }
     }
+    else if (opts.baseUrl) {
+        projectConfig.targets.e2e.options = {
+            ...projectConfig.targets.e2e.options,
+            baseUrl: opts.baseUrl,
+        };
+    }
     (0, devkit_1.updateProjectConfiguration)(tree, opts.project, projectConfig);
 }
 exports.default = configurationGenerator;

package/src/plugins/plugin.js

@@ -120,8 +120,6 @@ function buildCypressTargets(configFilePath, projectRoot, options, context) {
             targets[options.targetName].outputs = getOutputs(projectRoot, cypressConfig, 'e2e');
         }
         if (webServerCommands?.default) {
-            cypressConfig.e2e ??= {};
-            cypressConfig.e2e.webServerCommand ??= webServerCommands?.default;
             delete webServerCommands.default;
         }
         if (Object.keys(webServerCommands ?? {}).length > 0) {
@@ -176,7 +174,7 @@ function buildCypressTargets(configFilePath, projectRoot, options, context) {
         }
     }
     if ('component' in cypressConfig) {
-        const componentTestingTargetDefaults = (0, project_configuration_utils_1.readTargetDefaultsForTarget)(options.componentTestingTargetName, context.nxJsonConfiguration.targetDefaults, '@nx/cypress:cypress');
+        const componentTestingTargetDefaults = (0, project_configuration_utils_1.readTargetDefaultsForTarget)(options.componentTestingTargetName, context.nxJsonConfiguration.targetDefaults, 'nx:run-commands');
         // This will not override the e2e target if it is the same
         targets[options.componentTestingTargetName] ??= {
             command: `cypress open --config-file ${relativeConfigPath} --component`,

package/src/utils/add-linter.js

@@ -20,9 +20,6 @@ async function addLinterToCyProject(tree, options) {
             linter: options.linter,
             skipFormat: true,
             tsConfigPaths: [(0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json')],
-            eslintFilePatterns: [
-                `${projectConfig.root}/**/*.${options.js ? 'js' : '{js,ts}'}`,
-            ],
             setParserOptionsProject: options.setParserOptionsProject,
             skipPackageJson: options.skipPackageJson,
             rootProject: options.rootProject,

package/src/migrations/update-17-2-0/add-dev-server-targets-to-cypress-configs.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-17-2-0/add-dev-server-targets-to-cypress-configs.js

@@ -1,125 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-const typescript_1 = require("typescript");
-function addDevServerTargets(tree, cypressConfig, devServerTargets) {
-    const contents = tree.read(cypressConfig, 'utf-8');
-    const sourceFile = (0, typescript_1.createSourceFile)(cypressConfig, contents, typescript_1.ScriptTarget.ESNext);
-    const ciDevServerTarget = devServerTargets.ci;
-    delete devServerTargets.ci;
-    const changes = [];
-    const visit = (node) => {
-        if ((0, typescript_1.isCallExpression)(node) &&
-            (0, typescript_1.isIdentifier)(node.expression) &&
-            node.expression.text === 'nxE2EPreset') {
-            const argumentContents = ', ' +
-                JSON.stringify({
-                    devServerTargets,
-                    ciDevServerTarget,
-                });
-            if (node.arguments.length === 1) {
-                changes.push({
-                    type: devkit_1.ChangeType.Insert,
-                    index: node.arguments[0].getEnd(),
-                    text: argumentContents,
-                });
-            }
-            else {
-                const lastArgument = node.arguments[node.arguments.length - 1];
-                if ((0, typescript_1.isObjectLiteralExpression)(lastArgument)) {
-                    const lastProperty = lastArgument.properties[lastArgument.properties.length - 1];
-                    const trailingComma = lastArgument.properties.hasTrailingComma;
-                    changes.push({
-                        type: devkit_1.ChangeType.Insert,
-                        index: lastProperty.getEnd(),
-                        text: (trailingComma ? '' : ', ') +
-                            'devServerTargets: ' +
-                            JSON.stringify(devServerTargets) +
-                            (ciDevServerTarget
-                                ? `, ciDevServerTarget: '${ciDevServerTarget}'`
-                                : ''),
-                    });
-                }
-            }
-        }
-        else {
-            (0, typescript_1.forEachChild)(node, visit);
-        }
-    };
-    (0, typescript_1.forEachChild)(sourceFile, visit);
-    tree.write(cypressConfig, (0, devkit_1.applyChangesToString)(contents, changes));
-}
-async function update(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    const graph = await (0, devkit_1.createProjectGraphAsync)();
-    const devServerTargetsMap = new Map();
-    (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nx/cypress:cypress', (options, project, target, configuration) => {
-        const targetConfig = projects.get(project).targets?.[target];
-        if (!targetConfig) {
-            return;
-        }
-        const cypressConfig = options.cypressConfig ?? targetConfig.options?.cypressConfig;
-        if (!cypressConfig) {
-            return;
-        }
-        const devServerTargets = {};
-        devServerTargets.default = targetConfig.options?.devServerTarget;
-        for (const [configuration, configurationOptions] of Object.entries(targetConfig.configurations ?? {})) {
-            devServerTargets[configuration] = configurationOptions.devServerTarget;
-        }
-        devServerTargetsMap.set(cypressConfig, devServerTargets);
-    });
-    for (const [cypressConfig, devServerTargets] of devServerTargetsMap) {
-        addDevServerTargets(tree, cypressConfig, devServerTargets);
-    }
-    // const configFiles = glob(tree, [createNodes[0]]);
-    //
-    // const proj = Object.fromEntries(getProjects(tree).entries());
-    //
-    // const rootMappings = createProjectRootMappingsFromProjectConfigurations(proj);
-    //
-    // for (const configFile of configFiles) {
-    //   const siblings = tree.children(dirname(configFile));
-    //   if (!siblings.includes('project.json')) {
-    //     continue;
-    //   }
-    //
-    //   const projectName = findProjectForPath(configFile, rootMappings);
-    //   const projectConfig = readProjectConfiguration(tree, projectName);
-    //   const e2eTarget: TargetConfiguration<CypressExecutorOptions> =
-    //     projectConfig.targets?.e2e;
-    //
-    //   if (!e2eTarget || e2eTarget.executor !== '@nx/cypress:cypress') {
-    //     continue;
-    //   }
-    //
-    //   nxMetadata.devServerTarget = e2eTarget.options?.devServerTarget;
-    //   nxMetadata.productionDevServerTarget =
-    //     e2eTarget.configurations?.production?.devServerTarget;
-    //   nxMetadata.ciDevServerTarget =
-    //     e2eTarget.configurations?.ci?.devServerTarget;
-    //
-    //   if (Object.values(nxMetadata).filter((v) => !!v).length > 0) {
-    //     let contents = tree.read(configFile, 'utf-8');
-    //
-    //     contents =
-    //       `import type { NxCypressMetadata } from '@nx/cypress/plugin';\n` +
-    //       contents +
-    //       `
-    //
-    //     /**
-    //      * This is metadata for the @nx/cypress/plugin
-    //      */
-    //     export const nx: NxCypressMetadata = ${JSON.stringify(
-    //       nxMetadata,
-    //       null,
-    //       2
-    //     )};`;
-    //
-    //     tree.write(configFile, contents);
-    //   }
-    // }
-    await (0, devkit_1.formatFiles)(tree);
-}
-exports.default = update;