update battery deps

openstax · Sep 7, 2018 · cd722a0 · cd722a0
1 parent 78dda09
commit cd722a0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/battery-resistor-circuit/bower.json b/battery-resistor-circuit/bower.json
@@ -11,15 +11,15 @@
     "tests"
   ],
   "dependencies": {
-    "jquery": "~2.1.1",
+    "jquery": "~3.3.1",
     "lodash": "~2.4.1",
     "backbone": "~1.1.2",
     "font-awesome": "~4.2.0",
     "requirejs": "~2.1.14",
     "requirejs-text": "~2.0.12",
     "require-css": "~0.1.5",
     "require-less": "~0.1.2",
-    "bootstrap": "~3.2.0",
+    "bootstrap": "~3.3.7",
     "sinonjs": "~1.10.2",
     "mocha": "~1.21.4",
     "chai": "~1.9.1",

diff --git a/battery-resistor-circuit/package.json b/battery-resistor-circuit/package.json
@@ -27,19 +27,19 @@
     "bower": "^1.3.9",
     "csso": "^1.3.11",
     "font-awesome": "^4.2.0",
-    "grunt": "^0.4.5",
+    "grunt": "^1.0.3",
     "grunt-contrib-clean": "^0.6.0",
-    "grunt-contrib-connect": "^0.8.0",
+    "grunt-contrib-connect": "^1.0.2",
     "grunt-contrib-copy": "^0.5.0",
     "grunt-contrib-jshint": "^1.0.0",
-    "grunt-contrib-less": "^0.11.4",
+    "grunt-contrib-less": "^2.0.0",
     "grunt-contrib-requirejs": "^0.4.4",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-mocha": "^0.4.11",
+    "grunt-contrib-watch": "^1.1.0",
+    "grunt-mocha": "^1.1.0",
     "grunt-rename": "^0.1.4",
     "grunt-targethtml": "^0.2.6",
-    "less": "^1.7.4",
-    "matchdep": "^0.3.0",
+    "less": "^1.7.5",
+    "matchdep": "^2.0.0",
     "object-pool": "^0.1.0",
     "requirejs": "^2.1.15",
     "underscore": "^1.7.0",

diff --git a/battery-resistor-circuit/src/js/config.js b/battery-resistor-circuit/src/js/config.js
@@ -48,16 +48,22 @@
 
         shim: {
             'bootstrap-select': {
+                deps: ['bootstrap']
+            },
+            'bootstrap': {
+                deps: ['jquery']
+            },
+            'nouislider': {
                 deps: ['jquery']
             }
         },
     };
 
-    // Expose to the rest of the world 
-    if (typeof module !== 'undefined') { 
-        module.exports = config; // For nodejs 
-    } 
-    else if (typeof require.config !== 'undefined') { 
-        require.config(config); // For requirejs 
+    // Expose to the rest of the world
+    if (typeof module !== 'undefined') {
+        module.exports = config; // For nodejs
+    }
+    else if (typeof require.config !== 'undefined') {
+        require.config(config); // For requirejs
     }
-})();
+})();