Skip to content

Commit 31d27e9

Browse files
nklaymannklayman
authored
merge v2
2 parents 1d79761 + 0a2bd12 commit 31d27e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+6321
-7502
lines changed

‎.dockerignore‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎.eslintrc.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
module.exports = {
22
extends: 'standard',
3+
ignorePatterns: [
4+
'__tests__/projects/*',
5+
'generator/templates/base/src/background.js'
6+
],
37
env: {
48
jest: true
59
}

‎.github/workflows/nodeCI.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ on:
99
jobs:
1010
build:
1111
strategy:
12+
fail-fast: false
1213
matrix:
1314
os: [ubuntu-latest, windows-latest]
14-
node: [ '12', '10', '8' ]
15+
node: [ '14', '12', '10' ]
1516
include:
1617
- os: windows-latest
1718
commandPrefix: ''

‎.npmignore‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ __tests__/
33
.github/
44
.vscode/
55
docs/
6-
.dockerignore
76
.eslintrc.js
8-
.travis.yml
9-
appveyor.yml
107
deployDocs.js
11-
docker-entrypoint.sh
12-
Dockerfile
13-
jest.config.js
14-
testSetup.js
15-
vue-cli-service-custom-1.tgz
16-
vue-cli-service-custom-2.tgz
17-
vue-cli-service-v3.0.0-rc.2.tgz
8+
jest.config.js

‎Dockerfile‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Build status: [![Build status](https://github.com/nklayman/vue-cli-plugin-electr
1010

1111
## Quick Start:
1212

13-
Open a terminal in the directory of your app created with Vue-CLI 3.
13+
Open a terminal in the directory of your app created with Vue-CLI 3 or 4 (4 is recommended).
1414

1515
Then, install and invoke the generator of vue-cli-plugin-electron-builder by running:
1616

@@ -43,7 +43,7 @@ To see more documentation, [visit our website](https://nklayman.github.io/vue-cl
4343
## Supporters
4444

4545
| [![Yves Hoppe](https://avatars1.githubusercontent.com/u/897638?s=64&v=4)](https://github.com/yvesh) | [![Andrew LeTourneau](https://avatars2.githubusercontent.com/u/2807807?s=64&v=4)](https://github.com/centerorbit) | [![Mitch Dennet](https://avatars2.githubusercontent.com/u/16268619?s=64&v=4)](https://github.com/mitchdennett) | [![Kasen IO](https://avatars0.githubusercontent.com/u/52365539?s=64)](https://kasen.io) | [![Ivorzk](https://avatars2.githubusercontent.com/u/7390138?s=64)](https://github.com/Ivorzk) | [![Eric Schirtzinger](https://avatars2.githubusercontent.com/u/24927782?s=64)](https://github.com/eschirtz) | [![Alec Armbruster](https://avatars2.githubusercontent.com/u/35377827?s=64)](https://github.com/alectrocute) |
46-
| --------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- |
46+
| --------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------ |
4747
| [Yves Hoppe](https://github.com/yvesh) | [Andrew LeTourneau](https://github.com/centerorbit) | [Mitch Dennet](https://github.com/mitchdennett) | [Kasen IO](https://kasen.io) | [Ivorzk](https://github.com/Ivorzk) | [Eric Schirtzinger](https://github.com/eschirtz) | [Alec Armbruster](https://github.com/alectrocute) |
4848

4949
## Past Supporters

‎UPGRADING.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎__tests__/build.helper.js‎

Lines changed: 68 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -5,81 +5,79 @@ const portfinder = require('portfinder')
55
const checkLogs = require('./checkLogs.helper.js')
66

77
portfinder.basePort = 9515
8-
const runTests = useTS =>
9-
new Promise(async resolve => {
10-
const { project, projectName } = await create('build', useTS)
8+
const runTests = async (useTS) => {
9+
const { project, projectName } = await create('build', useTS)
1110

12-
const isWin = process.platform === 'win32'
13-
const projectPath = p =>
14-
path.join(process.cwd(), '__tests__/projects/' + projectName, p)
11+
const isWin = process.platform === 'win32'
12+
const projectPath = (p) =>
13+
path.join(process.cwd(), '__tests__/projects/' + projectName, p)
1514

16-
await project.run('vue-cli-service electron:build --x64 --dir')
17-
// Ensure /dist is not modified
18-
expect(project.has('dist')).toBe(false)
19-
// Ensure build successfully outputted files
20-
expect(project.has('dist_electron/bundled/index.html')).toBe(true)
21-
expect(project.has('dist_electron/bundled/favicon.ico')).toBe(true)
22-
expect(project.has('dist_electron/bundled/js')).toBe(true)
23-
expect(project.has('dist_electron/bundled/css')).toBe(true)
24-
expect(project.has('dist_electron/bundled/background.js')).toBe(true)
25-
if (isWin) {
26-
expect(project.has(`dist_electron/win-unpacked/${projectName}.exe`)).toBe(
27-
true
28-
)
29-
} else {
30-
expect(project.has(`dist_electron/linux-unpacked/${projectName}`)).toBe(
31-
true
32-
)
33-
}
34-
// Ensure that setup files were not created
35-
expect(project.has(`dist_electron/${projectName} Setup 0.1.0.exe`)).toBe(
36-
false
15+
await project.run('vue-cli-service electron:build --x64 --dir')
16+
// Ensure /dist is not modified
17+
expect(project.has('dist')).toBe(false)
18+
// Ensure build successfully outputted files
19+
expect(project.has('dist_electron/bundled/index.html')).toBe(true)
20+
expect(project.has('dist_electron/bundled/favicon.ico')).toBe(true)
21+
expect(project.has('dist_electron/bundled/js')).toBe(true)
22+
expect(project.has('dist_electron/bundled/css')).toBe(true)
23+
expect(project.has('dist_electron/bundled/background.js')).toBe(true)
24+
if (isWin) {
25+
expect(project.has(`dist_electron/win-unpacked/${projectName}.exe`)).toBe(
26+
true
3727
)
38-
expect(
39-
project.has(`dist_electron/${projectName}-0.1.0-x86_64.AppImage`)
40-
).toBe(false)
41-
expect(project.has(`dist_electron/${projectName}_0.1.0_amd64`)).toBe(false)
42-
// Launch app with spectron
43-
const app = new Application({
44-
path: `./__tests__/projects/${projectName}/dist_electron/${
45-
isWin ? 'win' : 'linux'
46-
}-unpacked/${projectName}${isWin ? '.exe' : ''}`,
47-
// Make sure tests do not interfere with each other
48-
port: await portfinder.getPortPromise(),
49-
// Increase wait timeout for parallel testing
50-
waitTimeout: 10000
51-
})
52-
await app.start()
53-
const win = app.browserWindow
54-
const client = app.client
55-
await client.waitUntilWindowLoaded()
28+
} else {
29+
expect(project.has(`dist_electron/linux-unpacked/${projectName}`)).toBe(
30+
true
31+
)
32+
}
33+
// Ensure that setup files were not created
34+
expect(project.has(`dist_electron/${projectName} Setup 0.1.0.exe`)).toBe(
35+
false
36+
)
37+
expect(
38+
project.has(`dist_electron/${projectName}-0.1.0-x86_64.AppImage`)
39+
).toBe(false)
40+
expect(project.has(`dist_electron/${projectName}_0.1.0_amd64`)).toBe(false)
41+
// Launch app with spectron
42+
const app = new Application({
43+
path: `./__tests__/projects/${projectName}/dist_electron/${
44+
isWin ? 'win' : 'linux'
45+
}-unpacked/${projectName}${isWin ? '.exe' : ''}`,
46+
// Make sure tests do not interfere with each other
47+
port: await portfinder.getPortPromise(),
48+
// Increase wait timeout for parallel testing
49+
waitTimeout: 10000
50+
})
51+
await app.start()
52+
const win = app.browserWindow
53+
const client = app.client
54+
await client.waitUntilWindowLoaded()
5655

57-
// Check that proper info was logged
58-
await checkLogs({ client, projectName, projectPath, mode: 'build' })
56+
// Check that proper info was logged
57+
await checkLogs({ client, projectName, projectPath, mode: 'build' })
5958

60-
// Window was created
61-
expect(await client.getWindowCount()).toBe(1)
62-
// It is not minimized
63-
expect(await win.isMinimized()).toBe(false)
64-
// Dev tools is not open
65-
expect(await win.isDevToolsOpened()).toBe(false)
66-
// Window is visible
67-
expect(await win.isVisible()).toBe(true)
68-
// Size is correct
69-
const { width, height } = await win.getBounds()
70-
expect(width).toBeGreaterThan(0)
71-
expect(height).toBeGreaterThan(0)
72-
// Load was successful
73-
expect(await app.webContents.isLoading()).toBe(false)
74-
// App is loaded properly
75-
expect(
76-
(await client.getHTML('#app')).indexOf(
77-
`Welcome to Your Vue.js ${useTS ? '+ TypeScript ' : ''}App`
78-
)
79-
).not.toBe(-1)
59+
// Window was created
60+
expect(await client.getWindowCount()).toBe(1)
61+
// It is not minimized
62+
expect(await win.isMinimized()).toBe(false)
63+
// Dev tools is not open
64+
expect(await win.isDevToolsOpened()).toBe(false)
65+
// Window is visible
66+
expect(await win.isVisible()).toBe(true)
67+
// Size is correct
68+
const { width, height } = await win.getBounds()
69+
expect(width).toBeGreaterThan(0)
70+
expect(height).toBeGreaterThan(0)
71+
// Load was successful
72+
expect(await app.webContents.isLoading()).toBe(false)
73+
// App is loaded properly
74+
expect(
75+
(await client.getHTML('#app')).indexOf(
76+
`Welcome to Your Vue.js ${useTS ? '+ TypeScript ' : ''}App`
77+
)
78+
).not.toBe(-1)
8079

81-
await app.stop()
82-
resolve()
83-
})
80+
await app.stop()
81+
}
8482

8583
module.exports.runTests = runTests

‎__tests__/checkLogs.helper.js‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@ module.exports = async ({ client, projectPath, projectName, mode }) => {
77
`dist_electron/${isWin ? 'win' : 'linux'}-unpacked/resources/app.asar`
88
)
99

10-
await client.getRenderProcessLogs().then(logs => {
11-
logs.forEach(log => {
12-
// Make sure there are no fatal errors
10+
await client.getRenderProcessLogs().then((logs) => {
11+
logs.forEach((log) => {
12+
// Make sure there are no fatal errors
1313
expect(log.level).not.toBe('SEVERE')
1414
})
1515
let appBaseUrl = logs
16-
// Find BASE_URL log
17-
.find(v => v.message.indexOf('process.env.BASE_URL=') !== -1)
16+
// Find BASE_URL log
17+
.find((v) => v.message.indexOf('process.env.BASE_URL=') !== -1)
1818
// Get just the value
1919
.message.split('=')[1]
2020
// Remove any quotes
2121
appBaseUrl = appBaseUrl.replace('"', '')
22-
// Base url should be root of server or packaged asar
22+
// Base url should be root of server or packaged asar
2323
expect(path.normalize(appBaseUrl)).toBe(
2424
isBuild ? outputPath : path.sep /* Server root */
2525
)
2626

2727
let appStatic = logs
28-
// Find __static log
29-
.find(v => v.message.indexOf('__static=') !== -1)
28+
// Find __static log
29+
.find((v) => v.message.indexOf('__static=') !== -1)
3030
// Get just the value
3131
.message.split('=')[1]
3232
// Remove any quotes
3333
appStatic = appStatic.replace('"', '')
34-
// __static should point to public folder or packaged asar
34+
// __static should point to public folder or packaged asar
3535
expect(path.normalize(appStatic)).toBe(
3636
isBuild ? outputPath : projectPath('public')
3737
)
3838

3939
let vuePath = logs
40-
// Find vuePath log
41-
.find(v => v.message.indexOf('vuePath=') !== -1)
40+
// Find vuePath log
41+
.find((v) => v.message.indexOf('vuePath=') !== -1)
4242
// Get just the value
4343
.message.split('=')[1]
4444
// Remove any quotes
@@ -51,8 +51,8 @@ module.exports = async ({ client, projectPath, projectName, mode }) => {
5151
}
5252

5353
let mockExternalPath = logs
54-
// Find externalModulePath log
55-
.find(v => v.message.indexOf('mockExternalPath=') !== -1)
54+
// Find externalModulePath log
55+
.find((v) => v.message.indexOf('mockExternalPath=') !== -1)
5656
// Get just the value
5757
.message.split('=')[1]
5858
// Remove any quotes
@@ -63,22 +63,22 @@ module.exports = async ({ client, projectPath, projectName, mode }) => {
6363
}
6464
})
6565

66-
await client.getMainProcessLogs().then(logs => {
66+
await client.getMainProcessLogs().then((logs) => {
6767
let appStatic = logs
68-
// Find __static log
69-
.find(m => m.indexOf('__static=') !== -1)
68+
// Find __static log
69+
.find((m) => m.indexOf('__static=') !== -1)
7070
// Get just the value
7171
.split('=')[1]
7272
// Remove any quotes
7373
appStatic = appStatic.replace('"', '').split(',')[0]
74-
// __static should point to public folder or packaged asar
74+
// __static should point to public folder or packaged asar
7575
expect(path.normalize(appStatic)).toBe(
7676
isBuild ? outputPath : projectPath('public')
7777
)
7878

7979
let mockExternalPath = logs
80-
// Find externalModulePath log
81-
.find(v => v.indexOf('mockExternalPath=') !== -1)
80+
// Find externalModulePath log
81+
.find((v) => v.indexOf('mockExternalPath=') !== -1)
8282
// Get just the value
8383
.split('=')[1]
8484
// Remove any quotes

0 commit comments

Comments
 (0)