Skip to content

Commit

Permalink
Don't overwrite all options previously specified when manifest is fou…
Browse files Browse the repository at this point in the history
…nd (assign re-defined only)
  • Loading branch information
Black-Platypus committed Oct 7, 2024
1 parent 9bfe70f commit 63aa95b
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,15 @@ async function nwbuild(options) {

try {
// Parse options
options = await util.parse(options, manifest);
// options = await util.parse(options, manifest); // Preserve user input for now, assign manifest overwrites, only then parse

manifest = await util.getNodeManifest({ srcDir: options.srcDir, glob: options.glob });
if (typeof manifest?.nwbuild === 'object') {
options = manifest.nwbuild;
if(typeof manifest.nwbuild.app === 'object')
Object.assign(options.app, manifest.nwbuild.app);
let appOptions = options.app;
Object.assign(options, manifest.nwbuild);
options.app = appOptions;
}

options = await util.parse(options, manifest);
Expand Down

0 comments on commit 63aa95b

Please sign in to comment.