Merge pull request #1006 from dimagi/dependabot/npm_and_yarn/underscore-1.13.1

Bump underscore from 1.8.3 to 1.13.1

Author: millerdev

package.json

@@ -33,15 +33,15 @@
         "requirejs": "2.3.6",
         "requirejs-plugins": "1.0.2",
         "requirejs-text": "2.0.15",
-        "requirejs-undertemplate": "0.0.4",
-        "underscore": "1.8.3",
+        "requirejs-undertemplate": "dimagi/requirejs-tpl#v0.0.5",
+        "underscore": "1.13.1",
         "xpath": "dimagi/js-xpath#v0.0.4",
         "xrayquire": "npm:xrayquire-for-npm#^0.1.1"
     },
     "devDependencies": {
         "chai": "4.2.0",
         "csso": ">=1.3.11",
-        "equivalent-xml-js": "mwhite/equivalent-xml-js#master",
+        "equivalent-xml-js": "dimagi/equivalent-xml-js#master",
         "grunt": "1.3.0",
         "grunt-contrib-connect": "1.0.2",
         "grunt-contrib-jshint": "2.1.0",

src/main.js

@@ -89,9 +89,6 @@ requirejs.config({
             deps: ['jquery'],
             exports: '$.fn.popover'
         },
-        'underscore': {
-            exports: '_'
-        },
         'XMLWriter': {
             exports: 'XMLWriter'
         },

tests/main.js

@@ -21,11 +21,6 @@ if (useBuilt) {
 }
 console.log("loading Vellum from " + baseUrl);
 
-// comment these to use built versions
-define("jquery", [testBase + 'node_modules/jquery/dist/jquery'], function () { return window.jQuery; });
-define("jquery.bootstrap", ["jquery", testBase + 'node_modules/bootstrap/dist/js/bootstrap'], function () {});
-define("underscore", [testBase + 'node_modules/underscore/underscore'], function () { return window._; });
-
 requirejs.config({
     baseUrl: baseUrl,
     paths: {
@@ -37,7 +32,7 @@ requirejs.config({
 // load jquery.vellum before loading tests because some tests depend on
 // jquery.vellum components and would try to load them at the wrong path
 // (this is only important when using the built version)
-requirejs(['jquery', 'jquery.vellum'], function ($) {
+requirejs(['jquery.vellum'], function () {
     // define our own paths for test dependencies that are also dependencies of
     // vellum that get excluded from the built version of vellum, to ensure that
     // the built version is tested correctly
@@ -48,32 +43,23 @@ requirejs(['jquery', 'jquery.vellum'], function ($) {
             'static': testBase + 'tests/static',
             'chai': testBase + 'node_modules/chai/chai',
             'equivalent-xml': testBase + 'node_modules/equivalent-xml-js/src/equivalent-xml'
-        },
-        shim: {
-            'equivalent-xml': {
-                deps: ['underscore'],
-                exports: 'EquivalentXml'
-            }
         }
     });
 
     if (useBuilt) {
         requirejs.config({
             paths: {
                 'text': '../node_modules/requirejs-text',
-                // for some reason this is necessary in firefox only for built
-                // version test page.  It shouldn't be
-                'tpl': '../node_modules/requirejs-tpl',
                 // https://github.com/guybedford/require-css/issues/133 
                 //'css': 'error',
                 'less': 'error',
                 'json': 'error'
             }
         });
-        $('head').append('<link rel="stylesheet" type="text/css" href="_build/style.css">');
     }
 
     requirejs([
+        'jquery',
         'tests/options',
 
         // tests for profiling load times
@@ -119,11 +105,13 @@ requirejs(['jquery', 'jquery.vellum'], function ($) {
         'tests/escapedHashtags',
         'tests/bulkActions',
         'tests/undomanager',
-    ], function (
-        options
-    ) {
+    ], function ($, options) {
         var session = window.sessionStorage;
 
+        if (useBuilt) {
+            $('head').append('<link rel="stylesheet" type="text/css" href="_build/style.css">');
+        }
+
         function runTests() {
             function showTestResults() {
                 $("#resultsTab").click();

yarn.lock

@@ -794,9 +794,9 @@ entities@^2.0.0, entities@~2.1.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
   integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
 
-equivalent-xml-js@mwhite/equivalent-xml-js#master:
+equivalent-xml-js@dimagi/equivalent-xml-js#master:
   version "0.0.0"
-  resolved "https://codeload.github.com/mwhite/equivalent-xml-js/tar.gz/7de21be29567a06535309b9ee969b97abcfbcb21"
+  resolved "https://codeload.github.com/dimagi/equivalent-xml-js/tar.gz/9fbcbf920ec8628264ab94f8e55bc5772bb76911"
 
 errno@^0.1.1:
   version "0.1.8"
@@ -2698,25 +2698,24 @@ [email protected], requirejs-text@~2.0.12:
   resolved "https://registry.yarnpkg.com/requirejs-text/-/requirejs-text-2.0.15.tgz#13138733613fc4457b7e1247e8cb751df7aa5429"
   integrity sha1-ExOHM2E/xEV7fhJH6Mt1HfeqVCk=
 
-[email protected]:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/requirejs-undertemplate/-/requirejs-undertemplate-0.0.4.tgz#c206453dcb5fa3d396399d2e3cf2e9f1c298209b"
-  integrity sha1-wgZFPctfo9OWOZ0uPPLp8cKYIJs=
+requirejs-undertemplate@dimagi/requirejs-tpl#v0.0.5:
+  version "0.0.5"
+  resolved "https://codeload.github.com/dimagi/requirejs-tpl/tar.gz/e2e00a613c7dccff092bfd48bd58d4f949a5dfb4"
   dependencies:
-    requirejs "~2.2.0"
+    requirejs "2.3.3"
     requirejs-text "~2.0.12"
     underscore "^1.8.3"
 
+[email protected]:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.3.tgz#aa59fd3a0287eaf407959a138228044b5dd6a6a3"
+  integrity sha1-qln9OgKH6vQHlZoTgigES13WpqM=
+
 [email protected]:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.6.tgz#e5093d9601c2829251258c0b9445d4d19fa9e7c9"
   integrity sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==
 
-requirejs@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.2.0.tgz#0f2b1538af2b8d0a4fffffde5d367aa9cd4cfe84"
-  integrity sha1-DysVOK8rjQpP///eXTZ6qc1M/oQ=
-
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
@@ -3186,15 +3185,10 @@ underscore.string@~3.3.4, underscore.string@~3.3.5:
     sprintf-js "^1.0.3"
     util-deprecate "^1.0.2"
 
-[email protected]:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"
-  integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=
-
-underscore@^1.8.3:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.12.0.tgz#4814940551fc80587cef7840d1ebb0f16453be97"
-  integrity sha512-21rQzss/XPMjolTiIezSu3JAjgagXKROtNrYFEOWK109qY1Uv2tVjPTZ1ci2HgvQDA16gHYSthQIJfB+XId/rQ==
+[email protected], underscore@^1.8.3:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1"
+  integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==
 
 union-value@^1.0.0:
   version "1.0.1"