diff --git a/package.json b/package.json index e4432901e5..2318781305 100644 --- a/package.json +++ b/package.json @@ -239,6 +239,7 @@ "babel-core": "^7.0.0-beta.3", "babel-loader": "^8.1.0", "babel-plugin-macros": "^2.8.0", + "babel-runtime": "^6.26.0", "bootstrap": "^4.5.0", "bootstrap-vue": "^2.15.0", "chart.js": "^2.9.3", diff --git a/src/main/index.ts b/src/main/index.ts index d9a48ca0ef..48a26db814 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -31,7 +31,7 @@ let windowManager: WindowManager = null; let clusterManager: ClusterManager = null; const vmURL = formatUrl({ - pathname: path.join(__dirname, "dist/index.html"), + pathname: path.join(__dirname, "index.html"), protocol: "file", slashes: true, }) @@ -123,7 +123,7 @@ app.on('window-all-closed', function () { app.on("activate", () => { if (!windowManager) { logger.debug("activate main window") - windowManager = new WindowManager(false) + windowManager = new WindowManager({ showSplash: false }) windowManager.showMain(vmURL) } }) diff --git a/src/main/window-manager.ts b/src/main/window-manager.ts index b29152a697..7f48cdeea8 100644 --- a/src/main/window-manager.ts +++ b/src/main/window-manager.ts @@ -11,7 +11,7 @@ export class WindowManager { protected promiseIpc: any protected windowState: windowStateKeeper.State; - constructor(showSplash = true) { + constructor({ showSplash = true } = {}) { this.promiseIpc = new PromiseIpc({ timeout: 2000 }) // Manage main window size&position with persistence this.windowState = windowStateKeeper({ @@ -32,7 +32,7 @@ export class WindowManager { } }) if (showSplash) { - this.splashWindow.loadFile(getStaticUrl("splash.html")) + this.splashWindow.loadURL(getStaticUrl("splash.html")) this.splashWindow.show() } diff --git a/src/renderer/_vue/App.vue b/src/renderer/_vue/App.vue index 5143d7c063..d4ded76902 100644 --- a/src/renderer/_vue/App.vue +++ b/src/renderer/_vue/App.vue @@ -1,5 +1,5 @@