From 12d3fac1796c590befb5b328d0bb9b318ebe9fef Mon Sep 17 00:00:00 2001
From: Mattias Buelens <mattias@buelens.com>
Date: Wed, 29 May 2019 18:03:59 +0200
Subject: [PATCH] Fix composite project setup

---
 package.json                       | 2 +-
 src/dedicated-worker/tsconfig.json | 1 -
 src/main/tsconfig.json             | 5 ++++-
 src/service-worker/tsconfig.json   | 1 -
 tsconfig.json                      | 8 ++------
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index b04c361..728717e 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "version": "1.0.0",
   "scripts": {
-    "build": "tsc -b"
+    "build": "tsc -b src/main"
   },
   "devDependencies": {
     "typescript": "^3.4.5"
diff --git a/src/dedicated-worker/tsconfig.json b/src/dedicated-worker/tsconfig.json
index b98bb8c..4c64c26 100644
--- a/src/dedicated-worker/tsconfig.json
+++ b/src/dedicated-worker/tsconfig.json
@@ -2,7 +2,6 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "lib": ["esnext", "webworker"],
-    "outDir": "../../dist/dedicated-worker"
   },
   "include": ["./**/*"]
 }
diff --git a/src/main/tsconfig.json b/src/main/tsconfig.json
index ffc19af..b8027e4 100644
--- a/src/main/tsconfig.json
+++ b/src/main/tsconfig.json
@@ -2,7 +2,10 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "lib": ["esnext", "dom"],
-    "outDir": "../../dist/main"
   },
+  "references": [
+    {"path": "../dedicated-worker"},
+    {"path": "../service-worker"},
+  ],
   "include": ["./**/*"]
 }
diff --git a/src/service-worker/tsconfig.json b/src/service-worker/tsconfig.json
index ad24548..4c64c26 100644
--- a/src/service-worker/tsconfig.json
+++ b/src/service-worker/tsconfig.json
@@ -2,7 +2,6 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "lib": ["esnext", "webworker"],
-    "outDir": "../../dist/service-worker"
   },
   "include": ["./**/*"]
 }
diff --git a/tsconfig.json b/tsconfig.json
index 926e1d7..57314d6 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -4,12 +4,8 @@
     "module": "esnext",
     "strict": true,
     "moduleResolution": "node",
+    "rootDir": "src",
+    "outDir": "dist",
     "composite": true
   },
-  "references": [
-    {"path": "src/main"},
-    {"path": "src/dedicated-worker"},
-    {"path": "src/service-worker"},
-  ],
-  "exclude": ["./dist/**/*"]
 }