Merge pull request silverstripe#920 from open-sausages/pulls/1/bump-j…

…s-dependencies

BUG Bump JS depednencies for merge and bootstrap

package.json

@@ -65,7 +65,7 @@
     "babel-core": "^6.26.3",
     "babel-polyfill": "6.7.4",
     "babel-runtime": "6.26.0",
-    "bootstrap": "^4.1.3",
+    "bootstrap": "^4.3.1",
     "classnames": "^2.2.5",
     "deep-freeze-strict": "^1.1.1",
     "dropzone": "^5.5.1",
@@ -74,6 +74,7 @@
     "graphql-tag": "^2.8.0",
     "griddle-react": "^0.8.2",
     "jquery": "^3.1.1",
+    "merge": "^1.2.1",
     "modernizr": "^3.5.0",
     "popper.js": "^1.14.4",
     "prop-types": "^15.6.2",

yarn.lock

@@ -1803,9 +1803,10 @@ boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
 
-bootstrap@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
+bootstrap@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
+  integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
 
 bowser@^1.0.0, bowser@^1.7.3:
   version "1.9.4"
@@ -6240,6 +6241,11 @@ merge@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
 
+merge@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
+  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
+
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"