Skip to content

Commit 6f02c9d

Browse files
committed
Replace multispinner with listr in build.js (#971)
1 parent 7f1c68b commit 6f02c9d

File tree

2 files changed

+47
-30
lines changed

2 files changed

+47
-30
lines changed

template/.electron-vue/build.js

Lines changed: 46 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const packager = require('electron-packager')
1111
const { spawn } = require('child_process')
1212
{{/if_eq}}
1313
const webpack = require('webpack')
14-
const Multispinner = require('multispinner')
14+
const Listr = require('listr')
1515

1616
{{#if_eq builder 'packager'}}const buildConfig = require('./build.config'){{/if_eq}}
1717
const mainConfig = require('./webpack.main.config')
@@ -33,7 +33,7 @@ function clean () {
3333
process.exit()
3434
}
3535

36-
function build () {
36+
async function build () {
3737
greeting()
3838

3939
del.sync(['dist/electron/*', '!.gitkeep'])
@@ -46,32 +46,49 @@ function build () {
4646

4747
let results = ''
4848

49-
m.on('success', () => {
50-
process.stdout.write('\x1B[2J\x1B[0f')
51-
console.log(`\n\n${results}`)
52-
console.log(`${okayLog}take it away ${chalk.yellow('`electron-{{builder}}`')}\n`)
53-
{{#if_eq builder 'packager'}}bundleApp(){{else}}process.exit(){{/if_eq}}
54-
})
55-
56-
pack(mainConfig).then(result => {
57-
results += result + '\n\n'
58-
m.success('main')
59-
}).catch(err => {
60-
m.error('main')
61-
console.log(`\n ${errorLog}failed to build main process`)
62-
console.error(`\n${err}\n`)
63-
process.exit(1)
64-
})
65-
66-
pack(rendererConfig).then(result => {
67-
results += result + '\n\n'
68-
m.success('renderer')
69-
}).catch(err => {
70-
m.error('renderer')
71-
console.log(`\n ${errorLog}failed to build renderer process`)
72-
console.error(`\n${err}\n`)
73-
process.exit(1)
74-
})
49+
const tasks = new Listr(
50+
[
51+
{
52+
title: 'building master process',
53+
task: async () => {
54+
await pack(mainConfig)
55+
.then(result => {
56+
results += result + '\n\n'
57+
})
58+
.catch(err => {
59+
console.log(`\n ${errorLog}failed to build main process`)
60+
console.error(`\n${err}\n`)
61+
})
62+
}
63+
},
64+
{
65+
title: 'building renderer process',
66+
task: async () => {
67+
await pack(rendererConfig)
68+
.then(result => {
69+
results += result + '\n\n'
70+
})
71+
.catch(err => {
72+
console.log(`\n ${errorLog}failed to build renderer process`)
73+
console.error(`\n${err}\n`)
74+
})
75+
}
76+
}
77+
],
78+
{ concurrent: 2 }
79+
)
80+
81+
await tasks
82+
.run()
83+
.then(() => {
84+
process.stdout.write('\x1B[2J\x1B[0f')
85+
console.log(`\n\n${results}`)
86+
console.log(`${okayLog}take it away ${chalk.yellow('`electron-builder`')}\n`)
87+
process.exit()
88+
})
89+
.catch(err => {
90+
process.exit(1)
91+
})
7592
}
7693

7794
function pack (config) {
@@ -147,4 +164,4 @@ function greeting () {
147164
})
148165
} else console.log(chalk.yellow.bold('\n lets-build'))
149166
console.log()
150-
}
167+
}

template/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@
137137
"karma-spec-reporter": "^0.0.32",
138138
"karma-webpack": "^3.0.0",
139139
{{/if}}
140+
"listr": "^0.14.3",
140141
{{#if e2e}}
141142
"require-dir": "^1.0.0",
142143
"spectron": "^3.8.0",
@@ -146,7 +147,6 @@
146147
"chai": "^4.1.2",
147148
"mocha": "^5.2.0",
148149
{{/testing}}
149-
"multispinner": "^0.2.1",
150150
"node-loader": "^0.6.0",
151151
{{#if usesass}}
152152
"node-sass": "^4.9.2",

0 commit comments

Comments
 (0)