diff --git a/.vscode/settings.json b/.vscode/settings.json index 9c8106cc729..c1630592e0b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,5 +8,7 @@ "jestrunner.codeLensSelector": "", "vitest.filesWatcherInclude": "**/*.test.ts", "editor.formatOnSave": true, - "typescript.preferences.preferTypeOnlyAutoImports": true + "typescript.preferences.preferTypeOnlyAutoImports": true, + "typescript.tsserver.log": "verbose", + "typescript.tsserver.trace": "messages" } diff --git a/packages/languages/tsconfig.json b/packages/languages/tsconfig.json index 6eede5d1091..a920fbfd984 100644 --- a/packages/languages/tsconfig.json +++ b/packages/languages/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "@rallly/tsconfig/base.json", + "extends": "@rallly/tsconfig/react.json", "include": ["**/*.ts"], "exclude": ["node_modules"] } diff --git a/packages/tsconfig/base.json b/packages/tsconfig/base.json deleted file mode 100644 index ae4cfac9c1a..00000000000 --- a/packages/tsconfig/base.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "display": "Default", - "extends": "@tsconfig/strictest/tsconfig.json", - "compilerOptions": { - "module": "ESNext", - "moduleResolution": "Bundler", - "noPropertyAccessFromIndexSignature": false, - "exactOptionalPropertyTypes": false, - "noUncheckedIndexedAccess": false, - "noImplicitReturns": false, - "verbatimModuleSyntax": true, - "skipLibCheck": true, - "strictNullChecks": true - } -} diff --git a/packages/tsconfig/next.json b/packages/tsconfig/next.json index 00294a07d6b..df4f5afa901 100644 --- a/packages/tsconfig/next.json +++ b/packages/tsconfig/next.json @@ -1,5 +1,8 @@ { "$schema": "https://json.schemastore.org/tsconfig", "display": "Next.js", - "extends": ["./base.json", "@tsconfig/next/tsconfig.json"] + "extends": "@tsconfig/next/tsconfig.json", + "compilerOptions": { + "verbatimModuleSyntax": true + } } diff --git a/packages/tsconfig/react.json b/packages/tsconfig/react.json index 0ac219582b4..dc76827a57a 100644 --- a/packages/tsconfig/react.json +++ b/packages/tsconfig/react.json @@ -1,8 +1,16 @@ { "$schema": "https://json.schemastore.org/tsconfig", "display": "Next.js", - "extends": ["./base"], "compilerOptions": { + "module": "ESNext", + "moduleResolution": "Bundler", + "noPropertyAccessFromIndexSignature": false, + "exactOptionalPropertyTypes": false, + "noUncheckedIndexedAccess": false, + "noImplicitReturns": false, + "verbatimModuleSyntax": true, + "skipLibCheck": true, + "strictNullChecks": true, "lib": ["dom", "dom.iterable", "esnext"], "jsx": "react-jsx" } diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index d4a747b8ce8..1563e3102cf 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -2,6 +2,6 @@ "compilerOptions": { "types": ["vitest/globals"] }, - "extends": "@rallly/tsconfig/base.json", + "extends": "@rallly/tsconfig/react.json", "include": ["**/*.ts", "**/*.tsx"] }