From a89645cfd0d955f1c9697242c6d56cbd30c4afd1 Mon Sep 17 00:00:00 2001 From: meriadec Date: Thu, 11 Jan 2018 15:06:39 +0100 Subject: [PATCH] Move electron to devDeps because electron-builder requires it --- package.json | 2 +- src/main/app.js | 2 +- src/main/bridge.js | 2 +- src/renderer/initEvents.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 75ff699d..c053f246 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ "@ledgerhq/hw-app-eth": "^1.0.4", "babel-loader": "^7.1.2", "color": "^2.0.1", - "electron": "1.7.10", "electron-devtools-installer": "^2.2.3", "file-loader": "^1.1.6", "history": "^4.7.2", @@ -61,6 +60,7 @@ "babel-preset-flow": "^6.23.0", "babel-preset-react": "^6.24.1", "babel-preset-stage-0": "^6.24.1", + "electron": "1.7.10", "electron-builder": "^19.49.0", "electron-rebuild": "^1.6.1", "electron-webpack": "1.11.0", diff --git a/src/main/app.js b/src/main/app.js index 3a8e84e8..138765ea 100644 --- a/src/main/app.js +++ b/src/main/app.js @@ -1,6 +1,6 @@ // @flow -import { app, BrowserWindow } from 'electron' +import { app, BrowserWindow } from 'electron' // eslint-disable-line import/no-extraneous-dependencies // Global reference to mainWindow // Necessary to prevent win from being garbage collected diff --git a/src/main/bridge.js b/src/main/bridge.js index a25405b0..5e8ff55e 100644 --- a/src/main/bridge.js +++ b/src/main/bridge.js @@ -1,7 +1,7 @@ // @flow import { fork } from 'child_process' -import { ipcMain } from 'electron' +import { ipcMain } from 'electron' // eslint-disable-line import/no-extraneous-dependencies import { resolve } from 'path' // $FlowFixMe diff --git a/src/renderer/initEvents.js b/src/renderer/initEvents.js index 129388bb..092f3c48 100644 --- a/src/renderer/initEvents.js +++ b/src/renderer/initEvents.js @@ -1,6 +1,6 @@ // @flow -import { ipcRenderer } from 'electron' +import { ipcRenderer } from 'electron' // eslint-disable-line import/no-extraneous-dependencies import objectPath from 'object-path' import { devicesUpdate, deviceAdd, deviceRemove } from 'actions/devices'