Skip to content

Commit 0a6bbf9

Browse files
riccardoperrariccardoperra
committed
fix: update TypeScript to 6.x (#687)
* fix: update TypeScript configuration and export paths for compatibility Signed-off-by: riccardoperra <riccardo.perra@icloud.com> * fix: update TypeScript output directory and package overrides Signed-off-by: riccardoperra <riccardo.perra@icloud.com> * docs(changeset): Update to TypeScript 6.0 * fix: update package dependencies and TypeScript configuration for compatibility Signed-off-by: riccardoperra <riccardo.perra@icloud.com> * some fixes Signed-off-by: riccardoperra <riccardo.perra@icloud.com> --------- Signed-off-by: riccardoperra <riccardo.perra@icloud.com>
1 parent 086961f commit 0a6bbf9

28 files changed

+1327
-366
lines changed

‎.changeset/short-feet-see.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
"@codeimage/prisma-models": patch
3+
"@codeimage/atomic-state": patch
4+
"@codeimage/dom-export": patch
5+
"@codeimage/highlight": patch
6+
"@codeimage/config": patch
7+
"@codeimage/locale": patch
8+
"@codeimage/app": patch
9+
"@codeimage/ui": patch
10+
"@codeimage/api": patch
11+
---
12+
13+
Update to TypeScript 6.0

‎apps/api/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
"oxlint": "catalog:next",
7676
"sinon": "^15.1.2",
7777
"tsup": "8.5.1",
78-
"tsx": "3.12.7",
79-
"typescript": "^5.9.3",
78+
"tsx": "catalog:next",
79+
"typescript": "catalog:next",
8080
"vite": "catalog:next",
8181
"vitest": "catalog:next"
8282
}

‎apps/api/test/tsconfig.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
"extends": "../tsconfig.json",
33
"compilerOptions": {
44
"noEmit": true,
5-
"moduleResolution": "Node16",
6-
"module": "ES2022",
7-
"target": "ES2022"
5+
"rootDir": "./",
6+
"moduleResolution": "nodenext",
7+
"module": "ESNext",
8+
"target": "ESNext",
89
},
9-
"include": ["../src/**/*.ts", "**/*.ts"]
10+
"include": ["../src/**/*.ts", "./**/*.ts"]
1011
}

‎apps/api/tsconfig.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
"resolveJsonModule": true,
66
"allowSyntheticDefaultImports": true,
77
"sourceMap": true,
8-
"moduleResolution": "NodeNext",
8+
"moduleResolution": "nodenext",
99
"module": "NodeNext",
1010
"target": "ES2022",
11+
"types": ["node"],
1112
"typeRoots": ["./src/common/domainFunctions/functions.d.ts"]
1213
},
1314
"include": ["./src/**/*.ts"]

‎apps/codeimage/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
"prettier": "^3.8.1",
3333
"rehype-raw": "catalog:next",
3434
"rehype-slug": "catalog:next",
35-
"rimraf": "^3.0.2",
35+
"rimraf": "catalog:next",
3636
"sass": "catalog:next",
3737
"tsx": "catalog:next",
38-
"typescript": "^5.9.3",
38+
"typescript": "catalog:next",
3939
"vite": "catalog:next",
4040
"vite-plugin-solid": "catalog:next",
4141
"vite-tsconfig-paths": "catalog:next",
@@ -103,7 +103,7 @@
103103
"motion": "^10.15.5",
104104
"polished": "^4.2.2",
105105
"rxjs": "^7.8.2",
106-
"solid-codemirror": "^2.3.2",
106+
"solid-codemirror": "catalog:next",
107107
"solid-headless": "^0.13.1",
108108
"solid-js": "catalog:next",
109109
"solid-mdx": "^0.0.7",

‎apps/codeimage/tsconfig.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4-
"jsx": "preserve",
4+
"rootDir": "./src",
55
"importHelpers": true,
66
"declaration": false,
77
"moduleResolution": "bundler",
88
"resolveJsonModule": true,
99
"skipLibCheck": true,
1010
"skipDefaultLibCheck": true,
11+
"jsx": "preserve",
1112
"jsxImportSource": "solid-js",
1213
"types": ["vite/client", "@types/mdx"],
1314
"verbatimModuleSyntax": true,
@@ -18,5 +19,5 @@
1819
"@ui/*": ["./src/ui/*"]
1920
}
2021
},
21-
"include": ["./src/**/*", "./scripts/**/*", "vite.config.ts"]
22+
"include": ["./src/**/*", "./scripts/**/*"]
2223
}

‎apps/website/package.json‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,21 @@
1111
"lighthouse": "lhci autorun"
1212
},
1313
"dependencies": {
14-
"@auth0/auth0-spa-js": "^2.0.4",
1514
"@codeimage/highlight": "workspace:*",
1615
"@codemirror/lang-javascript": "^6.2.5",
17-
"@codemirror/language": "^6.12.2",
18-
"@codemirror/state": "^6.6.0",
19-
"@codemirror/view": "^6.40.0",
16+
"@codemirror/language": "catalog:next",
17+
"@codemirror/state": "catalog:next",
18+
"@codemirror/view": "catalog:next",
2019
"@lezer/highlight": "catalog:next",
21-
"@solid-primitives/media": "2.3.5",
20+
"@solid-primitives/media": "^2.3.5",
2221
"@solid-primitives/platform": "^0.2.1",
23-
"@tanstack/router-plugin": "^1.167.3",
22+
"@tanstack/router-plugin": "^1.167.4",
2423
"@tanstack/solid-router": "latest",
2524
"@tanstack/solid-router-devtools": "latest",
2625
"@tanstack/solid-router-ssr-query": "latest",
2726
"@tanstack/solid-start": "latest",
2827
"motion": "^10.15.5",
29-
"solid-codemirror": "^2.3.2",
28+
"solid-codemirror": "catalog:next",
3029
"solid-js": "catalog:next",
3130
"solid-motionone": "^1.0.4",
3231
"vite-tsconfig-paths": "catalog:next"
@@ -35,7 +34,7 @@
3534
"@lhci/cli": "^0.15.1",
3635
"@tanstack/devtools-vite": "latest",
3736
"@types/node": "catalog:next",
38-
"typescript": "^5.9.3",
37+
"typescript": "catalog:next",
3938
"vite": "catalog:next",
4039
"vite-plugin-solid": "catalog:next"
4140
}

‎package.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@
8282
"oxlint": "catalog:next",
8383
"pnpm-bundle-workspace-package": "^1.0.2",
8484
"tslib": "^2.8.1",
85-
"tsx": "^3.14.0",
86-
"typescript": "^5.9.3",
85+
"tsx": "catalog:next",
86+
"typescript": "catalog:next",
8787
"vite": "catalog:next"
8888
},
8989
"engines": {
@@ -92,8 +92,7 @@
9292
},
9393
"pnpm": {
9494
"overrides": {
95-
"esbuild": "^0.19.8",
96-
"typescript": "^5.9.3"
95+
"typescript": "catalog:next"
9796
},
9897
"patchedDependencies": {
9998
"solid-headless": "patches/solid-headless.patch",

‎packages/atomic-state/tsconfig.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
4+
"rootDir": "./src",
45
"jsx": "preserve",
56
"moduleResolution": "bundler"
67
},

‎packages/config/package.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121
"lint": "oxlint",
2222
"lint:fix": "oxlint --fix",
2323
"clean": "rimraf dist",
24-
"build-esm": "tsc -p tsconfig.esm.json",
2524
"build-dts": "tsc -p tsconfig.dts.json",
2625
"typecheck": "tsc --noEmit --skipLibCheck --project tsconfig.dts.json",
27-
"typecheck:ci": "tsc --skipLibCheck --project tsconfig.dts.json",
28-
"dev": "chokidar \"src/**/*.{ts,tsx}\" -c \"pnpm build\""
26+
"typecheck:ci": "tsc --skipLibCheck --project tsconfig.dts.json"
2927
},
3028
"dependencies": {
3129
"@codeimage/highlight": "workspace:*",
@@ -74,8 +72,9 @@
7472
"devDependencies": {
7573
"oxfmt": "catalog:next",
7674
"oxlint": "catalog:next",
77-
"rimraf": "^3.0.2",
78-
"typescript": "^5.9.3",
75+
"rimraf": "catalog:next",
76+
"tsdown": "0.21.4",
77+
"typescript": "catalog:next",
7978
"vite": "catalog:next",
8079
"vite-plugin-dts": "catalog:next",
8180
"vite-plugin-solid": "catalog:next"

0 commit comments

Comments
 (0)
⚡