From 9d74dfdb7ab3f4ce06bab00ce685541293bd37a6 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Thu, 23 Dec 2021 16:04:18 +0100
Subject: build: Enable typescript composite mode and clean

Moves all typings to the dist-types directories from the dist
directories so that we can let vite clean the dist directories on build
without clobbering the typings generated by tsc.
---
 packages/main/package.json      | 3 +++
 packages/main/tsconfig.json     | 5 ++++-
 packages/preload/package.json   | 3 +++
 packages/preload/tsconfig.json  | 5 ++++-
 packages/renderer/package.json  | 3 +++
 packages/renderer/tsconfig.json | 5 ++++-
 packages/shared/package.json    | 4 +++-
 packages/shared/tsconfig.json   | 3 +--
 packages/shared/vite.config.js  | 2 +-
 9 files changed, 26 insertions(+), 7 deletions(-)

(limited to 'packages')

diff --git a/packages/main/package.json b/packages/main/package.json
index 1f5e749..509acdc 100644
--- a/packages/main/package.json
+++ b/packages/main/package.json
@@ -3,7 +3,9 @@
   "version": "0.1.0",
   "private": true,
   "main": "dist/index.cjs",
+  "types": "dist-types/index.d.ts",
   "scripts": {
+    "clean": "rimraf dist dist-types tsconfig.tsbuildinfo",
     "build": "vite build",
     "typecheck": "tsc"
   },
@@ -17,6 +19,7 @@
     "@types/electron-devtools-installer": "^2.2.0",
     "@types/node": "^17.0.4",
     "electron-devtools-installer": "^3.2.0",
+    "rimraf": "^3.0.2",
     "typescript": "^4.5.4",
     "vite": "^2.7.6"
   }
diff --git a/packages/main/tsconfig.json b/packages/main/tsconfig.json
index 970215c..5afee21 100644
--- a/packages/main/tsconfig.json
+++ b/packages/main/tsconfig.json
@@ -1,7 +1,10 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "noEmit": true,
+    "composite": true,
+    "declarationDir": "dist-types",
+    "emitDeclarationOnly": true,
+    "rootDir": "src",
     "types": [
       "node",
       "vite/client"
diff --git a/packages/preload/package.json b/packages/preload/package.json
index 2ad215c..e050b9a 100644
--- a/packages/preload/package.json
+++ b/packages/preload/package.json
@@ -4,7 +4,9 @@
   "private": true,
   "sideEffects": false,
   "main": "dist/index.cjs",
+  "types": "dist-types/index.d.ts",
   "scripts": {
+    "clean": "rimraf dist dist-types tsconfig.tsbuildinfo",
     "build": "vite build",
     "typecheck": "tsc"
   },
@@ -15,6 +17,7 @@
     "mobx-state-tree": "^5.1.0"
   },
   "devDependencies": {
+    "rimraf": "^3.0.2",
     "typescript": "^4.5.4",
     "vite": "^2.7.6"
   }
diff --git a/packages/preload/tsconfig.json b/packages/preload/tsconfig.json
index 8bfa0ec..66726e3 100644
--- a/packages/preload/tsconfig.json
+++ b/packages/preload/tsconfig.json
@@ -1,7 +1,10 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "noEmit": true
+    "composite": true,
+    "declarationDir": "dist-types",
+    "emitDeclarationOnly": true,
+    "rootDir": "src"
   },
   "references": [
     {
diff --git a/packages/renderer/package.json b/packages/renderer/package.json
index ceec3a5..5f9bd57 100644
--- a/packages/renderer/package.json
+++ b/packages/renderer/package.json
@@ -3,7 +3,9 @@
   "version": "0.1.0",
   "private": true,
   "main": "dist/index.html",
+  "types": "dist-types/index.d.ts",
   "scripts": {
+    "clean": "rimraf dist dist-types node_modules tsconfig.tsbuildinfo",
     "build": "vite build",
     "typecheck": "tsc"
   },
@@ -26,6 +28,7 @@
     "@vitejs/plugin-react": "^1.1.3",
     "mst-middlewares": "^5.1.0",
     "remotedev": "^0.2.9",
+    "rimraf": "^3.0.2",
     "typescript": "^4.5.4",
     "vite": "^2.7.6"
   }
diff --git a/packages/renderer/tsconfig.json b/packages/renderer/tsconfig.json
index 8746462..998ed07 100644
--- a/packages/renderer/tsconfig.json
+++ b/packages/renderer/tsconfig.json
@@ -1,8 +1,11 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "noEmit": true,
+    "composite": true,
+    "declarationDir": "dist-types",
+    "emitDeclarationOnly": true,
     "jsx": "react",
+    "rootDir": "src",
     "lib": [
       "dom",
       "dom.iterable",
diff --git a/packages/shared/package.json b/packages/shared/package.json
index f49be47..83aec54 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -4,12 +4,14 @@
   "private": true,
   "main": "dist/index.cjs",
   "module": "dist/index.es.js",
-  "types": "dist/index.d.ts",
+  "types": "dist-types/index.d.ts",
   "scripts": {
+    "clean": "rimraf dist dist-types tsconfig.tsbuildinfo",
     "build": "vite build",
     "typecheck": "tsc"
   },
   "devDependencies": {
+    "rimraf": "^3.0.2",
     "typescript": "^4.5.4",
     "vite": "^2.7.6"
   },
diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json
index d441cc8..de75833 100644
--- a/packages/shared/tsconfig.json
+++ b/packages/shared/tsconfig.json
@@ -2,8 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
-    "declaration": true,
-    "declarationDir": "dist",
+    "declarationDir": "dist-types",
     "emitDeclarationOnly": true,
     "rootDir": "src"
   },
diff --git a/packages/shared/vite.config.js b/packages/shared/vite.config.js
index 05ec118..a3efc87 100644
--- a/packages/shared/vite.config.js
+++ b/packages/shared/vite.config.js
@@ -36,7 +36,7 @@ const config = {
         ...builtinModules,
       ],
     },
-    emptyOutDir: false, // Do not remove `.d.ts` files.
+    emptyOutDir: true,
     brotliSize: false,
   },
 };
-- 
cgit v1.2.3-54-g00ecf