diff --git a/electron/electron-env.d.ts b/electron/electron-env.d.ts index bf0cd46..f3b4f4a 100644 --- a/electron/electron-env.d.ts +++ b/electron/electron-env.d.ts @@ -15,7 +15,7 @@ declare namespace NodeJS { * │ * ``` */ - DIST: string + APP_ROOT: string /** /dist/ or /public/ */ VITE_PUBLIC: string } diff --git a/electron/main.ts b/electron/main.ts index 1a6bc7d..5718e17 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -1,9 +1,6 @@ import { app, BrowserWindow } from 'electron' import path from 'node:path' -// 🚧 Use ['ENV_NAME'] avoid vite:define plugin - Vite@2.x -const VITE_DEV_SERVER_URL = process.env['VITE_DEV_SERVER_URL'] - // The built directory structure // // ├─┬─┬ dist @@ -13,10 +10,14 @@ const VITE_DEV_SERVER_URL = process.env['VITE_DEV_SERVER_URL'] // │ │ ├── main.js // │ │ └── preload.js // │ -process.env.DIST = path.join(__dirname, '../dist') -process.env.VITE_PUBLIC = VITE_DEV_SERVER_URL - ? path.join(process.env.DIST, '../public') - : process.env.DIST +process.env.APP_ROOT = path.join(__dirname, '..') + +// 🚧 Use ['ENV_NAME'] avoid vite:define plugin - Vite@2.x +export const VITE_DEV_SERVER_URL = process.env['VITE_DEV_SERVER_URL'] +export const MAIN_DIST = path.join(process.env.APP_ROOT, 'dist-electron') +export const RENDERER_DIST = path.join(process.env.APP_ROOT, 'dist') + +process.env.VITE_PUBLIC = VITE_DEV_SERVER_URL ? path.join(RENDERER_DIST, '../public') : RENDERER_DIST let win: BrowserWindow | null @@ -37,7 +38,7 @@ function createWindow() { win.loadURL(VITE_DEV_SERVER_URL) } else { // win.loadFile('dist/index.html') - win.loadFile(path.join(process.env.DIST, 'index.html')) + win.loadFile(path.join(RENDERER_DIST, 'index.html')) } }