{"prompt":"You are comparing an AI-suggested code fix with actual changes made in a commit.\n\nYour task: Determine if the commit contains the essence of the AI fix and provide a confidence level.\n\n## AI-Suggested Fix\n\n**What it fixes:** e2e-angular:e2e-ci--src/ng-add.test.ts\n\n**Description:** test(angular): update ng-add e2e test to use Cypress v13\n\n**Reasoning:** The PR adds support for Cypress v15 and updates the `versions()` function in `packages/cypress/src/utils/versions.ts` to use a switch statement that explicitly handles versions 13, 14, and 15, throwing an error for any other version.\n\nThe failing test `\"should handle a workspace with cypress v9\"` was installing Cypress v9.0.0 and then running the `@nx/angular:ng-add` generator, which internally calls the Cypress configuration generator. This generator uses the `versions()` function, which now re\n\n**Suggested Changes (diff):**\n```diff\ndiff --git a/e2e/angular/src/ng-add.test.ts b/e2e/angular/src/ng-add.test.ts\nindex c867764c87..089eac2997 100644\n--- a/e2e/angular/src/ng-add.test.ts\n+++ b/e2e/angular/src/ng-add.test.ts\n@@ -50,9 +50,9 @@ describe('convert Angular CLI workspace to an Nx workspace', () => {\n updateFile('angular.json', JSON.stringify(angularJson, null, 2));\n }\n \n- function addCypress9() {\n+ function addCypress13() {\n runNgAdd('@cypress/schematic', '--e2e-update', '1.7.0');\n- packageInstall('cypress', null, '^9.0.0');\n+ packageInstall('cypress', null, '^13.13.0');\n }\n \n function addCypress10() {\n@@ -255,8 +255,8 @@ describe('convert Angular CLI workspace to an Nx workspace', () => {\n checkFilesExist(`dist/${project}/browser/main.js`);\n });\n \n- it('should handle a workspace with cypress v9', () => {\n- addCypress9();\n+ it('should handle a workspace with cypress v13', () => {\n+ addCypress13();\n \n runCLI('g @nx/angular:ng-add --skip-install');\n \n\n```\n\n## Actual Commit Changes\n\n**Commit Diff:**\n```diff\ndiff --git a/e2e/angular/src/ng-add.test.ts b/e2e/angular/src/ng-add.test.ts\nindex c867764c875d7..074a287a422ea 100644\n--- a/e2e/angular/src/ng-add.test.ts\n+++ b/e2e/angular/src/ng-add.test.ts\n@@ -50,16 +50,11 @@ describe('convert Angular CLI workspace to an Nx workspace', () => {\n updateFile('angular.json', JSON.stringify(angularJson, null, 2));\n }\n \n- function addCypress9() {\n- runNgAdd('@cypress/schematic', '--e2e-update', '1.7.0');\n- packageInstall('cypress', null, '^9.0.0');\n- }\n-\n- function addCypress10() {\n+ function addCypress() {\n runNgAdd('@cypress/schematic', '--e2e', 'latest');\n // pin latest version of Cypress that's supported by Nx to avoid flakiness\n // when a new major version is released\n- packageInstall('cypress', null, '^14.2.1');\n+ packageInstall('cypress', null, '^15.6.0');\n }\n \n function addEsLint() {\n@@ -255,75 +250,8 @@ describe('convert Angular CLI workspace to an Nx workspace', () => {\n checkFilesExist(`dist/${project}/browser/main.js`);\n });\n \n- it('should handle a workspace with cypress v9', () => {\n- addCypress9();\n-\n- runCLI('g @nx/angular:ng-add --skip-install');\n-\n- const e2eProject = `${project}-e2e`;\n- //check e2e project files\n- checkFilesDoNotExist(\n- 'cypress.json',\n- 'cypress/tsconfig.json',\n- 'cypress/integration/spec.ts',\n- 'cypress/plugins/index.ts',\n- 'cypress/support/commands.ts',\n- 'cypress/support/index.ts'\n- );\n- checkFilesExist(\n- `apps/${e2eProject}/cypress.json`,\n- `apps/${e2eProject}/tsconfig.json`,\n- `apps/${e2eProject}/src/integration/spec.ts`,\n- `apps/${e2eProject}/src/plugins/index.ts`,\n- `apps/${e2eProject}/src/support/commands.ts`,\n- `apps/${e2eProject}/src/support/index.ts`\n- );\n-\n- const projectConfig = readJson(`apps/${project}/project.json`);\n- expect(projectConfig.targets['cypress-run']).toBeUndefined();\n- expect(projectConfig.targets['cypress-open']).toBeUndefined();\n- expect(projectConfig.targets.e2e).toBeUndefined();\n-\n- // check e2e project config\n- const e2eProjectConfig = readJson(`apps/${project}-e2e/project.json`);\n- expect(e2eProjectConfig.targets['cypress-run']).toEqual({\n- executor: '@nx/cypress:cypress',\n- options: {\n- devServerTarget: `${project}:serve`,\n- cypressConfig: `apps/${e2eProject}/cypress.json`,\n- },\n- configurations: {\n- production: {\n- devServerTarget: `${project}:serve:production`,\n- },\n- },\n- });\n- expect(e2eProjectConfig.targets['cypress-open']).toEqual({\n- executor: '@nx/cypress:cypress',\n- options: {\n- watch: true,\n- headless: false,\n- cypressConfig: `apps/${e2eProject}/cypress.json`,\n- },\n- });\n- expect(e2eProjectConfig.targets.e2e).toEqual({\n- executor: '@nx/cypress:cypress',\n- options: {\n- devServerTarget: `${project}:serve`,\n- watch: true,\n- headless: false,\n- cypressConfig: `apps/${e2eProject}/cypress.json`,\n- },\n- configurations: {\n- production: {\n- devServerTarget: `${project}:serve:production`,\n- },\n- },\n- });\n- });\n-\n- it('should handle a workspace with cypress v10', () => {\n- addCypress10();\n+ it('should handle a workspace with cypress', () => {\n+ addCypress();\n \n runCLI('g @nx/angular:ng-add --skip-install');\n \ndiff --git a/packages/angular/src/generators/component-test/component-test.ts b/packages/angular/src/generators/component-test/component-test.ts\nindex 85a08bbe1ef45..b366caf9c0c8d 100644\n--- a/packages/angular/src/generators/component-test/component-test.ts\n+++ b/packages/angular/src/generators/component-test/component-test.ts\n@@ -18,10 +18,6 @@ export async function componentTestGenerator(\n options: ComponentTestSchema\n ) {\n ensurePackage('@nx/cypress', nxVersion);\n- const { assertMinimumCypressVersion } = <\n- typeof import('@nx/cypress/src/utils/versions')\n- >require('@nx/cypress/src/utils/versions');\n- assertMinimumCypressVersion(10);\n const { root } = readProjectConfiguration(tree, options.project);\n const componentDirPath = joinPathFragments(root, options.componentDir);\n const componentFilePath = joinPathFragments(\ndiff --git a/packages/cypress/package.json b/packages/cypress/package.json\nindex 760e2a6242d47..ddd84b0ea7b37 100644\n--- a/packages/cypress/package.json\n+++ b/packages/cypress/package.json\n@@ -49,7 +49,7 @@\n \"nx\": \"workspace:*\"\n },\n \"peerDependencies\": {\n- \"cypress\": \">= 3 < 16\"\n+ \"cypress\": \">= 13 < 16\"\n },\n \"peerDependenciesMeta\": {\n \"cypress\": {\ndiff --git a/packages/cypress/src/executors/cypress/cypress.impl.spec.ts b/packages/cypress/src/executors/cypress/cypress.impl.spec.ts\nindex 6f9a40ca66552..9a4e851da20af 100644\n--- a/packages/cypress/src/executors/cypress/cypress.impl.spec.ts\n+++ b/packages/cypress/src/executors/cypress/cypress.impl.spec.ts\n@@ -1,4 +1,4 @@\n-import { ExecutorContext, stripIndents } from '@nx/devkit';\n+import { ExecutorContext } from '@nx/devkit';\n import * as detectPort from 'detect-port';\n import * as executorUtils from 'nx/src/command-line/run/executor-utils';\n import * as path from 'path';\n@@ -30,7 +30,7 @@ describe('Cypress builder', () => {\n skipServe: false,\n };\n let mockContext: ExecutorContext;\n- let mockedInstalledCypressVersion: jest.Mock<\n+ let mockedInstalledCypressMajorVersion: jest.Mock<\n ReturnType\n > = getInstalledCypressMajorVersion as any;\n mockContext = {\n@@ -62,6 +62,7 @@ describe('Cypress builder', () => {\n getTempTailwindPath as any;\n \n beforeEach(async () => {\n+ mockedInstalledCypressMajorVersion.mockReturnValue(15);\n runExecutor = (devkit as any).runExecutor = jest.fn().mockReturnValue([\n {\n success: true,\n@@ -98,7 +99,7 @@ describe('Cypress builder', () => {\n \n expect(cypressRun).toHaveBeenCalledWith(\n expect.objectContaining({\n- config: { baseUrl: 'http://localhost:4200' },\n+ config: expect.objectContaining({ baseUrl: 'http://localhost:4200' }),\n project: path.dirname(cypressOptions.cypressConfig),\n })\n );\n@@ -114,7 +115,7 @@ describe('Cypress builder', () => {\n \n expect(cypressOpen).toHaveBeenCalledWith(\n expect.objectContaining({\n- config: { baseUrl: 'http://localhost:4200' },\n+ config: expect.objectContaining({ baseUrl: 'http://localhost:4200' }),\n project: path.dirname(cypressOptions.cypressConfig),\n })\n );\n@@ -133,65 +134,6 @@ describe('Cypress builder', () => {\n } catch (e) {}\n });\n \n- it('should show warnings if using unsupported browsers v3', async () => {\n- mockedInstalledCypressVersion.mockReturnValue(3);\n- await cypressExecutor(\n- {\n- ...cypressOptions,\n- browser: 'edge',\n- },\n- mockContext\n- );\n-\n- expect(devkit.logger.warn).toHaveBeenCalled();\n- });\n-\n- it('should show warnings if using unsupported browsers v4', async () => {\n- mockedInstalledCypressVersion.mockReturnValue(4);\n- await cypressExecutor(\n- {\n- ...cypressOptions,\n- browser: 'canary',\n- },\n- mockContext\n- );\n-\n- expect(devkit.logger.warn).toHaveBeenCalled();\n- });\n-\n- it('should show warnings if using v8 deprecated headless flag', async () => {\n- mockedInstalledCypressVersion.mockReturnValue(8);\n- await cypressExecutor(\n- {\n- ...cypressOptions,\n- headless: true,\n- },\n- mockContext\n- );\n-\n- expect(devkit.logger.warn).toHaveBeenCalled();\n- });\n-\n- it('should skip warnings if using headless flag used on v7 and lower', async () => {\n- mockedInstalledCypressVersion.mockReturnValue(7);\n- await cypressExecutor(\n- {\n- ...cypressOptions,\n- headless: true,\n- },\n- mockContext\n- );\n- const deprecatedMessage = stripIndents`\n-NOTE:\n-Support for Cypress versions < 10 is deprecated. Please upgrade to at least Cypress version 10.\n-A generator to migrate from v8 to v10 is provided. See https://nx.dev/cypress/v10-migration-guide\n-`;\n-\n- // expect the warning about the using < v10 but should not also warn about headless\n- expect(devkit.logger.warn).toHaveBeenCalledTimes(1);\n- expect(devkit.logger.warn).toHaveBeenCalledWith(deprecatedMessage);\n- });\n-\n it('should call `Cypress.run` with provided baseUrl', async () => {\n const { success } = await cypressExecutor(\n {\n@@ -204,9 +146,9 @@ A generator to migrate from v8 to v10 is provided. See https://nx.dev/cypress/v1\n expect(success).toEqual(true);\n expect(cypressRun).toHaveBeenCalledWith(\n expect.objectContaining({\n- config: {\n+ config: expect.objectContaining({\n baseUrl: 'http://my-distant-host.com',\n- },\n+ }),\n project: path.dirname(cypressOptions.cypressConfig),\n })\n );\n@@ -299,7 +241,11 @@ A generator to migrate from v8 to v10 is provided. See https://nx.dev/cypress/v1\n expect(success).toEqual(true);\n expect(cypressRun).toHaveBeenCalledWith(\n expect.objectContaining({\n- ignoreTestFiles: '/some/path/to/a/file.js',\n+ config: expect.objectContaining({\n+ e2e: expect.objectContaining({\n+ excludeSpecPattern: '/some/path/to/a/file.js',\n+ }),\n+ }),\n })\n );\n });\n@@ -366,9 +312,9 @@ A generator to migrate from v8 to v10 is provided. See https://nx.dev/cypress/v1\n expect(success).toEqual(true);\n expect(cypressRun).toHaveBeenLastCalledWith(\n expect.objectContaining({\n- config: {\n+ config: expect.objectContaining({\n baseUrl: 'test-url-from-options',\n- },\n+ }),\n })\n );\n });\n@@ -378,9 +324,9 @@ A generator to migrate from v8 to v10 is provided. See https://nx.dev/cypress/v1\n expect(success).toEqual(true);\n expect(cypressRun).toHaveBeenLastCalledWith(\n expect.objectContaining({\n- config: {\n+ config: expect.objectContaining({\n baseUrl: 'http://localhost:4200',\n- },\n+ }),\n })\n );\n });\n@@ -398,9 +344,9 @@ A generator to migrate from v8 to v10 is provided. See https://nx.dev/cypress/v1\n expect(runExecutor).not.toHaveBeenCalled();\n expect(cypressRun).toHaveBeenCalledWith(\n expect.objectContaining({\n- config: {\n+ config: expect.objectContaining({\n baseUrl: 'http://my-distant-host.com',\n- },\n+ }),\n })\n );\n });\ndiff --git a/packages/cypress/src/executors/cypress/cypress.impl.ts b/packages/cypress/src/executors/cypress/cypress.impl.ts\nindex 5a658376d7bdb..b2d9d171673d0 100644\n--- a/packages/cypress/src/executors/cypress/cypress.impl.ts\n+++ b/packages/cypress/src/executors/cypress/cypress.impl.ts\n@@ -1,8 +1,7 @@\n-import { ExecutorContext, logger, stripIndents } from '@nx/devkit';\n+import { ExecutorContext, logger } from '@nx/devkit';\n import { existsSync, readdirSync, unlinkSync } from 'fs';\n import { basename, dirname } from 'path';\n import { getTempTailwindPath } from '../../utils/ct-helpers';\n-import { getInstalledCypressMajorVersion } from '../../utils/versions';\n import { startDevServer } from '../../utils/start-dev-server';\n \n const Cypress = require('cypress'); // @NOTE: Importing via ES6 messes the whole test dependencies.\n@@ -50,8 +49,7 @@ export default async function cypressExecutor(\n options: CypressExecutorOptions,\n context: ExecutorContext\n ) {\n- const installedCypressMajorVersion = getInstalledCypressMajorVersion();\n- options = normalizeOptions(options, context, installedCypressMajorVersion);\n+ options = normalizeOptions(options, context);\n // this is used by cypress component testing presets to build the executor contexts with the correct configuration options.\n process.env.NX_CYPRESS_TARGET_CONFIGURATION = context.configurationName;\n let success;\n@@ -59,14 +57,10 @@ export default async function cypressExecutor(\n const generatorInstance = startDevServer(options, context);\n for await (const devServerValues of generatorInstance) {\n try {\n- success = await runCypress(\n- devServerValues.baseUrl,\n- {\n- ...options,\n- portLockFilePath: devServerValues.portLockFilePath,\n- },\n- installedCypressMajorVersion\n- );\n+ success = await runCypress(devServerValues.baseUrl, {\n+ ...options,\n+ portLockFilePath: devServerValues.portLockFilePath,\n+ });\n if (!options.watch) {\n generatorInstance.return();\n break;\n@@ -83,84 +77,19 @@ export default async function cypressExecutor(\n \n function normalizeOptions(\n options: CypressExecutorOptions,\n- context: ExecutorContext,\n- installedCypressMajorVersion: number | null\n+ context: ExecutorContext\n ): NormalizedCypressExecutorOptions {\n options.env = options.env || {};\n+ options.testingType ??= 'e2e';\n if (options.testingType === 'component') {\n const project = context?.projectGraph?.nodes?.[context.projectName];\n if (project?.data?.root) {\n options.ctTailwindPath = getTempTailwindPath(context);\n }\n }\n- checkSupportedBrowser(options, installedCypressMajorVersion);\n- warnDeprecatedHeadless(options, installedCypressMajorVersion);\n- warnDeprecatedCypressVersion(installedCypressMajorVersion);\n return options;\n }\n \n-function checkSupportedBrowser(\n- { browser }: CypressExecutorOptions,\n- installedCypressMajorVersion: number | null\n-) {\n- // Browser was not passed in as an option, cypress will use whatever default it has set and we dont need to check it\n- if (!browser) {\n- return;\n- }\n-\n- if (installedCypressMajorVersion >= 4 && browser == 'canary') {\n- logger.warn(stripIndents`\n- Warning:\n- You are using a browser that is not supported by cypress v4+.\n-\n- Read here for more info:\n- https://docs.cypress.io/guides/references/migration-guide.html#Launching-Chrome-Canary-with-browser\n- `);\n- return;\n- }\n-\n- const supportedV3Browsers = ['electron', 'chrome', 'canary', 'chromium'];\n- if (\n- installedCypressMajorVersion <= 3 &&\n- !supportedV3Browsers.includes(browser)\n- ) {\n- logger.warn(stripIndents`\n- Warning:\n- You are using a browser that is not supported by cypress v3.\n- `);\n- return;\n- }\n-}\n-\n-function warnDeprecatedHeadless(\n- { headless }: CypressExecutorOptions,\n- installedCypressMajorVersion: number | null\n-) {\n- if (installedCypressMajorVersion < 8 || headless === undefined) {\n- return;\n- }\n-\n- if (headless) {\n- const deprecatedMsg = stripIndents`\n- NOTE:\n- You can now remove the use of the '--headless' flag during 'cypress run' as this is the default for all browsers.`;\n-\n- logger.warn(deprecatedMsg);\n- }\n-}\n-\n-function warnDeprecatedCypressVersion(\n- installedCypressMajorVersion: number | null\n-) {\n- if (installedCypressMajorVersion < 10) {\n- logger.warn(stripIndents`\n-NOTE:\n-Support for Cypress versions < 10 is deprecated. Please upgrade to at least Cypress version 10.\n-A generator to migrate from v8 to v10 is provided. See https://nx.dev/cypress/v10-migration-guide\n-`);\n- }\n-}\n-\n /**\n * @whatItDoes Initialize the Cypress test runner with the provided project configuration.\n * By default, Cypress will run tests from the CLI without the GUI and provide directly the results in the console output.\n@@ -168,8 +97,7 @@ A generator to migrate from v8 to v10 is provided. See https://nx.dev/cypress/v1\n */\n async function runCypress(\n baseUrl: string,\n- opts: NormalizedCypressExecutorOptions,\n- installedCypressMajorVersion: number | null\n+ opts: NormalizedCypressExecutorOptions\n ) {\n // Cypress expects the folder where a cypress config is present\n const projectFolderPath = dirname(opts.cypressConfig);\n@@ -210,15 +138,12 @@ async function runCypress(\n options.parallel = opts.parallel;\n options.ciBuildId = opts.ciBuildId?.toString();\n options.group = opts.group;\n+\n // renamed in cy 10\n- if (installedCypressMajorVersion >= 10) {\n- options.config ??= {};\n- options.config[opts.testingType] = {\n- excludeSpecPattern: opts.ignoreTestFiles,\n- };\n- } else {\n- options.ignoreTestFiles = opts.ignoreTestFiles;\n- }\n+ options.config ??= {};\n+ options.config[opts.testingType] = {\n+ excludeSpecPattern: opts.ignoreTestFiles,\n+ };\n \n if (opts.reporter) {\n options.reporter = opts.reporter;\ndiff --git a/packages/cypress/src/generators/component-configuration/component-configuration.spec.ts b/packages/cypress/src/generators/component-configuration/component-configuration.spec.ts\nindex d2f70b379c9f8..d7d2cf2928d29 100644\n--- a/packages/cypress/src/generators/component-configuration/component-configuration.spec.ts\n+++ b/packages/cypress/src/generators/component-configuration/component-configuration.spec.ts\n@@ -254,17 +254,4 @@ export default defineConfig({\n expect(tree.exists('libs/cool-lib/cypress')).toEqual(true);\n expect(actualProjectConfig.targets['component-test']).toMatchSnapshot();\n });\n-\n- it('should error when using cypress < v10', async () => {\n- mockedInstalledCypressVersion.mockReturnValue(9);\n- await expect(\n- async () =>\n- await componentConfigurationGenerator(tree, {\n- project: 'cool-lib',\n- skipFormat: true,\n- })\n- ).rejects.toThrow(\n- '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'\n- );\n- });\n });\ndiff --git a/packages/cypress/src/generators/component-configuration/component-configuration.ts b/packages/cypress/src/generators/component-configuration/component-configuration.ts\nindex 37b255bd667b5..295add64256fc 100644\n--- a/packages/cypress/src/generators/component-configuration/component-configuration.ts\n+++ b/packages/cypress/src/generators/component-configuration/component-configuration.ts\n@@ -84,13 +84,6 @@ function normalizeOptions(\n tree: Tree,\n options: CypressComponentConfigurationSchema\n ) {\n- const cyVersion = getInstalledCypressMajorVersion(tree);\n- if (cyVersion && cyVersion < 10) {\n- throw new Error(\n- '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'\n- );\n- }\n-\n const nxJson = readNxJson(tree);\n const addPlugin =\n process.env.NX_ADD_PLUGINS !== 'false' &&\ndiff --git a/packages/cypress/src/generators/configuration/configuration.ts b/packages/cypress/src/generators/configuration/configuration.ts\nindex bd000c17a1ec8..15b25f7ea4fb8 100644\n--- a/packages/cypress/src/generators/configuration/configuration.ts\n+++ b/packages/cypress/src/generators/configuration/configuration.ts\n@@ -290,8 +290,6 @@ async function addFiles(\n hasPlugin: boolean\n ) {\n const projectConfig = readProjectConfiguration(tree, options.project);\n- const cyVersion = getInstalledCypressMajorVersion(tree);\n- const filesToUse = cyVersion && cyVersion < 10 ? 'v9' : 'v10';\n \n const hasTsConfig = tree.exists(\n joinPathFragments(projectConfig.root, 'tsconfig.json')\n@@ -314,90 +312,66 @@ async function addFiles(\n tmpl: '',\n };\n \n- generateFiles(\n- tree,\n- join(__dirname, 'files', filesToUse),\n- projectConfig.root,\n- fileOpts\n- );\n+ generateFiles(tree, join(__dirname, 'files'), projectConfig.root, fileOpts);\n \n- if (filesToUse === 'v10') {\n- addBaseCypressSetup(tree, {\n- project: options.project,\n- directory: options.directory,\n- jsx: options.jsx,\n- js: options.js,\n- });\n+ addBaseCypressSetup(tree, {\n+ project: options.project,\n+ directory: options.directory,\n+ jsx: options.jsx,\n+ js: options.js,\n+ });\n \n- const cyFile = joinPathFragments(\n- projectConfig.root,\n- options.js ? 'cypress.config.js' : 'cypress.config.ts'\n+ const cyFile = joinPathFragments(\n+ projectConfig.root,\n+ options.js ? 'cypress.config.js' : 'cypress.config.ts'\n+ );\n+ let webServerCommands: Record;\n+\n+ let ciWebServerCommand: string;\n+ let ciBaseUrl: string;\n+\n+ if (hasPlugin && options.webServerCommands && options.ciWebServerCommand) {\n+ webServerCommands = options.webServerCommands;\n+ ciWebServerCommand = options.ciWebServerCommand;\n+ ciBaseUrl = options.ciBaseUrl;\n+ } else if (hasPlugin && options.devServerTarget) {\n+ webServerCommands = {};\n+\n+ webServerCommands.default = 'nx run ' + options.devServerTarget;\n+ const parsedTarget = parseTargetString(\n+ options.devServerTarget,\n+ projectGraph\n );\n- let webServerCommands: Record;\n-\n- let ciWebServerCommand: string;\n- let ciBaseUrl: string;\n-\n- if (hasPlugin && options.webServerCommands && options.ciWebServerCommand) {\n- webServerCommands = options.webServerCommands;\n- ciWebServerCommand = options.ciWebServerCommand;\n- ciBaseUrl = options.ciBaseUrl;\n- } else if (hasPlugin && options.devServerTarget) {\n- webServerCommands = {};\n-\n- webServerCommands.default = 'nx run ' + options.devServerTarget;\n- const parsedTarget = parseTargetString(\n- options.devServerTarget,\n- projectGraph\n- );\n \n- const devServerProjectConfig: ProjectConfiguration | undefined =\n- readProjectConfiguration(tree, parsedTarget.project);\n- // Add production e2e target if serve target is found\n- if (\n- parsedTarget.configuration !== 'production' &&\n- devServerProjectConfig?.targets?.[parsedTarget.target]\n- ?.configurations?.['production']\n- ) {\n- webServerCommands.production = `nx run ${parsedTarget.project}:${parsedTarget.target}:production`;\n- }\n- // Add ci/static e2e target if serve target is found\n- if (devServerProjectConfig?.targets?.['serve-static']) {\n- ciWebServerCommand = `nx run ${parsedTarget.project}:serve-static`;\n- }\n+ const devServerProjectConfig: ProjectConfiguration | undefined =\n+ readProjectConfiguration(tree, parsedTarget.project);\n+ // Add production e2e target if serve target is found\n+ if (\n+ parsedTarget.configuration !== 'production' &&\n+ devServerProjectConfig?.targets?.[parsedTarget.target]?.configurations?.[\n+ 'production'\n+ ]\n+ ) {\n+ webServerCommands.production = `nx run ${parsedTarget.project}:${parsedTarget.target}:production`;\n }\n- const updatedCyConfig = await addDefaultE2EConfig(\n- tree.read(cyFile, 'utf-8'),\n- {\n- cypressDir: options.directory,\n- bundler: options.bundler === 'vite' ? 'vite' : undefined,\n- webServerCommands,\n- ciWebServerCommand: ciWebServerCommand,\n- ciBaseUrl,\n- },\n- options.baseUrl\n- );\n-\n- tree.write(cyFile, updatedCyConfig);\n- }\n-\n- if (\n- cyVersion &&\n- cyVersion < 7 &&\n- tree.exists(\n- joinPathFragments(projectConfig.root, 'src', 'plugins', 'index.js')\n- )\n- ) {\n- updateJson(tree, join(projectConfig.root, 'cypress.json'), (json) => {\n- json.pluginsFile = './src/plugins/index';\n- return json;\n- });\n- } else if (cyVersion < 10) {\n- const pluginPath = join(projectConfig.root, 'src/plugins/index.js');\n- if (tree.exists(pluginPath)) {\n- tree.delete(pluginPath);\n+ // Add ci/static e2e target if serve target is found\n+ if (devServerProjectConfig?.targets?.['serve-static']) {\n+ ciWebServerCommand = `nx run ${parsedTarget.project}:serve-static`;\n }\n }\n+ const updatedCyConfig = await addDefaultE2EConfig(\n+ tree.read(cyFile, 'utf-8'),\n+ {\n+ cypressDir: options.directory,\n+ bundler: options.bundler === 'vite' ? 'vite' : undefined,\n+ webServerCommands,\n+ ciWebServerCommand: ciWebServerCommand,\n+ ciBaseUrl,\n+ },\n+ options.baseUrl\n+ );\n+\n+ tree.write(cyFile, updatedCyConfig);\n \n if (options.js) {\n toJS(tree);\n@@ -410,16 +384,13 @@ function addTarget(\n projectGraph: ProjectGraph\n ) {\n const projectConfig = readProjectConfiguration(tree, opts.project);\n- const cyVersion = getInstalledCypressMajorVersion(tree);\n projectConfig.targets ??= {};\n projectConfig.targets.e2e = {\n executor: '@nx/cypress:cypress',\n options: {\n cypressConfig: joinPathFragments(\n projectConfig.root,\n- cyVersion && cyVersion < 10\n- ? 'cypress.json'\n- : `cypress.config.${opts.js ? 'js' : 'ts'}`\n+ `cypress.config.${opts.js ? 'js' : 'ts'}`\n ),\n testingType: 'e2e',\n },\ndiff --git a/packages/cypress/src/generators/configuration/files/v10/__directory__/e2e/app.cy.ts__tmpl__ b/packages/cypress/src/generators/configuration/files/__directory__/e2e/app.cy.ts__tmpl__\nsimilarity index 100%\nrename from packages/cypress/src/generators/configuration/files/v10/__directory__/e2e/app.cy.ts__tmpl__\nrename to packages/cypress/src/generators/configuration/files/__directory__/e2e/app.cy.ts__tmpl__\ndiff --git a/packages/cypress/src/generators/configuration/files/v10/__directory__/support/app.po.ts__tmpl__ b/packages/cypress/src/generators/configuration/files/__directory__/support/app.po.ts__tmpl__\nsimilarity index 100%\nrename from packages/cypress/src/generators/configuration/files/v10/__directory__/support/app.po.ts__tmpl__\nrename to packages/cypress/src/generators/configuration/files/__directory__/support/app.po.ts__tmpl__\ndiff --git a/packages/cypress/src/generators/configuration/files/v10/__directory__/support/e2e.ts__tmpl__ b/packages/cypress/src/generators/configuration/files/__directory__/support/e2e.ts__tmpl__\nsimilarity index 100%\nrename from packages/cypress/src/generators/configuration/files/v10/__directory__/support/e2e.ts__tmpl__\nrename to packages/cypress/src/generators/configuration/files/__directory__/support/e2e.ts__tmpl__\ndiff --git a/packages/cypress/src/generators/configuration/files/v9/__directory__/fixtures/example.json__tmpl__ b/packages/cypress/src/generators/configuration/files/v9/__directory__/fixtures/example.json__tmpl__\ndeleted file mode 100644\nindex 294cbed6ce9e0..0000000000000\n--- a/packages/cypress/src/generators/configuration/files/v9/__directory__/fixtures/example.json__tmpl__\n+++ /dev/null\n@@ -1,4 +0,0 @@\n-{\n- \"name\": \"Using fixtures to represent data\",\n- \"email\": \"hello@cypress.io\"\n-}\ndiff --git a/packages/cypress/src/generators/configuration/files/v9/__directory__/integration/app.spec.ts__tmpl__ b/packages/cypress/src/generators/configuration/files/v9/__directory__/integration/app.spec.ts__tmpl__\ndeleted file mode 100644\nindex 7b40058fb8499..0000000000000\n--- a/packages/cypress/src/generators/configuration/files/v9/__directory__/integration/app.spec.ts__tmpl__\n+++ /dev/null\n@@ -1,13 +0,0 @@\n-import { getGreeting } from '../support/app.po';\n-\n-describe('<%= project %>', () => {\n- beforeEach(() => cy.visit('/'));\n-\n- it('should display welcome message', () => {\n- // Custom command example, see `../support/commands.ts` file\n- cy.login('my-email@something.com', 'myPassword');\n-\n- // Function helper example, see `../support/app.po.ts` file\n- getGreeting().contains(/Welcome/);\n- });\n-});\ndiff --git a/packages/cypress/src/generators/configuration/files/v9/__directory__/plugins/index.js__tmpl__ b/packages/cypress/src/generators/configuration/files/v9/__directory__/plugins/index.js__tmpl__\ndeleted file mode 100644\nindex 63aa33cbe284a..0000000000000\n--- a/packages/cypress/src/generators/configuration/files/v9/__directory__/plugins/index.js__tmpl__\n+++ /dev/null\n@@ -1,22 +0,0 @@\n-// ***********************************************************\n-// This example plugins/index.js can be used to load plugins\n-//\n-// You can change the location of this file or turn off loading\n-// the plugins file with the 'pluginsFile' configuration option.\n-//\n-// You can read more here:\n-// https://on.cypress.io/plugins-guide\n-// ***********************************************************\n-\n-// This function is called when a project is opened or re-opened (e.g. due to\n-// the project's config changing)\n-\n-const { preprocessTypescript } = require('@nx/cypress/plugins/preprocessor');\n-\n-module.exports = (on, config) => {\n- // `on` is used to hook into various events Cypress emits\n- // `config` is the resolved Cypress config\n-\n- // Preprocess Typescript file using Nx helper\n- on('file:preprocessor', preprocessTypescript(config));\n-};\ndiff --git a/packages/cypress/src/generators/configuration/files/v9/__directory__/support/app.po.ts__tmpl__ b/packages/cypress/src/generators/configuration/files/v9/__directory__/support/app.po.ts__tmpl__\ndeleted file mode 100644\nindex 32934246969c2..0000000000000\n--- a/packages/cypress/src/generators/configuration/files/v9/__directory__/support/app.po.ts__tmpl__\n+++ /dev/null\n@@ -1 +0,0 @@\n-export const getGreeting = () => cy.get('h1');\ndiff --git a/packages/cypress/src/generators/configuration/files/v9/__directory__/support/commands.ts__tmpl__ b/packages/cypress/src/generators/configuration/files/v9/__directory__/support/commands.ts__tmpl__\ndeleted file mode 100644\nindex fc4dc5d3d285d..0000000000000\n--- a/packages/cypress/src/generators/configuration/files/v9/__directory__/support/commands.ts__tmpl__\n+++ /dev/null\n@@ -1,33 +0,0 @@\n-// ***********************************************\n-// This example commands.js shows you how to\n-// create various custom commands and overwrite\n-// existing commands.\n-//\n-// For more comprehensive examples of custom\n-// commands please read more here:\n-// https://on.cypress.io/custom-commands\n-// ***********************************************\n-<% if (linter === 'eslint') { %>\n-// eslint-disable-next-line @typescript-eslint/no-namespace<% } %>\n-declare namespace Cypress {<% if (linter === 'eslint') { %>\n- // eslint-disable-next-line @typescript-eslint/no-unused-vars<% } %>\n- interface Chainable {\n- login(email: string, password: string): void;\n- }\n-}\n-//\n-// -- This is a parent command --\n-Cypress.Commands.add('login', (email, password) => {\n- console.log('Custom command example: Login', email, password);\n-});\n-//\n-// -- This is a child command --\n-// Cypress.Commands.add(\"drag\", { prevSubject: 'element'}, (subject, options) => { ... })\n-//\n-//\n-// -- This is a dual command --\n-// Cypress.Commands.add(\"dismiss\", { prevSubject: 'optional'}, (subject, options) => { ... })\n-//\n-//\n-// -- This will overwrite an existing command --\n-// Cypress.Commands.overwrite(\"visit\", (originalFn, url, options) => { ... })\ndiff --git a/packages/cypress/src/generators/configuration/files/v9/__directory__/support/index.ts__tmpl__ b/packages/cypress/src/generators/configuration/files/v9/__directory__/support/index.ts__tmpl__\ndeleted file mode 100644\nindex 459189af2288e..0000000000000\n--- a/packages/cypress/src/generators/configuration/files/v9/__directory__/support/index.ts__tmpl__\n+++ /dev/null\n@@ -1,17 +0,0 @@\n-// ***********************************************************\n-// This example support/index.ts is processed and\n-// loaded automatically before your test files.\n-//\n-// This is a great place to put global configuration and\n-// behavior that modifies Cypress.\n-//\n-// You can change the location of this file or turn off\n-// automatically serving support files with the\n-// 'supportFile' configuration option.\n-//\n-// You can read more here:\n-// https://on.cypress.io/configuration\n-// ***********************************************************\n-\n-// Import commands.ts using ES2015 syntax:\n-import './commands';\ndiff --git a/packages/cypress/src/generators/configuration/files/v9/__directory__/tsconfig.json b/packages/cypress/src/generators/configuration/files/v9/__directory__/tsconfig.json\ndeleted file mode 100644\nindex 76c2f84970d2e..0000000000000\n--- a/packages/cypress/src/generators/configuration/files/v9/__directory__/tsconfig.json\n+++ /dev/null\n@@ -1,10 +0,0 @@\n-{\n- \"extends\": \"<%= tsConfigPath %>\",\n- \"compilerOptions\": {\n- \"sourceMap\": false,\n- \"outDir\": \"<%= offsetFromRoot %>dist/out-tsc\",\n- \"allowJs\": true,\n- \"types\": [\"cypress\", \"node\"]\n- },\n- \"include\": [\"src/**/*.ts\", \"src/**/*.js\"]\n-}\ndiff --git a/packages/cypress/src/generators/configuration/files/v9/cypress.json b/packages/cypress/src/generators/configuration/files/v9/cypress.json\ndeleted file mode 100644\nindex 6311ceced6f38..0000000000000\n--- a/packages/cypress/src/generators/configuration/files/v9/cypress.json\n+++ /dev/null\n@@ -1,12 +0,0 @@\n-{\n- \"fileServerFolder\": \".\",\n- \"fixturesFolder\": \"./<%= dir %>/fixtures\",\n- \"integrationFolder\": \"./<%= dir %>/integration\",\n- \"modifyObstructiveCode\": false,\n- \"supportFile\": \"./<%= dir %>/support/index.<%= ext %>\",\n- \"pluginsFile\": false,\n- \"video\": true,\n- \"videosFolder\": \"<%= offsetFromRoot %>dist/cypress/<%= projectRoot %>/videos\",\n- \"screenshotsFolder\": \"<%= offsetFromRoot %>dist/cypress/<%= projectRoot %>/screenshots\",\n- \"chromeWebSecurity\": false\n-}\ndiff --git a/packages/cypress/src/generators/migrate-to-cypress-11/__snapshots__/migrate-to-cypress-11.spec.ts.snap b/packages/cypress/src/generators/migrate-to-cypress-11/__snapshots__/migrate-to-cypress-11.spec.ts.snap\ndeleted file mode 100644\nindex c722ebed524df..0000000000000\n--- a/packages/cypress/src/generators/migrate-to-cypress-11/__snapshots__/migrate-to-cypress-11.spec.ts.snap\n+++ /dev/null\n@@ -1,302 +0,0 @@\n-// Jest Snapshot v1, https://goo.gl/fbAQLP\n-\n-exports[`convertToCypressTen convertCypressProject should handle custom target names 1`] = `\n-\"import { defineConfig } from 'cypress';\n-import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';\n-\n-const cypressJsonConfig = {\n- fileServerFolder: '.',\n- fixturesFolder: './src/fixtures',\n- video: true,\n- videosFolder: '../dist/cypress/app-e2e/videos',\n- screenshotsFolder: '../dist/cypress/app-e2e/screenshots',\n- chromeWebSecurity: false,\n- specPattern: 'src/e2e/**/*.cy.{js,jsx,ts,tsx}',\n- supportFile: 'src/support/e2e.ts',\n-};\n-export default defineConfig({\n- e2e: {\n- ...nxE2EPreset(__dirname),\n- ...cypressJsonConfig,\n- },\n-});\n-\"\n-`;\n-\n-exports[`convertToCypressTen convertCypressProject should handle multiple configurations 1`] = `\n-\"import { defineConfig } from 'cypress';\n-import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';\n-\n-const cypressJsonConfig = {\n- fileServerFolder: '.',\n- fixturesFolder: './src/fixtures',\n- video: true,\n- videosFolder: '../dist/cypress/app-e2e/videos',\n- screenshotsFolder: '../dist/cypress/app-e2e/screenshots',\n- chromeWebSecurity: false,\n- specPattern: 'src/e2e/**/*.cy.{js,jsx,ts,tsx}',\n- supportFile: 'src/support/e2e.ts',\n-};\n-export default defineConfig({\n- e2e: {\n- ...nxE2EPreset(__dirname),\n- ...cypressJsonConfig,\n- },\n-});\n-\"\n-`;\n-\n-exports[`convertToCypressTen convertCypressProject should handle multiple configurations 2`] = `\n-{\n- \"configurations\": {\n- \"production\": {\n- \"devServerTarget\": \"target:serve:production\",\n- },\n- \"static\": {\n- \"baseUrl\": \"http://localhost:3000\",\n- },\n- },\n- \"executor\": \"@nx/cypress:cypress\",\n- \"options\": {\n- \"cypressConfig\": \"app-e2e/cypress.config.ts\",\n- \"devServerTarget\": \"app:serve\",\n- \"testingType\": \"e2e\",\n- },\n-}\n-`;\n-\n-exports[`convertToCypressTen convertCypressProject should handle multiple configurations with no default cypressConfig option 1`] = `\n-\"import { defineConfig } from 'cypress';\n-import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';\n-\n-const cypressJsonConfig = {\n- fileServerFolder: '.',\n- fixturesFolder: './src/fixtures',\n- video: true,\n- videosFolder: '../dist/cypress/app-e2e/videos',\n- screenshotsFolder: '../dist/cypress/app-e2e/screenshots',\n- chromeWebSecurity: false,\n- specPattern: 'src/e2e/**/*.cy.{js,jsx,ts,tsx}',\n- supportFile: 'src/support/e2e.ts',\n-};\n-export default defineConfig({\n- e2e: {\n- ...nxE2EPreset(__dirname),\n- ...cypressJsonConfig,\n- },\n-});\n-\"\n-`;\n-\n-exports[`convertToCypressTen convertCypressProject should handle multiple configurations with no default cypressConfig option 2`] = `\n-{\n- \"configurations\": {\n- \"production\": {\n- \"cypressConfig\": \"app-e2e/cypress.production.config.ts\",\n- \"devServerTarget\": \"target:serve:production\",\n- },\n- \"static\": {\n- \"baseUrl\": \"http://localhost:3000\",\n- \"cypressConfig\": \"app-e2e/cypress.config.ts\",\n- },\n- },\n- \"executor\": \"@nx/cypress:cypress\",\n- \"options\": {\n- \"baseUrl\": \"http://localhost:4200\",\n- \"testingType\": \"e2e\",\n- },\n-}\n-`;\n-\n-exports[`convertToCypressTen convertCypressProject should handle sharing the same config across projects 1`] = `\n-\"import { defineConfig } from 'cypress';\n-import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';\n-\n-const cypressJsonConfig = {\n- fileServerFolder: '.',\n- fixturesFolder: './src/fixtures',\n- video: true,\n- chromeWebSecurity: false,\n- specPattern: 'src/e2e/**/*.cy.{js,jsx,ts,tsx}',\n- supportFile: 'src/support/e2e.ts',\n-};\n-export default defineConfig({\n- e2e: {\n- ...nxE2EPreset(__dirname),\n- ...cypressJsonConfig,\n- },\n-});\n-\"\n-`;\n-\n-exports[`convertToCypressTen convertCypressProject should infer targets with --all flag 1`] = `\n-\"import { defineConfig } from 'cypress';\n-import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';\n-\n-const cypressJsonConfig = {\n- fileServerFolder: '.',\n- fixturesFolder: './src/fixtures',\n- video: true,\n- videosFolder: '../dist/cypress/app-e2e/videos',\n- screenshotsFolder: '../dist/cypress/app-e2e/screenshots',\n- chromeWebSecurity: false,\n- specPattern: 'src/e2e/**/*.cy.{js,jsx,ts,tsx}',\n- supportFile: 'src/support/e2e.ts',\n-};\n-export default defineConfig({\n- e2e: {\n- ...nxE2EPreset(__dirname),\n- ...cypressJsonConfig,\n- },\n-});\n-\"\n-`;\n-\n-exports[`convertToCypressTen convertCypressProject should infer targets with --all flag 2`] = `\n-{\n- \"e2e\": {\n- \"executor\": \"@nx/cypress:cypress\",\n- \"options\": {\n- \"cypressConfig\": \"app-e2e/cypress.config.ts\",\n- \"devServerTarget\": \"app:serve\",\n- \"testingType\": \"e2e\",\n- },\n- },\n- \"e2e-custom\": {\n- \"executor\": \"@nx/cypress:cypress\",\n- \"options\": {\n- \"cypressConfig\": \"app-e2e/cypress.config.ts\",\n- \"devServerTarget\": \"app:serve\",\n- \"testingType\": \"e2e\",\n- },\n- },\n- \"lint\": {\n- \"executor\": \"@nx/eslint:lint\",\n- },\n-}\n-`;\n-\n-exports[`convertToCypressTen convertCypressProject should not break when an invalid target is passed in 1`] = `\n-\"import { defineConfig } from 'cypress';\n-import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';\n-\n-const cypressJsonConfig = {\n- fileServerFolder: '.',\n- fixturesFolder: './src/fixtures',\n- video: true,\n- videosFolder: '../dist/cypress/app-e2e/videos',\n- screenshotsFolder: '../dist/cypress/app-e2e/screenshots',\n- chromeWebSecurity: false,\n- specPattern: 'src/e2e/**/*.cy.{js,jsx,ts,tsx}',\n- supportFile: 'src/support/e2e.ts',\n-};\n-export default defineConfig({\n- e2e: {\n- ...nxE2EPreset(__dirname),\n- ...cypressJsonConfig,\n- },\n-});\n-\"\n-`;\n-\n-exports[`convertToCypressTen convertCypressProject should not break when an invalid target is passed in 2`] = `\n-{\n- \"e2e\": {\n- \"executor\": \"@nx/cypress:cypress\",\n- \"options\": {\n- \"cypressConfig\": \"app-e2e/cypress.config.ts\",\n- \"devServerTarget\": \"app:serve\",\n- \"testingType\": \"e2e\",\n- },\n- },\n- \"e2e-custom\": {\n- \"executor\": \"@nx/cypress:cypress\",\n- \"options\": {\n- \"cypressConfig\": \"app-e2e/cypress.config.ts\",\n- \"devServerTarget\": \"app:serve\",\n- \"testingType\": \"e2e\",\n- },\n- },\n- \"lint\": {\n- \"executor\": \"@nx/eslint:lint\",\n- },\n-}\n-`;\n-\n-exports[`convertToCypressTen convertCypressProject should update project w/customized config 1`] = `\n-\"import { defineConfig } from 'cypress';\n-import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';\n-import setupNodeEvents from './src/plugins/index';\n-\n-const cypressJsonConfig = {\n- fileServerFolder: '.',\n- fixturesFolder: './src/fixtures',\n- video: true,\n- videosFolder: '../dist/cypress/app-e2e/videos',\n- screenshotsFolder: '../dist/cypress/app-e2e/screenshots',\n- chromeWebSecurity: false,\n- baseUrl: 'http://localhost:4200',\n- specPattern: 'src/e2e/**/*.cy.{js,jsx,ts,tsx}',\n- supportFile: false,\n-};\n-export default defineConfig({\n- e2e: {\n- ...nxE2EPreset(__dirname),\n- ...cypressJsonConfig,\n- setupNodeEvents,\n- },\n-});\n-\"\n-`;\n-\n-exports[`convertToCypressTen convertCypressProject should update project w/defaults 1`] = `\n-\"import { defineConfig } from 'cypress';\n-import { nxE2EPreset } from '@nx/cypress/plugins/cypress-preset';\n-\n-const cypressJsonConfig = {\n- fileServerFolder: '.',\n- fixturesFolder: './src/fixtures',\n- video: true,\n- videosFolder: '../dist/cypress/app-e2e/videos',\n- screenshotsFolder: '../dist/cypress/app-e2e/screenshots',\n- chromeWebSecurity: false,\n- specPattern: 'src/e2e/**/*.cy.{js,jsx,ts,tsx}',\n- supportFile: 'src/support/e2e.ts',\n-};\n-export default defineConfig({\n- e2e: {\n- ...nxE2EPreset(__dirname),\n- ...cypressJsonConfig,\n- },\n-});\n-\"\n-`;\n-\n-exports[`convertToCypressTen updateImports should update imports 1`] = `\n-\"\n-import { getGreeting } from '../support/app.po';\n-\n-import { blah } from '../support/e2e';\n-const eh = require('../support/e2e')\n-\n-import { blah } from '../support/e2e';\n-const eh = require('../support/e2e')\n-\n-describe('a', () => {\n- beforeEach(() => {\n- cy.visit('/')\n- blah()\n- eh()\n- });\n-\n- it('should display welcome message', () => {\n- // Custom command example, see \\\\\\`../support/commands.ts\\\\\\` file\n- cy.login('my-email@something.com', 'myPassword');\n-\n- // Function helper example, see \\\\\\`../support/app.po.ts\\\\\\` file\n- getGreeting().contains('Welcome a');\n- });\n-});\n-\n-\"\n-`;\ndiff --git a/packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.spec.ts b/packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.spec.ts\ndeleted file mode 100644\nindex a9ef066da30a9..0000000000000\n--- a/packages/cypress/src/generators/migrate-to-cypress-11/migrate-to-cypress-11.spec.ts\n+++ /dev/null\n@@ -1,709 +0,0 @@\n-import 'nx/src/internal-testing-utils/mock-project-graph';\n-\n-import {\n- addProjectConfiguration,\n- joinPathFragments,\n- readJson,\n- readProjectConfiguration,\n- Tree,\n- updateJson,\n- updateProjectConfiguration,\n- writeJson,\n-} from '@nx/devkit';\n-import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';\n-import { getInstalledCypressMajorVersion } from '../../utils/versions';\n-import { configurationGenerator } from '../configuration/configuration';\n-import {\n- createSupportFileImport,\n- updateImports,\n- updatePluginFile,\n- updateProjectPaths,\n-} from './conversion.util';\n-import { migrateCypressProject } from './migrate-to-cypress-11';\n-\n-jest.mock('../../utils/versions', () => ({\n- ...jest.requireActual('../../utils/versions'),\n- getInstalledCypressMajorVersion: jest.fn(),\n-}));\n-\n-describe('convertToCypressTen', () => {\n- let tree: Tree;\n- let mockedInstalledCypressVersion: jest.Mock<\n- ReturnType\n- > = getInstalledCypressMajorVersion as never;\n-\n- beforeEach(() => {\n- tree = createTreeWithEmptyWorkspace({ layout: 'apps-libs' });\n- mockedInstalledCypressVersion.mockReturnValue(9);\n- });\n-\n- afterAll(() => {\n- jest.resetAllMocks();\n- });\n-\n- describe('convertCypressProject', () => {\n- beforeEach(async () => {\n- addProjectConfiguration(tree, 'app', {\n- root: 'app',\n- sourceRoot: 'app/src',\n- targets: {\n- serve: {\n- executor: '@nx/web:file-server',\n- options: {},\n- },\n- },\n- });\n- mockedInstalledCypressVersion.mockReturnValue(9);\n-\n- addProjectConfiguration(tree, 'app-e2e', {\n- projectType: 'application',\n- root: 'app-e2e',\n- sourceRoot: 'app-e2e/src',\n- targets: {},\n- implicitDependencies: ['app'],\n- tags: [],\n- });\n-\n- writeJson(tree, 'app-e2e/tsconfig.json', {\n- include: ['src/**/*.ts', 'src/**/*.js'],\n- });\n-\n- await configurationGenerator(tree, {\n- skipFormat: true,\n- project: 'app-e2e',\n- devServerTarget: 'app:serve',\n- addPlugin: false,\n- });\n- });\n-\n- it('should update project w/defaults', async () => {\n- expect(tree.exists('app-e2e/cypress.json')).toBeTruthy();\n-\n- await migrateCypressProject(tree);\n-\n- expect(tree.exists('app-e2e/cypress.config.ts')).toBeTruthy();\n- expect(tree.read('app-e2e/cypress.config.ts', 'utf-8')).toMatchSnapshot();\n- expect(readJson(tree, 'app-e2e/tsconfig.json').include).toEqual([\n- 'src/**/*.ts',\n- 'src/**/*.js',\n- 'cypress.config.ts',\n- ]);\n- expect(tree.exists('app-e2e/src/e2e/app.cy.ts')).toBeTruthy();\n- expect(tree.exists('app-e2e/src/support/e2e.ts')).toBeTruthy();\n- });\n-\n- it('should update project w/customized config', async () => {\n- expect(tree.exists('app-e2e/cypress.json')).toBeTruthy();\n-\n- updateJson(tree, 'app-e2e/cypress.json', (json) => {\n- json = {\n- ...json,\n- baseUrl: 'http://localhost:4200',\n- supportFile: false,\n- pluginsFile: './src/plugins/index.js',\n- };\n-\n- return json;\n- });\n-\n- await migrateCypressProject(tree);\n-\n- expect(tree.exists('app-e2e/cypress.config.ts')).toBeTruthy();\n- expect(tree.read('app-e2e/cypress.config.ts', 'utf-8')).toMatchSnapshot();\n- expect(readJson(tree, 'app-e2e/tsconfig.json').include).toEqual([\n- 'src/**/*.ts',\n- 'src/**/*.js',\n- 'cypress.config.ts',\n- ]);\n- expect(tree.exists('app-e2e/src/e2e/app.cy.ts')).toBeTruthy();\n- expect(tree.exists('app-e2e/src/support/e2e.ts')).toBeTruthy();\n- });\n-\n- it('should not update a non e2e project', async () => {\n- await migrateCypressProject(tree);\n- expect(tree.exists('app/cypress.config.ts')).toBeFalsy();\n- expect(tree.exists('app/src/e2e/app.cy.ts')).toBeFalsy();\n- expect(tree.exists('app/src/support/e2e.ts')).toBeFalsy();\n- });\n-\n- it('should handle custom target names', async () => {\n- expect(tree.exists('app-e2e/cypress.json')).toBeTruthy();\n- const pc = readProjectConfiguration(tree, 'app-e2e');\n- pc.targets = {\n- 'e2e-custom': {\n- ...pc.targets['e2e'],\n- },\n- };\n- delete pc.targets['e2e'];\n- updateProjectConfiguration(tree, 'app-e2e', pc);\n-\n- await migrateCypressProject(tree);\n-\n- expect(tree.exists('app-e2e/cypress.config.ts')).toBeTruthy();\n- expect(tree.read('app-e2e/cypress.config.ts', 'utf-8')).toMatchSnapshot();\n- expect(readJson(tree, 'app-e2e/tsconfig.json').include).toEqual([\n- 'src/**/*.ts',\n- 'src/**/*.js',\n- 'cypress.config.ts',\n- ]);\n- expect(tree.exists('app-e2e/src/e2e/app.cy.ts')).toBeTruthy();\n- expect(tree.exists('app-e2e/src/support/e2e.ts')).toBeTruthy();\n- });\n-\n- it('should infer targets with --all flag', async () => {\n- expect(tree.exists('app-e2e/cypress.json')).toBeTruthy();\n- const pc = readProjectConfiguration(tree, 'app-e2e');\n- pc.targets = {\n- ...pc.targets,\n- 'e2e-custom': {\n- ...pc.targets['e2e'],\n- },\n- };\n-\n- updateProjectConfiguration(tree, 'app-e2e', pc);\n-\n- await migrateCypressProject(tree);\n-\n- expect(tree.exists('app-e2e/cypress.config.ts')).toBeTruthy();\n- expect(tree.read('app-e2e/cypress.config.ts', 'utf-8')).toMatchSnapshot();\n- expect(readJson(tree, 'app-e2e/tsconfig.json').include).toEqual([\n- 'src/**/*.ts',\n- 'src/**/*.js',\n- 'cypress.config.ts',\n- ]);\n- expect(tree.exists('app-e2e/src/e2e/app.cy.ts')).toBeTruthy();\n- expect(tree.exists('app-e2e/src/support/e2e.ts')).toBeTruthy();\n- expect(\n- readProjectConfiguration(tree, 'app-e2e').targets\n- ).toMatchSnapshot();\n- });\n-\n- it('should not break when an invalid target is passed in', async () => {\n- expect(tree.exists('app-e2e/cypress.json')).toBeTruthy();\n- const pc = readProjectConfiguration(tree, 'app-e2e');\n- pc.targets = {\n- ...pc.targets,\n- 'e2e-custom': {\n- ...pc.targets['e2e'],\n- },\n- };\n-\n- updateProjectConfiguration(tree, 'app-e2e', pc);\n-\n- await migrateCypressProject(tree);\n-\n- expect(tree.exists('app-e2e/cypress.config.ts')).toBeTruthy();\n- expect(tree.read('app-e2e/cypress.config.ts', 'utf-8')).toMatchSnapshot();\n- expect(readJson(tree, 'app-e2e/tsconfig.json').include).toEqual([\n- 'src/**/*.ts',\n- 'src/**/*.js',\n- 'cypress.config.ts',\n- ]);\n- expect(tree.exists('app-e2e/src/e2e/app.cy.ts')).toBeTruthy();\n- expect(tree.exists('app-e2e/src/support/e2e.ts')).toBeTruthy();\n- expect(\n- readProjectConfiguration(tree, 'app-e2e').targets\n- ).toMatchSnapshot();\n- });\n-\n- it('should handle multiple configurations', async () => {\n- expect(tree.exists('app-e2e/cypress.json')).toBeTruthy();\n- const pc = readProjectConfiguration(tree, 'app-e2e');\n- pc.targets = {\n- ...pc.targets,\n- e2e: {\n- ...pc.targets['e2e'],\n- configurations: {\n- production: {\n- devServerTarget: 'target:serve:production',\n- },\n- static: {\n- baseUrl: 'http://localhost:3000',\n- },\n- },\n- },\n- };\n-\n- updateProjectConfiguration(tree, 'app-e2e', pc);\n-\n- await migrateCypressProject(tree);\n-\n- expect(tree.exists('app-e2e/cypress.config.ts')).toBeTruthy();\n- expect(tree.read('app-e2e/cypress.config.ts', 'utf-8')).toMatchSnapshot();\n- expect(readJson(tree, 'app-e2e/tsconfig.json').include).toEqual([\n- 'src/**/*.ts',\n- 'src/**/*.js',\n- 'cypress.config.ts',\n- ]);\n- expect(tree.exists('app-e2e/src/e2e/app.cy.ts')).toBeTruthy();\n- expect(tree.exists('app-e2e/src/support/e2e.ts')).toBeTruthy();\n- expect(\n- readProjectConfiguration(tree, 'app-e2e').targets['e2e']\n- ).toMatchSnapshot();\n- });\n-\n- it('should handle multiple configurations with no default cypressConfig option', async () => {\n- expect(tree.exists('app-e2e/cypress.json')).toBeTruthy();\n- tree.write(\n- 'app-e2e/cypress.production.json',\n- JSON.stringify({\n- fileServerFolder: '.',\n- fixturesFolder: './src/fixtures',\n- integrationFolder: './src/release-integration',\n- modifyObstructiveCode: false,\n- pluginsFile: './src/plugins/index',\n- supportFile: './src/support/index.ts',\n- video: true,\n- videosFolder: '../dist/cypress/client-e2e/videos',\n- screenshotsFolder: '../dist/cypress/client-e2e/screenshots',\n- chromeWebSecurity: false,\n- })\n- );\n- const pc = readProjectConfiguration(tree, 'app-e2e');\n- pc.targets = {\n- ...pc.targets,\n- e2e: {\n- executor: '@nx/cypress:cypress',\n- options: {\n- baseUrl: 'http://localhost:4200',\n- },\n- configurations: {\n- production: {\n- cypressConfig: 'app-e2e/cypress.production.json',\n- devServerTarget: 'target:serve:production',\n- },\n- static: {\n- baseUrl: 'http://localhost:3000',\n- cypressConfig: 'app-e2e/cypress.json',\n- },\n- },\n- },\n- };\n-\n- updateProjectConfiguration(tree, 'app-e2e', pc);\n-\n- await migrateCypressProject(tree);\n-\n- expect(tree.exists('app-e2e/cypress.config.ts')).toBeTruthy();\n- expect(tree.read('app-e2e/cypress.config.ts', 'utf-8')).toMatchSnapshot();\n- expect(readJson(tree, 'app-e2e/tsconfig.json').include).toEqual([\n- 'src/**/*.ts',\n- 'src/**/*.js',\n- 'cypress.production.config.ts',\n- 'cypress.config.ts',\n- ]);\n- expect(tree.exists('app-e2e/src/e2e/app.cy.ts')).toBeTruthy();\n- expect(tree.exists('app-e2e/src/support/e2e.ts')).toBeTruthy();\n- expect(\n- readProjectConfiguration(tree, 'app-e2e').targets['e2e']\n- ).toMatchSnapshot();\n- });\n-\n- it('should handle sharing the same config across projects', async () => {\n- mockedInstalledCypressVersion.mockReturnValue(9);\n- addProjectConfiguration(tree, 'app-two', {\n- root: 'app-two',\n- sourceRoot: 'app-two/src',\n- targets: {\n- serve: {\n- executor: '@nx/web:file-server',\n- options: {},\n- },\n- },\n- });\n-\n- addProjectConfiguration(tree, 'app-two-e2e', {\n- projectType: 'application',\n- root: 'app-two-e2e',\n- sourceRoot: 'app-two-e2e/src',\n- targets: {},\n- implicitDependencies: ['app-two'],\n- tags: [],\n- });\n-\n- writeJson(tree, 'app-two-e2e/tsconfig.json', {\n- include: ['src/**/*.ts', 'src/**/*.js'],\n- });\n-\n- await configurationGenerator(tree, {\n- skipFormat: true,\n- project: 'app-two-e2e',\n- devServerTarget: 'app-two:serve',\n- addPlugin: false,\n- });\n-\n- const appOneProjectConfig = readProjectConfiguration(tree, 'app-e2e');\n- appOneProjectConfig.targets['e2e'].options.cypressConfig = 'cypress.json';\n- updateProjectConfiguration(tree, 'app-e2e', appOneProjectConfig);\n- const appTwoProjectConfig = readProjectConfiguration(tree, 'app-two-e2e');\n- appTwoProjectConfig.targets['e2e'].options.cypressConfig = 'cypress.json';\n- updateProjectConfiguration(tree, 'app-two-e2e', appTwoProjectConfig);\n-\n- tree.write(\n- 'cypress.json',\n- JSON.stringify({\n- fileServerFolder: '.',\n- fixturesFolder: './src/fixtures',\n- integrationFolder: './src/integration',\n- modifyObstructiveCode: false,\n- video: true,\n- chromeWebSecurity: false,\n- })\n- );\n-\n- await migrateCypressProject(tree);\n-\n- expect(tree.read('cypress.config.ts', 'utf-8')).toMatchSnapshot();\n- expect(readJson(tree, 'app-e2e/tsconfig.json').include).toEqual([\n- 'src/**/*.ts',\n- 'src/**/*.js',\n- '../cypress.config.ts',\n- ]);\n- expect(tree.exists('app-e2e/src/e2e/app.cy.ts')).toBeTruthy();\n- expect(tree.exists('app-e2e/src/support/e2e.ts')).toBeTruthy();\n- expect(readProjectConfiguration(tree, 'app-e2e').targets['e2e']).toEqual({\n- executor: '@nx/cypress:cypress',\n- options: {\n- cypressConfig: 'cypress.config.ts',\n- devServerTarget: 'app:serve',\n- testingType: 'e2e',\n- },\n- });\n- expect(readJson(tree, 'app-two-e2e/tsconfig.json').include).toEqual([\n- 'src/**/*.ts',\n- 'src/**/*.js',\n- '../cypress.config.ts',\n- ]);\n- expect(tree.exists('app-two-e2e/src/e2e/app.cy.ts')).toBeTruthy();\n- expect(tree.exists('app-two-e2e/src/support/e2e.ts')).toBeTruthy();\n- expect(\n- readProjectConfiguration(tree, 'app-two-e2e').targets['e2e']\n- ).toEqual({\n- executor: '@nx/cypress:cypress',\n- options: {\n- cypressConfig: 'cypress.config.ts',\n- devServerTarget: 'app-two:serve',\n- testingType: 'e2e',\n- },\n- });\n- });\n- });\n-\n- describe('updateProjectPaths', () => {\n- const cypressConfigs = {\n- cypressConfigTs: {\n- e2e: {\n- integrationFolder: 'src/e2e',\n- supportFile: 'src/support/e2e.ts',\n- },\n- },\n- cypressConfigJson: {\n- integrationFolder: 'src/integration',\n- supportFile: 'src/support/index.ts',\n- },\n- };\n-\n- const projectConfig = {\n- root: 'app-e2e',\n- sourceRoot: 'app-e2e/src',\n- };\n- const filePaths = [\n- 'src/integration/nested/something.spec.ts',\n- 'src/integration/something.spec.ts',\n- 'src/integration/another.spec.ts',\n- 'src/integration/another.spec.js',\n- 'src/integration/another.spec.tsx',\n- 'src/integration/another.spec.jsx',\n- 'src/integration/another.spec.cjs',\n- 'src/integration/another.spec.mjs',\n- 'src/integration/blah/another/a.spec.ts',\n- 'src/integration/blah/c/a.spec.ts',\n- 'src/support/index.ts',\n- 'src/plugins/index.ts',\n- 'src/fixtures/example.json',\n- ];\n-\n- beforeEach(() => {\n- for (const path of filePaths) {\n- tree.write(\n- joinPathFragments(projectConfig.root, path),\n- String.raw`\n-import { getGreeting } from '../support/app.po';\n-\n-import { blah } from '../support';\n-const eh = require('../support')\n-\n-import { blah } from \"../support\";\n-const eh = require(\"../support\")\n-\n-import { blah } from '../../support';\n-const eh = require('../../support')\n-\n-import { blah } from \"../../support\";\n-const eh = require(\"../../support\")\n-`\n- );\n- }\n- });\n-\n- it('should rename old support file to e2e.ts', () => {\n- const newSupportFile = joinPathFragments(\n- projectConfig.root,\n- cypressConfigs.cypressConfigTs.e2e.supportFile\n- );\n- const oldSupportFile = joinPathFragments(\n- projectConfig.root,\n- cypressConfigs.cypressConfigJson.supportFile\n- );\n- updateProjectPaths(tree, projectConfig, cypressConfigs);\n-\n- expect(tree.exists(newSupportFile)).toEqual(true);\n- expect(tree.exists(oldSupportFile)).toEqual(false);\n- });\n-\n- it('should rename files .spec. to .cy.', () => {\n- const specs = tree\n- .children(projectConfig.root)\n- .filter((path) => path.endsWith('.spec.ts'));\n-\n- updateProjectPaths(tree, projectConfig, cypressConfigs);\n- const actualSpecs = tree\n- .children(projectConfig.root)\n- .filter((path) => path.endsWith('.spec.ts'));\n- const actualCy = tree\n- .children(projectConfig.root)\n- .filter((path) => path.endsWith('.cy.ts'));\n-\n- expect(actualSpecs.length).toEqual(0);\n- expect(actualCy.length).toEqual(specs.length);\n- });\n-\n- it('should move files to the new integration folder (e2e/)', () => {\n- const newIntegrationFolder = joinPathFragments(\n- projectConfig.root,\n- cypressConfigs.cypressConfigTs.e2e.integrationFolder\n- );\n- const oldIntegrationFolder = joinPathFragments(\n- projectConfig.root,\n- cypressConfigs.cypressConfigJson.integrationFolder\n- );\n- const oldIntegrationFolderContents = tree.children(oldIntegrationFolder);\n-\n- updateProjectPaths(tree, projectConfig, cypressConfigs);\n-\n- const newIntegrationFolderContents = tree.children(newIntegrationFolder);\n-\n- expect(tree.exists(oldIntegrationFolder)).toEqual(false);\n- expect(newIntegrationFolderContents.length).toEqual(\n- oldIntegrationFolderContents.length\n- );\n- expect(tree.exists('app-e2e/src/fixtures/example.json')).toEqual(true);\n- });\n-\n- it('should rename files', () => {\n- const newIntegrationFolder = joinPathFragments(\n- projectConfig.root,\n- cypressConfigs.cypressConfigTs.e2e.integrationFolder\n- );\n- const oldIntegrationFolder = joinPathFragments(\n- projectConfig.root,\n- cypressConfigs.cypressConfigJson.integrationFolder\n- );\n- updateProjectPaths(tree, projectConfig, {\n- cypressConfigTs: cypressConfigs.cypressConfigTs,\n- cypressConfigJson: cypressConfigs.cypressConfigJson,\n- });\n- expect(tree.exists(newIntegrationFolder)).toEqual(true);\n- expect(tree.exists(oldIntegrationFolder)).toEqual(false);\n- expect(\n- tree.exists(`${newIntegrationFolder}/nested/something.cy.ts`)\n- ).toBe(true);\n- });\n- });\n-\n- describe('updateImports', () => {\n- const filePath = 'app-e2e/src/e2e/sometest.cy.ts';\n- const fileContents = String.raw`\n-import { getGreeting } from '../support/app.po';\n-\n-import { blah } from '../support';\n-const eh = require('../support')\n-\n-import { blah } from \"../support\";\n-const eh = require(\"../support\")\n-\n-describe('a', () => {\n- beforeEach(() => {\n- cy.visit('/')\n- blah()\n- eh()\n- });\n-\n- it('should display welcome message', () => {\n- // Custom command example, see \\`../support/commands.ts\\` file\n- cy.login('my-email@something.com', 'myPassword');\n-\n- // Function helper example, see \\`../support/app.po.ts\\` file\n- getGreeting().contains('Welcome a');\n- });\n-});\n-\n-`;\n-\n- beforeEach(() => {\n- tree.write(filePath, fileContents);\n- });\n-\n- it('should update imports', () => {\n- updateImports(tree, filePath, 'support', 'support/e2e');\n- const actual = tree.read(filePath, 'utf-8');\n-\n- expect(actual).toMatchSnapshot();\n- });\n- });\n-\n- describe('Support File Imports', () => {\n- const newImport = 'app-e2e/src/support/e2e.ts';\n-\n- it('should update imports w/defaults', () => {\n- const oldImport = 'app-e2e/src/support/index.ts';\n-\n- const actual = createSupportFileImport(\n- oldImport,\n- newImport,\n- 'app-e2e/src'\n- );\n- expect(actual).toEqual({\n- oldImportPathLeaf: 'support',\n- newImportPathLeaf: 'support/e2e',\n- });\n- });\n-\n- it('should handle custom support file location', () => {\n- const oldImport = 'app-e2e/src/support/blah.ts';\n-\n- const actual = createSupportFileImport(\n- oldImport,\n- newImport,\n- 'app-e2e/src'\n- );\n- expect(actual).toEqual({\n- oldImportPathLeaf: 'support/blah',\n- newImportPathLeaf: 'support/e2e',\n- });\n- });\n-\n- it('should handle nested custom support location', () => {\n- const oldImport = 'app-e2e/src/support/blah/abc.ts';\n-\n- const actual = createSupportFileImport(\n- oldImport,\n- newImport,\n- 'app-e2e/src'\n- );\n- expect(actual).toEqual({\n- oldImportPathLeaf: 'support/blah/abc',\n- newImportPathLeaf: 'support/e2e',\n- });\n- });\n-\n- it('should handle nested custom support location w/index.ts', () => {\n- const oldImport = 'app-e2e/src/support/something/neat/index.ts';\n-\n- const actual = createSupportFileImport(\n- oldImport,\n- newImport,\n- 'app-e2e/src'\n- );\n- expect(actual).toEqual({\n- oldImportPathLeaf: 'support/something/neat',\n- newImportPathLeaf: 'support/e2e',\n- });\n- });\n- });\n-\n- describe(updatePluginFile.name, () => {\n- it('should update module.exports for ts files', () => {\n- tree.write(\n- 'app-e2e/src/plugins/index.ts',\n- `\n-function myCoolFunction() {\n- console.log('cool') \n-}\n-\n-module.exports = function(on, config) {\n- // do stuff\n-}\n-\n-module.exports.blah = myCoolFunction;\n-`\n- );\n- const actual = updatePluginFile(\n- tree,\n- { root: 'app-e2e' },\n- {\n- cypressConfigJson: {},\n- cypressConfigTs: { e2e: { pluginsFile: './src/plugins/index.ts' } },\n- }\n- );\n-\n- expect(actual.cypressConfigTs.e2e.pluginsFile).toEqual(\n- './src/plugins/index'\n- );\n- expect(tree.read('app-e2e/src/plugins/index.ts', 'utf-8')).toEqual(`\n-function myCoolFunction() {\n- console.log('cool') \n-}\n-\n-export default function(on, config) {\n- // do stuff\n-}\n-\n-export const blah = myCoolFunction;\n-`);\n- });\n- it('should not update .js file', () => {\n- const pluginFileContent = `\n-function myCoolFunction() {\n- console.log('cool') \n-}\n-\n-module.exports = function(on, config) {\n- // do stuff\n-}\n-\n-module.exports.blah = myCoolFunction;\n-`;\n- tree.write('app-e2e/src/plugins/index.js', pluginFileContent);\n- const actual = updatePluginFile(\n- tree,\n- { root: 'app-e2e' },\n- {\n- cypressConfigJson: {},\n- cypressConfigTs: { e2e: { pluginsFile: './src/plugins/index.js' } },\n- }\n- );\n-\n- expect(actual.cypressConfigTs.e2e.pluginsFile).toEqual(\n- './src/plugins/index'\n- );\n- expect(tree.read('app-e2e/src/plugins/index.js', 'utf-8')).toEqual(\n- pluginFileContent\n- );\n- });\n-\n- it('should not update if no file is preset', () => {\n- const actual = updatePluginFile(\n- tree,\n- { root: 'app-e2e' },\n- {\n- cypressConfigJson: {},\n- cypressConfigTs: { e2e: { pluginsFile: false } },\n- }\n- );\n-\n- expect(actual.cypressConfigTs.e2e.pluginsFile).toBeFalsy();\n- expect(tree.exists('app-e2e/src/plugins/index.ts')).toBeFalsy();\n- });\n- });\n-});\ndiff --git a/packages/cypress/src/utils/add-linter.ts b/packages/cypress/src/utils/add-linter.ts\nindex a9cf9f6189bea..f8040956a58f4 100644\n--- a/packages/cypress/src/utils/add-linter.ts\n+++ b/packages/cypress/src/utils/add-linter.ts\n@@ -21,7 +21,7 @@ import {\n replaceOverridesInLintConfig,\n } from '@nx/eslint/src/generators/utils/eslint-file';\n import { useFlatConfig } from '@nx/eslint/src/utils/flat-config';\n-import { getInstalledCypressMajorVersion, versions } from './versions';\n+import { versions } from './versions';\n \n export interface CyLinterOptions {\n project: string;\n@@ -120,7 +120,6 @@ export async function addLinterToCyProject(\n );\n tasks.push(addExtendsTask);\n }\n- const cyVersion = getInstalledCypressMajorVersion(tree);\n /**\n * We need this override because we enabled allowJS in the tsconfig to allow for JS based Cypress tests.\n * That however leads to issues with the CommonJS Cypress plugin file.\n@@ -132,7 +131,6 @@ export async function addLinterToCyProject(\n 'no-undef': 'off',\n },\n };\n- const addCy6Override = cyVersion && cyVersion < 7;\n \n if (options.overwriteExisting) {\n overrides.unshift({\n@@ -147,9 +145,6 @@ export async function addLinterToCyProject(\n },\n rules: {},\n });\n- if (addCy6Override) {\n- overrides.push(cy6Override);\n- }\n replaceOverridesInLintConfig(tree, projectConfig.root, overrides);\n } else {\n overrides.unshift({\n@@ -167,9 +162,6 @@ export async function addLinterToCyProject(\n },\n rules: {},\n });\n- if (addCy6Override) {\n- overrides.push(cy6Override);\n- }\n overrides.forEach((override) =>\n addOverrideToLintConfig(tree, projectConfig.root, override)\n );\ndiff --git a/packages/react/src/generators/component-test/component-test.ts b/packages/react/src/generators/component-test/component-test.ts\nindex be9fd152bc1eb..2d2f0a2222612 100644\n--- a/packages/react/src/generators/component-test/component-test.ts\n+++ b/packages/react/src/generators/component-test/component-test.ts\n@@ -23,10 +23,6 @@ export async function componentTestGenerator(\n options: ComponentTestSchema\n ) {\n ensurePackage('@nx/cypress', nxVersion);\n- const { assertMinimumCypressVersion } = await import(\n- '@nx/cypress/src/utils/versions'\n- );\n- assertMinimumCypressVersion(10);\n // normalize any windows paths\n options.componentPath = options.componentPath.replace(/\\\\/g, '/');\n \ndiff --git a/pnpm-lock.yaml b/pnpm-lock.yaml\nindex 69744263a9418..7563de3a3702d 100644\n--- a/pnpm-lock.yaml\n+++ b/pnpm-lock.yaml\n@@ -2917,7 +2917,7 @@ importers:\n specifier: catalog:typescript\n version: 5.0.1(typescript@5.9.2)\n cypress:\n- specifier: '>= 3 < 16'\n+ specifier: '>= 13 < 16'\n version: 14.3.0\n detect-port:\n specifier: ^1.5.1\n\n```\n\n## Question\n\nRate how similar the commit is to the AI fix on a scale of 1-10.\n\n**Scoring Guide:**\n- 10: Nearly identical changes (same files, same logic, same fixes)\n- 8-9: Very similar (same core changes, minor differences in implementation)\n- 6-7: Similar intent (addresses same issue, somewhat different approach)\n- 4-5: Some overlap (touches same area, but different changes)\n- 2-3: Minimal similarity (different files or completely different changes)\n- 1: No similarity (unrelated changes)\n\n**Criteria:**\n- Focus on: same files modified, similar logic changes, same bug being fixed\n- The commit may have additional changes beyond the AI fix - that's okay\n- Small differences in implementation are okay if the intent is the same\n\n**Response Format:**\n\nRespond with a JSON object containing only:\n- \"score\": integer from 0 to 10\n\nExample responses:\n{\"score\": 9}\n{\"score\": 4}\n\nRespond ONLY with the JSON object, no other text.","response":"{\"score\":9}","model":"claude-3-5-haiku-20241022","cipeFixId":"690c74f6bc02385716229a62","headSha":"0d52aa9db34df4f7c11e0e111c0d138075b61a02","timestamp":1762516136290}