build: Simplify project structure

10 files changed, 34 insertions, 45 deletions

diff --git a/packages/main/package.json b/packages/main/package.json
index 1eba6c1..11a6270 100644
--- a/packages/main/package.json
+++ b/packages/main/package.json
@@ -1,12 +1,20 @@
 {
   "name": "@sophie/main",
   "version": "0.1.0",
+  "private": true,
+  "main": "dist/index.cjs",
+  "scripts": {
+    "build": "vite build",
+    "typecheck": "tsc --noEmit"
+  },
   "dependencies": {
     "electron": "^16.0.5"
   },
   "devDependencies": {
     "@types/electron-devtools-installer": "^2.2.0",
+    "@types/node": "^16.11.15",
     "electron-devtools-installer": "^3.2.0",
+    "typescript": "^4.5.4",
     "vite": "^2.7.6"
   }
 }
diff --git a/packages/main/tsconfig.json b/packages/main/tsconfig.json
index 7181228..1a569d2 100644
--- a/packages/main/tsconfig.json
+++ b/packages/main/tsconfig.json
@@ -1,19 +1,13 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "/@/*": [
-        "src/*"
-      ]
-    },
     "types": [
       "node",
       "vite/client"
     ]
   },
   "include": [
-    "src/**/*",
-    "../../types/**/*.d.ts"
+    "src/**/*.ts",
+    "types/**/*.d.ts"
   ]
 }
diff --git a/packages/main/types/vite-env.d.ts b/packages/main/types/vite-env.d.ts
new file mode 100644
index 0000000..c6d56a6
--- /dev/null
+++ b/packages/main/types/vite-env.d.ts
@@ -0,0 +1,5 @@
+/// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  VITE_DEV_SERVER_URL: string | undefined;
+}
diff --git a/packages/main/vite.config.js b/packages/main/vite.config.js
index 45c2c8c..556fcf8 100644
--- a/packages/main/vite.config.js
+++ b/packages/main/vite.config.js
@@ -1,7 +1,6 @@
 // @ts-check
 
 import { builtinModules } from 'module';
-import { join } from 'path';
 
 // `resolveJsonModule` is disabled for this package, but vite will load the json nevertheless.
 // @ts-expect-error
@@ -18,11 +17,6 @@ const config = {
   mode: process.env.MODE,
   root: PACKAGE_ROOT,
   envDir: process.cwd(),
-  resolve: {
-    alias: {
-      '/@/': join(PACKAGE_ROOT, 'src') + '/',
-    },
-  },
   build: {
     sourcemap: 'inline',
     target: `node${node}`,
diff --git a/packages/preload/package.json b/packages/preload/package.json
index 538c583..5417ec0 100644
--- a/packages/preload/package.json
+++ b/packages/preload/package.json
@@ -1,10 +1,17 @@
 {
   "name": "@sophie/preload",
   "version": "0.1.0",
+  "private": true,
+  "main": "dist/index.cjs",
+  "scripts": {
+    "build": "vite build",
+    "typecheck": "tsc --noEmit"
+  },
   "dependencies": {
     "electron": "^16.0.5"
   },
   "devDependencies": {
+    "typescript": "^4.5.4",
     "vite": "^2.7.6"
   }
 }
diff --git a/packages/preload/tsconfig.json b/packages/preload/tsconfig.json
index 580d63a..6bb6145 100644
--- a/packages/preload/tsconfig.json
+++ b/packages/preload/tsconfig.json
@@ -1,15 +1,6 @@
 {
   "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "/@/*": [
-        "src/*"
-      ]
-    }
-  },
   "include": [
-    "src/**/*",
-    "../../types/**/*.d.ts"
+    "src/**/*.ts"
   ]
 }
diff --git a/packages/preload/vite.config.js b/packages/preload/vite.config.js
index 8f11028..bc37ccb 100644
--- a/packages/preload/vite.config.js
+++ b/packages/preload/vite.config.js
@@ -1,7 +1,6 @@
 // @ts-check
 
 import { builtinModules } from 'module';
-import { join } from 'path';
 
 // `resolveJsonModule` is disabled for this package, but vite will load the json nevertheless.
 // @ts-expect-error
@@ -18,11 +17,6 @@ const config = {
   mode: process.env.MODE,
   root: PACKAGE_ROOT,
   envDir: process.cwd(),
-  resolve: {
-    alias: {
-      '/@/': join(PACKAGE_ROOT, 'src') + '/',
-    },
-  },
   build: {
     sourcemap: 'inline',
     target: `chrome${chrome}`,
diff --git a/packages/renderer/package.json b/packages/renderer/package.json
index 89a87b2..0c006a8 100644
--- a/packages/renderer/package.json
+++ b/packages/renderer/package.json
@@ -1,6 +1,12 @@
 {
   "name": "@sophie/renderer",
   "version": "0.1.0",
+  "private": true,
+  "main": "dist/index.html",
+  "scripts": {
+    "build": "vite build",
+    "typecheck": "tsc --noEmit"
+  },
   "dependencies": {
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
@@ -9,6 +15,7 @@
     "@types/react": "^17.0.37",
     "@types/react-dom": "^17.0.11",
     "@vitejs/plugin-react": "^1.1.3",
+    "typescript": "^4.5.4",
     "vite": "^2.7.6"
   }
 }
diff --git a/packages/renderer/tsconfig.json b/packages/renderer/tsconfig.json
index ff4fe7c..4a80025 100644
--- a/packages/renderer/tsconfig.json
+++ b/packages/renderer/tsconfig.json
@@ -1,21 +1,15 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": ".",
     "jsx": "react",
-    "paths": {
-      "/@/*": [
-        "src/*"
-      ]
-    },
-    "types": [
+    "lib": [
       "dom",
-      "dom.iterable"
+      "dom.iterable",
+      "esnext"
     ]
   },
   "include": [
     "src/**/*.ts",
-    "src/**/*.tsx",
-    "../../types/**/*.d.ts"
+    "src/**/*.tsx"
   ]
 }
diff --git a/packages/renderer/vite.config.js b/packages/renderer/vite.config.js
index c10b81f..ff34b6d 100644
--- a/packages/renderer/vite.config.js
+++ b/packages/renderer/vite.config.js
@@ -20,11 +20,6 @@ const PACKAGE_ROOT = __dirname;
 const config = {
   mode: process.env.MODE,
   root: PACKAGE_ROOT,
-  resolve: {
-    alias: {
-      '/@/': join(PACKAGE_ROOT, 'src') + '/',
-    },
-  },
   plugins: [
     react(),
   ],