Skip to content

Commit 8305404

Browse files
committed
fix(index/build): use electron builder config args, fixes #575
1 parent 788d99c commit 8305404

File tree

2 files changed

+27
-16
lines changed

2 files changed

+27
-16
lines changed

__tests__/commands.spec.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -350,15 +350,11 @@ describe('electron:build', () => {
350350
}
351351
})
352352
expect(fs.writeFileSync).toBeCalledWith(
353-
`dist_electron${path.sep}bundled${
354-
path.sep
355-
}legacy-assets-index.html.json`,
353+
`dist_electron${path.sep}bundled${path.sep}legacy-assets-index.html.json`,
356354
'[]'
357355
)
358356
expect(fs.writeFileSync).toBeCalledWith(
359-
`dist_electron${path.sep}bundled${
360-
path.sep
361-
}legacy-assets-subpage.html.json`,
357+
`dist_electron${path.sep}bundled${path.sep}legacy-assets-subpage.html.json`,
362358
'[]'
363359
)
364360
}
@@ -386,6 +382,17 @@ describe('electron:build', () => {
386382
})
387383
)
388384
})
385+
386+
test('Config arguments overwrite config', async () => {
387+
jest.unmock('yargs')
388+
await runCommand('electron:build', undefined, undefined, [
389+
'-c.directories.output=customDist'
390+
])
391+
392+
expect(builder.build.mock.calls[0][0].config.directories.output).toBe(
393+
'customDist'
394+
)
395+
})
389396
})
390397

391398
describe('electron:serve', () => {

index.js

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ module.exports = (api, options) => {
131131
try {
132132
await api.service.run('build', vueArgs)
133133
} catch (e) {
134-
error('Vue CLI build failed. Please resolve any issues with your build and try again.')
134+
error(
135+
'Vue CLI build failed. Please resolve any issues with your build and try again.'
136+
)
135137
process.exit(1)
136138
}
137139
// Copy package.json to output dir
@@ -207,15 +209,17 @@ module.exports = (api, options) => {
207209
info('Building app with electron-builder:')
208210
// Build the app using electron builder
209211
builder
210-
.build({
211-
// Args parsed with yargs
212-
...builderArgs,
213-
config: merge(
214-
defaultBuildConfig,
215-
// User-defined config overwrites defaults
216-
userBuildConfig
217-
)
218-
})
212+
.build(
213+
merge({
214+
config: merge(
215+
defaultBuildConfig,
216+
// User-defined config overwrites defaults
217+
userBuildConfig
218+
),
219+
// Args parsed with yargs
220+
...builderArgs
221+
})
222+
)
219223
.then(() => {
220224
// handle result
221225
done('Build complete!')

0 commit comments

Comments
 (0)