From dca0dfdfddca8ee55cd2111cd0c87afcbb2f88f3 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Wed, 22 Dec 2021 22:35:38 +0100
Subject: build: Simplify project structure

---
 packages/main/package.json        |  8 ++++++++
 packages/main/tsconfig.json       | 10 ++--------
 packages/main/types/vite-env.d.ts |  5 +++++
 packages/main/vite.config.js      |  6 ------
 4 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 packages/main/types/vite-env.d.ts

(limited to 'packages/main')

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}`,
-- 
cgit v1.2.3-54-g00ecf