From cbffd53cc7727c4298e1db3f106df233d59836b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josh=20Goldberg=20=E2=9C=A8?= Date: Fri, 13 Nov 2026 10:14:43 -0500 Subject: [PATCH 1/2] ref(tsconfig): Extend one shared base tsconfig from every package Co-Authored-By: Claude Opus 5.5 --- .github/workflows/smoke-tests.yml | 2 +- apps/cli-docs/tsconfig.json | 5 +-- apps/docs-mcp/tsconfig.json | 6 +-- apps/games-api/package.json | 1 - apps/games-api/tsconfig.json | 9 ++++- apps/local/tsconfig.app.json | 5 +-- apps/local/tsconfig.node.json | 4 +- packages/cli/tsconfig.json | 16 ++------ packages/codemod-cli3to4/tsconfig.json | 6 +-- packages/logger/tsconfig.json | 10 ++--- packages/mcp-cloudflare/package.json | 1 - packages/mcp-cloudflare/tsconfig.client.json | 19 ++++++++-- packages/mcp-cloudflare/tsconfig.node.json | 11 +++++- packages/mcp-core/package.json | 1 - packages/mcp-core/tsconfig.json | 11 +++++- packages/mcp-server-evals/package.json | 1 - packages/mcp-server-evals/tsconfig.json | 11 +++++- packages/mcp-server-mocks/package.json | 1 - packages/mcp-server-mocks/tsconfig.json | 11 +++++- packages/mcp-server-tsconfig/package.json | 9 ----- .../mcp-server-tsconfig/tsconfig.base.json | 38 ------------------- .../mcp-server-tsconfig/tsconfig.vite.json | 13 ------- packages/mcp-test-client/tsconfig.json | 13 ++++++- packages/toolkit-core/tsconfig.json | 7 +--- pnpm-lock.yaml | 16 -------- tsconfig.base.json | 14 +++++++ 26 files changed, 105 insertions(+), 136 deletions(-) delete mode 100644 packages/mcp-server-tsconfig/package.json delete mode 100644 packages/mcp-server-tsconfig/tsconfig.base.json delete mode 100644 packages/mcp-server-tsconfig/tsconfig.vite.json create mode 100644 tsconfig.base.json diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 84147a204..d97c741f0 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -13,7 +13,7 @@ on: - "packages/mcp-cloudflare/**" - "packages/mcp-core/**" - "packages/mcp-server-mocks/**" - - "packages/mcp-server-tsconfig/**" + - "tsconfig.base.json" - "packages/smoke-tests/**" - "package.json" - "pnpm-lock.yaml" diff --git a/apps/cli-docs/tsconfig.json b/apps/cli-docs/tsconfig.json index 0fc51d71b..26491b02d 100644 --- a/apps/cli-docs/tsconfig.json +++ b/apps/cli-docs/tsconfig.json @@ -1,6 +1,3 @@ { - "extends": "astro/tsconfigs/strict", - "compilerOptions": { - "strictNullChecks": true - } + "extends": ["../../tsconfig.base.json", "astro/tsconfigs/strict"] } diff --git a/apps/docs-mcp/tsconfig.json b/apps/docs-mcp/tsconfig.json index d349c64f7..d915be489 100644 --- a/apps/docs-mcp/tsconfig.json +++ b/apps/docs-mcp/tsconfig.json @@ -1,10 +1,8 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "ESNext", - "module": "ESNext", - "moduleResolution": "Bundler", "strict": true, - "skipLibCheck": true, + "target": "ESNext", "lib": ["ESNext", "WebWorker"], "jsx": "react-jsx", "jsxImportSource": "hono/jsx" diff --git a/apps/games-api/package.json b/apps/games-api/package.json index be6671bee..946e885fd 100644 --- a/apps/games-api/package.json +++ b/apps/games-api/package.json @@ -21,7 +21,6 @@ }, "devDependencies": { "@cloudflare/workers-types": "catalog:", - "@sentry/mcp-server-tsconfig": "workspace:*", "typescript": "catalog:", "vitest": "catalog:", "wrangler": "catalog:" diff --git a/apps/games-api/tsconfig.json b/apps/games-api/tsconfig.json index 4e0793b59..50fe6f5ba 100644 --- a/apps/games-api/tsconfig.json +++ b/apps/games-api/tsconfig.json @@ -1,7 +1,12 @@ { - "extends": "@sentry/mcp-server-tsconfig/tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "types": ["@cloudflare/workers-types"] + "strict": true, + "lib": ["ES2023", "ES2024.String"], + "types": ["@cloudflare/workers-types"], + "allowJs": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true }, "include": ["src"] } diff --git a/apps/local/tsconfig.app.json b/apps/local/tsconfig.app.json index 3a104a4a3..9611e02d4 100644 --- a/apps/local/tsconfig.app.json +++ b/apps/local/tsconfig.app.json @@ -1,21 +1,18 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo", "target": "es2023", "lib": ["ES2023", "DOM"], - "module": "esnext", "types": ["vite/client"], "allowArbitraryExtensions": true, - "skipLibCheck": true, /* Bundler mode */ - "moduleResolution": "bundler", "paths": { "@/*": ["./src/*"] }, "allowImportingTsExtensions": true, "verbatimModuleSyntax": true, - "moduleDetection": "force", "noEmit": true, "jsx": "react-jsx", diff --git a/apps/local/tsconfig.node.json b/apps/local/tsconfig.node.json index 8d2b2b02f..a2e3655d0 100644 --- a/apps/local/tsconfig.node.json +++ b/apps/local/tsconfig.node.json @@ -1,16 +1,16 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo", "target": "es2023", "lib": ["ES2023"], "types": ["node"], - "skipLibCheck": true, /* Bundler mode */ "module": "nodenext", + "moduleResolution": "nodenext", "allowImportingTsExtensions": true, "verbatimModuleSyntax": true, - "moduleDetection": "force", "noEmit": true, /* Linting */ diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index aaa42765e..a03877f24 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -1,27 +1,17 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { + "strict": true, "lib": ["ESNext"], "target": "ESNext", - "module": "ESNext", - "moduleDetection": "force", "allowJs": true, - "moduleResolution": "bundler", "allowImportingTsExtensions": true, "verbatimModuleSyntax": true, "erasableSyntaxOnly": true, "noEmit": true, - "resolveJsonModule": true, - "strict": true, - "skipLibCheck": true, "noFallthroughCasesInSwitch": true, "noUncheckedIndexedAccess": true, - "noImplicitOverride": true, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "noUnusedLocals": false, - "noUnusedParameters": false, - "noPropertyAccessFromIndexSignature": false, - "strictNullChecks": true + "noImplicitOverride": true }, "include": ["src/**/*.ts"], "exclude": ["node_modules", "dist"] diff --git a/packages/codemod-cli3to4/tsconfig.json b/packages/codemod-cli3to4/tsconfig.json index 9c066b590..123ee5921 100644 --- a/packages/codemod-cli3to4/tsconfig.json +++ b/packages/codemod-cli3to4/tsconfig.json @@ -1,6 +1,8 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { - "skipLibCheck": true, + "strict": true, + "target": "ESNext", "module": "NodeNext", "moduleResolution": "NodeNext", "types": ["@codemod.com/jssg-types"], @@ -8,8 +10,6 @@ "noEmit": true, "verbatimModuleSyntax": true, "erasableSyntaxOnly": true, - "strict": true, - "strictNullChecks": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, "noUncheckedIndexedAccess": true diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json index 7df4fae8a..c3f8e5906 100644 --- a/packages/logger/tsconfig.json +++ b/packages/logger/tsconfig.json @@ -1,15 +1,11 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "ES2022", + "strict": true, "lib": ["ES2023"], - "module": "ESNext", - "moduleResolution": "Bundler", "types": ["node"], - "strict": true, "noUncheckedIndexedAccess": true, - "noEmit": true, - "skipLibCheck": true, - "isolatedModules": true + "noEmit": true }, "include": ["src/**/*.ts", "test/*.ts"] } diff --git a/packages/mcp-cloudflare/package.json b/packages/mcp-cloudflare/package.json index 4e0be2e15..734589ca2 100644 --- a/packages/mcp-cloudflare/package.json +++ b/packages/mcp-cloudflare/package.json @@ -35,7 +35,6 @@ "@cloudflare/workers-types": "catalog:", "@sentry/mcp-core": "workspace:*", "@sentry/mcp-server-mocks": "workspace:*", - "@sentry/mcp-server-tsconfig": "workspace:*", "@sentry/toolkit-core": "workspace:*", "@sentry/vite-plugin": "catalog:", "@tailwindcss/typography": "catalog:", diff --git a/packages/mcp-cloudflare/tsconfig.client.json b/packages/mcp-cloudflare/tsconfig.client.json index 0bfc9a086..5e76fc37f 100644 --- a/packages/mcp-cloudflare/tsconfig.client.json +++ b/packages/mcp-cloudflare/tsconfig.client.json @@ -1,11 +1,22 @@ { - "extends": "@sentry/mcp-server-tsconfig/tsconfig.vite.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { + "strict": true, + "target": "ES2020", + "lib": ["ES2020", "DOM", "DOM.Iterable"], + "types": ["vite/client"], + "jsx": "react-jsx", + "useDefineForClassFields": true, + "allowJs": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.client.tsbuildinfo", "paths": { - "@/*": [ - "./src/*" - ] + "@/*": ["./src/*"] }, "outDir": "dist", "rootDir": "src" diff --git a/packages/mcp-cloudflare/tsconfig.node.json b/packages/mcp-cloudflare/tsconfig.node.json index bdadf3ce9..2a1294c66 100644 --- a/packages/mcp-cloudflare/tsconfig.node.json +++ b/packages/mcp-cloudflare/tsconfig.node.json @@ -1,6 +1,15 @@ { - "extends": "@sentry/mcp-server-tsconfig/tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { + "strict": true, + "lib": ["ES2023", "ES2024.String"], + "allowJs": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo", "outDir": "dist", "rootDir": "" diff --git a/packages/mcp-core/package.json b/packages/mcp-core/package.json index b43b0b86c..75ceef5f9 100644 --- a/packages/mcp-core/package.json +++ b/packages/mcp-core/package.json @@ -169,7 +169,6 @@ "@ai-sdk/provider-utils": "^4.0.11", "@modelcontextprotocol/sdk": "catalog:", "@sentry/mcp-server-mocks": "workspace:*", - "@sentry/mcp-server-tsconfig": "workspace:*", "msw": "catalog:", "tiktoken": "^1.0.18", "yaml": "^2.8.3" diff --git a/packages/mcp-core/tsconfig.json b/packages/mcp-core/tsconfig.json index d4fe4fe1a..522f59657 100644 --- a/packages/mcp-core/tsconfig.json +++ b/packages/mcp-core/tsconfig.json @@ -1,6 +1,15 @@ { - "extends": "@sentry/mcp-server-tsconfig/tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { + "strict": true, + "lib": ["ES2023", "ES2024.String"], + "allowJs": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.tsbuildinfo", "outDir": "dist", "rootDir": "src" diff --git a/packages/mcp-server-evals/package.json b/packages/mcp-server-evals/package.json index 995069575..b83253c3d 100644 --- a/packages/mcp-server-evals/package.json +++ b/packages/mcp-server-evals/package.json @@ -19,7 +19,6 @@ "@ai-sdk/openai": "catalog:", "@sentry/mcp-core": "workspace:*", "@sentry/mcp-server-mocks": "workspace:*", - "@sentry/mcp-server-tsconfig": "workspace:*", "ai": "catalog:", "dotenv": "catalog:", "msw": "catalog:", diff --git a/packages/mcp-server-evals/tsconfig.json b/packages/mcp-server-evals/tsconfig.json index d4fe4fe1a..522f59657 100644 --- a/packages/mcp-server-evals/tsconfig.json +++ b/packages/mcp-server-evals/tsconfig.json @@ -1,6 +1,15 @@ { - "extends": "@sentry/mcp-server-tsconfig/tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { + "strict": true, + "lib": ["ES2023", "ES2024.String"], + "allowJs": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.tsbuildinfo", "outDir": "dist", "rootDir": "src" diff --git a/packages/mcp-server-mocks/package.json b/packages/mcp-server-mocks/package.json index f55462983..755ddf7ab 100644 --- a/packages/mcp-server-mocks/package.json +++ b/packages/mcp-server-mocks/package.json @@ -26,7 +26,6 @@ "dev": "tsdown -w" }, "devDependencies": { - "@sentry/mcp-server-tsconfig": "workspace:*", "tsdown": "catalog:" }, "dependencies": { diff --git a/packages/mcp-server-mocks/tsconfig.json b/packages/mcp-server-mocks/tsconfig.json index d4fe4fe1a..522f59657 100644 --- a/packages/mcp-server-mocks/tsconfig.json +++ b/packages/mcp-server-mocks/tsconfig.json @@ -1,6 +1,15 @@ { - "extends": "@sentry/mcp-server-tsconfig/tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { + "strict": true, + "lib": ["ES2023", "ES2024.String"], + "allowJs": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.tsbuildinfo", "outDir": "dist", "rootDir": "src" diff --git a/packages/mcp-server-tsconfig/package.json b/packages/mcp-server-tsconfig/package.json deleted file mode 100644 index a69973b48..000000000 --- a/packages/mcp-server-tsconfig/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "@sentry/mcp-server-tsconfig", - "version": "0.42.0", - "private": true, - "files": [ - "tsconfig.base.json", - "tsconfig.vite.json" - ] -} diff --git a/packages/mcp-server-tsconfig/tsconfig.base.json b/packages/mcp-server-tsconfig/tsconfig.base.json deleted file mode 100644 index 96f158583..000000000 --- a/packages/mcp-server-tsconfig/tsconfig.base.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "display": "Default", - "compilerOptions": { - "target": "ES2022", - "lib": ["ES2023", "ES2024.String"], - "module": "ESNext", - "preserveWatchOutput": true, - - /* Bundler mode */ - "moduleResolution": "Bundler", - "esModuleInterop": true, - "skipLibCheck": true, - "allowImportingTsExtensions": false, - "resolveJsonModule": true, - "isolatedModules": true, - "moduleDetection": "force", - "noEmit": false, - - /* Linting */ - "strict": true, - "noUnusedLocals": false, - "noUnusedParameters": false, - "noFallthroughCasesInSwitch": true, - "noUncheckedSideEffectImports": true, - "forceConsistentCasingInFileNames": true, - - /* Basic Options */ - "sourceMap": true, - "composite": false, - "incremental": true, - "declaration": true, - "declarationMap": true, - "allowJs": true - }, - "include": [], - "exclude": ["node_modules"] -} diff --git a/packages/mcp-server-tsconfig/tsconfig.vite.json b/packages/mcp-server-tsconfig/tsconfig.vite.json deleted file mode 100644 index b7a7ff306..000000000 --- a/packages/mcp-server-tsconfig/tsconfig.vite.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "display": "Vite (React) Library", - "extends": "./tsconfig.base.json", - "compilerOptions": { - "jsx": "react-jsx", - "target": "ES2020", - "lib": ["ES2020", "DOM", "DOM.Iterable"], - "useDefineForClassFields": true, - "module": "ESNext", - "types": ["vite/client"] - } -} diff --git a/packages/mcp-test-client/tsconfig.json b/packages/mcp-test-client/tsconfig.json index 4c1f2efaf..9f0825197 100644 --- a/packages/mcp-test-client/tsconfig.json +++ b/packages/mcp-test-client/tsconfig.json @@ -1,9 +1,18 @@ { - "extends": "../mcp-server-tsconfig/tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { + "strict": true, + "lib": ["ES2023", "ES2024.String"], + "allowJs": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, "outDir": "./dist", "rootDir": "./src" }, "include": ["src/**/*"], "exclude": ["node_modules", "dist", "**/*.test.ts"] -} \ No newline at end of file +} diff --git a/packages/toolkit-core/tsconfig.json b/packages/toolkit-core/tsconfig.json index 9fc6f4c61..7495e3bd8 100644 --- a/packages/toolkit-core/tsconfig.json +++ b/packages/toolkit-core/tsconfig.json @@ -1,12 +1,9 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "ES2022", - "module": "ESNext", - "moduleResolution": "Bundler", "strict": true, "noUncheckedIndexedAccess": true, - "noEmit": true, - "skipLibCheck": true + "noEmit": true }, "include": ["src/**/*.ts"] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a5c12c315..ca34a7f54 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -363,9 +363,6 @@ importers: '@cloudflare/workers-types': specifier: 'catalog:' version: 4.20260405.1 - '@sentry/mcp-server-tsconfig': - specifier: workspace:* - version: link:../../packages/mcp-server-tsconfig typescript: specifier: 'catalog:' version: 5.9.3 @@ -767,9 +764,6 @@ importers: '@sentry/mcp-server-mocks': specifier: workspace:* version: link:../mcp-server-mocks - '@sentry/mcp-server-tsconfig': - specifier: workspace:* - version: link:../mcp-server-tsconfig '@sentry/toolkit-core': specifier: workspace:* version: link:../toolkit-core @@ -876,9 +870,6 @@ importers: '@sentry/mcp-server-mocks': specifier: workspace:* version: link:../mcp-server-mocks - '@sentry/mcp-server-tsconfig': - specifier: workspace:* - version: link:../mcp-server-tsconfig msw: specifier: 'catalog:' version: 2.10.2(@types/node@24.13.5)(typescript@5.9.3) @@ -909,9 +900,6 @@ importers: '@sentry/mcp-server-mocks': specifier: workspace:* version: link:../mcp-server-mocks - '@sentry/mcp-server-tsconfig': - specifier: workspace:* - version: link:../mcp-server-tsconfig ai: specifier: 'catalog:' version: 6.0.64(zod@4.6.7) @@ -944,14 +932,10 @@ importers: specifier: 'catalog:' version: 2.10.2(@types/node@24.13.5)(typescript@5.9.3) devDependencies: - '@sentry/mcp-server-tsconfig': - specifier: workspace:* - version: link:../mcp-server-tsconfig tsdown: specifier: 'catalog:' version: 0.12.9(typescript@5.9.3) - packages/mcp-server-tsconfig: {} packages/mcp-test-client: dependencies: diff --git a/tsconfig.base.json b/tsconfig.base.json new file mode 100644 index 000000000..bf775b69a --- /dev/null +++ b/tsconfig.base.json @@ -0,0 +1,14 @@ +{ + "$schema": "https://json.schemastore.org/tsconfig", + "compilerOptions": { + "target": "ES2022", + "module": "ESNext", + "moduleResolution": "Bundler", + "moduleDetection": "force", + "isolatedModules": true, + "esModuleInterop": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true + } +} From d1e96fbb554750ac43e3c2e5ea845d4819ef75b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josh=20Goldberg=20=E2=9C=A8?= Date: Fri, 13 Nov 2026 11:08:51 -0500 Subject: [PATCH 2/2] fix(tsconfig): Keep the codemod's tsconfig standalone for jssg Co-Authored-By: Claude Opus 5.5 --- packages/codemod-cli3to4/tsconfig.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/codemod-cli3to4/tsconfig.json b/packages/codemod-cli3to4/tsconfig.json index 123ee5921..d4322062b 100644 --- a/packages/codemod-cli3to4/tsconfig.json +++ b/packages/codemod-cli3to4/tsconfig.json @@ -1,8 +1,7 @@ { - "extends": "../../tsconfig.base.json", + // jssg can't resolve an `extends` outside this package, so this doesn't extend the shared base. "compilerOptions": { - "strict": true, - "target": "ESNext", + "skipLibCheck": true, "module": "NodeNext", "moduleResolution": "NodeNext", "types": ["@codemod.com/jssg-types"], @@ -10,6 +9,8 @@ "noEmit": true, "verbatimModuleSyntax": true, "erasableSyntaxOnly": true, + "strict": true, + "strictNullChecks": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, "noUncheckedIndexedAccess": true