Skip to content

Commit ad39e3a

Browse files
committed
Fix issue with electron-devtools-installer
1 parent d32dc90 commit ad39e3a

File tree

3 files changed

+52
-5
lines changed

3 files changed

+52
-5
lines changed

main.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
const { app, BrowserWindow } = require('electron')
55
const path = require('path')
66
const url = require('url')
7-
const { default: installExtension, REACT_DEVELOPER_TOOLS } = require('electron-devtools-installer')
87

98
// Keep a global reference of the window object, if you don't, the window will
109
// be closed automatically when the JavaScript object is garbage collected.
@@ -13,7 +12,12 @@ let mainWindow
1312
// Keep a reference for dev mode
1413
let dev = false
1514

16-
if (process.defaultApp || /[\\/]electron-prebuilt[\\/]/.test(process.execPath) || /[\\/]electron[\\/]/.test(process.execPath)) {
15+
// Broken:
16+
// if (process.defaultApp || /[\\/]electron-prebuilt[\\/]/.test(process.execPath) || /[\\/]electron[\\/]/.test(process.execPath)) {
17+
// dev = true
18+
// }
19+
20+
if (process.env.NODE_ENV !== undefined && process.env.NODE_ENV === 'development') {
1721
dev = true
1822
}
1923

@@ -61,6 +65,8 @@ function createWindow() {
6165

6266
// Open the DevTools automatically if developing
6367
if (dev) {
68+
const { default: installExtension, REACT_DEVELOPER_TOOLS } = require('electron-devtools-installer')
69+
6470
installExtension(REACT_DEVELOPER_TOOLS)
6571
.catch(err => console.log('Error loading React DevTools: ', err))
6672
mainWindow.webContents.openDevTools()

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
],
4040
"main": "main.js",
4141
"scripts": {
42-
"prod": "webpack --mode production --config webpack.build.config.js && electron --noDevServer .",
43-
"start": "webpack-dev-server --hot --host 0.0.0.0 --config=./webpack.dev.config.js --mode development",
44-
"build": "webpack --config webpack.build.config.js --mode production",
42+
"prod": "cross-env NODE_ENV=production webpack --mode production --config webpack.build.config.js && electron --noDevServer .",
43+
"start": "cross-env NODE_ENV=development webpack-dev-server --hot --host 0.0.0.0 --config=./webpack.dev.config.js --mode development",
44+
"build": "cross-env NODE_ENV=production webpack --config webpack.build.config.js --mode production",
4545
"package": "npm run build",
4646
"postpackage": "electron-packager ./ --out=./builds"
4747
},
@@ -54,6 +54,7 @@
5454
"@babel/preset-react": "^7.9.4",
5555
"babel-loader": "^8.1.0",
5656
"babili-webpack-plugin": "^0.1.2",
57+
"cross-env": "^7.0.2",
5758
"css-loader": "^3.4.2",
5859
"electron": "^8.2.0",
5960
"electron-devtools-installer": "^2.2.4",

yarn.lock

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1804,6 +1804,13 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
18041804
safe-buffer "^5.0.1"
18051805
sha.js "^2.4.8"
18061806

1807+
cross-env@^7.0.2:
1808+
version "7.0.2"
1809+
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.2.tgz#bd5ed31339a93a3418ac4f3ca9ca3403082ae5f9"
1810+
integrity sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==
1811+
dependencies:
1812+
cross-spawn "^7.0.1"
1813+
18071814
[email protected], cross-spawn@^6.0.0:
18081815
version "6.0.5"
18091816
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -1815,6 +1822,15 @@ [email protected], cross-spawn@^6.0.0:
18151822
shebang-command "^1.2.0"
18161823
which "^1.2.9"
18171824

1825+
cross-spawn@^7.0.1:
1826+
version "7.0.1"
1827+
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"
1828+
integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==
1829+
dependencies:
1830+
path-key "^3.1.0"
1831+
shebang-command "^2.0.0"
1832+
which "^2.0.1"
1833+
18181834
18191835
version "0.0.2"
18201836
resolved "https://registry.yarnpkg.com/cross-unzip/-/cross-unzip-0.0.2.tgz#5183bc47a09559befcf98cc4657964999359372f"
@@ -4787,6 +4803,11 @@ path-key@^2.0.0, path-key@^2.0.1:
47874803
resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
47884804
integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
47894805

4806+
path-key@^3.1.0:
4807+
version "3.1.1"
4808+
resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
4809+
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
4810+
47904811
path-parse@^1.0.5:
47914812
version "1.0.5"
47924813
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
@@ -6017,11 +6038,23 @@ shebang-command@^1.2.0:
60176038
dependencies:
60186039
shebang-regex "^1.0.0"
60196040

6041+
shebang-command@^2.0.0:
6042+
version "2.0.0"
6043+
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
6044+
integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
6045+
dependencies:
6046+
shebang-regex "^3.0.0"
6047+
60206048
shebang-regex@^1.0.0:
60216049
version "1.0.0"
60226050
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
60236051
integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
60246052

6053+
shebang-regex@^3.0.0:
6054+
version "3.0.0"
6055+
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
6056+
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
6057+
60256058
signal-exit@^3.0.0:
60266059
version "3.0.2"
60276060
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -6932,6 +6965,13 @@ which@^1.2.9:
69326965
dependencies:
69336966
isexe "^2.0.0"
69346967

6968+
which@^2.0.1:
6969+
version "2.0.2"
6970+
resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
6971+
integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
6972+
dependencies:
6973+
isexe "^2.0.0"
6974+
69356975
wide-align@^1.1.0:
69366976
version "1.1.2"
69376977
resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710"

0 commit comments

Comments
 (0)