refactor: use TS project references instead of running tsc multiple t…

…imes (#7437) * refactor: use TS project references instead of running tsc multiple times * deduplicate * dedup * eliminate --project * add swc config * add target
facebook · May 17, 2022 · 7613ecb · 7613ecb
1 parent 1bec5f6
commit 7613ecb
Show file tree

Hide file tree

Showing 76 changed files with 233 additions and 145 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git 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
@@ -1,5 +1,5 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/packages/docusaurus-plugin-ideal-image/tsconfig.client.json 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
@@ -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
diff --git a/packages/docusaurus-plugin-pwa/.npmignore b/packages/docusaurus-plugin-pwa/.npmignore
@@ -1,4 +1,4 @@
 copyUntypedFiles.mjs
-.tsbuildinfo
+.tsbuildinfo*
 tsconfig*
 __tests__