From f88da6c66d578f11960a1301e72ffdc4a59dd78b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Lorber?= Date: Fri, 19 Apr 2024 21:03:32 +0200 Subject: [PATCH] refactor: extract base TS client config + upgrade TS + refactor TS setup (#10065) --- .eslintrc.js | 2 +- .github/workflows/tests-e2e.yml | 4 +- .github/workflows/tests-windows.yml | 2 +- .github/workflows/tests.yml | 2 +- __tests__/validate-tsconfig.test.ts | 53 +++++++++---------- .../create-docusaurus/tsconfig.build.json | 4 +- packages/create-docusaurus/tsconfig.json | 2 +- .../docusaurus-cssnano-preset/tsconfig.json | 4 +- packages/docusaurus-logger/tsconfig.json | 4 +- packages/docusaurus-mdx-loader/tsconfig.json | 4 +- .../tsconfig.json | 4 +- .../tsconfig.client.json | 12 ++--- .../tsconfig.json | 4 +- .../tsconfig.client.json | 12 ++--- .../tsconfig.json | 4 +- .../tsconfig.json | 4 +- .../tsconfig.client.json | 12 ++--- .../docusaurus-plugin-debug/tsconfig.json | 4 +- .../tsconfig.client.json | 12 ++--- .../tsconfig.json | 4 +- .../tsconfig.client.json | 12 ++--- .../tsconfig.json | 4 +- .../tsconfig.client.json | 12 ++--- .../tsconfig.json | 4 +- .../tsconfig.client.json | 12 ++--- .../tsconfig.json | 4 +- .../tsconfig.client.json | 10 +--- packages/docusaurus-plugin-pwa/tsconfig.json | 4 +- .../tsconfig.worker.json | 4 +- .../docusaurus-plugin-sitemap/tsconfig.json | 4 +- .../tsconfig.client.json | 12 ++--- .../tsconfig.json | 4 +- .../docusaurus-preset-classic/tsconfig.json | 4 +- .../tsconfig.json | 4 +- .../tsconfig.client.json | 10 +--- .../docusaurus-theme-classic/tsconfig.json | 4 +- .../docusaurus-theme-common/tsconfig.json | 15 ++---- .../tsconfig.client.json | 10 +--- .../tsconfig.json | 4 +- .../tsconfig.client.json | 10 +--- .../docusaurus-theme-mermaid/tsconfig.json | 4 +- .../tsconfig.client.json | 10 +--- .../tsconfig.json | 4 +- .../tsconfig.build.json | 4 +- .../tsconfig.json | 2 +- .../docusaurus-utils-common/tsconfig.json | 4 +- .../docusaurus-utils-validation/tsconfig.json | 4 +- packages/docusaurus-utils/tsconfig.json | 4 +- packages/docusaurus/tsconfig.client.json | 12 ++--- packages/docusaurus/tsconfig.json | 2 +- packages/docusaurus/tsconfig.server.json | 4 +- packages/eslint-plugin/tsconfig.json | 4 +- packages/lqip-loader/tsconfig.json | 4 +- packages/stylelint-copyright/tsconfig.json | 4 +- tsconfig.base.client.json | 11 ++++ tsconfig.json => tsconfig.base.json | 0 56 files changed, 149 insertions(+), 228 deletions(-) create mode 100644 tsconfig.base.client.json rename tsconfig.json => tsconfig.base.json (100%) diff --git a/.eslintrc.js b/.eslintrc.js index 3b67b0030944..9aefce002eca 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -32,7 +32,7 @@ module.exports = { parser: '@typescript-eslint/parser', parserOptions: { // tsconfigRootDir: __dirname, - // project: ['./tsconfig.json', './website/tsconfig.json'], + // project: ['./tsconfig.base.json', './website/tsconfig.base.json'], }, globals: { JSX: true, diff --git a/.github/workflows/tests-e2e.yml b/.github/workflows/tests-e2e.yml index de5f5134ea3d..b98cb3270ba6 100644 --- a/.github/workflows/tests-e2e.yml +++ b/.github/workflows/tests-e2e.yml @@ -10,7 +10,7 @@ on: - yarn.lock - jest.config.mjs - packages/** - - tsconfig.json + - tsconfig.*.json pull_request: branches: - main @@ -20,7 +20,7 @@ on: - yarn.lock - jest.config.mjs - packages/** - - tsconfig.json + - tsconfig.*.json - admin/verdaccio.yaml - .github/workflows/tests-e2e.yml diff --git a/.github/workflows/tests-windows.yml b/.github/workflows/tests-windows.yml index 0cb9a15b6c74..c280e4fd9608 100644 --- a/.github/workflows/tests-windows.yml +++ b/.github/workflows/tests-windows.yml @@ -10,7 +10,7 @@ on: - yarn.lock - jest.config.mjs - packages/** - - tsconfig.json + - tsconfig.*.json concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 16d9e168a710..ae170e8b25d7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ on: - yarn.lock - jest.config.mjs - packages/** - - tsconfig.json + - tsconfig.*.json concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} diff --git a/__tests__/validate-tsconfig.test.ts b/__tests__/validate-tsconfig.test.ts index 8038a04ae824..c5dc5749ed3e 100644 --- a/__tests__/validate-tsconfig.test.ts +++ b/__tests__/validate-tsconfig.test.ts @@ -31,38 +31,37 @@ async function getTsconfigFiles(): Promise { } const tsconfigSchema = Joi.object({ - extends: '../../tsconfig.json', - compilerOptions: Joi.alternatives().conditional( - Joi.object({noEmit: true}).unknown(), - { - then: Joi.object({ - noEmit: Joi.valid(true).required(), - incremental: Joi.forbidden(), - tsBuildInfoFile: Joi.forbidden(), - outDir: Joi.forbidden(), - }).unknown(), - otherwise: Joi.object({ - noEmit: Joi.valid(false).required(), - incremental: Joi.valid(true).required(), - rootDir: Joi.valid('src').required(), - outDir: Joi.valid('lib').required(), - }).unknown(), - }, + extends: Joi.valid( + '../../tsconfig.base.json', + '../../tsconfig.base.client.json', ), + compilerOptions: Joi.object({ + rootDir: Joi.valid('src').required(), + outDir: Joi.valid('lib').required(), + tsBuildInfoFile: Joi.valid( + 'lib/.tsbuildinfo', + 'lib/.tsbuildinfo-client', + 'lib/.tsbuildinfo-worker', + ), + }).unknown(), }).unknown(); describe('tsconfig files', () => { it('contain all required fields', async () => { const tsconfigFiles = await getTsconfigFiles(); - tsconfigFiles.forEach((file) => { - try { - Joi.attempt(file.content, tsconfigSchema); - } catch (e) { - ( - e as Error - ).message += `\n${file.file} does not match the required schema.`; - throw e; - } - }); + + tsconfigFiles + // Ignore noEmit configs + .filter((file) => !(file.content.compilerOptions!.noEmit === true)) + .forEach((file) => { + try { + Joi.attempt(file.content, tsconfigSchema); + } catch (e) { + ( + e as Error + ).message += `\n${file.file} does not match the required schema.`; + throw e; + } + }); }); }); diff --git a/packages/create-docusaurus/tsconfig.build.json b/packages/create-docusaurus/tsconfig.build.json index 36377cdd0cbe..a95d8eb4c1fd 100644 --- a/packages/create-docusaurus/tsconfig.build.json +++ b/packages/create-docusaurus/tsconfig.build.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "composite": true, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/create-docusaurus/tsconfig.json b/packages/create-docusaurus/tsconfig.json index 13e35c5a957c..fd08e5ac9775 100644 --- a/packages/create-docusaurus/tsconfig.json +++ b/packages/create-docusaurus/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "references": [{"path": "./tsconfig.build.json"}], "compilerOptions": { "noEmit": true, diff --git a/packages/docusaurus-cssnano-preset/tsconfig.json b/packages/docusaurus-cssnano-preset/tsconfig.json index e16d5c2c5d33..0f463da3d702 100644 --- a/packages/docusaurus-cssnano-preset/tsconfig.json +++ b/packages/docusaurus-cssnano-preset/tsconfig.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-logger/tsconfig.json b/packages/docusaurus-logger/tsconfig.json index 69bd9341b47e..6a904aac6f51 100644 --- a/packages/docusaurus-logger/tsconfig.json +++ b/packages/docusaurus-logger/tsconfig.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "sourceMap": true, "declarationMap": true, "rootDir": "src", diff --git a/packages/docusaurus-mdx-loader/tsconfig.json b/packages/docusaurus-mdx-loader/tsconfig.json index 670db9ce9168..8708abf63c45 100644 --- a/packages/docusaurus-mdx-loader/tsconfig.json +++ b/packages/docusaurus-mdx-loader/tsconfig.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "sourceMap": true, "declarationMap": true, "rootDir": "src", diff --git a/packages/docusaurus-plugin-client-redirects/tsconfig.json b/packages/docusaurus-plugin-client-redirects/tsconfig.json index e16d5c2c5d33..0f463da3d702 100644 --- a/packages/docusaurus-plugin-client-redirects/tsconfig.json +++ b/packages/docusaurus-plugin-client-redirects/tsconfig.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-plugin-content-blog/tsconfig.client.json b/packages/docusaurus-plugin-content-blog/tsconfig.client.json index 5d06aa818c96..5e2b6e245224 100644 --- a/packages/docusaurus-plugin-content-blog/tsconfig.client.json +++ b/packages/docusaurus-plugin-content-blog/tsconfig.client.json @@ -1,15 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.client.json", "compilerOptions": { - "noEmit": false, - "composite": true, - "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo-client", - "moduleResolution": "bundler", - "module": "esnext", - "target": "esnext", "rootDir": "src", - "outDir": "lib" + "outDir": "lib", + "tsBuildInfoFile": "lib/.tsbuildinfo-client" }, "include": ["src/client", "src/*.d.ts"], "exclude": ["**/__tests__/**"] diff --git a/packages/docusaurus-plugin-content-blog/tsconfig.json b/packages/docusaurus-plugin-content-blog/tsconfig.json index 3936df64b7e4..fd1428b0b32c 100644 --- a/packages/docusaurus-plugin-content-blog/tsconfig.json +++ b/packages/docusaurus-plugin-content-blog/tsconfig.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "references": [{"path": "./tsconfig.client.json"}], "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-plugin-content-docs/tsconfig.client.json b/packages/docusaurus-plugin-content-docs/tsconfig.client.json index 5d06aa818c96..5e2b6e245224 100644 --- a/packages/docusaurus-plugin-content-docs/tsconfig.client.json +++ b/packages/docusaurus-plugin-content-docs/tsconfig.client.json @@ -1,15 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.client.json", "compilerOptions": { - "noEmit": false, - "composite": true, - "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo-client", - "moduleResolution": "bundler", - "module": "esnext", - "target": "esnext", "rootDir": "src", - "outDir": "lib" + "outDir": "lib", + "tsBuildInfoFile": "lib/.tsbuildinfo-client" }, "include": ["src/client", "src/*.d.ts"], "exclude": ["**/__tests__/**"] diff --git a/packages/docusaurus-plugin-content-docs/tsconfig.json b/packages/docusaurus-plugin-content-docs/tsconfig.json index 3936df64b7e4..fd1428b0b32c 100644 --- a/packages/docusaurus-plugin-content-docs/tsconfig.json +++ b/packages/docusaurus-plugin-content-docs/tsconfig.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "references": [{"path": "./tsconfig.client.json"}], "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-plugin-content-pages/tsconfig.json b/packages/docusaurus-plugin-content-pages/tsconfig.json index e16d5c2c5d33..0f463da3d702 100644 --- a/packages/docusaurus-plugin-content-pages/tsconfig.json +++ b/packages/docusaurus-plugin-content-pages/tsconfig.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-plugin-debug/tsconfig.client.json b/packages/docusaurus-plugin-debug/tsconfig.client.json index e69d347194cc..c411568a6d43 100644 --- a/packages/docusaurus-plugin-debug/tsconfig.client.json +++ b/packages/docusaurus-plugin-debug/tsconfig.client.json @@ -1,15 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.client.json", "compilerOptions": { - "noEmit": false, - "composite": true, - "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo-client", - "moduleResolution": "bundler", - "module": "esnext", - "target": "esnext", "rootDir": "src", - "outDir": "lib" + "outDir": "lib", + "tsBuildInfoFile": "lib/.tsbuildinfo-client" }, "include": ["src/theme", "src/*.d.ts"], "exclude": ["**/__tests__/**"] diff --git a/packages/docusaurus-plugin-debug/tsconfig.json b/packages/docusaurus-plugin-debug/tsconfig.json index 18b9536626ad..65bf6a5b9e1a 100644 --- a/packages/docusaurus-plugin-debug/tsconfig.json +++ b/packages/docusaurus-plugin-debug/tsconfig.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "references": [{"path": "./tsconfig.client.json"}], "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-plugin-google-analytics/tsconfig.client.json b/packages/docusaurus-plugin-google-analytics/tsconfig.client.json index 7cf373d92f92..d9c0e68fff3a 100644 --- a/packages/docusaurus-plugin-google-analytics/tsconfig.client.json +++ b/packages/docusaurus-plugin-google-analytics/tsconfig.client.json @@ -1,15 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.client.json", "compilerOptions": { - "noEmit": false, - "composite": true, - "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo-client", - "moduleResolution": "bundler", - "module": "esnext", - "target": "esnext", "rootDir": "src", - "outDir": "lib" + "outDir": "lib", + "tsBuildInfoFile": "lib/.tsbuildinfo-client" }, "include": ["src/analytics.ts", "src/*.d.ts"], "exclude": ["**/__tests__/**"] diff --git a/packages/docusaurus-plugin-google-analytics/tsconfig.json b/packages/docusaurus-plugin-google-analytics/tsconfig.json index c7fda37effc4..b3ccd5c0696a 100644 --- a/packages/docusaurus-plugin-google-analytics/tsconfig.json +++ b/packages/docusaurus-plugin-google-analytics/tsconfig.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "references": [{"path": "./tsconfig.client.json"}], "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-plugin-google-gtag/tsconfig.client.json b/packages/docusaurus-plugin-google-gtag/tsconfig.client.json index e31b80c88b1d..9d3fd42b756d 100644 --- a/packages/docusaurus-plugin-google-gtag/tsconfig.client.json +++ b/packages/docusaurus-plugin-google-gtag/tsconfig.client.json @@ -1,15 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.client.json", "compilerOptions": { - "noEmit": false, - "composite": true, - "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo-client", - "moduleResolution": "bundler", - "module": "esnext", - "target": "esnext", "rootDir": "src", - "outDir": "lib" + "outDir": "lib", + "tsBuildInfoFile": "lib/.tsbuildinfo-client" }, "include": ["src/gtag.ts", "src/*.d.ts"], "exclude": ["**/__tests__/**"] diff --git a/packages/docusaurus-plugin-google-gtag/tsconfig.json b/packages/docusaurus-plugin-google-gtag/tsconfig.json index fe656511f355..d71de8f76746 100644 --- a/packages/docusaurus-plugin-google-gtag/tsconfig.json +++ b/packages/docusaurus-plugin-google-gtag/tsconfig.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "references": [{"path": "./tsconfig.client.json"}], "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-plugin-google-tag-manager/tsconfig.client.json b/packages/docusaurus-plugin-google-tag-manager/tsconfig.client.json index 3480c8bca6e4..ba742c0016b9 100644 --- a/packages/docusaurus-plugin-google-tag-manager/tsconfig.client.json +++ b/packages/docusaurus-plugin-google-tag-manager/tsconfig.client.json @@ -1,15 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.client.json", "compilerOptions": { - "noEmit": false, - "composite": true, - "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo-client", - "moduleResolution": "bundler", - "module": "esnext", - "target": "esnext", "rootDir": "src", - "outDir": "lib" + "outDir": "lib", + "tsBuildInfoFile": "lib/.tsbuildinfo-client" }, "include": ["src/*.d.ts"], "exclude": ["**/__tests__/**"] diff --git a/packages/docusaurus-plugin-google-tag-manager/tsconfig.json b/packages/docusaurus-plugin-google-tag-manager/tsconfig.json index 1e49538f9ea2..b10e2ae30234 100644 --- a/packages/docusaurus-plugin-google-tag-manager/tsconfig.json +++ b/packages/docusaurus-plugin-google-tag-manager/tsconfig.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "references": [{"path": "./tsconfig.client.json"}], "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-plugin-ideal-image/tsconfig.client.json b/packages/docusaurus-plugin-ideal-image/tsconfig.client.json index e69d347194cc..c411568a6d43 100644 --- a/packages/docusaurus-plugin-ideal-image/tsconfig.client.json +++ b/packages/docusaurus-plugin-ideal-image/tsconfig.client.json @@ -1,15 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.client.json", "compilerOptions": { - "noEmit": false, - "composite": true, - "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo-client", - "moduleResolution": "bundler", - "module": "esnext", - "target": "esnext", "rootDir": "src", - "outDir": "lib" + "outDir": "lib", + "tsBuildInfoFile": "lib/.tsbuildinfo-client" }, "include": ["src/theme", "src/*.d.ts"], "exclude": ["**/__tests__/**"] diff --git a/packages/docusaurus-plugin-ideal-image/tsconfig.json b/packages/docusaurus-plugin-ideal-image/tsconfig.json index 18b9536626ad..65bf6a5b9e1a 100644 --- a/packages/docusaurus-plugin-ideal-image/tsconfig.json +++ b/packages/docusaurus-plugin-ideal-image/tsconfig.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "references": [{"path": "./tsconfig.client.json"}], "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-plugin-pwa/tsconfig.client.json b/packages/docusaurus-plugin-pwa/tsconfig.client.json index 52fd7b2b3398..c0825ea0820f 100644 --- a/packages/docusaurus-plugin-pwa/tsconfig.client.json +++ b/packages/docusaurus-plugin-pwa/tsconfig.client.json @@ -1,15 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.client.json", "compilerOptions": { - "noEmit": false, - "composite": true, - "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo-client", "rootDir": "src", "outDir": "lib", - "moduleResolution": "bundler", - "module": "esnext", - "target": "esnext" + "tsBuildInfoFile": "lib/.tsbuildinfo-client" }, "include": [ "src/theme/", diff --git a/packages/docusaurus-plugin-pwa/tsconfig.json b/packages/docusaurus-plugin-pwa/tsconfig.json index 0bef8e601656..555d8315d108 100644 --- a/packages/docusaurus-plugin-pwa/tsconfig.json +++ b/packages/docusaurus-plugin-pwa/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "references": [ {"path": "./tsconfig.client.json"}, {"path": "./tsconfig.worker.json"} @@ -7,7 +7,7 @@ "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-plugin-pwa/tsconfig.worker.json b/packages/docusaurus-plugin-pwa/tsconfig.worker.json index 7e3209535ad8..6316e841c235 100644 --- a/packages/docusaurus-plugin-pwa/tsconfig.worker.json +++ b/packages/docusaurus-plugin-pwa/tsconfig.worker.json @@ -1,11 +1,11 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "composite": true, "incremental": true, "lib": ["webworker", "esnext"], - "tsBuildInfoFile": "./lib/.tsbuildinfo-worker", + "tsBuildInfoFile": "lib/.tsbuildinfo-worker", "rootDir": "src", "outDir": "lib", "moduleResolution": "bundler", diff --git a/packages/docusaurus-plugin-sitemap/tsconfig.json b/packages/docusaurus-plugin-sitemap/tsconfig.json index e16d5c2c5d33..0f463da3d702 100644 --- a/packages/docusaurus-plugin-sitemap/tsconfig.json +++ b/packages/docusaurus-plugin-sitemap/tsconfig.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-plugin-vercel-analytics/tsconfig.client.json b/packages/docusaurus-plugin-vercel-analytics/tsconfig.client.json index e77a5fd904ff..09a0864ae1fa 100644 --- a/packages/docusaurus-plugin-vercel-analytics/tsconfig.client.json +++ b/packages/docusaurus-plugin-vercel-analytics/tsconfig.client.json @@ -1,15 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.client.json", "compilerOptions": { - "noEmit": false, - "composite": true, - "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo-client", - "moduleResolution": "bundler", - "module": "esnext", - "target": "esnext", "rootDir": "src", - "outDir": "lib" + "outDir": "lib", + "tsBuildInfoFile": "lib/.tsbuildinfo-client" }, "include": ["src/analytics.ts", "src/options.ts", "src/*.d.ts"], "exclude": ["**/__tests__/**"] diff --git a/packages/docusaurus-plugin-vercel-analytics/tsconfig.json b/packages/docusaurus-plugin-vercel-analytics/tsconfig.json index c7fda37effc4..b3ccd5c0696a 100644 --- a/packages/docusaurus-plugin-vercel-analytics/tsconfig.json +++ b/packages/docusaurus-plugin-vercel-analytics/tsconfig.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "references": [{"path": "./tsconfig.client.json"}], "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-preset-classic/tsconfig.json b/packages/docusaurus-preset-classic/tsconfig.json index e16d5c2c5d33..0f463da3d702 100644 --- a/packages/docusaurus-preset-classic/tsconfig.json +++ b/packages/docusaurus-preset-classic/tsconfig.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-remark-plugin-npm2yarn/tsconfig.json b/packages/docusaurus-remark-plugin-npm2yarn/tsconfig.json index 69bd9341b47e..6a904aac6f51 100644 --- a/packages/docusaurus-remark-plugin-npm2yarn/tsconfig.json +++ b/packages/docusaurus-remark-plugin-npm2yarn/tsconfig.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "sourceMap": true, "declarationMap": true, "rootDir": "src", diff --git a/packages/docusaurus-theme-classic/tsconfig.client.json b/packages/docusaurus-theme-classic/tsconfig.client.json index babbfc92e1cf..c034d3826b6c 100644 --- a/packages/docusaurus-theme-classic/tsconfig.client.json +++ b/packages/docusaurus-theme-classic/tsconfig.client.json @@ -1,15 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.client.json", "compilerOptions": { - "noEmit": false, - "composite": true, - "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo-client", "rootDir": "src", "outDir": "lib", - "moduleResolution": "bundler", - "module": "esnext", - "target": "esnext" + "tsBuildInfoFile": "lib/.tsbuildinfo-client" }, "include": [ "src/nprogress.ts", diff --git a/packages/docusaurus-theme-classic/tsconfig.json b/packages/docusaurus-theme-classic/tsconfig.json index 8aa1157eefbc..1ede3dd6e17d 100644 --- a/packages/docusaurus-theme-classic/tsconfig.json +++ b/packages/docusaurus-theme-classic/tsconfig.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "references": [{"path": "./tsconfig.client.json"}], "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-theme-common/tsconfig.json b/packages/docusaurus-theme-common/tsconfig.json index c3110df9497f..226848d2d64a 100644 --- a/packages/docusaurus-theme-common/tsconfig.json +++ b/packages/docusaurus-theme-common/tsconfig.json @@ -1,16 +1,11 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.client.json", "compilerOptions": { - "noEmit": false, - "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", - "moduleResolution": "bundler", - "module": "esnext", - "target": "esnext", - "sourceMap": true, - "declarationMap": true, "rootDir": "src", - "outDir": "lib" + "outDir": "lib", + "tsBuildInfoFile": "lib/.tsbuildinfo-client", + "sourceMap": true, + "declarationMap": true }, "include": ["src"], "exclude": ["**/__tests__/**"] diff --git a/packages/docusaurus-theme-live-codeblock/tsconfig.client.json b/packages/docusaurus-theme-live-codeblock/tsconfig.client.json index 361e08ae7d3d..20d299c51897 100644 --- a/packages/docusaurus-theme-live-codeblock/tsconfig.client.json +++ b/packages/docusaurus-theme-live-codeblock/tsconfig.client.json @@ -1,15 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.client.json", "compilerOptions": { - "noEmit": false, - "composite": true, - "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo-client", "rootDir": "src", "outDir": "lib", - "moduleResolution": "bundler", - "module": "esnext", - "target": "esnext" + "tsBuildInfoFile": "lib/.tsbuildinfo-client" }, "include": ["src/theme", "src/*.d.ts", "src/custom-buble.ts"], "exclude": ["**/__tests__/**"] diff --git a/packages/docusaurus-theme-live-codeblock/tsconfig.json b/packages/docusaurus-theme-live-codeblock/tsconfig.json index a6dc07deeeee..fecfd3133ad3 100644 --- a/packages/docusaurus-theme-live-codeblock/tsconfig.json +++ b/packages/docusaurus-theme-live-codeblock/tsconfig.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "references": [{"path": "./tsconfig.client.json"}], "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-theme-mermaid/tsconfig.client.json b/packages/docusaurus-theme-mermaid/tsconfig.client.json index a8a71b6cad65..394b25d2a35e 100644 --- a/packages/docusaurus-theme-mermaid/tsconfig.client.json +++ b/packages/docusaurus-theme-mermaid/tsconfig.client.json @@ -1,15 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.client.json", "compilerOptions": { - "noEmit": false, - "composite": true, - "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo-client", "rootDir": "src", "outDir": "lib", - "moduleResolution": "bundler", - "module": "esnext", - "target": "esnext" + "tsBuildInfoFile": "lib/.tsbuildinfo-client" }, "include": ["src/client", "src/theme", "src/*.d.ts"], "exclude": ["**/__tests__/**"] diff --git a/packages/docusaurus-theme-mermaid/tsconfig.json b/packages/docusaurus-theme-mermaid/tsconfig.json index 4eb745d80ce7..7ce7f61f550f 100644 --- a/packages/docusaurus-theme-mermaid/tsconfig.json +++ b/packages/docusaurus-theme-mermaid/tsconfig.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "references": [{"path": "./tsconfig.client.json"}], "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-theme-search-algolia/tsconfig.client.json b/packages/docusaurus-theme-search-algolia/tsconfig.client.json index 46cf1129e28f..2d3e8ea69414 100644 --- a/packages/docusaurus-theme-search-algolia/tsconfig.client.json +++ b/packages/docusaurus-theme-search-algolia/tsconfig.client.json @@ -1,15 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.client.json", "compilerOptions": { - "noEmit": false, - "composite": true, - "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo-client", "rootDir": "src", "outDir": "lib", - "moduleResolution": "bundler", - "module": "esnext", - "target": "esnext" + "tsBuildInfoFile": "lib/.tsbuildinfo-client" }, "include": ["src/theme", "src/client", "src/*.d.ts"], "exclude": ["**/__tests__/**"] diff --git a/packages/docusaurus-theme-search-algolia/tsconfig.json b/packages/docusaurus-theme-search-algolia/tsconfig.json index 4eb745d80ce7..7ce7f61f550f 100644 --- a/packages/docusaurus-theme-search-algolia/tsconfig.json +++ b/packages/docusaurus-theme-search-algolia/tsconfig.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "references": [{"path": "./tsconfig.client.json"}], "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/docusaurus-theme-translations/tsconfig.build.json b/packages/docusaurus-theme-translations/tsconfig.build.json index 912de0a933a8..377da210d5da 100644 --- a/packages/docusaurus-theme-translations/tsconfig.build.json +++ b/packages/docusaurus-theme-translations/tsconfig.build.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "composite": true, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "sourceMap": true, "declarationMap": true, "rootDir": "src", diff --git a/packages/docusaurus-theme-translations/tsconfig.json b/packages/docusaurus-theme-translations/tsconfig.json index 6ba7dee96bcd..c0dddebdf608 100644 --- a/packages/docusaurus-theme-translations/tsconfig.json +++ b/packages/docusaurus-theme-translations/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "references": [{"path": "./tsconfig.build.json"}], "compilerOptions": { "noEmit": true, diff --git a/packages/docusaurus-utils-common/tsconfig.json b/packages/docusaurus-utils-common/tsconfig.json index 0e5365a3c1e8..6be28b4e8f78 100644 --- a/packages/docusaurus-utils-common/tsconfig.json +++ b/packages/docusaurus-utils-common/tsconfig.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "sourceMap": true, "declarationMap": true, "rootDir": "src", diff --git a/packages/docusaurus-utils-validation/tsconfig.json b/packages/docusaurus-utils-validation/tsconfig.json index 69bd9341b47e..6a904aac6f51 100644 --- a/packages/docusaurus-utils-validation/tsconfig.json +++ b/packages/docusaurus-utils-validation/tsconfig.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "sourceMap": true, "declarationMap": true, "rootDir": "src", diff --git a/packages/docusaurus-utils/tsconfig.json b/packages/docusaurus-utils/tsconfig.json index 69bd9341b47e..6a904aac6f51 100644 --- a/packages/docusaurus-utils/tsconfig.json +++ b/packages/docusaurus-utils/tsconfig.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "sourceMap": true, "declarationMap": true, "rootDir": "src", diff --git a/packages/docusaurus/tsconfig.client.json b/packages/docusaurus/tsconfig.client.json index 5d06aa818c96..5e2b6e245224 100644 --- a/packages/docusaurus/tsconfig.client.json +++ b/packages/docusaurus/tsconfig.client.json @@ -1,15 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.client.json", "compilerOptions": { - "noEmit": false, - "composite": true, - "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo-client", - "moduleResolution": "bundler", - "module": "esnext", - "target": "esnext", "rootDir": "src", - "outDir": "lib" + "outDir": "lib", + "tsBuildInfoFile": "lib/.tsbuildinfo-client" }, "include": ["src/client", "src/*.d.ts"], "exclude": ["**/__tests__/**"] diff --git a/packages/docusaurus/tsconfig.json b/packages/docusaurus/tsconfig.json index 80dfc91440a4..253a34db6ca4 100644 --- a/packages/docusaurus/tsconfig.json +++ b/packages/docusaurus/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "references": [ {"path": "./tsconfig.server.json"}, {"path": "./tsconfig.client.json"} diff --git a/packages/docusaurus/tsconfig.server.json b/packages/docusaurus/tsconfig.server.json index e26c376455c3..b55af5720ab9 100644 --- a/packages/docusaurus/tsconfig.server.json +++ b/packages/docusaurus/tsconfig.server.json @@ -1,10 +1,10 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "composite": true, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/eslint-plugin/tsconfig.json b/packages/eslint-plugin/tsconfig.json index e16d5c2c5d33..0f463da3d702 100644 --- a/packages/eslint-plugin/tsconfig.json +++ b/packages/eslint-plugin/tsconfig.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/lqip-loader/tsconfig.json b/packages/lqip-loader/tsconfig.json index e16d5c2c5d33..0f463da3d702 100644 --- a/packages/lqip-loader/tsconfig.json +++ b/packages/lqip-loader/tsconfig.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/packages/stylelint-copyright/tsconfig.json b/packages/stylelint-copyright/tsconfig.json index e16d5c2c5d33..0f463da3d702 100644 --- a/packages/stylelint-copyright/tsconfig.json +++ b/packages/stylelint-copyright/tsconfig.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "noEmit": false, "incremental": true, - "tsBuildInfoFile": "./lib/.tsbuildinfo", + "tsBuildInfoFile": "lib/.tsbuildinfo", "rootDir": "src", "outDir": "lib" }, diff --git a/tsconfig.base.client.json b/tsconfig.base.client.json new file mode 100644 index 000000000000..186c9e90df12 --- /dev/null +++ b/tsconfig.base.client.json @@ -0,0 +1,11 @@ +{ + "extends": "./tsconfig.base.json", + "compilerOptions": { + "noEmit": false, + "composite": true, + "incremental": true, + "moduleResolution": "bundler", + "module": "esnext", + "target": "esnext" + } +} diff --git a/tsconfig.json b/tsconfig.base.json similarity index 100% rename from tsconfig.json rename to tsconfig.base.json