upgrade underscore and fetch from npmjs (#5660)

Makefile-docker

@@ -17,6 +17,7 @@ jquery/dist/jquery.js \
 jquery.browser/dist/jquery.browser.js \
 jquery.cookie/jquery.cookie.js \
 timeago/jquery.timeago.js \
+underscore/underscore.js \
 
 NODE_LIBS_JQUERY_UI := \
 jquery-ui/ui/version.js \

package.json

@@ -20,7 +20,8 @@
     "less": "2.7.2",
     "stylus": "0.54.5",
     "timeago": "1.5.4",
-    "uglify-js": "3.0.15"
+    "uglify-js": "3.0.15",
+    "underscore": "1.8.3"
   },
   "devDependencies": {
     "potools": "0.0.5"

src/olympia/lib/settings_base.py

@@ -668,7 +668,7 @@ MINIFY_BUNDLES = {
         'common': (
             'js/lib/raven.min.js',
             'js/common/raven-config.js',
-            'js/lib/underscore.js',
+            'js/node_lib/underscore.js',
             'js/zamboni/browser.js',
             'js/amo2009/addons.js',
             'js/zamboni/init.js',
@@ -757,7 +757,7 @@ MINIFY_BUNDLES = {
             'js/lib/ngettext-overload.js',
             'js/lib/raven.min.js',
             'js/common/raven-config.js',
-            'js/lib/underscore.js',
+            'js/node_lib/underscore.js',
             'js/impala/carousel.js',
             'js/zamboni/browser.js',
             'js/amo2009/addons.js',
@@ -854,7 +854,7 @@ MINIFY_BUNDLES = {
         'zamboni/discovery': (
             'js/node_lib/jquery.js',
             'js/node_lib/jquery.browser.js',
-            'js/lib/underscore.js',
+            'js/node_lib/underscore.js',
             'js/zamboni/browser.js',
             'js/zamboni/init.js',
             'js/impala/capabilities.js',