diff --git a/jest.config.mjs b/jest.config.mjs
index 39c7f9c7c6..28ba5e66a6 100644
--- a/jest.config.mjs
+++ b/jest.config.mjs
@@ -43,7 +43,18 @@ export default {
     '/packages/docusaurus-utils/src/index.ts',
   ],
   transform: {
-    '^.+\\.[jt]sx?$': '@swc/jest',
+    '^.+\\.[jt]sx?$': [
+      '@swc/jest',
+      {
+        jsc: {
+          parser: {
+            syntax: 'typescript',
+            tsx: true,
+          },
+          target: 'es2020',
+        },
+      },
+    ],
   },
   errorOnDeprecated: true,
   reporters: ['default', 'github-actions'],
diff --git a/packages/create-docusaurus/.npmignore b/packages/create-docusaurus/.npmignore
index 1edc83766f..0bc0b32a62 100644
--- a/packages/create-docusaurus/.npmignore
+++ b/packages/create-docusaurus/.npmignore
@@ -1,5 +1,5 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 __tests__
 node_modules
 
diff --git a/packages/create-docusaurus/package.json b/packages/create-docusaurus/package.json
index 8c715fc339..583b6f0661 100755
--- a/packages/create-docusaurus/package.json
+++ b/packages/create-docusaurus/package.json
@@ -13,8 +13,8 @@
   },
   "scripts": {
     "create-docusaurus": "create-docusaurus",
-    "build": "tsc -p tsconfig.build.json",
-    "watch": "tsc -p tsconfig.build.json --watch"
+    "build": "tsc --build",
+    "watch": "tsc --watch"
   },
   "bin": "bin/index.js",
   "publishConfig": {
diff --git a/packages/create-docusaurus/tsconfig.build.json b/packages/create-docusaurus/tsconfig.build.json
index 41b40e7cf6..3262001f72 100644
--- a/packages/create-docusaurus/tsconfig.build.json
+++ b/packages/create-docusaurus/tsconfig.build.json
@@ -1,6 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "module": "es2020",
     "incremental": true,
     "tsBuildInfoFile": "./lib/.tsbuildinfo",
diff --git a/packages/create-docusaurus/tsconfig.json b/packages/create-docusaurus/tsconfig.json
index edb2c88e1d..1b8a3ef4ba 100644
--- a/packages/create-docusaurus/tsconfig.json
+++ b/packages/create-docusaurus/tsconfig.json
@@ -1,10 +1,11 @@
-// For editor typechecking; includes bin
 {
-  "extends": "./tsconfig.build.json",
+  "extends": "../../tsconfig.json",
+  "references": [{"path": "./tsconfig.build.json"}],
   "compilerOptions": {
     "noEmit": true,
     "allowJs": true,
+    "module": "esnext",
     "rootDir": "."
   },
-  "include": ["src", "bin"]
+  "include": ["bin"]
 }
diff --git a/packages/docusaurus-logger/.npmignore b/packages/docusaurus-logger/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-logger/.npmignore
+++ b/packages/docusaurus-logger/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-mdx-loader/.npmignore b/packages/docusaurus-mdx-loader/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-mdx-loader/.npmignore
+++ b/packages/docusaurus-mdx-loader/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-migrate/.npmignore b/packages/docusaurus-migrate/.npmignore
index ba8304029e..b3d2bb61f7 100644
--- a/packages/docusaurus-migrate/.npmignore
+++ b/packages/docusaurus-migrate/.npmignore
@@ -1,5 +1,5 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
 
diff --git a/packages/docusaurus-migrate/package.json b/packages/docusaurus-migrate/package.json
index e8ad7c2d91..ea7affc71c 100644
--- a/packages/docusaurus-migrate/package.json
+++ b/packages/docusaurus-migrate/package.json
@@ -7,8 +7,8 @@
     "node": ">=14"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.build.json",
-    "watch": "tsc -p tsconfig.build.json --watch"
+    "build": "tsc --build",
+    "watch": "tsc --watch"
   },
   "repository": {
     "type": "git",
diff --git a/packages/docusaurus-migrate/tsconfig.build.json b/packages/docusaurus-migrate/tsconfig.build.json
index 358fdb6f6e..89b76f2859 100644
--- a/packages/docusaurus-migrate/tsconfig.build.json
+++ b/packages/docusaurus-migrate/tsconfig.build.json
@@ -1,6 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "incremental": true,
     "tsBuildInfoFile": "./lib/.tsbuildinfo",
     "rootDir": "src",
diff --git a/packages/docusaurus-migrate/tsconfig.json b/packages/docusaurus-migrate/tsconfig.json
index 419de04867..c930032b73 100644
--- a/packages/docusaurus-migrate/tsconfig.json
+++ b/packages/docusaurus-migrate/tsconfig.json
@@ -1,11 +1,11 @@
-// For editor typechecking; includes bin
 {
-  "extends": "./tsconfig.build.json",
+  "extends": "../../tsconfig.json",
+  "references": [{"path": "./tsconfig.build.json"}],
   "compilerOptions": {
     "noEmit": true,
     "module": "esnext",
     "allowJs": true,
     "rootDir": "."
   },
-  "include": ["src", "bin"]
+  "include": ["bin"]
 }
diff --git a/packages/docusaurus-plugin-client-redirects/.npmignore b/packages/docusaurus-plugin-client-redirects/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-plugin-client-redirects/.npmignore
+++ b/packages/docusaurus-plugin-client-redirects/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-plugin-content-blog/.npmignore b/packages/docusaurus-plugin-content-blog/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-plugin-content-blog/.npmignore
+++ b/packages/docusaurus-plugin-content-blog/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-plugin-content-docs/.npmignore b/packages/docusaurus-plugin-content-docs/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-plugin-content-docs/.npmignore
+++ b/packages/docusaurus-plugin-content-docs/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-plugin-content-docs/package.json b/packages/docusaurus-plugin-content-docs/package.json
index 697fcf7224..c02fc60957 100644
--- a/packages/docusaurus-plugin-content-docs/package.json
+++ b/packages/docusaurus-plugin-content-docs/package.json
@@ -12,7 +12,7 @@
   },
   "types": "src/plugin-content-docs.d.ts",
   "scripts": {
-    "build": "tsc",
+    "build": "tsc --build",
     "watch": "tsc --watch"
   },
   "publishConfig": {
diff --git a/packages/docusaurus-plugin-content-docs/src/plugin-content-docs.d.ts b/packages/docusaurus-plugin-content-docs/src/plugin-content-docs.d.ts
index 412a08cdb0..1d7784c63f 100644
--- a/packages/docusaurus-plugin-content-docs/src/plugin-content-docs.d.ts
+++ b/packages/docusaurus-plugin-content-docs/src/plugin-content-docs.d.ts
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+/// <reference types="@docusaurus/module-type-aliases" />
+
 declare module '@docusaurus/plugin-content-docs' {
   import type {MDXOptions} from '@docusaurus/mdx-loader';
   import type {
diff --git a/packages/docusaurus-plugin-content-docs/src/types.ts b/packages/docusaurus-plugin-content-docs/src/types.ts
index df3579b856..cb4506b20d 100644
--- a/packages/docusaurus-plugin-content-docs/src/types.ts
+++ b/packages/docusaurus-plugin-content-docs/src/types.ts
@@ -5,8 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-/// <reference types="@docusaurus/module-type-aliases" />
-
 import type {BrokenMarkdownLink, Tag} from '@docusaurus/utils';
 import type {
   VersionMetadata,
diff --git a/packages/docusaurus-plugin-content-docs/tsconfig.client.json b/packages/docusaurus-plugin-content-docs/tsconfig.client.json
new file mode 100644
index 0000000000..018e125eb7
--- /dev/null
+++ b/packages/docusaurus-plugin-content-docs/tsconfig.client.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "composite": true,
+    "incremental": true,
+    "tsBuildInfoFile": "./lib/.tsbuildinfo-client",
+    "module": "esnext",
+    "target": "esnext",
+    "rootDir": "src",
+    "outDir": "lib"
+  },
+  "include": ["src/client", "src/*.d.ts"]
+}
diff --git a/packages/docusaurus-plugin-content-docs/tsconfig.json b/packages/docusaurus-plugin-content-docs/tsconfig.json
index f5902ba108..57f0111934 100644
--- a/packages/docusaurus-plugin-content-docs/tsconfig.json
+++ b/packages/docusaurus-plugin-content-docs/tsconfig.json
@@ -1,9 +1,13 @@
 {
   "extends": "../../tsconfig.json",
+  "references": [{"path": "./tsconfig.client.json"}],
   "compilerOptions": {
     "incremental": true,
     "tsBuildInfoFile": "./lib/.tsbuildinfo",
+    "module": "commonjs",
     "rootDir": "src",
     "outDir": "lib"
-  }
+  },
+  "include": ["src"],
+  "exclude": ["src/client", "**/__tests__/**"]
 }
diff --git a/packages/docusaurus-plugin-content-pages/.npmignore b/packages/docusaurus-plugin-content-pages/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-plugin-content-pages/.npmignore
+++ b/packages/docusaurus-plugin-content-pages/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-plugin-debug/.npmignore b/packages/docusaurus-plugin-debug/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-plugin-debug/.npmignore
+++ b/packages/docusaurus-plugin-debug/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-plugin-debug/package.json b/packages/docusaurus-plugin-debug/package.json
index 9d3f2fd58a..eb9ce3d41a 100644
--- a/packages/docusaurus-plugin-debug/package.json
+++ b/packages/docusaurus-plugin-debug/package.json
@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "types": "src/plugin-debug.d.ts",
   "scripts": {
-    "build": "tsc && node copyUntypedFiles.mjs",
+    "build": "tsc --build && node copyUntypedFiles.mjs && prettier --config ../../.prettierrc --write \"lib/theme/**/*.js\"",
     "watch": "node copyUntypedFiles.mjs && tsc --watch"
   },
   "publishConfig": {
diff --git a/packages/docusaurus-plugin-debug/tsconfig.client.json b/packages/docusaurus-plugin-debug/tsconfig.client.json
new file mode 100644
index 0000000000..836fc6391a
--- /dev/null
+++ b/packages/docusaurus-plugin-debug/tsconfig.client.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "composite": true,
+    "incremental": true,
+    "tsBuildInfoFile": "./lib/.tsbuildinfo-client",
+    "module": "esnext",
+    "target": "esnext",
+    "rootDir": "src",
+    "outDir": "lib"
+  },
+  "include": ["src/theme", "src/*.d.ts"]
+}
diff --git a/packages/docusaurus-plugin-debug/tsconfig.json b/packages/docusaurus-plugin-debug/tsconfig.json
index f5902ba108..f3146ecc75 100644
--- a/packages/docusaurus-plugin-debug/tsconfig.json
+++ b/packages/docusaurus-plugin-debug/tsconfig.json
@@ -1,9 +1,13 @@
 {
   "extends": "../../tsconfig.json",
+  "references": [{"path": "./tsconfig.client.json"}],
   "compilerOptions": {
     "incremental": true,
     "tsBuildInfoFile": "./lib/.tsbuildinfo",
+    "module": "commonjs",
     "rootDir": "src",
     "outDir": "lib"
-  }
+  },
+  "include": ["src"],
+  "exclude": ["src/theme"]
 }
diff --git a/packages/docusaurus-plugin-google-analytics/.npmignore b/packages/docusaurus-plugin-google-analytics/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-plugin-google-analytics/.npmignore
+++ b/packages/docusaurus-plugin-google-analytics/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-plugin-google-analytics/package.json b/packages/docusaurus-plugin-google-analytics/package.json
index 77f5c813de..99531da0ac 100644
--- a/packages/docusaurus-plugin-google-analytics/package.json
+++ b/packages/docusaurus-plugin-google-analytics/package.json
@@ -8,7 +8,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "tsc --build",
     "watch": "tsc --watch"
   },
   "repository": {
diff --git a/packages/docusaurus-plugin-google-analytics/tsconfig.client.json b/packages/docusaurus-plugin-google-analytics/tsconfig.client.json
new file mode 100644
index 0000000000..3e8fdb9a0b
--- /dev/null
+++ b/packages/docusaurus-plugin-google-analytics/tsconfig.client.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "composite": true,
+    "incremental": true,
+    "tsBuildInfoFile": "./lib/.tsbuildinfo-client",
+    "module": "esnext",
+    "target": "esnext",
+    "rootDir": "src",
+    "outDir": "lib"
+  },
+  "include": ["src/analytics.ts", "src/*.d.ts"]
+}
diff --git a/packages/docusaurus-plugin-google-analytics/tsconfig.json b/packages/docusaurus-plugin-google-analytics/tsconfig.json
index f5902ba108..9ca3659166 100644
--- a/packages/docusaurus-plugin-google-analytics/tsconfig.json
+++ b/packages/docusaurus-plugin-google-analytics/tsconfig.json
@@ -1,9 +1,13 @@
 {
   "extends": "../../tsconfig.json",
+  "references": [{"path": "./tsconfig.client.json"}],
   "compilerOptions": {
     "incremental": true,
     "tsBuildInfoFile": "./lib/.tsbuildinfo",
+    "module": "commonjs",
     "rootDir": "src",
     "outDir": "lib"
-  }
+  },
+  "include": ["src"],
+  "exclude": ["src/analytics.ts"]
 }
diff --git a/packages/docusaurus-plugin-google-gtag/.npmignore b/packages/docusaurus-plugin-google-gtag/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-plugin-google-gtag/.npmignore
+++ b/packages/docusaurus-plugin-google-gtag/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-plugin-google-gtag/package.json b/packages/docusaurus-plugin-google-gtag/package.json
index 854f6d2e87..169b2c962a 100644
--- a/packages/docusaurus-plugin-google-gtag/package.json
+++ b/packages/docusaurus-plugin-google-gtag/package.json
@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "build": "tsc",
+    "build": "tsc --build",
     "watch": "tsc --watch"
   },
   "publishConfig": {
diff --git a/packages/docusaurus-plugin-google-gtag/tsconfig.client.json b/packages/docusaurus-plugin-google-gtag/tsconfig.client.json
new file mode 100644
index 0000000000..b00cb51206
--- /dev/null
+++ b/packages/docusaurus-plugin-google-gtag/tsconfig.client.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "composite": true,
+    "incremental": true,
+    "tsBuildInfoFile": "./lib/.tsbuildinfo-client",
+    "module": "esnext",
+    "target": "esnext",
+    "rootDir": "src",
+    "outDir": "lib"
+  },
+  "include": ["src/gtag.ts", "src/options.ts", "src/*.d.ts"]
+}
diff --git a/packages/docusaurus-plugin-google-gtag/tsconfig.json b/packages/docusaurus-plugin-google-gtag/tsconfig.json
index f5902ba108..cad9a09f4e 100644
--- a/packages/docusaurus-plugin-google-gtag/tsconfig.json
+++ b/packages/docusaurus-plugin-google-gtag/tsconfig.json
@@ -1,9 +1,13 @@
 {
   "extends": "../../tsconfig.json",
+  "references": [{"path": "./tsconfig.client.json"}],
   "compilerOptions": {
     "incremental": true,
     "tsBuildInfoFile": "./lib/.tsbuildinfo",
+    "module": "commonjs",
     "rootDir": "src",
     "outDir": "lib"
-  }
+  },
+  "include": ["src"],
+  "exclude": ["src/gtag.ts"]
 }
diff --git a/packages/docusaurus-plugin-ideal-image/.npmignore b/packages/docusaurus-plugin-ideal-image/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-plugin-ideal-image/.npmignore
+++ b/packages/docusaurus-plugin-ideal-image/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-plugin-ideal-image/package.json b/packages/docusaurus-plugin-ideal-image/package.json
index 6f6c73d117..6449d75574 100644
--- a/packages/docusaurus-plugin-ideal-image/package.json
+++ b/packages/docusaurus-plugin-ideal-image/package.json
@@ -5,11 +5,7 @@
   "main": "lib/index.js",
   "types": "src/plugin-ideal-image.d.ts",
   "scripts": {
-    "build": "yarn build:server && yarn build:browser && yarn build:copy && yarn build:format",
-    "build:server": "tsc --project tsconfig.server.json",
-    "build:browser": "tsc --project tsconfig.browser.json",
-    "build:copy": "node copyUntypedFiles.mjs",
-    "build:format": "prettier --config ../../.prettierrc --write \"lib/**/*.js\""
+    "build": "tsc --build && node copyUntypedFiles.mjs && prettier --config ../../.prettierrc --write \"lib/theme/**/*.js\""
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/docusaurus-plugin-ideal-image/tsconfig.browser.json b/packages/docusaurus-plugin-ideal-image/tsconfig.browser.json
deleted file mode 100644
index 3af8257cdf..0000000000
--- a/packages/docusaurus-plugin-ideal-image/tsconfig.browser.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "module": "esnext",
-    "jsx": "react-native"
-  },
-  "include": ["src/theme/", "src/*.d.ts"]
-}
diff --git a/packages/docusaurus-plugin-ideal-image/tsconfig.client.json b/packages/docusaurus-plugin-ideal-image/tsconfig.client.json
new file mode 100644
index 0000000000..836fc6391a
--- /dev/null
+++ b/packages/docusaurus-plugin-ideal-image/tsconfig.client.json
@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "composite": true,
+    "incremental": true,
+    "tsBuildInfoFile": "./lib/.tsbuildinfo-client",
+    "module": "esnext",
+    "target": "esnext",
+    "rootDir": "src",
+    "outDir": "lib"
+  },
+  "include": ["src/theme", "src/*.d.ts"]
+}
diff --git a/packages/docusaurus-plugin-ideal-image/tsconfig.json b/packages/docusaurus-plugin-ideal-image/tsconfig.json
index 51aec434b2..f3146ecc75 100644
--- a/packages/docusaurus-plugin-ideal-image/tsconfig.json
+++ b/packages/docusaurus-plugin-ideal-image/tsconfig.json
@@ -1,8 +1,13 @@
 {
   "extends": "../../tsconfig.json",
+  "references": [{"path": "./tsconfig.client.json"}],
   "compilerOptions": {
-    "lib": ["DOM", "ES2019"],
+    "incremental": true,
+    "tsBuildInfoFile": "./lib/.tsbuildinfo",
+    "module": "commonjs",
     "rootDir": "src",
     "outDir": "lib"
-  }
+  },
+  "include": ["src"],
+  "exclude": ["src/theme"]
 }
diff --git a/packages/docusaurus-plugin-ideal-image/tsconfig.server.json b/packages/docusaurus-plugin-ideal-image/tsconfig.server.json
deleted file mode 100644
index 1a463cd83a..0000000000
--- a/packages/docusaurus-plugin-ideal-image/tsconfig.server.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "include": ["src/*.ts"]
-}
diff --git a/packages/docusaurus-plugin-pwa/.npmignore b/packages/docusaurus-plugin-pwa/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-plugin-pwa/.npmignore
+++ b/packages/docusaurus-plugin-pwa/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-plugin-pwa/package.json b/packages/docusaurus-plugin-pwa/package.json
index f904d38a70..3bc6d0cd22 100644
--- a/packages/docusaurus-plugin-pwa/package.json
+++ b/packages/docusaurus-plugin-pwa/package.json
@@ -5,10 +5,7 @@
   "main": "lib/index.js",
   "types": "src/plugin-pwa.d.ts",
   "scripts": {
-    "build": "yarn build:server && yarn build:browser && yarn build:copy",
-    "build:server": "tsc --project tsconfig.server.json",
-    "build:browser": "tsc --project tsconfig.browser.json",
-    "build:copy": "node copyUntypedFiles.mjs"
+    "build": "tsc --build && node copyUntypedFiles.mjs && prettier --config ../../.prettierrc --write \"lib/theme/**/*.js\""
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/docusaurus-plugin-pwa/tsconfig.browser.json b/packages/docusaurus-plugin-pwa/tsconfig.browser.json
deleted file mode 100644
index 147b109fe0..0000000000
--- a/packages/docusaurus-plugin-pwa/tsconfig.browser.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "module": "esnext",
-    "jsx": "react-native"
-  },
-  "include": [
-    "src/theme/",
-    "src/*.d.ts",
-    "src/registerSw.ts",
-    "src/renderReloadPopup.tsx"
-  ]
-}
diff --git a/packages/docusaurus-plugin-pwa/tsconfig.client.json b/packages/docusaurus-plugin-pwa/tsconfig.client.json
new file mode 100644
index 0000000000..bb29e4aa07
--- /dev/null
+++ b/packages/docusaurus-plugin-pwa/tsconfig.client.json
@@ -0,0 +1,18 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "composite": true,
+    "incremental": true,
+    "tsBuildInfoFile": "./lib/.tsbuildinfo-client",
+    "rootDir": "src",
+    "outDir": "lib",
+    "module": "esnext",
+    "target": "esnext"
+  },
+  "include": [
+    "src/theme/",
+    "src/*.d.ts",
+    "src/registerSw.ts",
+    "src/renderReloadPopup.tsx"
+  ]
+}
diff --git a/packages/docusaurus-plugin-pwa/tsconfig.json b/packages/docusaurus-plugin-pwa/tsconfig.json
index 51aec434b2..98aa9153f6 100644
--- a/packages/docusaurus-plugin-pwa/tsconfig.json
+++ b/packages/docusaurus-plugin-pwa/tsconfig.json
@@ -1,8 +1,12 @@
 {
   "extends": "../../tsconfig.json",
+  "references": [{"path": "./tsconfig.client.json"}],
   "compilerOptions": {
-    "lib": ["DOM", "ES2019"],
+    "incremental": true,
+    "tsBuildInfoFile": "./lib/.tsbuildinfo",
     "rootDir": "src",
     "outDir": "lib"
-  }
+  },
+  "include": ["src"],
+  "exclude": ["src/theme/", "src/registerSw.ts", "src/renderReloadPopup.tsx"]
 }
diff --git a/packages/docusaurus-plugin-pwa/tsconfig.server.json b/packages/docusaurus-plugin-pwa/tsconfig.server.json
deleted file mode 100644
index 40f95c1d1c..0000000000
--- a/packages/docusaurus-plugin-pwa/tsconfig.server.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "include": ["src/*.ts"],
-  "exclude": [
-    "src/theme/",
-    "src/*.d.ts",
-    "src/registerSw.ts",
-    "src/renderReloadPopup.tsx"
-  ]
-}
diff --git a/packages/docusaurus-plugin-sitemap/.npmignore b/packages/docusaurus-plugin-sitemap/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-plugin-sitemap/.npmignore
+++ b/packages/docusaurus-plugin-sitemap/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-preset-classic/.npmignore b/packages/docusaurus-preset-classic/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-preset-classic/.npmignore
+++ b/packages/docusaurus-preset-classic/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-remark-plugin-npm2yarn/.npmignore b/packages/docusaurus-remark-plugin-npm2yarn/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-remark-plugin-npm2yarn/.npmignore
+++ b/packages/docusaurus-remark-plugin-npm2yarn/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-theme-classic/.npmignore b/packages/docusaurus-theme-classic/.npmignore
index 3e3575db0c..3f56a7b661 100644
--- a/packages/docusaurus-theme-classic/.npmignore
+++ b/packages/docusaurus-theme-classic/.npmignore
@@ -1,5 +1,5 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
 
diff --git a/packages/docusaurus-theme-classic/tsconfig.json b/packages/docusaurus-theme-classic/tsconfig.json
index 145e89f84a..659cb2cc6b 100644
--- a/packages/docusaurus-theme-classic/tsconfig.json
+++ b/packages/docusaurus-theme-classic/tsconfig.json
@@ -3,8 +3,7 @@
   "compilerOptions": {
     "lib": ["DOM", "ES2019"],
     "module": "esnext",
-    "noEmit": true,
-    "jsx": "react-native"
+    "noEmit": true
   },
   "include": ["src/"]
 }
diff --git a/packages/docusaurus-theme-common/.npmignore b/packages/docusaurus-theme-common/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-theme-common/.npmignore
+++ b/packages/docusaurus-theme-common/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-theme-common/tsconfig.json b/packages/docusaurus-theme-common/tsconfig.json
index 20c3d66f64..a6f83d37f3 100644
--- a/packages/docusaurus-theme-common/tsconfig.json
+++ b/packages/docusaurus-theme-common/tsconfig.json
@@ -4,6 +4,7 @@
     "incremental": true,
     "tsBuildInfoFile": "./lib/.tsbuildinfo",
     "module": "esnext",
+    "target": "esnext",
     "sourceMap": true,
     "declarationMap": true,
     "rootDir": "src",
diff --git a/packages/docusaurus-theme-live-codeblock/.npmignore b/packages/docusaurus-theme-live-codeblock/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-theme-live-codeblock/.npmignore
+++ b/packages/docusaurus-theme-live-codeblock/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-theme-live-codeblock/package.json b/packages/docusaurus-theme-live-codeblock/package.json
index 2e79749422..661b8b3cc4 100644
--- a/packages/docusaurus-theme-live-codeblock/package.json
+++ b/packages/docusaurus-theme-live-codeblock/package.json
@@ -11,11 +11,7 @@
     "access": "public"
   },
   "scripts": {
-    "build": "yarn build:server && yarn build:client && yarn build:copy && yarn build:format",
-    "build:server": "tsc --project tsconfig.server.json",
-    "build:client": "tsc --project tsconfig.client.json",
-    "build:copy": "node copyUntypedFiles.mjs",
-    "build:format": "prettier --config ../../.prettierrc --write \"lib/**/*.js\""
+    "build": "tsc --build && node copyUntypedFiles.mjs && prettier --config ../../.prettierrc --write \"lib/theme/**/*.js\""
   },
   "repository": {
     "type": "git",
diff --git a/packages/docusaurus-theme-live-codeblock/tsconfig.client.json b/packages/docusaurus-theme-live-codeblock/tsconfig.client.json
index 462a6376e3..1988ff0b38 100644
--- a/packages/docusaurus-theme-live-codeblock/tsconfig.client.json
+++ b/packages/docusaurus-theme-live-codeblock/tsconfig.client.json
@@ -1,8 +1,13 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
+    "incremental": true,
+    "tsBuildInfoFile": "./lib/.tsbuildinfo-client",
+    "rootDir": "src",
+    "outDir": "lib",
     "module": "esnext",
-    "jsx": "react-native"
+    "target": "esnext"
   },
-  "include": ["src/theme/", "src/*.d.ts", "src/custom-buble.ts"]
+  "include": ["src/theme", "src/*.d.ts", "src/custom-buble.ts"]
 }
diff --git a/packages/docusaurus-theme-live-codeblock/tsconfig.json b/packages/docusaurus-theme-live-codeblock/tsconfig.json
index f5902ba108..e9a5d5fd33 100644
--- a/packages/docusaurus-theme-live-codeblock/tsconfig.json
+++ b/packages/docusaurus-theme-live-codeblock/tsconfig.json
@@ -1,9 +1,12 @@
 {
   "extends": "../../tsconfig.json",
+  "references": [{"path": "./tsconfig.client.json"}],
   "compilerOptions": {
     "incremental": true,
     "tsBuildInfoFile": "./lib/.tsbuildinfo",
     "rootDir": "src",
     "outDir": "lib"
-  }
+  },
+  "include": ["src"],
+  "exclude": ["src/custom-buble.ts", "src/theme", "**/__tests__/**"]
 }
diff --git a/packages/docusaurus-theme-live-codeblock/tsconfig.server.json b/packages/docusaurus-theme-live-codeblock/tsconfig.server.json
deleted file mode 100644
index 2159e2ef8e..0000000000
--- a/packages/docusaurus-theme-live-codeblock/tsconfig.server.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "include": ["src/*.ts"],
-  "exclude": ["src/custom-buble.ts"]
-}
diff --git a/packages/docusaurus-theme-search-algolia/.npmignore b/packages/docusaurus-theme-search-algolia/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-theme-search-algolia/.npmignore
+++ b/packages/docusaurus-theme-search-algolia/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-theme-search-algolia/package.json b/packages/docusaurus-theme-search-algolia/package.json
index f1e3f6db96..2a809087b4 100644
--- a/packages/docusaurus-theme-search-algolia/package.json
+++ b/packages/docusaurus-theme-search-algolia/package.json
@@ -21,11 +21,7 @@
   },
   "license": "MIT",
   "scripts": {
-    "build": "yarn build:server && yarn build:client && yarn build:copy && yarn build:format",
-    "build:server": "tsc --project tsconfig.server.json",
-    "build:client": "tsc --project tsconfig.client.json",
-    "build:copy": "node copyUntypedFiles.mjs",
-    "build:format": "prettier --config ../../.prettierrc --write \"lib/**/*.js\""
+    "build": "tsc --build && node copyUntypedFiles.mjs && prettier --config ../../.prettierrc --write \"lib/theme/**/*.js\""
   },
   "dependencies": {
     "@docsearch/react": "^3.0.0",
diff --git a/packages/docusaurus-theme-search-algolia/tsconfig.client.json b/packages/docusaurus-theme-search-algolia/tsconfig.client.json
index 0ea16454ec..9e8321ca3d 100644
--- a/packages/docusaurus-theme-search-algolia/tsconfig.client.json
+++ b/packages/docusaurus-theme-search-algolia/tsconfig.client.json
@@ -1,8 +1,13 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
+    "incremental": true,
+    "tsBuildInfoFile": "./lib/.tsbuildinfo-client",
+    "rootDir": "src",
+    "outDir": "lib",
     "module": "esnext",
-    "jsx": "react-native"
+    "target": "esnext"
   },
-  "include": ["src/theme/", "src/client/", "src/*.d.ts"]
+  "include": ["src/theme", "src/client", "src/*.d.ts"]
 }
diff --git a/packages/docusaurus-theme-search-algolia/tsconfig.json b/packages/docusaurus-theme-search-algolia/tsconfig.json
index 51aec434b2..413bf07963 100644
--- a/packages/docusaurus-theme-search-algolia/tsconfig.json
+++ b/packages/docusaurus-theme-search-algolia/tsconfig.json
@@ -1,8 +1,12 @@
 {
   "extends": "../../tsconfig.json",
+  "references": [{"path": "./tsconfig.client.json"}],
   "compilerOptions": {
-    "lib": ["DOM", "ES2019"],
+    "incremental": true,
+    "tsBuildInfoFile": "./lib/.tsbuildinfo",
     "rootDir": "src",
     "outDir": "lib"
-  }
+  },
+  "include": ["src"],
+  "exclude": ["src/client", "src/theme", "**/__tests__/**"]
 }
diff --git a/packages/docusaurus-theme-search-algolia/tsconfig.server.json b/packages/docusaurus-theme-search-algolia/tsconfig.server.json
deleted file mode 100644
index 3faf6c3e99..0000000000
--- a/packages/docusaurus-theme-search-algolia/tsconfig.server.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "include": ["src/*.ts", "src/templates/*.ts"]
-}
diff --git a/packages/docusaurus-theme-translations/.npmignore b/packages/docusaurus-theme-translations/.npmignore
index 1b59b1ca63..acffb6122e 100644
--- a/packages/docusaurus-theme-translations/.npmignore
+++ b/packages/docusaurus-theme-translations/.npmignore
@@ -1,5 +1,5 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
 
diff --git a/packages/docusaurus-theme-translations/package.json b/packages/docusaurus-theme-translations/package.json
index 5c27fb37c9..ea54a52385 100644
--- a/packages/docusaurus-theme-translations/package.json
+++ b/packages/docusaurus-theme-translations/package.json
@@ -14,8 +14,8 @@
   },
   "license": "MIT",
   "scripts": {
-    "build": "tsc -p tsconfig.build.json",
-    "watch": "tsc -p tsconfig.build.json --watch",
+    "build": "tsc --build",
+    "watch": "tsc --watch",
     "update": "node ./update.mjs"
   },
   "dependencies": {
diff --git a/packages/docusaurus-theme-translations/tsconfig.build.json b/packages/docusaurus-theme-translations/tsconfig.build.json
index aee99fc0f3..a0eb19189c 100644
--- a/packages/docusaurus-theme-translations/tsconfig.build.json
+++ b/packages/docusaurus-theme-translations/tsconfig.build.json
@@ -1,6 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "incremental": true,
     "tsBuildInfoFile": "./lib/.tsbuildinfo",
     "sourceMap": true,
diff --git a/packages/docusaurus-theme-translations/tsconfig.json b/packages/docusaurus-theme-translations/tsconfig.json
index 59be626a27..667e745996 100644
--- a/packages/docusaurus-theme-translations/tsconfig.json
+++ b/packages/docusaurus-theme-translations/tsconfig.json
@@ -1,10 +1,11 @@
 {
   "extends": "../../tsconfig.json",
+  "references": [{"path": "./tsconfig.build.json"}],
   "compilerOptions": {
     "module": "esnext",
     "noEmit": true,
     "checkJs": true,
     "allowJs": true
   },
-  "include": ["update.mjs", "src"]
+  "include": ["update.mjs"]
 }
diff --git a/packages/docusaurus-utils-common/.npmignore b/packages/docusaurus-utils-common/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-utils-common/.npmignore
+++ b/packages/docusaurus-utils-common/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-utils-validation/.npmignore b/packages/docusaurus-utils-validation/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-utils-validation/.npmignore
+++ b/packages/docusaurus-utils-validation/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus-utils/.npmignore b/packages/docusaurus-utils/.npmignore
index f2b994d4e3..16beccca2e 100644
--- a/packages/docusaurus-utils/.npmignore
+++ b/packages/docusaurus-utils/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git a/packages/docusaurus/.npmignore b/packages/docusaurus/.npmignore
index ba8304029e..b3d2bb61f7 100644
--- a/packages/docusaurus/.npmignore
+++ b/packages/docusaurus/.npmignore
@@ -1,5 +1,5 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
 
diff --git a/packages/docusaurus/package.json b/packages/docusaurus/package.json
index a2aaee6796..1fb6245f9f 100644
--- a/packages/docusaurus/package.json
+++ b/packages/docusaurus/package.json
@@ -24,8 +24,8 @@
     "docusaurus": "bin/docusaurus.mjs"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.server.json && tsc -p tsconfig.client.json && node copyUntypedFiles.mjs",
-    "watch": "node copyUntypedFiles.mjs && concurrently -n \"server,client\" --kill-others \"tsc -p tsconfig.server.json --watch\" \"tsc -p tsconfig.client.json --watch\""
+    "build": "tsc --build && node copyUntypedFiles.mjs",
+    "watch": "node copyUntypedFiles.mjs && tsc --watch"
   },
   "bugs": {
     "url": "https://github.com/facebook/docusaurus/issues"
diff --git a/packages/docusaurus/tsconfig.client.json b/packages/docusaurus/tsconfig.client.json
index 66613cf7c2..018e125eb7 100644
--- a/packages/docusaurus/tsconfig.client.json
+++ b/packages/docusaurus/tsconfig.client.json
@@ -1,13 +1,13 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "incremental": true,
-    "lib": ["DOM", "ES2019"],
+    "tsBuildInfoFile": "./lib/.tsbuildinfo-client",
     "module": "esnext",
-    "tsBuildInfoFile": "./lib/client/.tsbuildinfo",
-    "rootDir": "src/client",
-    "outDir": "lib/client",
-    "jsx": "react-native"
+    "target": "esnext",
+    "rootDir": "src",
+    "outDir": "lib"
   },
-  "include": ["src/client", "src/deps.d.ts"]
+  "include": ["src/client", "src/*.d.ts"]
 }
diff --git a/packages/docusaurus/tsconfig.json b/packages/docusaurus/tsconfig.json
index e467cc1955..ebbe87890d 100644
--- a/packages/docusaurus/tsconfig.json
+++ b/packages/docusaurus/tsconfig.json
@@ -1,10 +1,15 @@
-// For editor typechecking; includes bin
 {
-  "extends": "./tsconfig.server.json",
+  "extends": "../../tsconfig.json",
+  "references": [
+    {"path": "./tsconfig.server.json"},
+    {"path": "./tsconfig.client.json"}
+  ],
   "compilerOptions": {
     "noEmit": true,
+    "allowJs": true,
+    "checkJs": true,
     "rootDir": ".",
     "module": "esnext"
   },
-  "include": ["src", "bin"]
+  "include": ["bin"]
 }
diff --git a/packages/docusaurus/tsconfig.server.json b/packages/docusaurus/tsconfig.server.json
index cabe532baa..eb1b6945ac 100644
--- a/packages/docusaurus/tsconfig.server.json
+++ b/packages/docusaurus/tsconfig.server.json
@@ -1,12 +1,13 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "incremental": true,
     "tsBuildInfoFile": "./lib/.tsbuildinfo",
+    "module": "commonjs",
     "rootDir": "src",
-    "outDir": "lib",
-    "allowJs": true
+    "outDir": "lib"
   },
   "include": ["src"],
-  "exclude": ["**/__tests__/**/*", "src/client"]
+  "exclude": ["src/client", "**/__tests__/**"]
 }
diff --git a/packages/eslint-plugin/.npmignore b/packages/eslint-plugin/.npmignore
index 5f1c98c31f..3e3043484f 100644
--- a/packages/eslint-plugin/.npmignore
+++ b/packages/eslint-plugin/.npmignore
@@ -1,5 +1,5 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
 
diff --git a/packages/lqip-loader/.npmignore b/packages/lqip-loader/.npmignore
index ba8304029e..b3d2bb61f7 100644
--- a/packages/lqip-loader/.npmignore
+++ b/packages/lqip-loader/.npmignore
@@ -1,5 +1,5 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
 
diff --git a/tsconfig.json b/tsconfig.json
index cb10e8a5cc..e7d9ca05d0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,7 +6,7 @@
     "lib": ["ESNext", "DOM"],
     "declaration": true,
     "declarationMap": false,
-    "jsx": "react",
+    "jsx": "react-native",
     "importHelpers": true,
     "noEmitHelpers": true,
 
@@ -44,5 +44,5 @@
     "isolatedModules": true,
     "skipLibCheck": true // @types/webpack and webpack/types.d.ts are not the same thing
   },
-  "exclude": ["node_modules", "**/__tests__/**/*", "**/lib/**/*"]
+  "exclude": ["node_modules", "**/__tests__/**", "**/lib/**/*"]
 }