build: Simplify type declaration generation

19 files changed, 31 insertions, 34 deletions

diff --git a/.electron-builder.config.js b/.electron-builder.config.js
index 4ff94d7..3fa9ab5 100644
--- a/.electron-builder.config.js
+++ b/.electron-builder.config.js
@@ -19,7 +19,11 @@ const config = {
     buildResources: 'buildResources',
   },
   files: [
-    'packages/**/dist/**',
+    'packages/main/dist/**',
+    'packages/preload/dist/**',
+    'packages/renderer/dist/**',
+    'packages/service-inject/dist/**',
+    'packages/service-preload/dist/**',
   ],
   extraMetadata: {
     version: process.env.VITE_APP_VERSION,
diff --git a/.gitignore b/.gitignore
index b310389..0b6997b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,4 @@
 !.yarn/releases
 !.yarn/versions
 dist/
-dist-types/
 *.tsbuildinfo
diff --git a/package.json b/package.json
index f9225db..5494b2a 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
   "main": "packages/main/dist/index.cjs",
   "scripts": {
     "clean": "rimraf dist .log && yarn workspaces foreach run clean",
-    "pretest": "yarn workspaces foreach -vpt --include '@sophie/*shared' run build",
+    "pretest": "yarn workspaces foreach -vpt run pretest",
     "test": "yarn pretest && yarn workspaces foreach -vpt run test",
     "build": "yarn workspaces foreach -vpt run build",
     "precompile": "cross-env MODE=production yarn run build",
diff --git a/packages/main/package.json b/packages/main/package.json
index 48268fb..b93dec0 100644
--- a/packages/main/package.json
+++ b/packages/main/package.json
@@ -5,7 +5,7 @@
   "main": "dist/index.cjs",
   "types": "dist-types/index.d.ts",
   "scripts": {
-    "clean": "rimraf dist dist-types tsconfig.tsbuildinfo",
+    "clean": "rimraf dist tsconfig.tsbuildinfo",
     "build": "vite build",
     "typecheck": "tsc"
   },
diff --git a/packages/main/tsconfig.json b/packages/main/tsconfig.json
index 2529709..6387562 100644
--- a/packages/main/tsconfig.json
+++ b/packages/main/tsconfig.json
@@ -1,10 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "declarationDir": "dist-types",
-    "emitDeclarationOnly": true,
-    "rootDir": "src",
+    "noEmit": true,
     "types": [
       "node",
       "vite/client"
diff --git a/packages/preload/package.json b/packages/preload/package.json
index f7baa37..f804be0 100644
--- a/packages/preload/package.json
+++ b/packages/preload/package.json
@@ -6,7 +6,7 @@
   "main": "dist/index.cjs",
   "types": "dist-types/index.d.ts",
   "scripts": {
-    "clean": "rimraf dist dist-types tsconfig.tsbuildinfo",
+    "clean": "rimraf dist tsconfig.tsbuildinfo",
     "test": "jest",
     "build": "vite build",
     "typecheck": "tsc"
diff --git a/packages/preload/tsconfig.json b/packages/preload/tsconfig.json
index 49f223a..af0fd5f 100644
--- a/packages/preload/tsconfig.json
+++ b/packages/preload/tsconfig.json
@@ -1,10 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "declarationDir": "dist-types",
-    "emitDeclarationOnly": true,
-    "rootDir": "src",
+    "noEmit": true,
     "lib": [
       "dom",
       "dom.iterable",
diff --git a/packages/renderer/package.json b/packages/renderer/package.json
index 9f4605d..e9bb4c6 100644
--- a/packages/renderer/package.json
+++ b/packages/renderer/package.json
@@ -5,7 +5,7 @@
   "main": "dist/index.html",
   "types": "dist-types/index.d.ts",
   "scripts": {
-    "clean": "rimraf dist dist-types node_modules tsconfig.tsbuildinfo",
+    "clean": "rimraf dist node_modules tsconfig.tsbuildinfo",
     "build": "vite build",
     "typecheck": "tsc"
   },
diff --git a/packages/renderer/tsconfig.json b/packages/renderer/tsconfig.json
index 998ed07..8746462 100644
--- a/packages/renderer/tsconfig.json
+++ b/packages/renderer/tsconfig.json
@@ -1,11 +1,8 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "declarationDir": "dist-types",
-    "emitDeclarationOnly": true,
+    "noEmit": true,
     "jsx": "react",
-    "rootDir": "src",
     "lib": [
       "dom",
       "dom.iterable",
diff --git a/packages/service-inject/package.json b/packages/service-inject/package.json
index 8298d20..7065cf0 100644
--- a/packages/service-inject/package.json
+++ b/packages/service-inject/package.json
@@ -6,7 +6,7 @@
   "main": "dist/index.cjs",
   "types": "dist-types/index.d.ts",
   "scripts": {
-    "clean": "rimraf dist dist-types tsconfig.tsbuildinfo",
+    "clean": "rimraf dist tsconfig.tsbuildinfo",
     "build": "vite build",
     "typecheck": "tsc"
   },
diff --git a/packages/service-inject/tsconfig.json b/packages/service-inject/tsconfig.json
index 4007f60..638690b 100644
--- a/packages/service-inject/tsconfig.json
+++ b/packages/service-inject/tsconfig.json
@@ -1,10 +1,7 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "declarationDir": "dist-types",
-    "emitDeclarationOnly": true,
-    "rootDir": "src",
+    "noEmit": true,
     "lib": [
       "dom",
       "dom.iterable",
diff --git a/packages/service-preload/package.json b/packages/service-preload/package.json
index 40b6837..714ae50 100644
--- a/packages/service-preload/package.json
+++ b/packages/service-preload/package.json
@@ -5,7 +5,7 @@
   "main": "dist/index.cjs",
   "types": "dist-types/index.d.ts",
   "scripts": {
-    "clean": "rimraf dist dist-types tsconfig.tsbuildinfo",
+    "clean": "rimraf dist tsconfig.tsbuildinfo",
     "build": "vite build",
     "typecheck": "tsc"
   },
diff --git a/packages/service-preload/tsconfig.json b/packages/service-preload/tsconfig.json
index e5b8ccb..638690b 100644
--- a/packages/service-preload/tsconfig.json
+++ b/packages/service-preload/tsconfig.json
@@ -1,10 +1,12 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
-    "declarationDir": "dist-types",
-    "emitDeclarationOnly": true,
-    "rootDir": "src"
+    "noEmit": true,
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ]
   },
   "references": [
     {
diff --git a/packages/service-shared/package.json b/packages/service-shared/package.json
index 1511906..a176def 100644
--- a/packages/service-shared/package.json
+++ b/packages/service-shared/package.json
@@ -4,9 +4,10 @@
   "private": true,
   "sideEffects": false,
   "main": "dist/index.cjs",
-  "types": "dist-types/index.d.ts",
+  "types": "dist/index.d.ts",
   "scripts": {
-    "clean": "rimraf dist dist-types tsconfig.tsbuildinfo",
+    "clean": "rimraf dist tsconfig.tsbuildinfo",
+    "pretest": "yarn typecheck && yarn build",
     "build": "vite build",
     "typecheck": "tsc"
   },
diff --git a/packages/service-shared/tsconfig.json b/packages/service-shared/tsconfig.json
index de75833..ff5a29b 100644
--- a/packages/service-shared/tsconfig.json
+++ b/packages/service-shared/tsconfig.json
@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
-    "declarationDir": "dist-types",
+    "declarationDir": "dist",
     "emitDeclarationOnly": true,
     "rootDir": "src"
   },
diff --git a/packages/service-shared/vite.config.js b/packages/service-shared/vite.config.js
index 6f4959f..2391810 100644
--- a/packages/service-shared/vite.config.js
+++ b/packages/service-shared/vite.config.js
@@ -28,6 +28,7 @@ const config = makeConfig({
         ...builtinModules,
       ],
     },
+    emptyOutDir: false, // Do not remove .d.ts files.
   },
 });
 
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 7f8830d..6406035 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -5,9 +5,10 @@
   "sideEffects": false,
   "main": "dist/index.cjs",
   "module": "dist/index.es.js",
-  "types": "dist-types/index.d.ts",
+  "types": "dist/index.d.ts",
   "scripts": {
-    "clean": "rimraf dist dist-types tsconfig.tsbuildinfo",
+    "clean": "rimraf dist tsconfig.tsbuildinfo",
+    "pretest": "yarn typecheck && yarn build",
     "build": "vite build",
     "typecheck": "tsc"
   },
diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json
index de75833..ff5a29b 100644
--- a/packages/shared/tsconfig.json
+++ b/packages/shared/tsconfig.json
@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
-    "declarationDir": "dist-types",
+    "declarationDir": "dist",
     "emitDeclarationOnly": true,
     "rootDir": "src"
   },
diff --git a/packages/shared/vite.config.js b/packages/shared/vite.config.js
index 718695a..5fb1ceb 100644
--- a/packages/shared/vite.config.js
+++ b/packages/shared/vite.config.js
@@ -33,6 +33,7 @@ const config = makeConfig({
         ...builtinModules,
       ],
     },
+    emptyOutDir: false, // Do not remove .d.ts files.
   },
 });