Skip to content

Commit

Permalink
Replace "object-assign" with native Object.assign
Browse files Browse the repository at this point in the history
  • Loading branch information
jhnns committed Feb 17, 2017
1 parent 4130dff commit ae1d865
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ const JSON5 = require("json5");
const path = require("path");
const util = require("util");
const os = require("os");
const assign = require("object-assign");
const emojiRegex = /[\uD800-\uDFFF]./;
const emojiList = require("emojis-list").filter(emoji => emojiRegex.test(emoji));
const matchAbsolutePath = /^\/|^[A-Z]:[/\\]|^\\\\/i; // node 0.10 does not support path.isAbsolute()
Expand Down Expand Up @@ -122,7 +121,7 @@ exports.getLoaderConfig = function(loaderContext, defaultConfigKey) {
if(configKey) {
const config = loaderContext.options[configKey] || {};
delete query.config;
return assign({}, config, query);
return Object.assign({}, config, query);
}

return query;
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
"dependencies": {
"big.js": "^3.1.3",
"emojis-list": "^2.0.0",
"json5": "^0.5.0",
"object-assign": "^4.0.1"
"json5": "^0.5.0"
},
"scripts": {
"test": "mocha",
Expand Down

0 comments on commit ae1d865

Please sign in to comment.