Skip to content

Commit

Permalink
Merge pull request #438 from srod/feature/remove-xtend
Browse files Browse the repository at this point in the history
feat(package): remove xtend
  • Loading branch information
srod authored Oct 18, 2018
2 parents 8a9c4d8 + 254a471 commit 2b6289b
Show file tree
Hide file tree
Showing 5 changed files with 999 additions and 171 deletions.
3 changes: 1 addition & 2 deletions lib/compressors/html-minifier.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
* Module dependencies.
*/

var extend = require('xtend');
var HTMLMinifier = require('html-minifier').minify;
var utils = require('../utils');

Expand Down Expand Up @@ -51,7 +50,7 @@ module.exports = compressHTMLMinifier;
*/

function compressHTMLMinifier(settings, content, callback, index) {
var options = extend(defaultOptions, settings.options);
var options = Object.assign(defaultOptions, settings.options);
var contentMinified = HTMLMinifier(content, options);
utils.writeFile(settings.output, contentMinified, index);
if (callback) {
Expand Down
9 changes: 4 additions & 5 deletions lib/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

var path = require('path');
var glob = require('glob');
var extend = require('xtend');
var utils = require('./utils');

/**
Expand Down Expand Up @@ -42,10 +41,10 @@ module.exports = setup;
function setup(inputSettings) {
checkMandatories(inputSettings);

var settings = extend(utils.clone(defaultSettings), inputSettings);
settings = extend(settings, wildcards(settings.input, settings.publicFolder));
settings = extend(settings, checkOutput(settings.input, settings.output));
settings = extend(settings, setPublicFolder(settings.input, settings.publicFolder));
var settings = Object.assign(utils.clone(defaultSettings), inputSettings);
settings = Object.assign(settings, wildcards(settings.input, settings.publicFolder));
settings = Object.assign(settings, checkOutput(settings.input, settings.output));
settings = Object.assign(settings, setPublicFolder(settings.input, settings.publicFolder));

return settings;
}
Expand Down
50 changes: 12 additions & 38 deletions package-lock.json

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

5 changes: 1 addition & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,13 @@
"sqwish": "0.2.2",
"uglify-es": "3.3.9",
"uglify-js": "3.4.9",
"update-notifier": "2.5.0",
"xtend": "4.0.1"
"update-notifier": "2.5.0"
},
"devDependencies": {
"babel-preset-env": "1.7.0",
"codecov": "3.1.0",
"eslint": "5.0.1",
"eslint-config-prettier": "3.1.0",
"eslint-plugin-prettier": "2.7.0",
"husky": "1.1.2",
"eslint-plugin-prettier": "3.0.0",
"husky": "1.1.2",
"jest": "23.1.0",
Expand Down
Loading

0 comments on commit 2b6289b

Please sign in to comment.