From 48e65947f722d45135e3bdbc1db51386ca3d084e Mon Sep 17 00:00:00 2001 From: Thomas Nordquist Date: Mon, 15 Apr 2019 14:15:59 +0200 Subject: [PATCH] Load (my) redux dev tools in dev mode --- app/src/index.tsx | 2 +- src/development.ts | 10 ++++++++++ src/electron.ts | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/app/src/index.tsx b/app/src/index.tsx index 991ccc1..9772a28 100644 --- a/app/src/index.tsx +++ b/app/src/index.tsx @@ -11,7 +11,7 @@ import { ThemeProvider } from '@material-ui/styles' import './utils/tracking' import { themes } from './theme' -const composeEnhancers = /*(window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || */ compose +const composeEnhancers = (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose const store = createStore( reducers, composeEnhancers( diff --git a/src/development.ts b/src/development.ts index a241436..3b12803 100644 --- a/src/development.ts +++ b/src/development.ts @@ -1,4 +1,7 @@ +import * as os from 'os' +import * as path from 'path' import axios from 'axios' +import { BrowserWindow } from 'electron' export async function waitForDevServer() { let response @@ -13,6 +16,13 @@ export async function waitForDevServer() { } } +export function loadDevTools() { + // Redux + BrowserWindow.addDevToolsExtension( + path.join(os.homedir(), '/Library/Application Support/Google/Chrome/Default/Extensions/lmhkpmbekcpmknklioeibfkpmmfibljd/2.17.0_0/') + ) +} + export function isDev() { return Boolean(process.argv.find(arg => arg === '--development')) } diff --git a/src/electron.ts b/src/electron.ts index 8238027..bac0b4b 100644 --- a/src/electron.ts +++ b/src/electron.ts @@ -7,7 +7,7 @@ import { ConnectionManager } from '../backend/src/index' import { electronTelemetryFactory } from 'electron-telemetry' import { menuTemplate } from './MenuTemplate' import buildOptions from './buildOptions' -import { waitForDevServer, isDev, runningUiTestOnCi } from './development' +import { waitForDevServer, isDev, runningUiTestOnCi, loadDevTools } from './development' import { shouldAutoUpdate as shouldAutoUpdate, handleAutoUpdate } from './autoUpdater' if (!isDev() && !runningUiTestOnCi()) { @@ -30,6 +30,7 @@ let mainWindow: BrowserWindow | undefined async function createWindow() { if (isDev()) { await waitForDevServer() + loadDevTools() } const iconPath = path.join(__dirname, 'icon.png')