Introduce new folder structure

.eslintrc

@@ -22,7 +22,7 @@
             }
         }
     ],
-    "ignorePatterns": ["bundle", "dist", "dist-electron"],
+    "ignorePatterns": ["bundle", "dist-main", "dist-preload", "dist-renderer"],
     "env": {
         "browser": true,
         "node": true

.github/workflows/build.yml

@@ -34,7 +34,8 @@ jobs:
 
             - name: Run typecheck
               run: |
-                  pnpm typecheck:electron
+                  pnpm typecheck:main
+                  pnpm typecheck:preload
                   pnpm typecheck:renderer
 
             - name: Run linter

.github/workflows/release.yml

@@ -34,7 +34,8 @@ jobs:
 
             - name: Run typecheck
               run: |
-                  pnpm typecheck:electron
+                  pnpm typecheck:main
+                  pnpm typecheck:preload
                   pnpm typecheck:renderer
 
             - name: Run linter

.gitignore

@@ -1,7 +1,8 @@
-dist-electron/
-dist/
+dist-main/
+dist-preload/
+dist-renderer/
 release/
-tsconfig.node.tsbuildinfo
+tsconfig.tsbuildinfo
 
 .DS_Store
 
@@ -16,9 +17,6 @@ tsconfig.node.tsbuildinfo
 #Bundled files
 bundle/
 
-#Packaged apps
-dist/
-
 # debug files
 icon-store/
 

electron-builder.config.js

@@ -8,7 +8,7 @@ module.exports = {
         output: "release",
         buildResources: "build",
     },
-    files: ["dist-electron/**/*.js", "dist/**/*"],
+    files: ["dist-main/index.js", "dist-preload/index.js", "dist-renderer/**/*"],
     extraMetadata: {
         version: process.env.VITE_APP_VERSION,
     },

package.json

@@ -8,18 +8,19 @@
         "name": "Oliver Schwendener",
         "url": "https://github.com/oliverschwendener"
     },
-    "main": "dist-electron/main/index.js",
+    "main": "dist-main/index.js",
     "scripts": {
         "build": "vite build",
         "dev": "vite",
         "lint": "eslint . --ext js,ts,tsx",
         "package:publish": "electron-builder --config electron-builder.config.js --publish always",
         "package": "electron-builder --config electron-builder.config.js",
-        "test:coverage": "vitest run --coverage",
-        "test:watch": "vitest",
-        "test": "vitest run",
-        "typecheck:electron": "tsc -p tsconfig.node.json --noEmit",
-        "typecheck:renderer": "tsc -p tsconfig.json --noEmit"
+        "test:coverage": "vitest run --root=src --coverage",
+        "test:watch": "vitest --root=src",
+        "test": "vitest run --root=src",
+        "typecheck:main": "tsc -p src/main/tsconfig.json --noEmit",
+        "typecheck:preload": "tsc -p src/preload/tsconfig.json --noEmit",
+        "typecheck:renderer": "tsc -p src/renderer/tsconfig.json --noEmit"
     },
     "devDependencies": {
         "@types/react": "^18.2.6",
@@ -27,18 +28,18 @@
         "@types/react-router-dom": "^5.3.3",
         "@typescript-eslint/eslint-plugin": "^6.0.0",
         "@typescript-eslint/parser": "^6.0.0",
-        "@vitejs/plugin-react": "^4.0.0",
-        "@vitest/coverage-v8": "^0.33.0",
+        "@vitejs/plugin-react": "^4.1.0",
+        "@vitest/coverage-v8": "^0.34.6",
         "electron": "^26.1.0",
         "electron-builder": "^24.6.3",
         "eslint": "^8.44.0",
         "prettier": "^3.0.2",
         "prettier-plugin-organize-imports": "^3.2.3",
         "typescript": "^5.1.3",
-        "vite": "^4.3.9",
-        "vite-plugin-electron": "^0.11.2",
+        "vite": "^4.4.11",
+        "vite-plugin-electron": "^0.14.1",
         "vite-plugin-electron-renderer": "^0.14.5",
-        "vitest": "^0.33.0"
+        "vitest": "^0.34.6"
     },
     "dependencies": {
         "@fluentui/react-components": "^9.30.0",

src/common/UeliPlugin.ts

@@ -1,5 +1,5 @@
-import type { OperatingSystem } from "@common/OperatingSystem";
 import type { PluginDependencies } from "../electron/main/Plugins";
+import type { OperatingSystem } from "./OperatingSystem";
 
 export interface UeliPlugin {
     readonly id: string;

src/main/BrowserWindow/index.ts

@@ -18,9 +18,7 @@ export const useBrowserWindow = async ({
     nativeTheme: NativeTheme;
     settingsManager: SettingsManager;
 }): Promise<void> => {
-    const preloadScriptFilePath = app.isPackaged
-        ? join(__dirname, "..", "..", "dist-electron", "preload", "index.js")
-        : join(__dirname, "..", "preload", "index.js");
+    const preloadScriptFilePath = join(__dirname, "..", "dist-preload", "index.js");
 
     const browserWindowConstructorOptionsMap: Record<OperatingSystem, BrowserWindowConstructorOptions> = {
         macOS: {
@@ -58,6 +56,6 @@ export const useBrowserWindow = async ({
     nativeTheme.addListener("updated", () => browserWindow.webContents.send("nativeThemeChanged"));
 
     app.isPackaged
-        ? await browserWindow.loadFile(join(__dirname, "..", "..", "dist", "index.html"))
+        ? await browserWindow.loadFile(join(__dirname, "..", "dist-renderer", "index.html"))
         : await browserWindow.loadURL(process.env.VITE_DEV_SERVER_URL);
 };

src/main/tsconfig.json

@@ -0,0 +1,4 @@
+{
+    "extends": "../../tsconfig.node.json",
+    "include": [".", "../common"]
+}

src/preload/tsconfig.json

@@ -0,0 +1,4 @@
+{
+    "extends": "../../tsconfig.node.json",
+    "include": [".", "../common"]
+}