Skip to content

Commit 5360203

Browse files
jakebaileyjakebailey
committed
Overhaul tsconfigs to output to the right locations
1 parent d60d508 commit 5360203

File tree

29 files changed

+38
-117
lines changed

29 files changed

+38
-117
lines changed

‎src/cancellationToken/tsconfig.json

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
{
2-
"extends": "../tsconfig-noncomposite-base",
2+
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local/",
5-
"rootDir": ".",
6-
"composite": false,
7-
"declaration": false,
8-
"declarationMap": false,
9-
"removeComments": true,
10-
"incremental": false,
4+
"outDir": "../../built/local/cancellationToken",
115
"module": "commonjs",
126
"types": [
137
"node"

‎src/compiler/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local",
4+
"outDir": "../../built/local/compiler",
55
"types": ["node"]
66
},
77

‎src/compiler/tsconfig.release.json

-10
This file was deleted.

‎src/debug/tsconfig.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
{
2-
"extends": "../tsconfig-library-base",
2+
"extends": "../tsconfig-base",
33
"compilerOptions": {
44
"target": "es2019",
55
"lib": ["es2019"],
6-
"outDir": "../../built/local",
7-
"declaration": false,
8-
"sourceMap": true
6+
"outDir": "../../built/local/debug"
97
},
108
"files": [
119
"dbg.ts",

‎src/deprecatedCompat/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local",
4+
"outDir": "../../built/local/deprecatedCompat",
55
"experimentalDecorators": true
66
},
77
"references": [
@@ -19,4 +19,4 @@
1919
"4.8/mergeDecoratorsAndModifiers.ts",
2020
"_namespaces/ts.ts"
2121
]
22-
}
22+
}

‎src/dynamicImportCompat/tsconfig.json

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
{
2-
"extends": "../tsconfig-library-base",
2+
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local",
4+
"outDir": "../../built/local/dynamicImportCompat",
55
"rootDir": ".",
66
"target": "esnext",
77
"module": "esnext",
8-
"lib": ["esnext"],
9-
"declaration": false,
10-
"sourceMap": true,
11-
"tsBuildInfoFile": "../../built/local/dynamicImportCompat.tsbuildinfo"
8+
"lib": ["esnext"]
129
},
1310
"files": [
1411
"dynamicImportCompat.ts",

‎src/executeCommandLine/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local"
4+
"outDir": "../../built/local/executeCommandLine"
55
},
66

77
"references": [

‎src/executeCommandLine/tsconfig.release.json

-11
This file was deleted.

‎src/harness/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local",
4+
"outDir": "../../built/local/harness",
55
"types": [
66
"node", "mocha", "chai"
77
],

‎src/instrumenter/tsconfig.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
"dom",
88
"scripthost"
99
],
10-
"outDir": "../../built/local",
11-
"sourceMap": true
10+
"outDir": "../../built/local/instrumenter"
1211
},
1312
"files": [
1413
"instrumenter.ts"
1514
]
16-
}
15+
}

‎src/jsTyping/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local",
4+
"outDir": "../../built/local/jsTyping",
55
"types": [
66
"node"
77
],

‎src/loggedIO/tsconfig-tsc-instrumented.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
2+
// TODO: ???
23
"extends": "../tsconfig-base",
34
"compilerOptions": {
4-
"outDir": "../../built/local",
5+
"outDir": "../../built/local/loggedIO",
56
"types": [
67
"node", "mocha", "chai"
78
],

‎src/loggedIO/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local",
4+
"outDir": "../../built/local/loggedIO",
55
"types": [
66
],
77
"lib": [

‎src/server/tsconfig.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"removeComments": false,
5-
"outDir": "../../built/local",
6-
"preserveConstEnums": true,
4+
"outDir": "../../built/local/server",
75
"types": [
86
"node"
97
]

‎src/services/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local"
4+
"outDir": "../../built/local/services"
55
},
66
"references": [
77
{ "path": "../compiler" },

‎src/testRunner/tsconfig.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
{
2-
"extends": "../tsconfig-noncomposite-base",
2+
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local",
5-
"composite": false,
6-
"declaration": false,
7-
"declarationMap": false,
4+
"outDir": "../../built/local/testRunner",
85
"types": [
96
"node", "mocha", "chai"
107
],

‎src/tsc/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"extends": "../tsconfig-noncomposite-base",
2+
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local"
4+
"outDir": "../../built/local/tsc"
55
},
66
"files": [
77
"tsc.ts",

‎src/tsc/tsconfig.release.json

-17
This file was deleted.

‎src/tsconfig-base.json

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"lib": ["es2015.iterable", "es2015.generator", "es5"],
55
"target": "es5",
66
"moduleResolution": "node",
7-
"rootDir": ".",
87

98
"declaration": true,
109
"declarationMap": true,

‎src/tsconfig-library-base.json

-10
This file was deleted.

‎src/tsconfig-noncomposite-base.json

-9
This file was deleted.

‎src/tsserver/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"extends": "../tsconfig-noncomposite-base",
2+
"extends": "../tsconfig-base",
33

44
"compilerOptions": {
5-
"outDir": "../../built/local",
5+
"outDir": "../../built/local/tsserver",
66
"types": [
77
"node"
88
]

‎src/tsserverlibrary/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"extends": "../tsconfig-library-base",
2+
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local"
4+
"outDir": "../../built/local/tsserverlibrary"
55
},
66
"files": [
77
"tsserverlibrary.ts",

‎src/typescript/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"extends": "../tsconfig-library-base",
2+
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local"
4+
"outDir": "../../built/local/typescript"
55
},
66
"files": [
77
"typescript.ts",

‎src/typescriptServices/tsconfig.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"extends": "../tsconfig-library-base",
2+
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local"
4+
"outDir": "../../built/local/typescriptServices"
55
},
66
"files": [
77
"typescriptServices.ts",

‎src/typingsInstaller/tsconfig.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
2-
"extends": "../tsconfig-noncomposite-base",
2+
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"removeComments": true,
5-
"outDir": "../../built/local",
4+
"outDir": "../../built/local/typingsInstaller",
65
"types": [
76
"node"
87
],

‎src/typingsInstallerCore/tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local",
4+
"outDir": "../../built/local/typingsInstallerCore",
55
"types": [
66
"node"
77
],

‎src/watchGuard/tsconfig.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
{
2-
"extends": "../tsconfig-noncomposite-base",
2+
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"removeComments": true,
5-
"incremental": false,
6-
"outDir": "../../built/local",
4+
"outDir": "../../built/local/watchGuard",
75
"types": [
86
"node"
97
],

‎src/webServer/tsconfig.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"removeComments": false,
5-
"outDir": "../../built/local",
6-
"preserveConstEnums": true,
4+
"outDir": "../../built/local/webServer",
75
"types": [
86
"node"
97
]

0 commit comments

Comments
 (0)