Skip to content

Commit

Permalink
Merge pull request dependents#42 from realityking/object-assign
Browse files Browse the repository at this point in the history
Use native Object.assign
  • Loading branch information
mrjoelkemp authored Jan 7, 2018
2 parents 8431f90 + 4838448 commit e1c5f53
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
3 changes: 1 addition & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ var resolveDependencyPath;
var appModulePath = require('app-module-path');
var webpackResolve;
var isRelative = require('is-relative-path');
var objectAssign = require('object-assign');

var defaultLookups = {
'.js': jsLookup,
Expand Down Expand Up @@ -253,7 +252,7 @@ function resolveWebpackPath(partial, filename, directory, webpackConfig) {
return '';
}

var resolveConfig = objectAssign({}, loadedConfig.resolve);
var resolveConfig = Object.assign({}, loadedConfig.resolve);

if (!resolveConfig.modules && (resolveConfig.root || resolveConfig.modulesDirectories)) {
resolveConfig.modules = [];
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
"is-relative-path": "^1.0.1",
"module-definition": "^2.2.4",
"module-lookup-amd": "^4.0.2",
"object-assign": "^4.0.1",
"resolve": "^1.1.7",
"resolve-dependency-path": "^1.0.2",
"sass-lookup": "^1.1.0",
Expand Down

0 comments on commit e1c5f53

Please sign in to comment.