Overhaul tsconfigs to output to the right locations

jakebailey · jakebailey · commit 2ac243c41bbd · 2022-09-13T09:52:16.000-07:00
diff --git a/src/cancellationToken/tsconfig.json b/src/cancellationToken/tsconfig.json
@@ -1,13 +1,7 @@
 {
-    "extends": "../tsconfig-noncomposite-base",
+    "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local/",
-        "rootDir": ".",
-        "composite": false,
-        "declaration": false,
-        "declarationMap": false,
-        "removeComments": true,
-        "incremental": false,
+        "outDir": "../../built/local/cancellationToken",
         "module": "commonjs",
         "types": [
             "node"
diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
+        "outDir": "../../built/local/compiler",
         "types": ["node"]
     },
 
diff --git a/src/compiler/tsconfig.release.json b/src/compiler/tsconfig.release.json
diff --git a/src/debug/tsconfig.json b/src/debug/tsconfig.json
@@ -1,11 +1,9 @@
 {
-    "extends": "../tsconfig-library-base",
+    "extends": "../tsconfig-base",
     "compilerOptions": {
         "target": "es2019",
         "lib": ["es2019"],
-        "outDir": "../../built/local",
-        "declaration": false,
-        "sourceMap": true
+        "outDir": "../../built/local/debug"
     },
     "files": [
         "dbg.ts",
diff --git a/src/deprecatedCompat/tsconfig.json b/src/deprecatedCompat/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
+        "outDir": "../../built/local/deprecatedCompat",
         "experimentalDecorators": true
     },
     "references": [
@@ -19,4 +19,4 @@
         "4.8/mergeDecoratorsAndModifiers.ts",
         "_namespaces/ts.ts"
     ]
-}
+}
diff --git a/src/dynamicImportCompat/tsconfig.json b/src/dynamicImportCompat/tsconfig.json
@@ -1,14 +1,11 @@
 {
-    "extends": "../tsconfig-library-base",
+    "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
+        "outDir": "../../built/local/dynamicImportCompat",
         "rootDir": ".",
         "target": "esnext",
         "module": "esnext",
-        "lib": ["esnext"],
-        "declaration": false,
-        "sourceMap": true,
-        "tsBuildInfoFile": "../../built/local/dynamicImportCompat.tsbuildinfo"
+        "lib": ["esnext"]
     },
     "files": [
         "dynamicImportCompat.ts",
diff --git a/src/executeCommandLine/tsconfig.json b/src/executeCommandLine/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local"
+        "outDir": "../../built/local/executeCommandLine"
     },
 
     "references": [
diff --git a/src/executeCommandLine/tsconfig.release.json b/src/executeCommandLine/tsconfig.release.json
diff --git a/src/harness/tsconfig.json b/src/harness/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
+        "outDir": "../../built/local/harness",
         "types": [
             "node", "mocha", "chai"
         ],
diff --git a/src/instrumenter/tsconfig.json b/src/instrumenter/tsconfig.json
@@ -7,10 +7,9 @@
             "dom",
             "scripthost"
         ],
-        "outDir": "../../built/local",
-        "sourceMap": true
+        "outDir": "../../built/local/instrumenter"
     },
     "files": [
         "instrumenter.ts"
     ]
-}
+}
diff --git a/src/jsTyping/tsconfig.json b/src/jsTyping/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
+        "outDir": "../../built/local/jsTyping",
         "types": [
             "node"
         ],
diff --git a/src/loggedIO/tsconfig-tsc-instrumented.json b/src/loggedIO/tsconfig-tsc-instrumented.json
@@ -1,7 +1,8 @@
 {
+    // TODO: ???
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
+        "outDir": "../../built/local/loggedIO",
         "types": [
             "node", "mocha", "chai"
         ],
diff --git a/src/loggedIO/tsconfig.json b/src/loggedIO/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
+        "outDir": "../../built/local/loggedIO",
         "types": [
         ],
         "lib": [
diff --git a/src/server/tsconfig.json b/src/server/tsconfig.json
@@ -1,9 +1,7 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "removeComments": false,
-        "outDir": "../../built/local",
-        "preserveConstEnums": true,
+        "outDir": "../../built/local/server",
         "types": [
             "node"
         ]
diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local"
+        "outDir": "../../built/local/services"
     },
     "references": [
         { "path": "../compiler" },
diff --git a/src/testRunner/tsconfig.json b/src/testRunner/tsconfig.json
@@ -1,10 +1,7 @@
 {
-    "extends": "../tsconfig-noncomposite-base",
+    "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
-        "composite": false,
-        "declaration": false,
-        "declarationMap": false,
+        "outDir": "../../built/local/testRunner",
         "types": [
             "node", "mocha", "chai"
         ],
diff --git a/src/tsc/tsconfig.json b/src/tsc/tsconfig.json
@@ -1,7 +1,7 @@
 {
-    "extends": "../tsconfig-noncomposite-base",
+    "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local"
+        "outDir": "../../built/local/tsc"
     },
     "files": [
         "tsc.ts",
diff --git a/src/tsc/tsconfig.release.json b/src/tsc/tsconfig.release.json
diff --git a/src/tsconfig-base.json b/src/tsconfig-base.json
@@ -4,7 +4,6 @@
         "lib": ["es2015.iterable", "es2015.generator", "es5"],
         "target": "es5",
         "moduleResolution": "node",
-        "rootDir": ".",
 
         "declaration": true,
         "declarationMap": true,
diff --git a/src/tsconfig-library-base.json b/src/tsconfig-library-base.json
diff --git a/src/tsconfig-noncomposite-base.json b/src/tsconfig-noncomposite-base.json
diff --git a/src/tsserver/tsconfig.json b/src/tsserver/tsconfig.json
@@ -1,8 +1,8 @@
 {
-    "extends": "../tsconfig-noncomposite-base",
+    "extends": "../tsconfig-base",
  
     "compilerOptions": {
-        "outDir": "../../built/local",
+        "outDir": "../../built/local/tsserver",
         "types": [
             "node"
         ]
diff --git a/src/tsserverlibrary/tsconfig.json b/src/tsserverlibrary/tsconfig.json
@@ -1,7 +1,7 @@
 {
-    "extends": "../tsconfig-library-base",
+    "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local"
+        "outDir": "../../built/local/tsserverlibrary"
     },
     "files": [
         "tsserverlibrary.ts",
diff --git a/src/typescript/tsconfig.json b/src/typescript/tsconfig.json
@@ -1,7 +1,7 @@
 {
-    "extends": "../tsconfig-library-base",
+    "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local"
+        "outDir": "../../built/local/typescript"
     },
     "files": [
         "typescript.ts",
diff --git a/src/typescriptServices/tsconfig.json b/src/typescriptServices/tsconfig.json
@@ -1,7 +1,7 @@
 {
-    "extends": "../tsconfig-library-base",
+    "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local"
+        "outDir": "../../built/local/typescriptServices"
     },
     "files": [
         "typescriptServices.ts",
diff --git a/src/typingsInstaller/tsconfig.json b/src/typingsInstaller/tsconfig.json
@@ -1,8 +1,7 @@
 {
-    "extends": "../tsconfig-noncomposite-base",
+    "extends": "../tsconfig-base",
     "compilerOptions": {
-        "removeComments": true,
-        "outDir": "../../built/local",
+        "outDir": "../../built/local/typingsInstaller",
         "types": [
             "node"
         ],
diff --git a/src/typingsInstallerCore/tsconfig.json b/src/typingsInstallerCore/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../../built/local",
+        "outDir": "../../built/local/typingsInstallerCore",
         "types": [
             "node"
         ],
diff --git a/src/watchGuard/tsconfig.json b/src/watchGuard/tsconfig.json
@@ -1,9 +1,7 @@
 {
-    "extends": "../tsconfig-noncomposite-base",
+    "extends": "../tsconfig-base",
     "compilerOptions": {
-        "removeComments": true,
-        "incremental":  false,
-        "outDir": "../../built/local",
+        "outDir": "../../built/local/watchGuard",
         "types": [
             "node"
         ],
diff --git a/src/webServer/tsconfig.json b/src/webServer/tsconfig.json
@@ -1,9 +1,7 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "removeComments": false,
-        "outDir": "../../built/local",
-        "preserveConstEnums": true,
+        "outDir": "../../built/local/webServer",
         "types": [
             "node"
         ]

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"extends": "../tsconfig-base",`
`3`	`3`	`"compilerOptions": {`
`4`		`- "outDir": "../../built/local",`
	`4`	`+ "outDir": "../../built/local/compiler",`
`5`	`5`	`"types": ["node"]`
`6`	`6`	`},`
`7`	`7`