chore: improve DX (#1663)

* chore: add back react/redux devtools * chore: do not open devtools for splash window * chore: replace electron-extension-installer, drop redux-logger
appium · Sep 6, 2024 · f2951f3 · f2951f3
1 parent eae5e96
commit f2951f3
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 99 deletions.
diff --git a/app/common/renderer/store.js b/app/common/renderer/store.js
@@ -1,28 +1,14 @@
 import {configureStore} from '@reduxjs/toolkit';
-import {createLogger} from 'redux-logger';
 
 import actions from './actions';
 import createRootReducer from './reducers';
 
 const store = configureStore({
   reducer: createRootReducer(),
-  middleware: (getDefaultMiddleware) => {
-    const middleware = getDefaultMiddleware({
+  middleware: (getDefaultMiddleware) =>
+    getDefaultMiddleware({
       serializableCheck: false,
-    });
-
-    // Additional development tools
-    if (process.env.NODE_ENV === 'development') {
-      // Logging Middleware
-      const logger = createLogger({
-        level: 'info',
-        collapsed: true,
-      });
-      middleware.push(logger);
-    }
-
-    return middleware;
-  },
+    }),
   devTools:
     process.env.NODE_ENV !== 'development'
       ? false

diff --git a/app/electron/main/debug.js b/app/electron/main/debug.js
@@ -2,7 +2,7 @@ import {
   installExtension,
   REACT_DEVELOPER_TOOLS,
   REDUX_DEVTOOLS,
-} from 'electron-extension-installer';
+} from '@tomjs/electron-devtools-installer';
 
 export async function installExtensions() {
   const opts = {

diff --git a/app/electron/main/main.js b/app/electron/main/main.js
@@ -1,7 +1,7 @@
 import {app} from 'electron';
 import debug from 'electron-debug';
 
-// import {installExtensions} from './debug';
+import {installExtensions} from './debug';
 import {isDev, setupIPCListeners} from './helpers';
 import {setupMainWindow} from './windows';
 
@@ -20,11 +20,10 @@ app.on('window-all-closed', () => {
   app.quit();
 });
 
-app.on('ready', () => {
+app.on('ready', async () => {
   if (isDev) {
     debug();
-    // TODO: uncomment this after upgrading to Electron 15+
-    // await installExtensions();
+    await installExtensions();
   }
 
   setupIPCListeners();

diff --git a/app/electron/main/windows.js b/app/electron/main/windows.js
@@ -25,6 +25,9 @@ function buildSplashWindow() {
     minWidth: 300,
     minHeight: 300,
     frame: false,
+    webPreferences: {
+      devTools: false,
+    },
   });
 }
 
@@ -59,10 +62,6 @@ export function setupMainWindow() {
     splashWindow.destroy();
     mainWindow.show();
     mainWindow.focus();
-
-    if (isDev) {
-      mainWindow.openDevTools();
-    }
   });
 
   mainWindow.on('closed', () => {