Skip to content

Commit

Permalink
Merge pull request #364 from TrySound/drop-deep-extend
Browse files Browse the repository at this point in the history
Replace deep-extend with nested Object.assign
  • Loading branch information
jrit authored Jul 8, 2020
2 parents 879e34c + 7116879 commit f55f820
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
9 changes: 7 additions & 2 deletions bin/juice
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

var juice = require('..');
var cli = require('../lib/cli');
var xtend = require('deep-extend');
var fs = require('fs');
var path = require('path');

Expand All @@ -17,7 +16,13 @@ var queue = [];

if (options.optionsFile) {
var optionsFromFile = require(path.resolve(process.cwd(),options.optionsFile));
options = xtend({}, optionsFromFile, options);
options = Object.assign({}, optionsFromFile, options, {
webResources: Object.assign(
{},
optionsFromFile && optionsFromFile.webResources,
options && options.webResources
)
});
}

if (options.cssFile) {
Expand Down
5 changes: 0 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"dependencies": {
"cheerio": "^0.22.0",
"commander": "^2.15.1",
"deep-extend": "^0.6.0",
"mensch": "^0.3.4",
"slick": "^1.12.2",
"web-resource-inliner": "^4.3.3"
Expand Down

0 comments on commit f55f820

Please sign in to comment.