Skip to content

Commit 9ee45b1

Browse files
committed
chore(generator): support electron 8, fixes #660
1 parent 992c00b commit 9ee45b1

File tree

6 files changed

+32
-24
lines changed

6 files changed

+32
-24
lines changed

__tests__/createProject.helper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const createProject = (projectName, useTS, customPlugins = {}) =>
2525
preset.plugins['vue-cli-plugin-electron-builder'] = {
2626
// electron-builder requires that an exact version of electron is provided,
2727
// unless electron is already installed
28-
electronBuilder: { electronVersion: '7.0.0' }
28+
electronBuilder: { electronVersion: '8.0.0' }
2929
}
3030
preset.plugins = { ...preset.plugins, ...customPlugins }
3131
const projectPath = p =>

__tests__/generator.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ beforeEach(() => {
3434
jest.clearAllMocks()
3535
})
3636
const runGenerator = () =>
37-
generator(mockApi, { electronBuilder: { electronVersion: '^7.0.0' } })
37+
generator(mockApi, { electronBuilder: { electronVersion: '^8.0.0' } })
3838

3939
describe('.gitignore', () => {
4040
test('extends gitignore if it exists', () => {

__tests__/mock_package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"isMock": true,
33
"devDependencies": {
4-
"electron": "^7.0.0"
4+
"electron": "^8.0.0"
55
}
66
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"@vue/eslint-config-typescript": "^4.0.0",
6161
"chai": "^4.2.0",
6262
"chai-as-promised": "^7.1.1",
63-
"electron": "^7.0.0",
63+
"electron": "^8.0.0",
6464
"eslint-config-standard": "^14.0.0",
6565
"eslint-plugin-import": "^2.14.0",
6666
"eslint-plugin-node": "^11.0.0",
@@ -69,7 +69,7 @@
6969
"jest": "^24.8.0",
7070
"lnk": "^1.1.0",
7171
"rimraf": "^3.0.0",
72-
"spectron": "^9.0.0",
72+
"spectron": "^10.0.0",
7373
"terminal-tasks": "^0.0.5",
7474
"typescript": "^3.0.1",
7575
"vue": "^2.5.20",

prompts.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,8 @@ module.exports = [
55
name: 'electronBuilder.electronVersion',
66
type: 'list',
77
message: 'Choose Electron Version',
8-
default: '^7.0.0',
8+
default: '^8.0.0',
99
choices: [
10-
{
11-
name: '^5.0.0',
12-
value: '^5.0.0',
13-
short: '^5.0.0'
14-
},
1510
{
1611
name: '^6.0.0',
1712
value: '^6.0.0',
@@ -21,6 +16,11 @@ module.exports = [
2116
name: '^7.0.0',
2217
value: '^7.0.0',
2318
short: '^7.0.0'
19+
},
20+
{
21+
name: '^8.0.0',
22+
value: '^8.0.0',
23+
short: '^8.0.0'
2424
}
2525
],
2626
when: () => {

yarn.lock

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1737,6 +1737,13 @@
17371737
resolved "https://registry.yarnpkg.com/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1"
17381738
integrity sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==
17391739

1740+
"@types/webdriverio@^4.8.0":
1741+
version "4.13.3"
1742+
resolved "https://registry.yarnpkg.com/@types/webdriverio/-/webdriverio-4.13.3.tgz#c1571c4e62724135c0b11e7d7e36b07af5168856"
1743+
integrity sha512-AfSQM1xTO9Ax+u9uSQPDuw69DQ0qA2RMoKHn86jCgWNcwKVUjGMSP4sfSl3JOfcZN8X/gWvn7znVPp2/g9zcJA==
1744+
dependencies:
1745+
"@types/node" "*"
1746+
17401747
"@types/webpack-env@^1.15.1":
17411748
version "1.15.1"
17421749
resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.15.1.tgz#c8e84705e08eed430b5e15b39c65b0944e4d1422"
@@ -6050,10 +6057,10 @@ electron-builder@^22.2.0:
60506057
update-notifier "^4.0.0"
60516058
yargs "^15.1.0"
60526059

6053-
electron-chromedriver@^7.0.0:
6054-
version "7.0.0"
6055-
resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-7.0.0.tgz#204e1bfcdf2dfd56e5a3b8e6f37d19b1433a7937"
6056-
integrity sha512-7qymT0fn3VTit0peym1iz4Y+fTwq9EPsv1V9Qh+vQdoVqP/4SM9lOHrsBeuFN1JJADZLu7R119ZvMkP6EnLYhw==
6060+
electron-chromedriver@^8.0.0:
6061+
version "8.0.0"
6062+
resolved "https://registry.yarnpkg.com/electron-chromedriver/-/electron-chromedriver-8.0.0.tgz#16f6124d481e9312cc18abc16495ddc2d61f8264"
6063+
integrity sha512-d0210ExhkGOwYLXFZHQR6LISZ8UbMqXWLwjTe8Cdh44XlO4z4+6DWQfM0p7aB2Qak/An6tN732Yl98wN1ylZww==
60576064
dependencies:
60586065
electron-download "^4.1.1"
60596066
extract-zip "^1.6.7"
@@ -6105,10 +6112,10 @@ electron-to-chromium@^1.3.349:
61056112
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.353.tgz#c6f13f27d5212643979867a400c1a5e8a4ef042a"
61066113
integrity sha512-CkG24biyy9qQTQs8U2vGQaiyWSFDxAXP/UGHBveXZ1TGoWOAw+eYZXryrX0UeIMKnQjcaHx33hzYuydv98kqGQ==
61076114

6108-
electron@^7.0.0:
6109-
version "7.1.12"
6110-
resolved "https://registry.yarnpkg.com/electron/-/electron-7.1.12.tgz#7a9a416975f466b941c8ef1a48c5a50aefad494f"
6111-
integrity sha512-gOJxAlJX2UyCRRncKzKzHSZStDI6MdoDzsustTCzudoZx3vlst1kkIP0n5t3TWTNoKNY/ihRsYIpeu63ar1m/g==
6115+
electron@^8.0.0:
6116+
version "8.0.1"
6117+
resolved "https://registry.yarnpkg.com/electron/-/electron-8.0.1.tgz#7f5070a1625f423cddcece25a1eb9e6d2f1339fb"
6118+
integrity sha512-kLZAQkbrAFNjQVpcHJUnjRYQNafuuWKnsdxzag5do1ewMqN0J4Pi/hPE27+5/1YAFMcbvCrPqhWIpcMsi8mKXQ==
61126119
dependencies:
61136120
"@electron/get" "^1.0.1"
61146121
"@types/node" "^12.0.12"
@@ -13596,13 +13603,14 @@ spdy@^4.0.1:
1359613603
select-hose "^2.0.0"
1359713604
spdy-transport "^3.0.0"
1359813605

13599-
spectron@^9.0.0:
13600-
version "9.0.0"
13601-
resolved "https://registry.yarnpkg.com/spectron/-/spectron-9.0.0.tgz#6581780027172095e168353c82ed934212a0c97f"
13602-
integrity sha512-aMxprQ+5/8hDl27P6FafIuuL8jAueJ7WEc6S6pEEQNU7xGCMcfj0RY6TB1i9BtkazMymIxAkmwqlK233Fbhcgw==
13606+
spectron@^10.0.0:
13607+
version "10.0.1"
13608+
resolved "https://registry.yarnpkg.com/spectron/-/spectron-10.0.1.tgz#d89fdd3c9625c7dbb5d1f047fda7cb922eda0125"
13609+
integrity sha512-eMAOr7ovYf+e6+DhkoxVWAMRfZvLJMjtZKwWYkL56fv3Ij6rxhYLjOxybKj0phgMYZ7o2cX5zu2NoyiUM756CA==
1360313610
dependencies:
13611+
"@types/webdriverio" "^4.8.0"
1360413612
dev-null "^0.1.1"
13605-
electron-chromedriver "^7.0.0"
13613+
electron-chromedriver "^8.0.0"
1360613614
request "^2.87.0"
1360713615
split "^1.0.0"
1360813616
webdriverio "^4.13.0"

0 commit comments

Comments
 (0)