Skip to content

Commit 488c49e

Browse files
committed
Upgrade TypeScript to 6.0.2 and update tsconfig path and include/exclude settings across workspaces
- update typescript to 6.0.2, fix potential issues with tsconfigs, google for migration ├── apps │ ├── browser │ │ ├── package.json │ │ └── tsconfig.json │ ├── editor │ │ ├── package.json │ │ ├── package.nls.bg.json │ │ ├── package.nls.cs.json │ │ ├── package.nls.de.json │ │ ├── package.nls.es.json │ │ ├── package.nls.fr.json │ │ ├── package.nls.hu.json │ │ ├── package.nls.it.json │ │ ├── package.nls.ja.json │ │ ├── package.nls.json │ │ ├── package.nls.ko.json │ │ ├── package.nls.pl.json │ │ ├── package.nls.pt-br.json │ │ ├── package.nls.ru.json │ │ ├── package.nls.tr.json │ │ ├── package.nls.zh-cn.json │ │ ├── package.nls.zh-tw.json │ │ ├── src │ │ │ ├── env.d.ts │ │ │ └── views │ │ │ ├── chats │ │ │ │ └── frontend │ │ │ │ └── App.tsx │ │ │ ├── prompt │ │ │ │ └── frontend │ │ │ │ └── App.tsx │ │ │ └── settings │ │ │ └── frontend │ │ │ └── App.tsx │ │ ├── tsconfig.json │ │ └── webpack.config.ts │ └── web │ ├── package.json │ └── tsconfig.json ├── package.json ├── packages │ ├── shared │ │ ├── package.json │ │ ├── tsconfig.build.json │ │ └── tsconfig.json │ └── ui │ ├── package.json │ ├── src │ │ ├── components │ │ │ └── editor │ │ │ ├── common │ │ │ │ └── Scrollable │ │ │ │ └── Scrollable.tsx │ │ │ └── settings-view │ │ │ └── Layout │ │ │ └── Layout.tsx │ │ ├── styles │ │ │ └── global.scss │ │ └── types │ │ └── scss.d.ts │ └── tsconfig.json ├── pnpm-workspace.yaml └── tsconfig.json
1 parent 0940242 commit 488c49e

12 files changed

Lines changed: 431 additions & 336 deletions

File tree

‎apps/browser/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"style-loader": "3.3.3",
2727
"ts-node": "10.9.2",
2828
"ts-loader": "9.5.4",
29-
"typescript": "5.9.3",
29+
"typescript": "6.0.2",
3030
"webextension-polyfill": "0.12.0",
3131
"webpack": "5.102.0",
3232
"webpack-cli": "5.1.4",

‎apps/browser/tsconfig.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
"lib": ["dom", "ESNext"],
55
"module": "commonjs",
66
"outDir": "out",
7+
"rootDir": "../../",
78
"sourceMap": true,
89
"esModuleInterop": true,
9-
"baseUrl": ".",
1010
"strict": true,
1111
"jsx": "react-jsx",
12+
"skipLibCheck": true,
1213
"types": ["chrome", "webextension-polyfill", "node", "jest"],
1314
"paths": {
1415
"@/*": ["./src/*"],

‎apps/web/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
"@types/node": "20.0.0",
2121
"@types/react": "18.2.0",
2222
"@types/react-dom": "18.2.0",
23-
"typescript": "5.8.2"
23+
"typescript": "6.0.2"
2424
}
2525
}

‎apps/web/tsconfig.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
"isolatedModules": true,
1515
"jsx": "preserve",
1616
"incremental": true,
17-
"baseUrl": ".",
17+
"rootDir": ".",
18+
"types": ["node", "jest"],
1819
"paths": {
19-
"@/*": ["src/*"]
20+
"@/*": ["./src/*"]
2021
},
2122
"plugins": [
2223
{
@@ -30,6 +31,5 @@
3031
"src/**/*.ts",
3132
"src/**/*.tsx",
3233
".next/types/**/*.ts"
33-
],
34-
"exclude": ["node_modules"]
34+
]
3535
}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"lint-staged": "15.2.10",
1414
"prettier": "3.7.4",
1515
"ts-jest": "29.4.0",
16-
"typescript": "5.8.3"
16+
"typescript": "6.0.2"
1717
},
1818
"scripts": {
1919
"prepare": "husky",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Optional: Separate config if you want to build without tests included
22
{
33
"extends": "./tsconfig.json",
4-
"exclude": ["node_modules", "dist", "src/**/*.spec.ts", "src/**/*.test.ts"]
4+
"exclude": ["dist", "src/**/*.spec.ts", "src/**/*.test.ts"]
55
}

‎packages/shared/tsconfig.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"esModuleInterop": true,
1010
"jsx": "react-jsx",
1111
"jsxImportSource": "react",
12-
"baseUrl": ".",
12+
"rootDir": "../../",
13+
"types": ["node", "jest"],
1314
"paths": {
1415
"@shared/*": ["./src/*"]
1516
}
@@ -21,6 +22,5 @@
2122
"../ui/src/**/*.tsx",
2223
"../../apps/editor/src/**/*.ts",
2324
"../../apps/editor/src/**/*.tsx"
24-
],
25-
"exclude": ["node_modules"]
25+
]
2626
}

‎packages/ui/package.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
22
"name": "ui",
3-
"version": "1.0.0",
4-
"private": true,
53
"scripts": {
64
"storybook": "storybook dev -p 6006",
75
"build-storybook": "storybook build"
@@ -15,9 +13,9 @@
1513
"css-loader": "6.5.1",
1614
"sass": "1.86.1",
1715
"sass-loader": "12.4.0",
18-
"storybook": "7.6.20",
16+
"storybook": "7.6.24",
1917
"style-loader": "3.3.1",
20-
"typescript": "5.8.2"
18+
"typescript": "6.0.2"
2119
},
2220
"dependencies": {
2321
"@storybook/react": "7.6.20",

‎packages/ui/src/types/scss.d.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
declare module '*.scss'
2+
declare module '*.css'
3+
declare module 'simplebar-react'
4+
15
declare module '*.module.scss' {
26
const classes: { [key: string]: string }
37
export default classes

‎packages/ui/tsconfig.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@
1010
"forceConsistentCasingInFileNames": true,
1111
"noFallthroughCasesInSwitch": true,
1212
"module": "esnext",
13-
"moduleResolution": "node",
1413
"resolveJsonModule": true,
1514
"isolatedModules": true,
1615
"jsx": "react-jsx",
1716
"jsxImportSource": "react",
1817
"declaration": true,
19-
"types": ["node"],
18+
"types": ["node", "jest"],
2019
"sourceMap": true,
21-
"baseUrl": ".",
20+
"rootDir": "../../",
2221
"paths": {
2322
"@/*": ["./src/*", "../../apps/editor/src/*"],
2423
"@shared/*": ["../shared/src/*"],
@@ -33,6 +32,5 @@
3332
"../shared/src/*.tsx",
3433
"../../apps/editor/src/**/*.ts",
3534
"../../apps/editor/src/**/*.tsx"
36-
],
37-
"exclude": ["node_modules", "dist"]
35+
]
3836
}

0 commit comments

Comments
 (0)