Skip to content

chore: upgrade to TypeScript 6 #11347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
erwanMarmelab wants to merge 9 commits into
base: next
Choose a base branch
from
Open

chore: upgrade to TypeScript 6 #11347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
75c8623
chore: upgrade to TypeScript 7
erwanMarmelab Aug 26, 2026
6e384b7
feat: upgrade to TypeScript 7 - ra-core
erwanMarmelab Aug 26, 2026
660b548
feat: upgrade to TypeScript 7 - packages, examples and tsconfigs
erwanMarmelab Aug 26, 2026
35ae767
update gh workflow
erwanMarmelab Aug 27, 2026
4103805
chore: target TypeScript 6 instead of 7
erwanMarmelab Aug 27, 2026
203c63b
Delete .vscode/settings.json
erwanMarmelab Aug 27, 2026
baacdc4
restore package.json indentation
erwanMarmelab Aug 27, 2026
47fa887
docs: correct which TypeScript version changed each default
erwanMarmelab Aug 28, 2026
43847c4
Merge branch 'next' into feat/typescript-v7/main
erwanMarmelab Sep 1, 2026
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
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ jobs:
run: make lint
- name: Build
run: make build
- name: Typecheck
run: make typecheck

@fzaninotto fzaninotto Sep 1, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make build already does the typecheck, so you're essentially doing it twice

- name: Zip packages build artifact
run: zip packages-build.zip -r examples/data-generator/dist packages/*/dist
- name: Upload packages build artifact
Expand Down
2 changes: 1 addition & 1 deletion Agents.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ react-admin/

## Package Dependencies

- **Core**: React 18.3+, TypeScript 5.8+, lodash 4.17+, inflection 3.0+
- **Core**: React 18.3+, TypeScript 6.0+, lodash 4.17+, inflection 3.0+
- **Routing**: React Router 6.28+
- **Data**: TanStack Query 5.90+ (React Query)
- **Forms**: React Hook Form 7.53+
Expand Down
3 changes: 2 additions & 1 deletion examples/crm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^6.0.5",
"rollup-plugin-visualizer": "^7.0.1",
"typescript": "^5.1.3",
"rollup-preserve-directives": "^1.1.3",
"typescript": "^6.0.3",
"vite": "^8.1.5",
"web-vitals": "^3.5.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/crm/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"forceConsistentCasingInFileNames": true,
"noFallthroughCasesInSwitch": true,
"module": "esnext",
"moduleResolution": "node",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/crm/tsconfig.node.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"compilerOptions": {
"composite": true,
"module": "ESNext",
"moduleResolution": "Node",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true
},
"include": ["vite.config.ts"]
Expand Down
5 changes: 3 additions & 2 deletions examples/data-generator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@
"types": "./dist/index.d.cts",
"type": "module",
"scripts": {
"build": "zshy --silent"
"build": "zshy --silent",
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@faker-js/faker": "^10.0.0",
"date-fns": "^3.6.0"
},
"devDependencies": {
"ra-core": "^5.15.2",
"typescript": "^5.1.3",
"typescript": "^6.0.3",
"zshy": "^0.5.0"
},
"peerDependencies": {
Expand Down
3 changes: 2 additions & 1 deletion examples/demo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
"@vitejs/plugin-react": "^6.0.5",
"msw": "^2.10.4",
"rollup-plugin-visualizer": "^7.0.1",
"typescript": "^5.1.3",
"rollup-preserve-directives": "^1.1.3",
"typescript": "^6.0.3",
"vite": "^8.1.5"
},
"msw": {
Expand Down
7 changes: 5 additions & 2 deletions examples/demo/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
{
"compilerOptions": {
"target": "es5",
"target": "ES2020",
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true,
"skipLibCheck": true,
"types": [
"node"
],
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"strict": true,
"forceConsistentCasingInFileNames": true,
"noFallthroughCasesInSwitch": true,
"module": "esnext",
"moduleResolution": "node",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/tsconfig.node.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"compilerOptions": {
"composite": true,
"module": "ESNext",
"moduleResolution": "Node",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true
},
"include": ["vite.config.ts"]
Expand Down
2 changes: 1 addition & 1 deletion examples/no-code/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"devDependencies": {
"@vitejs/plugin-react": "^6.0.5",
"typescript": "^5.1.3",
"typescript": "^6.0.3",
"vite": "^8.1.5"
},
"gitHead": "6eb0f6fcbe3ba237b507f3506d230b3445c0a764"
Expand Down
6 changes: 3 additions & 3 deletions examples/no-code/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"lib": ["DOM", "DOM.Iterable", "ESNext"],
"types": ["vite/client", "node"],
"allowJs": false,
"skipLibCheck": false,
"esModuleInterop": false,
"skipLibCheck": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"strict": true,
"forceConsistentCasingInFileNames": true,
"module": "ESNext",
"moduleResolution": "Node",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
Expand Down
4 changes: 2 additions & 2 deletions examples/ra-offline/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"eslint-plugin-react-hooks": "^5.2.0",
"globals": "^16.0.0",
"prettier": "^3.3.3",
"typescript": "^5.1.6",
"typescript-eslint": "^8.28.0",
"typescript": "^6.0.3",
"typescript-eslint": "^8.68.0",
"vite": "^8.1.5",
"vite-plugin-pwa": "^1.3.0"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/simple/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@vitejs/plugin-react": "^6.0.5",
"little-state-machine": "^4.8.1",
"react-simple-animate": "^3.5.3",
"typescript": "^5.1.3",
"typescript": "^6.0.3",
"vite": "^8.1.5"
}
}
4 changes: 2 additions & 2 deletions examples/simple/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"compilerOptions": {
"baseUrl": ".",

@fzaninotto fzaninotto Sep 1, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why did you remove this? It's required to make the demo run in a subpath

"outDir": "lib",
"rootDir": "src",
"declaration": true,
Expand All @@ -9,10 +8,11 @@
"lib": ["es2017", "dom"],
"target": "es2016",
"module": "esnext",
"moduleResolution": "node",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true,
"esModuleInterop": true,
"skipLibCheck": true,
"strict": false,

@fzaninotto fzaninotto Sep 1, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a mistake, the simple example should compile in strict mode

"strictNullChecks": true
},
"exclude": ["**/*.spec.ts", "**/*.spec.tsx", "**/*.spec.js"],
Expand Down
2 changes: 1 addition & 1 deletion examples/tutorial/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^6.0.5",
"typescript": "^5.1.3",
"typescript": "^6.0.3",
"vite": "^8.1.5"
}
}
4 changes: 2 additions & 2 deletions examples/tutorial/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"lib": ["DOM", "DOM.Iterable", "ESNext"],
"allowJs": false,
"skipLibCheck": true,
"esModuleInterop": false,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"strict": true,
"forceConsistentCasingInFileNames": true,
"module": "ESNext",
"moduleResolution": "Node",
"moduleResolution": "bundler",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
Expand Down
2 changes: 1 addition & 1 deletion examples/tutorial/tsconfig.node.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"compilerOptions": {
"composite": true,
"module": "ESNext",
"moduleResolution": "Node",
"moduleResolution": "bundler",
"allowSyntheticDefaultImports": true
},
"include": ["vite.config.ts"]
Expand Down
3 changes: 3 additions & 0 deletions jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ module.exports = {
{
isolatedModules: true,
useESM: true,
// The root tsconfig targets esnext modules for TypeScript 7;
// Jest runs CommonJS, so pin the emit format here.
tsconfig: { module: 'commonjs' },
},
],
},
Expand Down
9 changes: 5 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "react-admin-lerna",
"scripts": {
"build": "lerna run build",
"typecheck": "CI=true lerna run build",
"typecheck": "lerna run typecheck",
"watch": "lerna run --parallel watch",
"test-unit": "cross-env LANG=en_US.UTF-8 NODE_ENV=test cross-env BABEL_ENV=cjs NODE_ICU_DATA=./node_modules/full-icu jest",
"test-unit-ci": "cross-env LANG=en_US.UTF-8 NODE_ENV=test cross-env BABEL_ENV=cjs NODE_ICU_DATA=./node_modules/full-icu jest --runInBand",
Expand Down Expand Up @@ -40,6 +40,7 @@
"@types/eslint-plugin-jsx-a11y": "^6",
"@types/gh-pages": "^6",
"@types/jest": "^29.5.2",
"@types/node": "^20.10.7",
"@types/react": "^18.3.3",
"@vitejs/plugin-react": "^6.0.5",
"cross-env": "^5.2.0",
Expand Down Expand Up @@ -74,10 +75,10 @@
"react": "^18.3.1",
"react-dom": "^18.3.1",
"storybook": "^10.5.5",
"ts-jest": "^29.1.0",
"ts-jest": "^29.4.12",
"tsx": "^4.19.3",
"typescript": "^5.8.3",
"typescript-eslint": "^8.28.0",
"typescript": "^6.0.3",
"typescript-eslint": "^8.68.0",
"vite": "^8.1.5",
"whatwg-fetch": "^3.0.0"
},
Expand Down
3 changes: 2 additions & 1 deletion packages/create-react-admin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
},
"scripts": {
"build": "tsc",
"typecheck": "tsc --noEmit",
"test": "prettier --check . && xo && ava"
},
"files": [
Expand All @@ -33,7 +34,7 @@
},
"devDependencies": {
"@types/react": ">=18.0.0",
"typescript": "^5.1.3"
"typescript": "^6.0.3"
},
"gitHead": "19dcb264898c8e01c408eb66ce02c50b67c851ab"
}
5 changes: 3 additions & 2 deletions packages/ra-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"bugs": "https://github.com/marmelab/react-admin/issues",
"license": "MIT",
"scripts": {
"build": "zshy --silent"
"build": "zshy --silent",
"typecheck": "tsc --noEmit"
},
"devDependencies": {
"@hookform/resolvers": "^5.2.2",
Expand All @@ -55,7 +56,7 @@
"react-hook-form": "^7.72.0",
"react-router": "^6.28.1",
"react-router-dom": "^6.28.1",
"typescript": "^5.1.3",
"typescript": "^6.0.3",
"yup": "^0.32.11",
"zod": "^4.3.6",
"zshy": "^0.5.0"
Expand Down
5 changes: 3 additions & 2 deletions packages/ra-data-fakerest/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
},
"homepage": "https://github.com/marmelab/react-admin#readme",
"scripts": {
"build": "zshy --silent"
"build": "zshy --silent",
"typecheck": "tsc --noEmit"
},
"dependencies": {
"fakerest": "^4.0.1"
Expand All @@ -42,7 +43,7 @@
"@types/jest": "^29.5.2",
"expect": "^27.4.6",
"ra-core": "^5.15.2",
"typescript": "^5.1.3",
"typescript": "^6.0.3",
"zshy": "^0.5.0"
},
"peerDependencies": {
Expand Down
5 changes: 3 additions & 2 deletions packages/ra-data-graphql-simple/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
],
"license": "MIT",
"scripts": {
"build": "zshy --silent"
"build": "zshy --silent",
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@apollo/client": "^3.3.19",
Expand All @@ -44,7 +45,7 @@
},
"devDependencies": {
"graphql": "^15.6.0",
"typescript": "^5.1.3",
"typescript": "^6.0.3",
"zshy": "^0.5.0"
},
"gitHead": "19dcb264898c8e01c408eb66ce02c50b67c851ab",
Expand Down
5 changes: 3 additions & 2 deletions packages/ra-data-graphql/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
],
"license": "MIT",
"scripts": {
"build": "zshy --silent"
"build": "zshy --silent",
"typecheck": "tsc --noEmit"
},
"dependencies": {
"@apollo/client": "^3.3.19",
Expand All @@ -43,7 +44,7 @@
},
"devDependencies": {
"graphql": "^15.6.0",
"typescript": "^5.1.3",
"typescript": "^6.0.3",
"zshy": "^0.5.0"
},
"gitHead": "19dcb264898c8e01c408eb66ce02c50b67c851ab",
Expand Down
5 changes: 3 additions & 2 deletions packages/ra-data-json-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@
"bugs": "https://github.com/marmelab/react-admin/issues",
"license": "MIT",
"scripts": {
"build": "zshy --silent"
"build": "zshy --silent",
"typecheck": "tsc --noEmit"
},
"dependencies": {
"query-string": "^7.1.3",
"ra-core": "^5.15.2"
},
"devDependencies": {
"typescript": "^5.1.3",
"typescript": "^6.0.3",
"zshy": "^0.5.0"
},
"gitHead": "19dcb264898c8e01c408eb66ce02c50b67c851ab",
Expand Down
5 changes: 3 additions & 2 deletions packages/ra-data-local-forage/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,16 @@
},
"homepage": "https://github.com/marmelab/react-admin#readme",
"scripts": {
"build": "zshy --silent"
"build": "zshy --silent",
"typecheck": "tsc --noEmit"
},
"dependencies": {
"localforage": "^1.7.1",
"lodash": "~4.18.1",
"ra-data-fakerest": "^5.15.2"
},
"devDependencies": {
"typescript": "^5.1.3",
"typescript": "^6.0.3",
"zshy": "^0.5.0"
},
"peerDependencies": {
Expand Down
5 changes: 3 additions & 2 deletions packages/ra-data-local-storage/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,15 @@
},
"homepage": "https://github.com/marmelab/react-admin#readme",
"scripts": {
"build": "zshy --silent"
"build": "zshy --silent",
"typecheck": "tsc --noEmit"
},
"dependencies": {
"lodash": "~4.18.1",
"ra-data-fakerest": "^5.15.2"
},
"devDependencies": {
"typescript": "^5.1.3",
"typescript": "^6.0.3",
"zshy": "^0.5.0"
},
"peerDependencies": {
Expand Down
Loading
Loading