mirror of
https://github.com/mozilla/pdf.js.git
synced 2025-04-19 06:38:07 +02:00
Merge pull request #17133 from Snuffleupagus/rm-builder-merge
Use object destructuring, rather than the `merge` helper, in the gulpfile
This commit is contained in:
commit
c60401a765
2 changed files with 63 additions and 83 deletions
17
external/builder/builder.mjs
vendored
17
external/builder/builder.mjs
vendored
|
@ -229,19 +229,4 @@ function preprocess(inFilename, outFilename, defines) {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Merge two defines arrays. Values in the second param will override values in
|
||||
* the first.
|
||||
*/
|
||||
function merge(defaults, defines) {
|
||||
const ret = Object.create(null);
|
||||
for (const key in defaults) {
|
||||
ret[key] = defaults[key];
|
||||
}
|
||||
for (const key in defines) {
|
||||
ret[key] = defines[key];
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
export { merge, preprocess };
|
||||
export { preprocess };
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue