@nx/cypress 18.1.0-beta.2 → 18.1.0-beta.4

package/migrations.json

@@ -47,6 +47,12 @@
       "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"
+    },
+    "update-cypress-version-13-6-6": {
+      "cli": "nx",
+      "version": "18.1.0-beta.3",
+      "description": "Update to Cypress ^13.6.6 if the workspace is using Cypress v13 to ensure workspaces don't use v13.6.5 which has an issue when verifying Cypress.",
+      "implementation": "./src/migrations/update-18-1-0/update-cypress-version-13-6-6"
     }
   },
   "packageJsonUpdates": {

package/package.json

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

package/plugins/cypress-preset.js

@@ -39,9 +39,14 @@ function startWebServer(webServerCommand) {
         stdio: 'inherit',
     });
     return () => {
-        // child.kill() does not work on linux
-        // process.kill will kill the whole process group on unix
-        process.kill(-serverProcess.pid, 'SIGKILL');
+        if (process.platform === 'win32') {
+            serverProcess.kill();
+        }
+        else {
+            // child.kill() does not work on linux
+            // process.kill will kill the whole process group on unix
+            process.kill(-serverProcess.pid, 'SIGKILL');
+        }
     };
 }
 /**
@@ -61,21 +66,12 @@ function startWebServer(webServerCommand) {
  */
 function nxE2EPreset(pathToConfig, options) {
     const basePath = options?.cypressDir || 'src';
-    const dir = (0, path_1.dirname)(pathToConfig);
-    let supportFile = undefined;
-    for (const f of ['e2e.ts', 'e2e.js']) {
-        const candidate = (0, path_1.join)(dir, basePath, 'support', f);
-        if ((0, fs_1.existsSync)(candidate)) {
-            supportFile = candidate;
-            break;
-        }
-    }
     const baseConfig /*Cypress.EndToEndConfigOptions & {
       [NX_PLUGIN_OPTIONS]: unknown;
     }*/ = {
         ...nxBaseCypressPreset(pathToConfig),
         fileServerFolder: '.',
-        supportFile,
+        supportFile: `${basePath}/support/e2e.{js,ts}`,
         specPattern: `${basePath}/**/*.cy.{js,jsx,ts,tsx}`,
         fixturesFolder: `${basePath}/fixtures`,
         [constants_1.NX_PLUGIN_OPTIONS]: {
@@ -122,7 +118,7 @@ function waitForServer(url, webServerConfig) {
     return new Promise((resolve, reject) => {
         let pollTimeout;
         const { protocol } = new URL(url);
-        const timeoutDuration = webServerConfig?.timeout ?? 15 * 1000;
+        const timeoutDuration = webServerConfig?.timeout ?? 60 * 1000;
         const timeout = setTimeout(() => {
             clearTimeout(pollTimeout);
             reject(new Error(`Web server failed to start in ${timeoutDuration}ms. This can be configured in cypress.config.ts.`));

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

@@ -15,7 +15,7 @@ function componentConfigurationGenerator(tree, options) {
 exports.componentConfigurationGenerator = componentConfigurationGenerator;
 async function componentConfigurationGeneratorInternal(tree, options) {
     const tasks = [];
-    const opts = normalizeOptions(options);
+    const opts = normalizeOptions(tree, options);
     tasks.push(await (0, init_1.default)(tree, {
         ...opts,
         skipFormat: true,
@@ -38,14 +38,18 @@ async function componentConfigurationGeneratorInternal(tree, options) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.componentConfigurationGeneratorInternal = componentConfigurationGeneratorInternal;
-function normalizeOptions(options) {
+function normalizeOptions(tree, options) {
     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');
     }
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
+        nxJson.useInferencePlugins !== false;
     return {
-        addPlugin: process.env.NX_ADD_PLUGINS !== 'false',
+        addPlugin,
         ...options,
+        framework: options.framework ?? null,
         directory: options.directory ?? 'cypress',
     };
 }

package/src/generators/component-configuration/files/__directory__/support/component-index.html

@@ -5,7 +5,10 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title><%= project %> Components App</title>
-
+  <% if(framework === 'next') { %>
+  <!-- Used by Next.js to inject CSS. -->
+  <div id="__next_css__DO_NOT_USE__"></div>
+  <% } %>
 </head>
 <body>
   <div data-cy-root></div>

package/src/generators/component-configuration/schema.d.ts

@@ -10,4 +10,5 @@ export interface CypressComponentConfigurationSchema {
    * @internal
    */
   addExplicitTargets?: boolean;
+  framework?: 'next';
 }

package/src/generators/configuration/configuration.js

@@ -20,15 +20,18 @@ function configurationGenerator(tree, options) {
 exports.configurationGenerator = configurationGenerator;
 async function configurationGeneratorInternal(tree, options) {
     const opts = normalizeOptions(tree, options);
+    opts.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     const tasks = [];
     if (!(0, cypress_version_1.installedCypressVersion)()) {
         tasks.push(await (0, js_1.initGenerator)(tree, { ...options, skipFormat: true }));
         tasks.push(await (0, init_1.default)(tree, {
             ...opts,
             skipFormat: true,
-            addPlugin: options.addPlugin,
         }));
     }
+    else if (opts.addPlugin) {
+        (0, init_1.addPlugin)(tree);
+    }
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
@@ -41,7 +44,6 @@ async function configurationGeneratorInternal(tree, options) {
     const linterTask = await (0, add_linter_1.addLinterToCyProject)(tree, {
         ...opts,
         cypressDir: opts.directory,
-        addPlugin: opts.addPlugin,
     });
     tasks.push(linterTask);
     if (!opts.skipPackageJson) {
@@ -80,9 +82,12 @@ In this case you need to provide a devServerTarget,'<projectName>:<targetName>[:
     if (!options.baseUrl && !devServerTarget) {
         throw new Error('Either baseUrl or devServerTarget must be provided');
     }
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    options.addPlugin ??=
+        process.env.NX_ADD_PLUGINS !== 'false' &&
+            nxJson.useInferencePlugins !== false;
     return {
         ...options,
-        addPlugin: options.addPlugin ?? process.env.NX_ADD_PLUGINS !== 'false',
         bundler: options.bundler ?? 'webpack',
         rootProject: options.rootProject ?? projectConfig.root === '.',
         linter: options.linter ?? eslint_1.Linter.EsLint,

package/src/generators/cypress-project/cypress-project.js

@@ -201,6 +201,7 @@ async function normalizeOptions(host, options) {
     });
     options.linter = options.linter || eslint_1.Linter.EsLint;
     options.bundler = options.bundler || 'webpack';
+    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
     return {
         ...options,
         // other generators depend on the rootProject flag down stream

package/src/generators/init/init.d.ts

@@ -1,5 +1,6 @@
 import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
+export declare function addPlugin(tree: Tree): void;
 export declare function cypressInitGenerator(tree: Tree, options: Schema): Promise<GeneratorCallback>;
 export declare function cypressInitGeneratorInternal(tree: Tree, options: Schema): Promise<GeneratorCallback>;
 export default cypressInitGenerator;

package/src/generators/init/init.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cypressInitGeneratorInternal = exports.cypressInitGenerator = void 0;
+exports.cypressInitGeneratorInternal = exports.cypressInitGenerator = exports.addPlugin = void 0;
 const devkit_1 = require("@nx/devkit");
 const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
 const plugin_1 = require("../../plugins/plugin");
@@ -49,6 +49,7 @@ function addPlugin(tree) {
     });
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
+exports.addPlugin = addPlugin;
 function updateProductionFileset(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const productionFileset = nxJson.namedInputs?.production;
@@ -68,7 +69,10 @@ async function cypressInitGenerator(tree, options) {
 exports.cypressInitGenerator = cypressInitGenerator;
 async function cypressInitGeneratorInternal(tree, options) {
     updateProductionFileset(tree);
-    options.addPlugin ??= process.env.NX_ADD_PLUGINS !== 'false';
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    options.addPlugin ??=
+        process.env.NX_ADD_PLUGINS !== 'false' &&
+            nxJson.useInferencePlugins !== false;
     if (options.addPlugin) {
         addPlugin(tree);
     }

package/src/migrations/update-18-1-0/update-cypress-version-13-6-6.d.ts

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

package/src/migrations/update-18-1-0/update-cypress-version-13-6-6.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+const cypress_version_1 = require("../../utils/cypress-version");
+async function default_1(tree) {
+    if ((0, cypress_version_1.installedCypressVersion)() < 13) {
+        return;
+    }
+    (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { cypress: '^13.6.6' });
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.default = default_1;

package/src/utils/config.js

@@ -105,7 +105,7 @@ async function addMountDefinition(cmpCommandFileContents) {
 exports.addMountDefinition = addMountDefinition;
 function getProjectCypressConfigPath(tree, projectRoot) {
     const cypressConfigPaths = (0, devkit_1.glob)(tree, [
-        `${projectRoot}/${exports.CYPRESS_CONFIG_FILE_NAME_PATTERN}`,
+        (0, devkit_1.joinPathFragments)(projectRoot, exports.CYPRESS_CONFIG_FILE_NAME_PATTERN),
     ]);
     if (cypressConfigPaths.length === 0) {
         throw new Error(`Could not find a cypress config file in ${projectRoot}.`);

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 = "18.16.9";
 export declare const cypressViteDevServerVersion = "^2.2.1";
-export declare const cypressVersion = "^13.0.0";
+export declare const cypressVersion = "^13.6.6";
 export declare const cypressWebpackVersion = "^2.0.0";
 export declare const webpackHttpPluginVersion = "^5.5.0";
 export declare const viteVersion = "~5.0.0";

package/src/utils/versions.js

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