@nx/cypress 23.1.0-rc.2 → 23.1.0

package/dist/src/generators/base-setup/base-setup.d.ts

@@ -8,5 +8,16 @@ export interface CypressBaseSetupSchema {
     directory?: string;
     js?: boolean;
     jsx?: boolean;
+    /**
+     * When set, the generated `cypress.config` includes the e2e preset inline so
+     * a fresh config is complete on first write - no post-hoc AST merge or
+     * overwrite. Omit for a bare `defineConfig({})` (e.g. component testing,
+     * which merges in its own `component` block afterwards).
+     */
+    e2ePreset?: {
+        /** Pre-formatted (indented) JSON of NxCypressE2EPresetOptions. */
+        presetOptions: string;
+        baseUrl?: string;
+    };
 }
 export declare function addBaseCypressSetup(tree: Tree, options: CypressBaseSetupSchema): void;

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

@@ -31,6 +31,12 @@ function addBaseCypressSetup(tree, options) {
         linter: isEslintInstalled(tree) ? 'eslint' : 'none',
         ext: '',
         moduleResolution: (0, internal_1.getTsConfigModuleResolution)(tree),
+        // The config-*-* templates use `import.meta.url` (ESM) / `__filename`
+        // (CJS) - the shape base-setup already selects below - so the e2e preset is
+        // rendered correctly for the module system without any AST parsing.
+        e2ePreset: !!options.e2ePreset,
+        presetOptions: options.e2ePreset?.presetOptions ?? '',
+        baseUrl: options.e2ePreset?.baseUrl ?? '',
     };
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files/common'), projectConfig.root, templateVars);
     (0, devkit_1.generateFiles)(tree, isUsingTsSolutionConfig

package/dist/src/generators/base-setup/files/config-js-cjs/cypress.config.js__ext__

@@ -1,3 +1,12 @@
+<% if (e2ePreset) { -%>
+const { nxE2EPreset } = require('@nx/cypress/plugins/cypress-preset');
+<% } -%>
 const { defineConfig } = require('cypress');
-
-module.exports = defineConfig({});
+<% if (!e2ePreset) { %>
+<% } -%>
+module.exports = defineConfig({<% if (e2ePreset) { %>
+  e2e: {
+    ...nxE2EPreset(__filename, <%- presetOptions %>),<% if (baseUrl) { %>
+    baseUrl: '<%- baseUrl %>',<% } %>
+  },
+<% } %>});

package/dist/src/generators/base-setup/files/config-js-esm/cypress.config.js__ext__

@@ -1,3 +1,12 @@
+<% if (e2ePreset) { -%>
+import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
+<% } -%>
 import { defineConfig } from 'cypress';
-
-export default defineConfig({});
+<% if (!e2ePreset) { %>
+<% } -%>
+export default defineConfig({<% if (e2ePreset) { %>
+  e2e: {
+    ...nxE2EPreset(import.meta.url, <%- presetOptions %>),<% if (baseUrl) { %>
+    baseUrl: '<%- baseUrl %>',<% } %>
+  },
+<% } %>});

package/dist/src/generators/base-setup/files/config-ts-cjs/cypress.config.ts__ext__

@@ -1,3 +1,12 @@
+<% if (e2ePreset) { -%>
+const { nxE2EPreset } = require('@nx/cypress/plugins/cypress-preset');
+<% } -%>
 const { defineConfig } = require('cypress');
-
-module.exports = defineConfig({});
+<% if (!e2ePreset) { %>
+<% } -%>
+module.exports = defineConfig({<% if (e2ePreset) { %>
+  e2e: {
+    ...nxE2EPreset(__filename, <%- presetOptions %>),<% if (baseUrl) { %>
+    baseUrl: '<%- baseUrl %>',<% } %>
+  },
+<% } %>});

package/dist/src/generators/base-setup/files/config-ts-esm/cypress.config.ts__ext__

@@ -1,3 +1,12 @@
+<% if (e2ePreset) { -%>
+import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';
+<% } -%>
 import { defineConfig } from 'cypress';
-
-export default defineConfig({});
+<% if (!e2ePreset) { %>
+<% } -%>
+export default defineConfig({<% if (e2ePreset) { %>
+  e2e: {
+    ...nxE2EPreset(import.meta.url, <%- presetOptions %>),<% if (baseUrl) { %>
+    baseUrl: '<%- baseUrl %>',<% } %>
+  },
+<% } %>});

package/dist/src/generators/configuration/configuration.js

@@ -186,13 +186,11 @@ async function addFiles(tree, options, projectGraph, hasPlugin) {
         tmpl: '',
     };
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), projectConfig.root, fileOpts);
-    (0, base_setup_1.addBaseCypressSetup)(tree, {
-        project: options.project,
-        directory: options.directory,
-        jsx: options.jsx,
-        js: options.js,
-    });
     const cyFile = (0, devkit_1.joinPathFragments)(projectConfig.root, options.js ? 'cypress.config.js' : 'cypress.config.ts');
+    // A pre-existing config may be user-authored, so we AST-merge our e2e block
+    // into it below. A fresh one is generated complete by base-setup, so it never
+    // needs AST parsing - loading tsquery crashes under TypeScript 7.
+    const cypressConfigExists = tree.exists(cyFile);
     let webServerCommands;
     let ciWebServerCommand;
     let ciBaseUrl;
@@ -216,14 +214,30 @@ async function addFiles(tree, options, projectGraph, hasPlugin) {
             ciWebServerCommand = `nx run ${parsedTarget.project}:serve-static`;
         }
     }
-    const updatedCyConfig = await (0, config_1.addDefaultE2EConfig)(tree.read(cyFile, 'utf-8'), {
+    const e2ePresetOptions = {
         cypressDir: options.directory,
         bundler: options.bundler === 'vite' ? 'vite' : undefined,
         webServerCommands,
-        ciWebServerCommand: ciWebServerCommand,
+        ciWebServerCommand,
         ciBaseUrl,
-    }, options.baseUrl);
-    tree.write(cyFile, updatedCyConfig);
+    };
+    (0, base_setup_1.addBaseCypressSetup)(tree, {
+        project: options.project,
+        directory: options.directory,
+        jsx: options.jsx,
+        js: options.js,
+        // Generate a fresh config already containing the e2e preset (base-setup
+        // no-ops when a config already exists - see the merge below).
+        e2ePreset: {
+            presetOptions: JSON.stringify(e2ePresetOptions, null, 2)
+                .split('\n')
+                .join('\n    '),
+            baseUrl: options.baseUrl,
+        },
+    });
+    if (cypressConfigExists) {
+        tree.write(cyFile, await (0, config_1.addDefaultE2EConfig)(tree.read(cyFile, 'utf-8'), e2ePresetOptions, options.baseUrl));
+    }
     if (options.js) {
         (0, devkit_1.toJS)(tree);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/cypress",
-  "version": "23.1.0-rc.2",
+  "version": "23.1.0",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -89,12 +89,12 @@
     "semver": "^7.6.3",
     "tree-kill": "^1.2.2",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.1.0-rc.2",
-    "@nx/eslint": "23.1.0-rc.2",
-    "@nx/js": "23.1.0-rc.2"
+    "@nx/devkit": "23.1.0",
+    "@nx/eslint": "23.1.0",
+    "@nx/js": "23.1.0"
   },
   "devDependencies": {
-    "nx": "23.1.0-rc.2"
+    "nx": "23.1.0"
   },
   "peerDependencies": {
     "cypress": ">= 13 < 16"