core(tsc): add base tsconfig for config inheritance

GoogleChrome · Sep 15, 2021 · f3700cc · f3700cc
1 parent 06bdf13
commit f3700cc
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 141 deletions.
diff --git a/flow-report/tsconfig.json b/flow-report/tsconfig.json
@@ -1,39 +1,27 @@
 {
+  "extends": "../tsconfig-base.json",
   "compilerOptions": {
-    "composite": true,
     "outDir": "../.tmp/tsbuildinfo/flow-report",
+
+    // Project has real tsc output (and declaration was interfering with build).
+    // see https://github.com/GoogleChrome/lighthouse/pull/12929
     "emitDeclarationOnly": false,
-    "declarationMap": true,
 
     // Limit to base JS and DOM defs.
     "lib": ["es2020", "dom", "dom.iterable"],
-    // Selectively include types from node_modules.
+    // Selectively include types from node_modules/.
     "types": ["node", "jest"],
-    "target": "es2020",
-    "module": "es2020",
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-
-    "allowJs": true,
-    "checkJs": true,
-    "strict": true,
-    // TODO: remove the next line to be fully `strict`.
-    "useUnknownInCatchVariables": false,
-
-    // "listFiles": true,
-    // "noErrorTruncation": true,
-    "extendedDiagnostics": true,
 
     "jsx": "react-jsx",
     "jsxImportSource": "preact",
   },
+  "references": [
+    {"path": "../types/lhr/"},
+    {"path": "../report"},
+  ],
   "include": [
     "**/*.ts",
     "**/*.tsx",
     "./types",
   ],
-  "references": [
-    {"path": "../types/lhr/"},
-    {"path": "../report"},
-  ],
 }
diff --git a/lighthouse-treemap/tsconfig.json b/lighthouse-treemap/tsconfig.json
@@ -1,36 +1,20 @@
 {
+  "extends": "../tsconfig-base.json",
   "compilerOptions": {
-    "composite": true,
     "outDir": "../.tmp/tsbuildinfo/lighthouse-treemap",
-    "emitDeclarationOnly": true,
-    "declarationMap": true,
 
     // Limit to base JS and DOM defs.
     "lib": ["es2020", "dom", "dom.iterable"],
-    // Selectively include types from node_modules.
+    // Selectively include types from node_modules/.
     "types": ["tabulator-tables"],
-    "target": "es2020",
-    "module": "es2020",
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-
-    "allowJs": true,
-    "checkJs": true,
-    "strict": true,
-    // TODO: remove the next line to be fully `strict`.
-    "useUnknownInCatchVariables": false,
-
-    // "listFiles": true,
-    // "noErrorTruncation": true,
-    "extendedDiagnostics": true,
   },
-  "include": [
-    "app/src/**/*.js",
-    "types/**/*.d.ts",
-  ],
   "references": [
     {"path": "../types/lhr/"},
     {"path": "../report/"},
     {"path": "../lighthouse-viewer/"},
   ],
+  "include": [
+    "app/src/**/*.js",
+    "types/**/*.d.ts",
+  ],
 }
diff --git a/lighthouse-viewer/tsconfig.json b/lighthouse-viewer/tsconfig.json
@@ -1,35 +1,19 @@
 {
+  "extends": "../tsconfig-base.json",
   "compilerOptions": {
-    "composite": true,
     "outDir": "../.tmp/tsbuildinfo/lighthouse-viewer",
-    "emitDeclarationOnly": true,
-    "declarationMap": true,
 
     // Limit to base JS and DOM defs.
     "lib": ["es2020", "dom", "dom.iterable"],
-    // Don't include any types from node_modules.
+    // Don't include any types from node_modules/.
     "types": [],
-    "target": "es2020",
-    "module": "es2020",
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-
-    "allowJs": true,
-    "checkJs": true,
-    "strict": true,
-    // TODO: remove the next line to be fully `strict`.
-    "useUnknownInCatchVariables": false,
-
-    // "listFiles": true,
-    // "noErrorTruncation": true,
-    "extendedDiagnostics": true,
   },
-  "include": [
-    "app/src/**/*.js",
-    "./types/*.d.ts",
-  ],
   "references": [
     {"path": "../types/lhr/"},
     {"path": "../report/"}
   ],
+  "include": [
+    "app/src/**/*.js",
+    "./types/*.d.ts",
+  ],
 }
diff --git a/package.json b/package.json
@@ -68,7 +68,7 @@
     "dogfood-lhci": "./lighthouse-core/scripts/dogfood-lhci.sh",
     "timing-trace": "node lighthouse-core/scripts/generate-timing-trace.js",
     "changelog": "conventional-changelog --config ./build/changelog-generator/index.js --infile changelog.md --same-file",
-    "type-check": "tsc --build ./ report/ lighthouse-viewer/ lighthouse-treemap/ flow-report/",
+    "type-check": "tsc --build ./tsconfig-base.json",
     "i18n:checks": "./lighthouse-core/scripts/i18n/assert-strings-collected.sh",
     "i18n:collect-strings": "node lighthouse-core/scripts/i18n/collect-strings.js",
     "update:lantern-baseline": "node lighthouse-core/scripts/lantern/update-baseline-lantern-values.js",
@@ -173,7 +173,7 @@
     "terser": "^5.3.8",
     "ts-jest": "^27.0.4",
     "typed-query-selector": "^2.4.0",
-    "typescript": "4.4.2",
+    "typescript": "4.4.3",
     "webtreemap-cdt": "^3.2.1"
   },
   "dependencies": {

diff --git a/report/generator/tsconfig.json b/report/generator/tsconfig.json
@@ -1,23 +1,12 @@
 {
+  "extends": "../../tsconfig-base.json",
   "compilerOptions": {
-    "composite": true,
     "outDir": "../../.tmp/tsbuildinfo/report/generator",
-    "emitDeclarationOnly": true,
-    "declarationMap": true,
 
-    "target": "ES2020",
-    "module": "commonjs",
-    "moduleResolution": "node",
-
-    "allowJs": true,
-    "checkJs": true,
-    "strict": true,
-    // TODO: remove the next line to be fully `strict`.
-    "useUnknownInCatchVariables": false,
-
-    // "listFiles": true,
-    // "noErrorTruncation": true,
-    "extendedDiagnostics": true,
+    // Limit defs to base JS and DOM (for URL: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/34960).
+    "lib": ["es2020", "dom"],
+    // Only include `@types/node` from node_modules/.
+    "types": ["node"],
   },
   "references": [
     {"path": "../../types/lhr/"},

diff --git a/report/tsconfig.json b/report/tsconfig.json
@@ -1,36 +1,21 @@
 {
+  "extends": "../tsconfig-base.json",
   "compilerOptions": {
-    "composite": true,
     "outDir": "../.tmp/tsbuildinfo/report",
-    "emitDeclarationOnly": true,
-    "declarationMap": true,
 
     // Limit to base JS and DOM defs.
     "lib": ["es2020", "dom", "dom.iterable"],
-    // Don't include any types from node_modules.
+    // Don't include any types from node_modules/.
     "types": [],
-    "target": "es2020",
-    "module": "es2020",
-    "moduleResolution": "node",
-
-    "allowJs": true,
-    "checkJs": true,
-    "strict": true,
-    // TODO: remove the next line to be fully `strict`.
-    "useUnknownInCatchVariables": false,
-
-    // "listFiles": true,
-    // "noErrorTruncation": true,
-    "extendedDiagnostics": true,
   },
-  "include": [
-    "**/*.js",
-    "types/**/*.d.ts",
-  ],
   "references": [
     {"path": "../types/lhr/"},
     {"path": "./generator/"}
   ],
+  "include": [
+    "**/*.js",
+    "types/**/*.d.ts",
+  ],
   "exclude": [
     "generator/**/*.js",
     // These test files require further changes before they can be type checked.

diff --git a/tsconfig-base.json b/tsconfig-base.json
@@ -0,0 +1,38 @@
+// Base compiler options and all compilation entry points.
+
+{
+  "compilerOptions": {
+    "composite": true,
+    "emitDeclarationOnly": true,
+    "declarationMap": true,
+
+    "target": "es2020",
+    "module": "es2020",
+    "moduleResolution": "node",
+    "esModuleInterop": true,
+
+    "allowJs": true,
+    "checkJs": true,
+    "strict": true,
+    // TODO: remove the next line to be fully `strict`.
+    "useUnknownInCatchVariables": false,
+
+    // "listFiles": true,
+    // "noErrorTruncation": true,
+    "extendedDiagnostics": true,
+  },
+  // `references` is not inherited by extending tsconfigs. This is a list of all
+  // project references so `tsc --build tsconfig-base.json` can type check all files.
+  "references": [
+    {"path": "./"},
+    {"path": "./types/lhr/"},
+    {"path": "./report/"},
+    {"path": "./report/generator/"},
+    {"path": "./lighthouse-viewer/"},
+    {"path": "./lighthouse-treemap/"},
+    {"path": "./flow-report/"},
+  ],
+  "files": [],
+  "include": [],
+  "exclude": [],
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,22 +1,16 @@
 {
+  "extends": "./tsconfig-base.json",
   "compilerOptions": {
-    "emitDeclarationOnly": true,
-    "module": "commonjs",
-    "target": "ES2020",
-    "allowJs": true,
-    "checkJs": true,
-    "strict": true,
-    // TODO: remove the next line to be fully `strict`.
-    "useUnknownInCatchVariables": false,
-    // "listFiles": true,
-    // "noErrorTruncation": true,
+    "outDir": ".tmp/tsbuildinfo/",
 
+    // TODO(esmodules): included to support require('file.json'). Remove on the switch to ES Modules.
     "resolveJsonModule": true,
-    "diagnostics": true,
-    "composite": true,
-    "outDir": ".tmp/tsbuildinfo/",
-    "esModuleInterop": true,
   },
+  "references": [
+    {"path": "./types/lhr/"},
+    {"path": "./report/"},
+    {"path": "./report/generator/"},
+  ],
   "include": [
     "root.js",
     "lighthouse-cli/**/*.js",
@@ -36,11 +30,6 @@
     "third-party/snyk/snapshot.json",
     "lighthouse-core/audits/byte-efficiency/polyfill-graph-data.json",
   ],
-  "references": [
-    {"path": "./types/lhr/"},
-    {"path": "./report/"},
-    {"path": "./report/generator/"},
-  ],
   "exclude": [
     "lighthouse-core/test/audits/**/*.js",
     "lighthouse-core/test/fixtures/**/*.js",

diff --git a/types/lhr/tsconfig.json b/types/lhr/tsconfig.json
@@ -1,22 +1,12 @@
 {
+  "extends": "../../tsconfig-base.json",
   "compilerOptions": {
-    "module": "esnext",
-    "target": "esnext",
-    "esModuleInterop": true,
-    "moduleResolution": "node",
-
-    "strict": true,
-    "extendedDiagnostics": true,
+    "outDir": "../../.tmp/tsbuildinfo/types/lhr",
 
-    // We only need the base JS definitions, no libs in node_modules, no DOM, etc.
+    // We only need the base JS definitions, no DOM, etc.
     "lib": ["esnext"],
+    // Don't include any types from node_modules/.
     "types": [],
-
-    // "listFiles": true,
-    // "noErrorTruncation": true,
-
-    "composite": true,
-    "outDir": "../../.tmp/tsbuildinfo/types/lhr",
   },
   "include": [
     "*.d.ts",

diff --git a/yarn.lock b/yarn.lock
@@ -8496,10 +8496,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-[email protected].2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.2.tgz#6d618640d430e3569a1dfb44f7d7e600ced3ee86"
-  integrity sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==
+[email protected].3:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324"
+  integrity sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==
 
 uglify-js@^3.1.4:
   version "3.4.9"