Skip to content

Commit de3713f

Browse files
AtofStrykerAtofStryker
committed
update system tests to use react 18 and install latest dependencies for applicable system tests. use react18 harness before removal
1 parent 1dc8c98 commit de3713f

File tree

209 files changed

+24438
-42679
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+24438
-42679
lines changed

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ function loadErrorSpec (options: Options): VerifyFunc {
5151
return createVerify({ fileName: Cypress._.last(filePath.split('/')), hasPreferredIde: false, mode: 'component' })
5252
}
5353

54-
const reactVersions = [17, 18] as const
54+
// keeping structure as to easily adapt for future versions of react
55+
const reactVersions = [18] as const
5556

5657
reactVersions.forEach((reactVersion) => {
5758
describe(`React ${reactVersion}`, {
@@ -281,12 +282,12 @@ describe.skip('Svelte', {
281282
numTestsKeptInMemory: 1,
282283
}, () => {
283284
beforeEach(() => {
284-
cy.scaffoldProject('svelte-webpack')
285+
cy.scaffoldProject('svelte-webpack-configured')
285286
})
286287

287288
it('error conditions', () => {
288289
const verify = loadErrorSpec({
289-
projectName: 'svelte-webpack',
290+
projectName: 'svelte-webpack-configured',
290291
configFile: 'cypress.config.js',
291292
filePath: 'src/errors.cy.js',
292293
failCount: 4,

‎packages/app/cypress/e2e/runner/reporter-ct-mount-hover.cy.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const PROJECTS: {projectName: ProjectDirs[number], test: string}[] = [
99
{ projectName: 'next-14', test: 'index.cy' },
1010
{ projectName: 'vue3-vite-ts-configured', test: 'HelloWorld.cy' },
1111
{ projectName: 'vue3-webpack-ts-configured', test: 'HelloWorld.cy' },
12-
{ projectName: 'svelte-vite', test: 'App.cy' },
12+
{ projectName: 'svelte-vite-configured', test: 'App.cy' },
1313
]
1414

1515
// These are especially flaky on windows, skipping them there.

‎packages/data-context/test/unit/sources/WizardDataSource.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ describe('packagesToInstall', () => {
1818
it('regular react project with webpack', async () => {
1919
const ctx = createTestDataContext()
2020

21-
const projectPath = await scaffoldMigrationProject('react-app-webpack-5-unconfigured')
21+
const projectPath = await scaffoldMigrationProject('react18-webpack-unconfigured')
2222

2323
ctx.update((coreData) => {
2424
coreData.currentProject = projectPath

‎packages/scaffold-config/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ We will also attempt to scaffold a configuration file for projects using React a
1515
| Vue | - | Vite | 4.x, 5.x | Vue 3 | `@cypress/react@latest` | [Link](../../system-tests/projects/vue3-vite-ts-configured) |
1616
| Vue | - | Webpack | 4.x, 5.x | Vue 3 | `@cypress/vue@latest` | [Link](../../system-tests/projects/vue3-webpack-ts-configured) |
1717
| Angular | - | Webpack | 5.x | Angular 17, 18 | `@cypress/angular@latest` | [Link](../../system-tests/projects/angular-cli-configured) |
18-
| Svelte | - | Vite | 4.x, 5.x | Svelte 4 | `@cypress/svelte@latest` | [Link](../../system-tests/projects/svelte-vite) |
19-
| Svelte | - | Webpack | 4.x, 5.x | Svelte 4 | `@cypress/svelte@latest` | [Link](../../system-tests/projects/svelte-webpack) |
18+
| Svelte | - | Vite | 4.x, 5.x | Svelte 4 | `@cypress/svelte@latest` | [Link](../../system-tests/projects/svelte-vite-configured) |
19+
| Svelte | - | Webpack | 4.x, 5.x | Svelte 4 | `@cypress/svelte@latest` | [Link](../../system-tests/projects/svelte-webpack-configured) |
2020
| Next.js | 14.x | Webpack | 4.x, 5.x | React 18 | `@cypress/react@latest` | [Link](../../system-tests/projects/nextjs-configured) |
2121

2222
### Adding More Projects

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ const resolvedCtFrameworks = CT_FRAMEWORKS.map((x) => resolveComponentFrameworkD
7676

7777
describe('detectFramework', () => {
7878
it('React App with webpack 5', async () => {
79-
const projectPath = await scaffoldMigrationProject('react-app-webpack-5-unconfigured')
79+
const projectPath = await scaffoldMigrationProject('react18-webpack-unconfigured')
8080

8181
fakeDepsInNodeModules(projectPath, [
8282
{ dependency: 'react', version: '16.0.0' },

‎system-tests/project-fixtures/react/cypress/support/component.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { mount } from 'cypress/react'
1+
import { mount } from 'cypress/react18'
22

33
import './backgroundColor.css'
44

‎system-tests/projects/coffee-react-interop/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"react": "17.0.2",
4-
"react-dom": "17.0.2"
3+
"react": "18.3.1",
4+
"react-dom": "18.3.1"
55
}
66
}

‎system-tests/projects/coffee-react-interop/yarn.lock

+13-21
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,24 @@ loose-envify@^1.1.0:
1414
dependencies:
1515
js-tokens "^3.0.0 || ^4.0.0"
1616

17-
object-assign@^4.1.1:
18-
version "4.1.1"
19-
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
20-
integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
21-
22-
[email protected]:
23-
version "17.0.2"
24-
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
25-
integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
17+
[email protected]:
18+
version "18.3.1"
19+
resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
20+
integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==
2621
dependencies:
2722
loose-envify "^1.1.0"
28-
object-assign "^4.1.1"
29-
scheduler "^0.20.2"
23+
scheduler "^0.23.2"
3024

31-
react@17.0.2:
32-
version "17.0.2"
33-
resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
34-
integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
25+
react@18.3.1:
26+
version "18.3.1"
27+
resolved "https://registry.npmjs.org/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891"
28+
integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==
3529
dependencies:
3630
loose-envify "^1.1.0"
37-
object-assign "^4.1.1"
3831

39-
scheduler@^0.20.2:
40-
version "0.20.2"
41-
resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
42-
integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
32+
scheduler@^0.23.2:
33+
version "0.23.2"
34+
resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3"
35+
integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==
4336
dependencies:
4437
loose-envify "^1.1.0"
45-
object-assign "^4.1.1"

‎system-tests/projects/config-cjs-and-esm/config-node-next/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"devDependencies": {
3-
"typescript": "4.7.3"
3+
"typescript": "5.6.3"
44
},
55
"type": "module",
66
"projectFixtureDirectory": "simple_passing"

‎system-tests/projects/config-cjs-and-esm/config-node-next/yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# yarn lockfile v1
33

44

5-
typescript@4.7.3:
6-
version "4.7.3"
7-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
8-
integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
5+
typescript@5.6.3:
6+
version "5.6.3"
7+
resolved "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
8+
integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==

‎system-tests/projects/config-cjs-and-esm/config-with-cjs-tsconfig-es5/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"devDependencies": {
3-
"typescript": "4.7.3"
3+
"typescript": "5.6.3"
44
},
55
"projectFixtureDirectory": "simple_passing"
66
}

‎system-tests/projects/config-cjs-and-esm/config-with-cjs-tsconfig-es5/yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# yarn lockfile v1
33

44

5-
typescript@4.7.3:
6-
version "4.7.3"
7-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
8-
integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
5+
typescript@5.6.3:
6+
version "5.6.3"
7+
resolved "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
8+
integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==

‎system-tests/projects/config-cjs-and-esm/config-with-js-tsconfig-es2015/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"devDependencies": {
3-
"typescript": "4.7.3"
3+
"typescript": "5.6.3"
44
},
55
"projectFixtureDirectory": "simple_passing"
66
}

‎system-tests/projects/config-cjs-and-esm/config-with-js-tsconfig-es2015/yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# yarn lockfile v1
33

44

5-
typescript@4.7.3:
6-
version "4.7.3"
7-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
8-
integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
5+
typescript@5.6.3:
6+
version "5.6.3"
7+
resolved "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
8+
integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==

‎system-tests/projects/config-cjs-and-esm/config-with-js-tsconfig-es3/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"devDependencies": {
3-
"typescript": "4.7.3"
3+
"typescript": "5.6.3"
44
},
55
"projectFixtureDirectory": "simple_passing"
66
}

‎system-tests/projects/config-cjs-and-esm/config-with-js-tsconfig-es3/yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# yarn lockfile v1
33

44

5-
typescript@4.7.3:
6-
version "4.7.3"
7-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
8-
integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
5+
typescript@5.6.3:
6+
version "5.6.3"
7+
resolved "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
8+
integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==

‎system-tests/projects/config-cjs-and-esm/config-with-js-tsconfig-es5/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"devDependencies": {
3-
"typescript": "4.7.3"
3+
"typescript": "5.6.3"
44
},
55
"projectFixtureDirectory": "simple_passing"
66
}

‎system-tests/projects/config-cjs-and-esm/config-with-js-tsconfig-es5/yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# yarn lockfile v1
33

44

5-
typescript@4.7.3:
6-
version "4.7.3"
7-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
8-
integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
5+
typescript@5.6.3:
6+
version "5.6.3"
7+
resolved "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
8+
integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==

‎system-tests/projects/config-cjs-and-esm/config-with-mjs-tsconfig-es5/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"devDependencies": {
3-
"typescript": "4.7.3"
3+
"typescript": "5.6.3"
44
},
55
"projectFixtureDirectory": "simple_passing"
66
}

‎system-tests/projects/config-cjs-and-esm/config-with-mjs-tsconfig-es5/yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# yarn lockfile v1
33

44

5-
typescript@4.7.3:
6-
version "4.7.3"
7-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
8-
integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
5+
typescript@5.6.3:
6+
version "5.6.3"
7+
resolved "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
8+
integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==

‎system-tests/projects/config-cjs-and-esm/config-with-module-resolution-bundler/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"devDependencies": {
3-
"typescript": "4.7.3"
3+
"typescript": "5.6.3"
44
},
55
"projectFixtureDirectory": "simple_passing"
66
}

‎system-tests/projects/config-cjs-and-esm/config-with-module-resolution-bundler/yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# yarn lockfile v1
33

44

5-
typescript@4.7.3:
6-
version "4.7.3"
7-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d"
8-
integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
5+
typescript@5.6.3:
6+
version "5.6.3"
7+
resolved "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b"
8+
integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==

‎system-tests/projects/config-cjs-and-esm/config-with-ts-module-and-esbuild/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"devDependencies": {
3-
"esbuild": "0.14.25",
4-
"typescript": "4.7.3"
3+
"esbuild": "0.24.0",
4+
"typescript": "5.6.3"
55
},
66
"type": "module",
77
"projectFixtureDirectory": "simple_passing"

0 commit comments

Comments
 (0)