Skip to content

Commit

Permalink
Clean up config merging
Browse files Browse the repository at this point in the history
  • Loading branch information
MarshallOfSound committed Dec 4, 2016
1 parent 829f4c7 commit 47aca1c
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/electron-forge-package.js
Expand Up @@ -48,12 +48,10 @@ const main = async () => {
const platform = program.platform || process.platform;

const forgeConfig = await getForgeConfig(dir);
const packageOpts = {
const packageOpts = Object.assign({
asar: false,
overwrite: true,
};
Object.assign(packageOpts, forgeConfig.electronPackagerConfig);
Object.assign(packageOpts, {
}, forgeConfig.electronPackagerConfig, {
afterCopy: [async (buildPath, electronVersion, pPlatform, pArch, done) => {
await pify(rimraf)(path.resolve(buildPath, 'node_modules/electron-compile/test'));
done();
Expand Down

0 comments on commit 47aca1c

Please sign in to comment.