1 files changed, 21 insertions, 17 deletions

diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts
index 7c7be35..f8b6787 100644
--- a/packages/main/src/index.ts
+++ b/packages/main/src/index.ts
@@ -50,6 +50,9 @@ import { createMainStore } from './stores/MainStore';
 
 const isDevelopment = import.meta.env.MODE === 'development';
 
+// Alwayse enable sandboxing.
+app.enableSandbox();
+
 // Use alternative directory when debugging to avoid clobbering the main installation.
 if (isDevelopment) {
   app.setPath('userData', `${app.getPath('userData')}-dev`);
@@ -62,9 +65,6 @@ if (!isSingleInstance) {
   process.exit(0);
 }
 
-// Alwayse enable sandboxing.
-app.enableSandbox();
-
 // Disable chromium's MPRIS integration, which is usually more annoying
 // (triggered by random sounds played by websites) than useful.
 app.commandLine.appendSwitch(
@@ -90,17 +90,13 @@ function getResourceUrl(relativePath: string): string {
   return new URL(relativePath, baseUrl).toString();
 }
 
-let serviceInjectRelativePath = '../../service-inject/dist/index.cjs';
+let serviceInjectRelativePath = '../../service-inject/dist/index.js';
 let serviceInjectPath = getResourcePath(serviceInjectRelativePath);
 let serviceInject: WebSource = {
   code: readFileSync(serviceInjectPath, 'utf8'),
   url: getResourceUrl(serviceInjectRelativePath),
 };
 
-if (isDevelopment) {
-  installDevToolsExtensions(app);
-}
-
 let mainWindow: BrowserWindow | null = null;
 
 const store = createMainStore();
@@ -134,13 +130,13 @@ function shouldCancelMainWindowRequest(url: string, method: string): boolean {
   return !normalizedUrl.startsWith(getResourceUrl(rendererBaseUrl));
 }
 
-function createWindow(): Promise<unknown> {
+async function createWindow(): Promise<unknown> {
   mainWindow = new BrowserWindow({
     show: false,
     autoHideMenuBar: true,
     webPreferences: {
-      devTools: isDevelopment,
       sandbox: true,
+      devTools: isDevelopment,
       preload: getResourcePath('../../preload/dist/index.cjs'),
     },
   });
@@ -159,8 +155,14 @@ function createWindow(): Promise<unknown> {
     })
   });
 
-  webContents.on('will-navigate', (event) => {
-    event.preventDefault();
+  const pageUrl = (isDevelopment && import.meta.env.VITE_DEV_SERVER_URL !== undefined)
+    ? import.meta.env.VITE_DEV_SERVER_URL
+    : getResourceUrl('../renderer/dist/index.html');
+
+  webContents.on('will-navigate', (event, url) => {
+    if (url !== pageUrl) {
+      event.preventDefault();
+    }
   });
 
   webContents.setWindowOpenHandler(() => ({ action: 'deny' }));
@@ -279,10 +281,6 @@ function createWindow(): Promise<unknown> {
     callback({ requestHeaders });
   });
 
-  const pageUrl = (isDevelopment && import.meta.env.VITE_DEV_SERVER_URL !== undefined)
-    ? import.meta.env.VITE_DEV_SERVER_URL
-    : getResourceUrl('../renderer/dist/index.html');
-
   return Promise.all([
     mainWindow.loadURL(pageUrl),
     browserView.webContents.loadURL('https://git.marussy.com/sophie/about'),
@@ -307,7 +305,13 @@ app.on('window-all-closed', () => {
   }
 });
 
-app.whenReady().then(createWindow).catch((err) => {
+app.whenReady().then(async () => {
+  if (isDevelopment) {
+    await installDevToolsExtensions();
+  }
+
+  return createWindow();
+}).catch((err) => {
   console.error('Failed to create window', err);
   process.exit(1);
 });