Skip to content

Commit 157a893

Browse files
committed
Specify rootDir and outDir in tsconfig-base rather than in each tsconfig
1 parent 8fc68d6 commit 157a893

File tree

21 files changed

+14
-30
lines changed

21 files changed

+14
-30
lines changed

Herebyfile.mjs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -474,11 +474,14 @@ export const lint = task({
474474

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

477-
// No need for writeCJSReexport, this outputs to the right place.
478477
const buildCancellationToken = task({
479478
name: "cancellation-token",
480479
dependencies: [generateDiagnostics],
481-
run: () => cmdLineOptions.bundle ? esbuildCancellationToken.build() : buildProject("src/cancellationToken"),
480+
run: async () =>{
481+
if (cmdLineOptions.bundle) return esbuildCancellationToken.build();
482+
await writeCJSReexport("./built/local/cancellationToken/cancellationToken.js", "./built/local/cancellationToken.js");
483+
await buildProject("src/cancellationToken");
484+
},
482485
});
483486
const cleanCancellationToken = task({
484487
name: "clean-cancellation-token",
@@ -494,7 +497,7 @@ const buildTypingsInstaller = task({
494497
dependencies: [generateDiagnostics],
495498
run: async () => {
496499
if (cmdLineOptions.bundle) return esbuildTypingsInstaller.build();
497-
await writeCJSReexport("./built/typingsInstaller/nodeTypingsInstaller.js", "./built/local/typingsInstaller.js");
500+
await writeCJSReexport("./built/local/typingsInstaller/nodeTypingsInstaller.js", "./built/local/typingsInstaller.js");
498501
await buildProject("src/typingsInstaller");
499502
},
500503
});
@@ -507,11 +510,14 @@ cleanTasks.push(cleanTypingsInstaller);
507510

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

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

src/cancellationToken/tsconfig.json

Lines changed: 0 additions & 3 deletions
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"

src/compiler/tsconfig.json

Lines changed: 0 additions & 1 deletion
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

src/debug/tsconfig.json

Lines changed: 0 additions & 3 deletions
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
},

src/deprecatedCompat/tsconfig.json

Lines changed: 0 additions & 1 deletion
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": [

src/executeCommandLine/tsconfig.json

Lines changed: 0 additions & 1 deletion
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": [

src/harness/tsconfig.json

Lines changed: 0 additions & 1 deletion
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
],

src/jsTyping/tsconfig.json

Lines changed: 0 additions & 1 deletion
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
],

src/loggedIO/tsconfig.json

Lines changed: 0 additions & 1 deletion
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": [

src/server/tsconfig.json

Lines changed: 0 additions & 1 deletion
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
]

0 commit comments

Comments
 (0)