Specify rootDir and outDir in tsconfig-base rather than in each tsconfig

jakebailey · jakebailey · commit ab0711572f44 · 2022-10-19T18:25:23.000-07:00
diff --git a/Herebyfile.mjs b/Herebyfile.mjs
@@ -473,11 +473,14 @@ export const lint = task({
 
 const esbuildCancellationToken = esbuildTask("./src/cancellationToken/cancellationToken.ts", "./built/local/cancellationToken.js");
 
-// No need for writeCJSReexport, this outputs to the right place.
 const buildCancellationToken = task({
     name: "cancellation-token",
     dependencies: [generateDiagnostics],
-    run: () => cmdLineOptions.bundle ? esbuildCancellationToken.build() : buildProject("src/cancellationToken"),
+    run: async () =>{
+        if (cmdLineOptions.bundle) return esbuildCancellationToken.build();
+        await writeCJSReexport("./built/local/cancellationToken/cancellationToken.js", "./built/local/cancellationToken.js");
+        await buildProject("src/cancellationToken");
+    },
 });
 const cleanCancellationToken = task({
     name: "clean-cancellation-token",
@@ -493,7 +496,7 @@ const buildTypingsInstaller = task({
     dependencies: [generateDiagnostics],
     run: async () => {
         if (cmdLineOptions.bundle) return esbuildTypingsInstaller.build();
-        await writeCJSReexport("./built/typingsInstaller/nodeTypingsInstaller.js", "./built/local/typingsInstaller.js");
+        await writeCJSReexport("./built/local/typingsInstaller/nodeTypingsInstaller.js", "./built/local/typingsInstaller.js");
         await buildProject("src/typingsInstaller");
     },
 });
@@ -506,11 +509,14 @@ cleanTasks.push(cleanTypingsInstaller);
 
 const esbuildWatchGuard = esbuildTask("./src/watchGuard/watchGuard.ts", "./built/local/watchGuard.js");
 
-// No need for writeCJSReexport, this outputs to the right place.
 const buildWatchGuard = task({
     name: "watch-guard",
     dependencies: [generateDiagnostics],
-    run: () => cmdLineOptions.bundle ? esbuildWatchGuard.build() : buildProject("src/watchGuard"),
+    run: async () => {
+        if (cmdLineOptions.bundle) return esbuildWatchGuard.build();
+        await writeCJSReexport("./built/local/watchGuard/watchGuard.js", "./built/local/watchGuard.js");
+        await buildProject("src/watchGuard");
+    },
 });
 const cleanWatchGuard = task({
     name: "clean-watch-guard",
diff --git a/src/cancellationToken/tsconfig.json b/src/cancellationToken/tsconfig.json
@@ -1,9 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
-        "tsBuildInfoFile": "../../built/local/cancellationToken.tsbuildinfo",
-        "rootDir": ".",
         "module": "commonjs",
         "types": [
             "node"
diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/compiler",
         "types": ["node"]
     },
 
diff --git a/src/debug/tsconfig.json b/src/debug/tsconfig.json
@@ -1,9 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
-        "tsBuildInfoFile": "../../built/local/debug.tsbuildinfo",
-        "rootDir": ".",
         "target": "es2019",
         "lib": ["es2019"],
     },
diff --git a/src/deprecatedCompat/tsconfig.json b/src/deprecatedCompat/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/deprecatedCompat",
         "experimentalDecorators": true
     },
     "references": [
diff --git a/src/executeCommandLine/tsconfig.json b/src/executeCommandLine/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/executeCommandLine"
     },
 
     "references": [
diff --git a/src/harness/tsconfig.json b/src/harness/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/harness",
         "types": [
             "node", "mocha", "chai"
         ],
diff --git a/src/jsTyping/tsconfig.json b/src/jsTyping/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/jsTyping",
         "types": [
             "node"
         ],
diff --git a/src/loggedIO/tsconfig.json b/src/loggedIO/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/loggedIO",
         "types": [
         ],
         "lib": [
diff --git a/src/server/tsconfig.json b/src/server/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/server",
         "types": [
             "node"
         ]
diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/services"
     },
     "references": [
         { "path": "../compiler" },
diff --git a/src/testRunner/tsconfig.json b/src/testRunner/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/testRunner",
         "types": [
             "node", "mocha", "chai"
         ],
diff --git a/src/tsc/tsconfig.json b/src/tsc/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/tsc"
     },
     "files": [
         "tsc.ts",
diff --git a/src/tsconfig-base.json b/src/tsconfig-base.json
@@ -1,5 +1,8 @@
 {
     "compilerOptions": {
+        "rootDir": ".",
+        "outDir": "../built/local",
+
         "pretty": true,
         "lib": ["es2015.iterable", "es2015.generator", "es5"],
         "target": "es5",
diff --git a/src/tsserver/tsconfig.json b/src/tsserver/tsconfig.json
@@ -2,7 +2,6 @@
     "extends": "../tsconfig-base",
  
     "compilerOptions": {
-        "outDir": "../../built/local/tsserver",
         "types": [
             "node"
         ]
diff --git a/src/tsserverlibrary/tsconfig.json b/src/tsserverlibrary/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/tsserverlibrary"
     },
     "files": [
         "tsserverlibrary.ts",
diff --git a/src/typescript/tsconfig.json b/src/typescript/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/typescript"
     },
     "files": [
         "typescript.ts",
diff --git a/src/typingsInstaller/tsconfig.json b/src/typingsInstaller/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/typingsInstaller",
         "types": [
             "node"
         ],
diff --git a/src/typingsInstallerCore/tsconfig.json b/src/typingsInstallerCore/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/typingsInstallerCore",
         "types": [
             "node"
         ],
diff --git a/src/watchGuard/tsconfig.json b/src/watchGuard/tsconfig.json
@@ -1,9 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
-        "tsBuildInfoFile": "../../built/local/watchGuard.tsbuildinfo",
-        "rootDir": ".",
         "types": [
             "node"
         ],
diff --git a/src/webServer/tsconfig.json b/src/webServer/tsconfig.json
@@ -1,7 +1,6 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/webServer",
         "types": [
             "node"
         ]

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "../tsconfig-base",`
`3`	`3`	`"compilerOptions": {`
`4`		`- "outDir": "../../built/local/compiler",`
`5`	`4`	`"types": ["node"]`
`6`	`5`	`},`
`7`	`6`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
	`3`	`+ "rootDir": ".",`
	`4`	`+ "outDir": "../built/local",`
	`5`	`+`
`3`	`6`	`"pretty": true,`
`4`	`7`	`"lib": ["es2015.iterable", "es2015.generator", "es5"],`
`5`	`8`	`"target": "es5",`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`"extends": "../tsconfig-base",`
`3`	`3`
`4`	`4`	`"compilerOptions": {`
`5`		`- "outDir": "../../built/local/tsserver",`
`6`	`5`	`"types": [`
`7`	`6`	`"node"`
`8`	`7`	`]`