From 99f6fd143701a7a4e5f04fb38075efbe9403473d Mon Sep 17 00:00:00 2001 From: leejooy96 Date: Fri, 16 Sep 2022 12:10:24 +0900 Subject: [PATCH] main: use loadFile instead of loadURL in production --- src/main/MainRunner.js | 15 ++++++++++++--- src/main/utils/Constants.js | 7 ++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/MainRunner.js b/src/main/MainRunner.js index d99d644..06c1d02 100644 --- a/src/main/MainRunner.js +++ b/src/main/MainRunner.js @@ -48,12 +48,16 @@ export const createMainWindow = async (mainWindow) => { electronRemote.initialize() }) - await mainWindow.loadURL(`${Constants.APP_INDEX_URL}`) + if (Constants.IS_DEV_ENV) { + await mainWindow.loadURL(Constants.APP_INDEX_URL_DEV) + } else { + await mainWindow.loadFile(Constants.APP_INDEX_URL_PROD) + } return mainWindow } -export const createErrorWindow = (errorWindow, mainWindow, details) => { +export const createErrorWindow = async (errorWindow, mainWindow, details) => { if (!Constants.IS_DEV_ENV) { mainWindow?.hide() } @@ -67,7 +71,12 @@ export const createErrorWindow = (errorWindow, mainWindow, details) => { }) errorWindow.setMenu(null) - errorWindow.loadURL(`${Constants.APP_INDEX_URL}#/error`).then(() => true) + + if (Constants.IS_DEV_ENV) { + await errorWindow.loadURL(`${Constants.APP_INDEX_URL_DEV}#/error`) + } else { + await errorWindow.loadFile(Constants.APP_INDEX_URL_PROD, { hash: 'error' }) + } errorWindow.on('ready-to-show', () => { if (!Constants.IS_DEV_ENV && mainWindow && !mainWindow.isDestroyed()) { diff --git a/src/main/utils/Constants.js b/src/main/utils/Constants.js index b0120ea..c983394 100644 --- a/src/main/utils/Constants.js +++ b/src/main/utils/Constants.js @@ -1,6 +1,4 @@ -import { join } from 'path' import { platform } from 'os' -import { app } from 'electron' export default class Constants { static APP_NAME = 'Vutron' @@ -17,7 +15,6 @@ export default class Constants { enableRemoteModule: true } - static APP_INDEX_URL = process.env.NODE_ENV === 'development' - ? 'http://localhost:9080/index.html' - : join('file://', app.getAppPath(), '/dist/electron/index.html') + static APP_INDEX_URL_DEV = 'http://localhost:9080/index.html' + static APP_INDEX_URL_PROD = './dist/electron/index.html' }