aboutsummaryrefslogtreecommitdiff
path: root/node_modules/lodash/defaults.js
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-04-20 03:09:25 +0200
committerFlorian Dold <florian.dold@gmail.com>2017-04-24 16:14:29 +0200
commit82f2b76e25a4a67e01ec67e5ebe39d14ad771ea8 (patch)
tree965f6eb89b84d65a62b49008fd972c004832ccd1 /node_modules/lodash/defaults.js
parente6e0cbc387c2a77b48e4065c229daa65bf1aa0fa (diff)
downloadwallet-core-82f2b76e25a4a67e01ec67e5ebe39d14ad771ea8.tar.xz
Reorganize module loading.
We now use webpack instead of SystemJS, effectively bundling modules into one file (plus commons chunks) for every entry point. This results in a much smaller extension size (almost half). Furthermore we use yarn/npm even for extension run-time dependencies. This relieves us from manually vendoring and building dependencies. It's also easier to understand for new developers familiar with node.
Diffstat (limited to 'node_modules/lodash/defaults.js')
-rw-r--r--node_modules/lodash/defaults.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/node_modules/lodash/defaults.js b/node_modules/lodash/defaults.js
index 5333b4256..6b75ee08c 100644
--- a/node_modules/lodash/defaults.js
+++ b/node_modules/lodash/defaults.js
@@ -1,7 +1,7 @@
var apply = require('./_apply'),
- assignInDefaults = require('./_assignInDefaults'),
assignInWith = require('./assignInWith'),
- baseRest = require('./_baseRest');
+ baseRest = require('./_baseRest'),
+ customDefaultsAssignIn = require('./_customDefaultsAssignIn');
/**
* Assigns own and inherited enumerable string keyed properties of source
@@ -25,7 +25,7 @@ var apply = require('./_apply'),
* // => { 'a': 1, 'b': 2 }
*/
var defaults = baseRest(function(args) {
- args.push(undefined, assignInDefaults);
+ args.push(undefined, customDefaultsAssignIn);
return apply(assignInWith, undefined, args);
});