Build: Speed up tsc builds (#38903)

* Use incremental tsc builds (cache) * Save and restore tsc cache on circleci * Fix up main `tsconfig`
Automattic · Feb 13, 2020 · 666c470 · 666c470
1 parent 5b61638
commit 666c470
Show file tree

Hide file tree

Showing 11 changed files with 57 additions and 17 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -28,6 +28,7 @@ references:
         "$CIRCLE_TEST_REPORTS/server"           \
         "$CIRCLE_TEST_REPORTS/e2ereports"       \
         "$HOME/jest-cache"                      \
+        "$HOME/.tsc-cache"                      \
         "$HOME/terser-cache"
 
   # Jest cache caching
@@ -59,6 +60,22 @@ references:
     paths:
       - ~/jest-cache
 
+  #
+  # TypeScript compiler (tsc) cache caching
+  #
+  restore-tsc-cache: &restore-tsc-cache
+    name: Restore TypeScript cache
+    keys:
+      - v{{ .Environment.GLOBAL_CACHE_PREFIX }}-v0-tsc-{{ .Branch }}-{{ .Revision }}
+      - v{{ .Environment.GLOBAL_CACHE_PREFIX }}-v0-tsc-{{ .Branch }}
+      - v{{ .Environment.GLOBAL_CACHE_PREFIX }}-v0-tsc-master
+      - v{{ .Environment.GLOBAL_CACHE_PREFIX }}-v0-tsc
+  save-tsc-cache: &save-tsc-cache
+    name: Save TypeScript cache
+    key: v{{ .Environment.GLOBAL_CACHE_PREFIX }}-v0-tsc-{{ .Branch }}-{{ .Revision }}
+    paths:
+      - ~/.tsc-cache
+
   #
   # Terser cache caching
   #
@@ -197,10 +214,12 @@ jobs:
       - run: *update-git-master
       - save_cache: *save-git-cache
       # npm dependencies
+      - restore_cache: *restore-tsc-cache
       - restore_cache: *restore-npm-cache
       - run: *npm-install
       - run: *npm-e2e-install
       - save_cache: *save-npm-cache
+      - save_cache: *save-tsc-cache
       - run: npm run build-packages
       - persist_to_workspace:
           root: '~'

diff --git a/.dockerignore b/.dockerignore
@@ -1,4 +1,5 @@
 Dockerfile
+/.tsc-cache
 .dockerignore
 .git
 .npm-debug.log*

diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@
 *.code-workspace
 *.iml
 *.iws
+/.tsc-cache/
 /tags
 node_modules
 /npm-debug.log*

diff --git a/client/landing/gutenboarding/tsconfig.json b/client/landing/gutenboarding/tsconfig.json
@@ -8,6 +8,10 @@
 		"baseUrl": ".",
 		"paths": {
 			"*": [ "*", "../../*" ]
-		}
+		},
+
+		"noEmit": true,
+		"incremental": true,
+		"tsBuildInfoFile": "../../../.tsc-cache/gutenboarding"
 	}
 }
diff --git a/package.json b/package.json
@@ -82,7 +82,7 @@
 		"clean:build": "npx rimraf build client/server/bundler/*.json client/server/devdocs/search-index.js",
 		"clean:packages": "npx lerna run clean --stream",
 		"clean:public": "npx rimraf public",
-		"distclean": "npm run clean && npx rimraf node_modules client/node_modules apps/*/node_modules packages/*/node_modules test/e2e/node_modules",
+		"distclean": "npm run clean && npx rimraf node_modules client/node_modules apps/*/node_modules packages/*/node_modules test/e2e/node_modules .tsc-cache",
 		"docker": "docker run -it --name wp-calypso --rm -p 80:3000 wp-calypso",
 		"docker-jetpack-cloud": "docker run -it --env CALYPSO_ENV=jetpack-cloud-production --name wp-calypso --rm -p 80:3000 wp-calypso",
 		"eslint-branch": "node bin/eslint-branch.js",

diff --git a/packages/components/tsconfig.json b/packages/components/tsconfig.json
@@ -22,7 +22,10 @@
 		"forceConsistentCasingInFileNames": true,
 
 		"typeRoots": [ "../../node_modules/@types" ],
-		"types": []
+		"types": [],
+
+		"incremental": true,
+		"tsBuildInfoFile": "../../.tsc-cache/components"
 	},
 	"include": [ "src" ],
 	"exclude": [ "**/docs/*", "**/test/*" ]

diff --git a/packages/composite-checkout-wpcom/tsconfig-cjs.json b/packages/composite-checkout-wpcom/tsconfig-cjs.json
@@ -4,6 +4,8 @@
 		"module": "commonjs",
 		"declaration": false,
 		"declarationDir": null,
-		"outDir": "./dist/cjs"
+		"outDir": "./dist/cjs",
+
+		"tsBuildInfoFile": "../../.tsc-cache/composite-checkout-wpcom-cjs"
 	}
 }
diff --git a/packages/composite-checkout-wpcom/tsconfig.json b/packages/composite-checkout-wpcom/tsconfig.json
@@ -22,7 +22,10 @@
 		"esModuleInterop": true,
 
 		"typeRoots": [ "../../node_modules/@types" ],
-		"types": []
+		"types": [],
+
+		"incremental": true,
+		"tsBuildInfoFile": "../../.tsc-cache/composite-checkout-wpcom"
 	},
 	"include": [ "src/**/*" ],
 	"exclude": [ "**/test/**/*", "**/docs/**/*" ]

diff --git a/packages/data-stores/tsconfig-cjs.json b/packages/data-stores/tsconfig-cjs.json
@@ -4,6 +4,8 @@
 		"module": "commonjs",
 		"declaration": false,
 		"declarationDir": null,
-		"outDir": "dist/cjs"
+		"outDir": "dist/cjs",
+
+		"tsBuildInfoFile": "../../.tsc-cache/data-stores-cjs"
 	}
 }
diff --git a/packages/data-stores/tsconfig.json b/packages/data-stores/tsconfig.json
@@ -30,7 +30,10 @@
 		"types": [],
 
 		"noEmitHelpers": true,
-		"importHelpers": true
+		"importHelpers": true,
+
+		"incremental": true,
+		"tsBuildInfoFile": "../../.tsc-cache/data-stores"
 	},
 	"files": [ "./src/index.ts", "./global.d.ts" ],
 	"exclude": [ "**/docs/*", "**/test/*" ]

diff --git a/tsconfig.json b/tsconfig.json
@@ -6,24 +6,26 @@
 		"isolatedModules": true,
 
 		"paths": {
-			"*": [ "*", "client/*", "server/*" ]
+			"*": [ "*", "client/*" ]
 		},
-		"baseUrl": "."
+		"baseUrl": ".",
+		"incremental": true,
+		"tsBuildInfoFile": ".tsc-cache/client"
 	},
-	"include": [ "client", "server" ],
+	"include": [ "client" ],
 	"exclude": [
-		"**/build-module/*",
-		"**/build-style/*",
-		"**/build/*",
-		"**/dist/*",
-		"**/node_modules/*",
+		"**/build",
+		"**/build-module",
+		"**/build-style",
+		"**/dist",
+		"**/node_modules",
 		"apps",
 		"build",
 		"cached-results.json",
+		"client/server/bundler/assets*.json",
+		"client/server/devdocs/search-index.js",
 		"packages",
 		"public",
-		"server/bundler/assets*.json",
-		"server/devdocs/search-index.js",
 		"stats.json"
 	]
 }