Skip to content

Commit 8d83aff

Browse files
committed
Unify TypeScript configurations across the monorepo, update React type definitions to 18.2.60, and clean up gitignore entries
- update typescript to 6.0.2, fix potential issues with tsconfigs, google for migration - in `apps/web` runing `npx tsc --noEmit` produces errors: [Pasted text] - fill root tsconfig properly so `npx tsc --noEmit` can run - when `npx tsc` is run from apps/browser, its fine, [Pasted text] - order dependencies alphabetically ├── 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 │ │ │ ├── constants │ │ │ │ └── state-keys.ts │ │ │ ├── features │ │ │ │ └── context-restoration │ │ │ │ └── index.ts │ │ │ ├── i18n │ │ │ │ └── index.ts │ │ │ ├── utils │ │ │ │ └── ascii-tree │ │ │ │ └── ascii-tree.ts │ │ │ └── views │ │ │ ├── prompt │ │ │ │ └── backend │ │ │ │ └── utils │ │ │ │ └── symbols │ │ │ │ └── git │ │ │ │ └── replace-git-symbols.ts │ │ │ ├── settings │ │ │ │ └── helpers │ │ │ │ └── open-settings.ts │ │ │ └── shared │ │ │ └── utils │ │ │ └── hash-sign-quick-pick │ │ │ ├── hash-sign-quick-pick.ts │ │ │ ├── index.ts │ │ │ └── symbols │ │ │ ├── changes-symbol.ts │ │ │ ├── commit-symbol.ts │ │ │ ├── index.ts │ │ │ ├── saved-context-symbol.ts │ │ │ ├── skill-symbol.ts │ │ │ └── snippet-symbol.ts │ │ └── tsconfig.json │ └── web │ ├── package.json │ ├── src │ │ ├── app │ │ │ ├── get_dictionary.ts │ │ │ ├── layout.tsx │ │ │ └── page.tsx │ │ ├── dictionaries │ │ │ ├── dictionary.ts │ │ │ ├── en.ts │ │ │ └── pl.ts │ │ └── middleware.ts │ └── tsconfig.json ├── package.json ├── packages │ ├── shared │ │ ├── .gitignore │ │ ├── package.json │ │ ├── src │ │ │ ├── constants │ │ │ │ ├── chatbots.ts │ │ │ │ └── websocket.ts │ │ │ ├── hooks │ │ │ │ ├── index.ts │ │ │ │ ├── use-compacting.ts │ │ │ │ └── use-is-mac.ts │ │ │ ├── types │ │ │ │ ├── edit-format.ts │ │ │ │ ├── file-in-preview.ts │ │ │ │ ├── prompt-types.ts │ │ │ │ ├── response-history-item.ts │ │ │ │ ├── target.ts │ │ │ │ ├── task.ts │ │ │ │ └── websocket-message.ts │ │ │ └── utils │ │ │ ├── display-token-count.ts │ │ │ ├── extract-path-from-line-of-code │ │ │ │ ├── extract-path-from-line-of-code.spec.ts │ │ │ │ ├── extract-path-from-line-of-code.ts │ │ │ │ └── index.ts │ │ │ ├── logger.ts │ │ │ └── simplify-prompt-symbols │ │ │ ├── index.ts │ │ │ ├── simplify-prompt-symbols.spec.ts │ │ │ └── simplify-prompt-symbols.ts │ │ ├── tsconfig.build.json │ │ └── tsconfig.json │ └── ui │ ├── package.json │ └── tsconfig.json └── tsconfig.json
1 parent 66f8496 commit 8d83aff

19 files changed

Lines changed: 132 additions & 267 deletions

‎.gitignore‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
/node_modules
2-
/docs/index.md
1+
node_modules
2+
/docs/index.md
3+
tsconfig.tsbuildinfo

‎apps/browser/.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/dist
22
/dist-firefox
3-
/node_modules
43
/extension-*.zip
5-
/extension-*.zip
4+
/extension-*.zip

‎apps/browser/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"@types/chrome": "0.1.16",
1212
"@types/jest": "29.5.14",
1313
"@types/node": "20.x",
14-
"@types/react": "18.2.48",
15-
"@types/react-dom": "18.2.18",
14+
"@types/react": "18.2.60",
15+
"@types/react-dom": "18.2.19",
1616
"@types/webextension-polyfill": "0.12.4",
1717
"archiver": "6.0.1",
1818
"baseline-browser-mapping": "2.9.19",
@@ -24,8 +24,8 @@
2424
"sass": "1.93.2",
2525
"sass-loader": "13.3.3",
2626
"style-loader": "3.3.3",
27-
"ts-node": "10.9.2",
2827
"ts-loader": "9.5.4",
28+
"ts-node": "10.9.2",
2929
"typescript": "6.0.2",
3030
"webextension-polyfill": "0.12.0",
3131
"webpack": "5.102.0",

‎apps/editor/.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/out
2-
/node_modules
32
/*.vsix
43
/README.md
5-
/.env
4+
/.env

‎apps/editor/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1362,9 +1362,9 @@
13621362
"@types/node": "20.x",
13631363
"@types/react": "18.2.60",
13641364
"@types/react-dom": "18.2.19",
1365+
"@types/turndown": "5.0.5",
13651366
"@types/vscode": "1.96.0",
13661367
"@types/ws": "8.18.1",
1367-
"@types/turndown": "5.0.5",
13681368
"clean-webpack-plugin": "4.0.0",
13691369
"copy-webpack-plugin": "12.0.2",
13701370
"css-loader": "6.5.1",
@@ -1402,6 +1402,7 @@
14021402
"react-dom": "18.2.0",
14031403
"rimraf": "6.0.1",
14041404
"simplebar-react": "3.3.1",
1405+
"typescript": "6.0.2",
14051406
"ui": "workspace:*",
14061407
"utf-8-validate": "6.0.5",
14071408
"ws": "8.21.3"

‎apps/editor/tsconfig.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
"esModuleInterop": true,
1010
"jsx": "react-jsx",
1111
"jsxImportSource": "react",
12-
"baseUrl": ".",
12+
"types": ["node", "react", "jest"],
13+
"skipLibCheck": true,
14+
"rootDir": "../../",
15+
"incremental": true,
1316
"paths": {
1417
"@/*": ["./src/*"],
1518
"@shared/*": ["../../packages/shared/src/*"],
@@ -21,6 +24,5 @@
2124
"src/**/*.tsx",
2225
"../../packages/shared/src/**/*.ts",
2326
"../../packages/ui/src/**/*"
24-
],
25-
"exclude": ["node_modules"]
27+
]
2628
}

‎apps/web/.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
/node_modules
21
/.next

‎apps/web/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"devDependencies": {
1919
"@types/negotiator": "0.6.3",
2020
"@types/node": "20.0.0",
21-
"@types/react": "18.2.0",
22-
"@types/react-dom": "18.2.0",
21+
"@types/react": "18.2.60",
22+
"@types/react-dom": "18.2.19",
2323
"typescript": "6.0.2"
2424
}
2525
}

‎apps/web/src/app/layout.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ReactNode } from 'react'
22
import { get_dictionary } from './get_dictionary'
33

4-
const Layout: React.FC<{ children: ReactNode }> = async ({ children }) => {
4+
const Layout = async ({ children }: { children: ReactNode }) => {
55
// Set the lang attribute dynamically on the html tag for accessibility
66
const dictionary = await get_dictionary()
77

‎apps/web/src/app/page.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { get_dictionary } from './get_dictionary'
22

3-
const Page: React.FC = async () => {
3+
const Page = async () => {
44
const dictionary = await get_dictionary()
55

66
return (

0 commit comments

Comments
 (0)