Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ jobs:
include:
# Only check typescript for latest version (to streamline CI)
- node: 24
typescript: '3.8'
typescript: '5.0'
# No need to test orchestrion for v18
- node: 20
use_orchestrion: 'true'
Expand All @@ -826,8 +826,8 @@ jobs:
dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}

- name: Overwrite typescript version
if: matrix.typescript == '3.8'
run: node ./scripts/use-ts-3_8.js
if: matrix.typescript == '5.0'
run: node ./scripts/use-ts-5_0.js
working-directory: dev-packages/node-integration-tests

- name: Run integration tests
Expand Down Expand Up @@ -875,7 +875,7 @@ jobs:
include:
# Only check typescript for latest version (to streamline CI)
- node: 24
typescript: '3.8'
typescript: '5.0'
steps:
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
uses: actions/checkout@v7
Expand All @@ -891,8 +891,8 @@ jobs:
dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}

- name: Overwrite typescript version
if: matrix.typescript == '3.8'
run: node ./scripts/use-ts-3_8.js
if: matrix.typescript == '5.0'
run: node ./scripts/use-ts-5_0.js
working-directory: dev-packages/node-core-integration-tests

- name: Run integration tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"eject": "react-scripts eject",
"clean": "npx rimraf node_modules pnpm-lock.yaml",
"test:build": "pnpm install && pnpm build",
"test:build-ts3.8": "pnpm install && pnpm add typescript@3.8 && pnpm build",
"test:build-canary": "pnpm install && pnpm add react@canary react-dom@canary && pnpm build",
"test:assert": "pnpm -v"
},
Expand All @@ -43,13 +42,5 @@
},
"volta": {
"extends": "../../package.json"
},
"sentryTest": {
"variants": [
{
"build-command": "pnpm test:build-ts3.8",
"label": "create-react-app (TS 3.8)"
}
]
}
}

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"test": "playwright test",
"clean": "npx rimraf node_modules pnpm-lock.yaml",
"test:build": "pnpm install && pnpm build",
"test:build-ts3.8": "pnpm install && pnpm add typescript@3.8 && pnpm build",
"test:build-canary": "pnpm install && pnpm add react@canary react-dom@canary && pnpm build",
"test:assert": "pnpm test"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"test": "playwright test",
"clean": "npx rimraf node_modules pnpm-lock.yaml",
"test:build": "pnpm install && npx playwright install && pnpm build",
"test:build-ts3.8": "pnpm install && pnpm add typescript@3.8 && npx playwright install && pnpm build",
"test:build-canary": "pnpm install && pnpm add react@canary react-dom@canary && npx playwright install && pnpm build",
"test:assert": "pnpm test"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"test": "playwright test",
"clean": "npx rimraf node_modules pnpm-lock.yaml",
"test:build": "pnpm install && pnpm build",
"test:build-ts3.8": "pnpm install && pnpm add typescript@3.8 && pnpm build",
"test:build-canary": "pnpm install && pnpm add react@canary react-dom@canary && pnpm build",
"test:assert": "pnpm test"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"test": "playwright test",
"clean": "npx rimraf node_modules pnpm-lock.yaml",
"test:build": "pnpm install && pnpm build",
"test:build-ts3.8": "pnpm install && pnpm add typescript@3.8 && pnpm build",
"test:build-canary": "pnpm install && pnpm add react@canary react-dom@canary && pnpm build",
"test:assert": "pnpm test"
},
Expand Down Expand Up @@ -51,13 +50,5 @@
},
"volta": {
"extends": "../../package.json"
},
"sentryTest": {
"variants": [
{
"build-command": "pnpm test:build-ts3.8",
"label": "react-router-6 (TS 3.8)"
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"test": "playwright test",
"clean": "npx rimraf node_modules pnpm-lock.yaml",
"test:build": "pnpm install && npx playwright install && pnpm build",
"test:build-ts3.8": "pnpm install && pnpm add typescript@3.8 && npx playwright install && pnpm build",
"test:build-canary": "pnpm install && pnpm add react@canary react-dom@canary && npx playwright install && pnpm build",
"test:assert": "pnpm test"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"test": "playwright test",
"clean": "npx rimraf node_modules pnpm-lock.yaml",
"test:build": "pnpm install && npx playwright install && pnpm build",
"test:build-ts3.8": "pnpm install && pnpm add typescript@3.8 && npx playwright install && pnpm build",
"test:build-canary": "pnpm install && pnpm add react@canary react-dom@canary && npx playwright install && pnpm build",
"test:assert": "pnpm test"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"test": "playwright test",
"clean": "npx rimraf node_modules pnpm-lock.yaml",
"test:build": "pnpm install && pnpm build",
"test:build-ts3.8": "pnpm install && pnpm add typescript@3.8 && pnpm build",
"test:build-canary": "pnpm install && pnpm add react@canary react-dom@canary && pnpm build",
"test:assert": "pnpm test"
},
Expand All @@ -48,18 +47,5 @@
},
"volta": {
"extends": "../../package.json"
},
"sentryTest": {
"variants": [
{
"build-command": "pnpm test:build-ts3.8",
"label": "react-router-7-spa-streaming (TS 3.8)"
}
]
},
"pnpm": {
"overrides": {
"esbuild": "0.24.0"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"test": "playwright test",
"clean": "npx rimraf node_modules pnpm-lock.yaml",
"test:build": "pnpm install && pnpm build",
"test:build-ts3.8": "pnpm install && pnpm add typescript@3.8 && pnpm build",
"test:build-canary": "pnpm install && pnpm add react@canary react-dom@canary && pnpm build",
"test:assert": "pnpm test"
},
Expand All @@ -48,18 +47,5 @@
},
"volta": {
"extends": "../../package.json"
},
"sentryTest": {
"variants": [
{
"build-command": "pnpm test:build-ts3.8",
"label": "react-router-7-spa (TS 3.8)"
}
]
},
"pnpm": {
"overrides": {
"esbuild": "0.24.0"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"test": "playwright test",
"clean": "npx rimraf node_modules pnpm-lock.yaml",
"test:build": "pnpm install && npx playwright install && pnpm build",
"test:build-ts3.8": "pnpm install && pnpm add typescript@3.8 && npx playwright install && pnpm build",
"test:build-canary": "pnpm install && pnpm add react@canary react-dom@canary && npx playwright install && pnpm build",
"test:assert": "pnpm test"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"test": "playwright test",
"clean": "npx rimraf node_modules pnpm-lock.yaml",
"test:build": "pnpm install && pnpm build",
"test:build-ts3.8": "pnpm install && pnpm add typescript@3.8 && pnpm build",
"test:build-canary": "pnpm install && pnpm add react@canary react-dom@canary && pnpm build",
"test:assert": "pnpm test"
},
Expand All @@ -48,13 +47,5 @@
},
"volta": {
"extends": "../../package.json"
},
"sentryTest": {
"variants": [
{
"build-command": "pnpm test:build-ts3.8",
"label": "react-router-8-spa (TS 3.8)"
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"test": "playwright test",
"clean": "npx rimraf node_modules pnpm-lock.yaml",
"test:build": "pnpm install && pnpm build",
"test:build-ts3.8": "pnpm install && pnpm add typescript@3.8 && pnpm build",
"test:build-canary": "pnpm install && pnpm add react@canary react-dom@canary && pnpm build",
"test:assert": "pnpm test"
},
Expand Down
44 changes: 0 additions & 44 deletions dev-packages/node-core-integration-tests/scripts/use-ts-3_8.js

This file was deleted.

16 changes: 16 additions & 0 deletions dev-packages/node-core-integration-tests/scripts/use-ts-5_0.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/* eslint-disable no-console */
const { execSync } = require('child_process');
const { join } = require('path');

const cwd = join(__dirname, '../../..');

const tsVersion = '5.0.4';

console.log(`Installing typescript@${tsVersion}, and @types/node@18...`);

execSync(`yarn add --dev --ignore-workspace-root-check typescript@${tsVersion} @types/node@^18`, {
stdio: 'inherit',
cwd,
});

console.log('TypeScript version updated successfully.');
2 changes: 0 additions & 2 deletions dev-packages/node-core-integration-tests/utils/runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,6 @@ export function createRunner(...paths: string[]) {
}
}

// We need to properly define & pass these types around for TS 3.8,
// which otherwise fails to infer these correctly :(
type ServerStartup = [number | undefined, (() => void) | undefined];
type DockerStartup = VoidFunction | undefined;

Expand Down
44 changes: 0 additions & 44 deletions dev-packages/node-integration-tests/scripts/use-ts-3_8.js

This file was deleted.

Loading
Loading