Skip to content

Commit 3382b8e

Browse files
jakebaileyjakebailey
committed
Specify rootDir and outDir in tsconfig-base rather than in each tsconfig
1 parent 6189add commit 3382b8e

File tree

21 files changed

+14
-30
lines changed

21 files changed

+14
-30
lines changed

Diff for: ‎Herebyfile.mjs

+11-5
Original file line numberDiff line numberDiff line change
@@ -473,11 +473,14 @@ export const lint = task({
473473

474474
const esbuildCancellationToken = esbuildTask("./src/cancellationToken/cancellationToken.ts", "./built/local/cancellationToken.js");
475475

476-
// No need for writeCJSReexport, this outputs to the right place.
477476
const buildCancellationToken = task({
478477
name: "cancellation-token",
479478
dependencies: [generateDiagnostics],
480-
run: () => cmdLineOptions.bundle ? esbuildCancellationToken.build() : buildProject("src/cancellationToken"),
479+
run: async () =>{
480+
if (cmdLineOptions.bundle) return esbuildCancellationToken.build();
481+
await writeCJSReexport("./built/local/cancellationToken/cancellationToken.js", "./built/local/cancellationToken.js");
482+
await buildProject("src/cancellationToken");
483+
},
481484
});
482485
const cleanCancellationToken = task({
483486
name: "clean-cancellation-token",
@@ -493,7 +496,7 @@ const buildTypingsInstaller = task({
493496
dependencies: [generateDiagnostics],
494497
run: async () => {
495498
if (cmdLineOptions.bundle) return esbuildTypingsInstaller.build();
496-
await writeCJSReexport("./built/typingsInstaller/nodeTypingsInstaller.js", "./built/local/typingsInstaller.js");
499+
await writeCJSReexport("./built/local/typingsInstaller/nodeTypingsInstaller.js", "./built/local/typingsInstaller.js");
497500
await buildProject("src/typingsInstaller");
498501
},
499502
});
@@ -506,11 +509,14 @@ cleanTasks.push(cleanTypingsInstaller);
506509

507510
const esbuildWatchGuard = esbuildTask("./src/watchGuard/watchGuard.ts", "./built/local/watchGuard.js");
508511

509-
// No need for writeCJSReexport, this outputs to the right place.
510512
const buildWatchGuard = task({
511513
name: "watch-guard",
512514
dependencies: [generateDiagnostics],
513-
run: () => cmdLineOptions.bundle ? esbuildWatchGuard.build() : buildProject("src/watchGuard"),
515+
run: async () => {
516+
if (cmdLineOptions.bundle) return esbuildWatchGuard.build();
517+
await writeCJSReexport("./built/local/watchGuard/watchGuard.js", "./built/local/watchGuard.js");
518+
await buildProject("src/watchGuard");
519+
},
514520
});
515521
const cleanWatchGuard = task({
516522
name: "clean-watch-guard",

Diff for: ‎src/cancellationToken/tsconfig.json

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local",
5-
"tsBuildInfoFile": "../../built/local/cancellationToken.tsbuildinfo",
6-
"rootDir": ".",
74
"module": "commonjs",
85
"types": [
96
"node"

Diff for: ‎src/compiler/tsconfig.json

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

Diff for: ‎src/debug/tsconfig.json

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local",
5-
"tsBuildInfoFile": "../../built/local/debug.tsbuildinfo",
6-
"rootDir": ".",
74
"target": "es2019",
85
"lib": ["es2019"],
96
},

Diff for: ‎src/deprecatedCompat/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local/deprecatedCompat",
54
"experimentalDecorators": true
65
},
76
"references": [

Diff for: ‎src/executeCommandLine/tsconfig.json

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

76
"references": [

Diff for: ‎src/harness/tsconfig.json

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

Diff for: ‎src/jsTyping/tsconfig.json

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

Diff for: ‎src/loggedIO/tsconfig.json

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

Diff for: ‎src/server/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local/server",
54
"types": [
65
"node"
76
]

Diff for: ‎src/services/tsconfig.json

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

Diff for: ‎src/testRunner/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local/testRunner",
54
"types": [
65
"node", "mocha", "chai"
76
],

Diff for: ‎src/tsc/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local/tsc"
54
},
65
"files": [
76
"tsc.ts",

Diff for: ‎src/tsconfig-base.json

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"compilerOptions": {
3+
"rootDir": ".",
4+
"outDir": "../built/local",
5+
36
"pretty": true,
47
"lib": ["es2015.iterable", "es2015.generator", "es5"],
58
"target": "es5",

Diff for: ‎src/tsserver/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"extends": "../tsconfig-base",
33

44
"compilerOptions": {
5-
"outDir": "../../built/local/tsserver",
65
"types": [
76
"node"
87
]

Diff for: ‎src/tsserverlibrary/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local/tsserverlibrary"
54
},
65
"files": [
76
"tsserverlibrary.ts",

Diff for: ‎src/typescript/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local/typescript"
54
},
65
"files": [
76
"typescript.ts",

Diff for: ‎src/typingsInstaller/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local/typingsInstaller",
54
"types": [
65
"node"
76
],

Diff for: ‎src/typingsInstallerCore/tsconfig.json

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

Diff for: ‎src/watchGuard/tsconfig.json

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local",
5-
"tsBuildInfoFile": "../../built/local/watchGuard.tsbuildinfo",
6-
"rootDir": ".",
74
"types": [
85
"node"
96
],

Diff for: ‎src/webServer/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"extends": "../tsconfig-base",
33
"compilerOptions": {
4-
"outDir": "../../built/local/webServer",
54
"types": [
65
"node"
76
]

0 commit comments

Comments
 (0)