Skip to content

Commit d193aaa

Browse files
committed
fix(installVueDevtools): launch electron even if devtools install fails
1 parent bfa5fa3 commit d193aaa

File tree

2 files changed

+33
-29
lines changed

2 files changed

+33
-29
lines changed

generator/templates/base/src/background.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,11 @@ app.on('activate', () => {
5555
app.on('ready', async () => {
5656
if (isDevelopment && !process.env.IS_TEST) {
5757
// Install Vue Devtools
58-
await installVueDevtools()
58+
try {
59+
await installVueDevtools()
60+
} catch (e) {
61+
console.error('Vue Devtools failed to install:', e.toString())
62+
}
5963
}
6064
createWindow()
6165
})

lib/installVueDevtools/index.js

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,35 @@ if (fs.existsSync(getIDMapPath())) {
2020
}
2121

2222
const install = (forceDownload = false) => {
23-
return new Promise(resolve => {
24-
const chromeStoreID = 'nhdogjmejiglipccpnnnanhbledajbpd'
25-
const extensionName = IDMap[chromeStoreID]
26-
const extensionInstalled =
27-
extensionName &&
28-
BrowserWindow.getDevToolsExtensions &&
29-
BrowserWindow.getDevToolsExtensions()[extensionName]
30-
if (!forceDownload && extensionInstalled) {
31-
return resolve(IDMap[chromeStoreID])
32-
}
33-
downloadChromeExtension(chromeStoreID, forceDownload).then(
34-
extensionFolder => {
35-
// Use forceDownload, but already installed
36-
if (extensionInstalled) {
37-
BrowserWindow.removeDevToolsExtension(extensionName)
38-
}
39-
const name = BrowserWindow.addDevToolsExtension(extensionFolder) // eslint-disable-line
40-
fs.writeFileSync(
41-
getIDMapPath(),
42-
JSON.stringify(
43-
Object.assign(IDMap, {
44-
[chromeStoreID]: name
45-
})
46-
)
47-
)
48-
resolve(extensionFolder)
23+
// return new Promise(resolve => {
24+
const chromeStoreID = 'nhdogjmejiglipccpnnnanhbledajbpd'
25+
const extensionName = IDMap[chromeStoreID]
26+
const extensionInstalled =
27+
extensionName &&
28+
BrowserWindow.getDevToolsExtensions &&
29+
BrowserWindow.getDevToolsExtensions()[extensionName]
30+
if (!forceDownload && extensionInstalled) {
31+
return Promise.resolve(IDMap[chromeStoreID])
32+
}
33+
return downloadChromeExtension(chromeStoreID, forceDownload).then(
34+
extensionFolder => {
35+
// Use forceDownload, but already installed
36+
if (extensionInstalled) {
37+
BrowserWindow.removeDevToolsExtension(extensionName)
4938
}
50-
)
51-
})
39+
const name = BrowserWindow.addDevToolsExtension(extensionFolder) // eslint-disable-line
40+
fs.writeFileSync(
41+
getIDMapPath(),
42+
JSON.stringify(
43+
Object.assign(IDMap, {
44+
[chromeStoreID]: name
45+
})
46+
)
47+
)
48+
return Promise.resolve(name)
49+
}
50+
)
51+
// })
5252
}
5353

5454
export default install

0 commit comments

Comments
 (0)