v2.0.2

Barklarm · Aug 5, 2024 · 8f23803 · 8f23803
1 parent ab3044a
commit 8f23803
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 17 deletions.
diff --git a/forge.config.ts b/forge.config.ts
@@ -10,6 +10,7 @@ import MakerDMG from '@electron-forge/maker-dmg';
 
 const config: ForgeConfig = {
   packagerConfig: {
+    asar: true,
     icon: 'src/assets/favicon',
     osxSign: {
       identity: `Developer ID Application: ${process.env.MAC_DEVELOPER_ID}`,

diff --git a/src/index.html b/src/index.html
diff --git a/src/main.ts b/src/main.ts
@@ -12,6 +12,7 @@ import { initialize } from './i18n';
 import { NotificationConfiguration } from './types/NotificationEnabled';
 
 declare const MAIN_WINDOW_VITE_DEV_SERVER_URL: string;
+declare const MAIN_WINDOW_VITE_NAME: string;
 
 if (store.get('autoupdate')) {
   updateElectronApp();
@@ -45,7 +46,9 @@ app.on('ready', () => {
   observerManager.refershObservers();
   appManager.setTray(tray);
 
-  appManager.setWindow(new AppWindow(MAIN_WINDOW_VITE_DEV_SERVER_URL, join(__dirname, 'preload.js')));
+  appManager.setWindow(
+    new AppWindow(MAIN_WINDOW_VITE_DEV_SERVER_URL, MAIN_WINDOW_VITE_NAME, join(__dirname, 'preload.js'))
+  );
   ipcMain.on('electron-refresh-observers', () => {
     observerManager.refershObservers();
   });

diff --git a/src/main/AppWindow.test.ts b/src/main/AppWindow.test.ts
@@ -56,7 +56,8 @@ describe('AppWindows', () => {
     it('generates correct instance', () => {
       const expectedUrl = faker.internet.url();
       const expectedPreload = faker.system.directoryPath();
-      const window = new AppWindow(expectedUrl, expectedPreload);
+      const name = faker.string.alphanumeric();
+      const window = new AppWindow(expectedUrl, name, expectedPreload);
       expect(browserWindowMock).toBeCalledWith({
         title: 'Barklarm - Configuration',
         icon: expectedImage,

diff --git a/src/main/AppWindow.ts b/src/main/AppWindow.ts
@@ -13,11 +13,11 @@ export class AppWindow {
   public readonly window: BrowserWindow;
   private readonly IconPath: string = join(__dirname, '..', 'assets', 'icon.png');
 
-  constructor(url: string, preload: string) {
-    this.window = this.createWindow(url, preload);
+  constructor(url: string, windowName: string, preload: string) {
+    this.window = this.createWindow(url, windowName, preload);
   }
 
-  createWindow(url: string, preload: string): BrowserWindow {
+  createWindow(url: string, windowName: string, preload: string): BrowserWindow {
     const window = new BrowserWindow({
       title: `Barklarm - ${translate('Configuration')}`,
       icon: nativeImage.createFromPath(this.IconPath),
@@ -27,7 +27,11 @@ export class AppWindow {
       },
     });
     window.setMenu(null);
-    window.loadURL(url);
+    if (url) {
+      window.loadURL(url);
+    } else {
+      window.loadFile(join(__dirname, `../renderer/${windowName}/index.html`));
+    }
     if (!app.isPackaged) window.webContents.openDevTools();
     const hide = _hide(window);
     window.on('minimize', hide);

diff --git a/vite.renderer.config.mts b/vite.renderer.config.mts
@@ -12,7 +12,7 @@ export default defineConfig((env) => {
   return {
     root,
     mode,
-    base: './src',
+    base: './',
     build: {
       outDir: `.vite/renderer/${name}`,
     },