From 82f2b76e25a4a67e01ec67e5ebe39d14ad771ea8 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
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/template.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'node_modules/lodash/template.js')

diff --git a/node_modules/lodash/template.js b/node_modules/lodash/template.js
index 2df417fa7..16539eec2 100644
--- a/node_modules/lodash/template.js
+++ b/node_modules/lodash/template.js
@@ -1,7 +1,7 @@
-var assignInDefaults = require('./_assignInDefaults'),
-    assignInWith = require('./assignInWith'),
+var assignInWith = require('./assignInWith'),
     attempt = require('./attempt'),
     baseValues = require('./_baseValues'),
+    customDefaultsAssignIn = require('./_customDefaultsAssignIn'),
     escapeStringChar = require('./_escapeStringChar'),
     isError = require('./isError'),
     isIterateeCall = require('./_isIterateeCall'),
@@ -141,9 +141,9 @@ function template(string, options, guard) {
     options = undefined;
   }
   string = toString(string);
-  options = assignInWith({}, options, settings, assignInDefaults);
+  options = assignInWith({}, options, settings, customDefaultsAssignIn);
 
-  var imports = assignInWith({}, options.imports, settings.imports, assignInDefaults),
+  var imports = assignInWith({}, options.imports, settings.imports, customDefaultsAssignIn),
       importsKeys = keys(imports),
       importsValues = baseValues(imports, importsKeys);
 
-- 
cgit v1.2.3