From 82f2b76e25a4a67e01ec67e5ebe39d14ad771ea8 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Thu, 20 Apr 2017 03:09:25 +0200 Subject: 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. --- node_modules/lodash/defaults.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'node_modules/lodash/defaults.js') 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); }); -- cgit v1.2.3