From 30000ce36e6d02071baa54404ec5c322a5a88865 Mon Sep 17 00:00:00 2001 From: Henrik Giesel Date: Sun, 3 Oct 2021 16:14:41 +0200 Subject: [PATCH] Revert "Put rootDirs into subprojects" This partially reverts commit e1d4292ce3979e7b7ee21bf3951b8a462d45c29c. It seems like this might not be necessary after all. However some other change made on this branch seems to have fixed the .svelte.d.ts imports --- ts/change-notetype/tsconfig.json | 1 - ts/components/tsconfig.json | 1 - ts/congrats/tsconfig.json | 1 - ts/deck-options/tsconfig.json | 1 - ts/editable/tsconfig.json | 1 - ts/editor/tsconfig.json | 1 - ts/html-filter/tsconfig.json | 1 - ts/lib/tsconfig.json | 1 - ts/reviewer/tsconfig.json | 1 - ts/sveltelib/tsconfig.json | 1 - ts/tsconfig.json | 4 ++++ 11 files changed, 4 insertions(+), 10 deletions(-) diff --git a/ts/change-notetype/tsconfig.json b/ts/change-notetype/tsconfig.json index 343099dd9..276e90989 100644 --- a/ts/change-notetype/tsconfig.json +++ b/ts/change-notetype/tsconfig.json @@ -1,6 +1,5 @@ { "extends": "../tsconfig.json", - "rootDirs": ["../../bazel-bin/ts/change-notetype"], "include": ["*"], "references": [ { "path": "../lib" }, diff --git a/ts/components/tsconfig.json b/ts/components/tsconfig.json index 967d2a2d5..6ef6ea47c 100644 --- a/ts/components/tsconfig.json +++ b/ts/components/tsconfig.json @@ -1,6 +1,5 @@ { "extends": "../tsconfig.json", - "rootDirs": ["../../bazel-bin/ts/components"], "include": ["*"], "references": [{ "path": "../lib" }, { "path": "../sveltelib" }] } diff --git a/ts/congrats/tsconfig.json b/ts/congrats/tsconfig.json index f9cfbf1f4..156ec7f9f 100644 --- a/ts/congrats/tsconfig.json +++ b/ts/congrats/tsconfig.json @@ -1,6 +1,5 @@ { "extends": "../tsconfig.json", - "rootDirs": ["../../bazel-bin/ts/congrats"], "include": ["*"], "references": [{ "path": "../lib" }] } diff --git a/ts/deck-options/tsconfig.json b/ts/deck-options/tsconfig.json index ea665bd14..276e90989 100644 --- a/ts/deck-options/tsconfig.json +++ b/ts/deck-options/tsconfig.json @@ -1,6 +1,5 @@ { "extends": "../tsconfig.json", - "rootDirs": ["../../bazel-bin/ts/deck-options"], "include": ["*"], "references": [ { "path": "../lib" }, diff --git a/ts/editable/tsconfig.json b/ts/editable/tsconfig.json index d41b14d36..a3fb6b2dc 100644 --- a/ts/editable/tsconfig.json +++ b/ts/editable/tsconfig.json @@ -1,6 +1,5 @@ { "extends": "../tsconfig.json", - "rootDirs": ["../../bazel-bin/ts/editable"], "include": ["*"], "references": [ { "path": "../components" }, diff --git a/ts/editor/tsconfig.json b/ts/editor/tsconfig.json index 6321ef2f6..28951ad86 100644 --- a/ts/editor/tsconfig.json +++ b/ts/editor/tsconfig.json @@ -1,6 +1,5 @@ { "extends": "../tsconfig.json", - "rootDirs": ["../../bazel-bin/ts/editor"], "include": ["*"], "references": [ { "path": "../components" }, diff --git a/ts/html-filter/tsconfig.json b/ts/html-filter/tsconfig.json index e4fd5bec9..587e87472 100644 --- a/ts/html-filter/tsconfig.json +++ b/ts/html-filter/tsconfig.json @@ -1,6 +1,5 @@ { "extends": "../tsconfig.json", - "rootDirs": ["../../bazel-bin/ts/html-filter"], "include": ["*"], "references": [], "compilerOptions": { diff --git a/ts/lib/tsconfig.json b/ts/lib/tsconfig.json index 78e6380d6..587e87472 100644 --- a/ts/lib/tsconfig.json +++ b/ts/lib/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../tsconfig.json", "include": ["*"], - "rootDirs": ["../../bazel-bin/ts/lib"], "references": [], "compilerOptions": { "types": ["jest"] diff --git a/ts/reviewer/tsconfig.json b/ts/reviewer/tsconfig.json index 836b23e94..156ec7f9f 100644 --- a/ts/reviewer/tsconfig.json +++ b/ts/reviewer/tsconfig.json @@ -1,6 +1,5 @@ { "extends": "../tsconfig.json", - "rootDirs": ["../../bazel-bin/ts/reviewer"], "include": ["*"], "references": [{ "path": "../lib" }] } diff --git a/ts/sveltelib/tsconfig.json b/ts/sveltelib/tsconfig.json index 7e4a1539e..156ec7f9f 100644 --- a/ts/sveltelib/tsconfig.json +++ b/ts/sveltelib/tsconfig.json @@ -1,6 +1,5 @@ { "extends": "../tsconfig.json", - "rootDirs": ["../../bazel-bin/ts/sveltelib"], "include": ["*"], "references": [{ "path": "../lib" }] } diff --git a/ts/tsconfig.json b/ts/tsconfig.json index ec2df25ab..46ba3b402 100644 --- a/ts/tsconfig.json +++ b/ts/tsconfig.json @@ -32,6 +32,10 @@ // "outDir": "dist", // "rootDir": "..", "rootDir": ".", + "rootDirs": [ + // for VS code + "../bazel-bin/ts" + ], "baseUrl": ".", "paths": {}, "types": [],