Skip to content

Commit faad0b0

Browse files
committed
Merge branch 'feat/replace_tsnode_for_tsx_config_process' of github.com:cypress-io/cypress into feat/replace_tsnode_for_tsx_config_process
2 parents a05ab24 + b6c3daa commit faad0b0

File tree

33 files changed

+15939
-23621
lines changed

33 files changed

+15939
-23621
lines changed

.circleci/cache-version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Bump this version to force CI to re-create the cache from scratch.
22

3-
4-22-2025
3+
4-24-2025

cli/CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ _Released 07/01/2025 (PENDING)_
55

66
**Breaking Changes:**
77

8+
- Removed support for Angular 17. The minimum supported version is now `18.0.0`. Addresses [#31303](https://github.com/cypress-io/cypress/issues/31303).
89
- Removed support for Node.js 18 and Node.js 23. Addresses [#31302](https://github.com/cypress-io/cypress/issues/31302).
910
- Removed support for [Chrome DevTools Protocol](https://chromedevtools.github.io/devtools-protocol) with the [firefox](https://www.mozilla.org/) browser. Addresses [#31189](https://github.com/cypress-io/cypress/issues/31189).
1011
- The Cypress configuration wizard for Component Testing supports TypeScript 5.0 or greater. Addresses [#31187](https://github.com/cypress-io/cypress/issues/31187).

npm/angular/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Mount Angular components in the open source [Cypress.io](https://www.cypress.io/
66
77
## Requirements
88

9-
- Angular 17.2.0+ (Cypress 13 and under supports Angular 13 - 16)
9+
- Angular 18.0.0+ (`@cypress/angular@2` supports Angular 13 - 16 and `@cypress/angular@3` supports Angular 17)
1010

1111
## Development
1212

npm/angular/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
},
1414
"dependencies": {},
1515
"devDependencies": {
16-
"@angular/common": "^17.2.0",
17-
"@angular/core": "^17.2.0",
18-
"@angular/platform-browser-dynamic": "^17.2.0",
16+
"@angular/common": "^18.0.0",
17+
"@angular/core": "^18.0.0",
18+
"@angular/platform-browser-dynamic": "^18.0.0",
1919
"@cypress/mount-utils": "0.0.0-development",
2020
"rollup": "^4.24.4",
2121
"typescript": "~5.4.5",
2222
"zone.js": "~0.14.6"
2323
},
2424
"peerDependencies": {
25-
"@angular/common": ">=17.2",
26-
"@angular/core": ">=17.2",
27-
"@angular/platform-browser-dynamic": ">=17.2",
25+
"@angular/common": ">=18.0.0",
26+
"@angular/core": ">=18.0.0",
27+
"@angular/platform-browser-dynamic": ">=18.0.0",
2828
"rxjs": ">=7.5.0",
2929
"zone.js": ">=0.13.0"
3030
},

npm/cypress-schematic/README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131

3232
## Requirements
3333

34-
- Angular 17.2.0+ (Cypress 13 and under supports Angular 13 - 16)
35-
34+
- Angular 18.0.0+ (`@cypress/schematic@2` supports Angular 13 - 16 and `@cypress/schematic@3` supports Angular 17)
3635
## Usage ⏯
3736

3837
### Adding E2E and Component Testing

npm/cypress-schematic/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"vitest": "2.1.4"
2828
},
2929
"peerDependencies": {
30-
"@angular/cli": ">=17.2",
31-
"@angular/core": ">=17.2"
30+
"@angular/cli": ">=18.0.0",
31+
"@angular/core": ">=18.0.0"
3232
},
3333
"license": "MIT",
3434
"repository": {

npm/webpack-dev-server/cypress/e2e/angular.cy.ts

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import type { ProjectFixtureDir } from '@tooling/system-tests/lib/fixtureDirs'
44

55
const WEBPACK_ANGULAR: ProjectFixtureDir[] = [
6-
'angular-17',
76
'angular-18',
87
'angular-19',
98
]

npm/webpack-dev-server/test/handlers/angularHandler.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ chai.use(chaiPromise)
2222
describe('angularHandler', function () {
2323
this.timeout(1000 * 60)
2424

25-
it('sources the config from angular-17', async () => {
26-
const projectRoot = await scaffoldMigrationProject('angular-17')
25+
it('sources the config from angular-18', async () => {
26+
const projectRoot = await scaffoldMigrationProject('angular-18')
2727

2828
process.chdir(projectRoot)
2929
const devServerConfig = {

packages/app/cypress/e2e/runner/ct-framework-errors.cy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ describe.skip('Svelte', {
340340
})
341341
})
342342

343-
const angularVersions = [17, 18] as const
343+
const angularVersions = [18, 19] as const
344344

345345
angularVersions.forEach((angularVersion) => {
346346
describe(`Angular ${angularVersion}`, {

packages/scaffold-config/src/dependencies.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export const WIZARD_DEPENDENCY_ANGULAR_CLI = {
7070
package: '@angular/cli',
7171
installer: '@angular/cli',
7272
description: 'CLI tool that you use to initialize, develop, scaffold, and maintain Angular applications.',
73-
minVersion: '^17.2.0 || ^18.0.0 || ^19.0.0',
73+
minVersion: '^18.0.0 || ^19.0.0',
7474
} as const
7575

7676
export const WIZARD_DEPENDENCY_ANGULAR_DEVKIT_BUILD_ANGULAR = {
@@ -79,7 +79,7 @@ export const WIZARD_DEPENDENCY_ANGULAR_DEVKIT_BUILD_ANGULAR = {
7979
package: '@angular-devkit/build-angular',
8080
installer: '@angular-devkit/build-angular',
8181
description: 'Angular Webpack build facade',
82-
minVersion: '^17.2.0 || ^18.0.0 || ^19.0.0',
82+
minVersion: '^18.0.0 || ^19.0.0',
8383
} as const
8484

8585
export const WIZARD_DEPENDENCY_ANGULAR_CORE = {
@@ -88,7 +88,7 @@ export const WIZARD_DEPENDENCY_ANGULAR_CORE = {
8888
package: '@angular/core',
8989
installer: '@angular/core',
9090
description: 'The core of the Angular framework',
91-
minVersion: '^17.2.0 || ^18.0.0 || ^19.0.0',
91+
minVersion: '^18.0.0 || ^19.0.0',
9292
} as const
9393

9494
export const WIZARD_DEPENDENCY_ANGULAR_COMMON = {
@@ -97,7 +97,7 @@ export const WIZARD_DEPENDENCY_ANGULAR_COMMON = {
9797
package: '@angular/common',
9898
installer: '@angular/common',
9999
description: 'Commonly needed Angular directives and services',
100-
minVersion: '^17.2.0 || ^18.0.0 || ^19.0.0',
100+
minVersion: '^18.0.0 || ^19.0.0',
101101
} as const
102102

103103
export const WIZARD_DEPENDENCY_ANGULAR_PLATFORM_BROWSER_DYNAMIC = {
@@ -106,7 +106,7 @@ export const WIZARD_DEPENDENCY_ANGULAR_PLATFORM_BROWSER_DYNAMIC = {
106106
package: '@angular/platform-browser-dynamic',
107107
installer: '@angular/platform-browser-dynamic',
108108
description: 'Library for using Angular in a web browser with JIT compilation',
109-
minVersion: '^17.2.0 || ^18.0.0 || ^19.0.0',
109+
minVersion: '^18.0.0 || ^19.0.0',
110110
} as const
111111

112112
export const WIZARD_DEPENDENCY_SVELTE: Cypress.CypressComponentDependency = {

packages/scaffold-config/test/unit/detect.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ describe('detectFramework', () => {
147147
})
148148
})
149149

150-
;['17.2.0', '18.2.0'].forEach((v) => {
150+
;['18.2.0', '19.2.9'].forEach((v) => {
151151
it(`Angular CLI v${v}`, async () => {
152152
const projectPath = await scaffoldMigrationProject('angular-cli-unconfigured')
153153

packages/server/test/support/fixtures/cloud/studio/test-studio.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class StudioServer implements StudioServerShape {
2020
destroy (): Promise<void> {
2121
return Promise.resolve()
2222
}
23-
23+
2424
addSocketListeners (socket: Socket): void {
2525
// This is a test implementation that does nothing
2626
}

system-tests/projects/angular-17/angular.json

-96
This file was deleted.

system-tests/projects/angular-17/cypress.config.ts

-29
This file was deleted.

system-tests/projects/angular-17/package.json

-39
This file was deleted.

0 commit comments

Comments
 (0)