From 23106ab622ccea13af1b2560e98609beaaf94704 Mon Sep 17 00:00:00 2001 From: Afonso Jorge Ramos Date: Mon, 1 Jul 2024 13:13:41 +0100 Subject: [PATCH 1/5] chore: automatically open devtools on local development --- package.json | 2 +- src/electron/main.js | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index ca31bf4c5..3092afd0d 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "lint:check": "biome check", "lint": "biome check --fix", "test": "jest", - "start": "electron . --enable-logging", + "start": "NODE_ENV='development' && electron . --enable-logging", "prepare": "husky" }, "engines": { diff --git a/src/electron/main.js b/src/electron/main.js index 303bd0e8c..fd7aab7a8 100644 --- a/src/electron/main.js +++ b/src/electron/main.js @@ -77,16 +77,13 @@ app.whenReady().then(async () => { // DevTools configuration mb.window.webContents.on('devtools-opened', () => { - mb.window.setSize(800, 600); - mb.window.center(); - mb.window.resizable = true; + if (process.env.NODE_ENV === 'development') + mb.window.setAlwaysOnTop(true); }); - mb.window.webContents.on('devtools-closed', () => { - const trayBounds = mb.tray.getBounds(); - mb.window.setSize(browserWindowOpts.width, browserWindowOpts.height); - mb.positioner.move('trayCenter', trayBounds); - mb.window.resizable = false; + mb.window.on('ready-to-show', () => { + if (process.env.NODE_ENV === 'development') + mb.window.webContents.openDevTools(); }); }); From 4b38c89d9946bb46ee2fd061958bdce72f189877 Mon Sep 17 00:00:00 2001 From: Afonso Jorge Ramos Date: Mon, 1 Jul 2024 13:14:20 +0100 Subject: [PATCH 2/5] docs: add reload app note --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a36e457a7..e0b94e530 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -30,6 +30,8 @@ To run the **electron app**: pnpm start ``` +To reload the app with the changes that `pnpm watch` has detected, you can use the `CmdOrCtrl+R` shortcut. + ### Tests There are 2 checks: From 31336466dd6839bf9815bcfb892566a2a0972210 Mon Sep 17 00:00:00 2001 From: Afonso Jorge Ramos Date: Tue, 2 Jul 2024 01:35:21 +0100 Subject: [PATCH 3/5] chore: revert `main.js` changes --- src/electron/main.js | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/src/electron/main.js b/src/electron/main.js index fd7aab7a8..4e2797d39 100644 --- a/src/electron/main.js +++ b/src/electron/main.js @@ -34,6 +34,17 @@ const browserWindowOpts = { }; const contextMenu = Menu.buildFromTemplate([ + { + label: 'View', + submenu: [ + { role: 'reload' }, + { role: 'toggleDevTools' }, + { type: 'separator' }, + { role: 'resetZoom' }, + { role: 'zoomIn' }, + { role: 'zoomOut' }, + ], + }, { label: 'Quit', click: () => { @@ -77,13 +88,17 @@ app.whenReady().then(async () => { // DevTools configuration mb.window.webContents.on('devtools-opened', () => { - if (process.env.NODE_ENV === 'development') - mb.window.setAlwaysOnTop(true); + mb.window.setSize(800, 600); + mb.window.center(); + mb.window.resizable = true; + mb.window.setAlwaysOnTop(true); }); - mb.window.on('ready-to-show', () => { - if (process.env.NODE_ENV === 'development') - mb.window.webContents.openDevTools(); + mb.window.webContents.on('devtools-closed', () => { + const trayBounds = mb.tray.getBounds(); + mb.window.setSize(browserWindowOpts.width, browserWindowOpts.height); + mb.positioner.move('trayCenter', trayBounds); + mb.window.resizable = false; }); }); From c4a7c1421b8a7335cfbabc56cff9e75931b91b2c Mon Sep 17 00:00:00 2001 From: Afonso Jorge Ramos Date: Tue, 2 Jul 2024 01:36:12 +0100 Subject: [PATCH 4/5] chore: remove node_env --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3092afd0d..ca31bf4c5 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "lint:check": "biome check", "lint": "biome check --fix", "test": "jest", - "start": "NODE_ENV='development' && electron . --enable-logging", + "start": "electron . --enable-logging", "prepare": "husky" }, "engines": { From 57fd301b24253c3c2cbca73189a4a1ee08df3d8f Mon Sep 17 00:00:00 2001 From: Afonso Jorge Ramos Date: Tue, 2 Jul 2024 01:37:57 +0100 Subject: [PATCH 5/5] chore: add reload and toggleDevTools buttons --- src/electron/main.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/electron/main.js b/src/electron/main.js index 4e2797d39..0d04fcf23 100644 --- a/src/electron/main.js +++ b/src/electron/main.js @@ -35,16 +35,12 @@ const browserWindowOpts = { const contextMenu = Menu.buildFromTemplate([ { - label: 'View', - submenu: [ - { role: 'reload' }, - { role: 'toggleDevTools' }, - { type: 'separator' }, - { role: 'resetZoom' }, - { role: 'zoomIn' }, - { role: 'zoomOut' }, - ], + role: 'reload', }, + { + role: 'toggleDevTools', + }, + { type: 'separator' }, { label: 'Quit', click: () => {