Merge branch 'master' into staging

1 files changed, 25 insertions, 9 deletions

diff --git a/package.json b/package.json
index 9a46403f3..010f2b606 100644
--- a/package.json
+++ b/package.json
@@ -1,31 +1,47 @@
 {
   "name": "stif-boiv",
   "dependencies": {
+    "@rails/webpacker": "3.0.2",
+    "babel-jest": "21.2.0",
     "babel-polyfill": "6.16.0",
     "babel-preset-es2015": "6.18.0",
-    "babel-preset-react": "6.16.0",
+    "babel-preset-react": "6.24.1",
     "babelify": "7.3.0",
-    "browserify": "13.1.1",
-    "browserify-incremental": "3.1.1",
+    "bootstrap": "3",
+    "coffeescript": "1.12.7",
+    "jquery": "3.2.1",
     "lodash": "4.17.4",
-    "promise-polyfill": "^6.0.2",
+    "promise-polyfill": "6.0.2",
     "react": "15.3.2",
     "react-dom": "15.3.2",
     "react-redux": "4.4.5",
-    "react-select2": "4.0.2",
+    "react-select2": "4.0.3",
     "redux": "3.6.0",
-    "whatwg-fetch": "2.0.3",
     "redux-logger": "2.7.4",
+    "redux-promise": "0.5.3",
     "redux-thunk": "2.1.0",
-    "redux-promise": "0.5.3"
+    "whatwg-fetch": "2.0.3"
   },
   "license": "MIT",
   "engines": {
-    "node": "5.12.0"
+    "node": "6.11.4"
   },
   "devDependencies": {
+    "clean-webpack-plugin": "0.1.17",
     "es6-object-assign": "1.0.3",
+    "jest": "21.2.1",
     "react-addons-test-utils": "15.3.2",
-    "sinon": "1.17.7"
+    "sinon": "1.17.7",
+    "uglify-js": "3.1.3",
+    "webpack-dev-server": "2.9.1"
+  },
+  "jest": {
+    "testRegex": "(/test/.*|(\\_|/)spec)\\.js$",
+    "roots": [
+      "<rootDir>/spec/javascript"
+    ],
+    "setupFiles": [
+      "<rootDir>/config/webpack/test.js"
+    ]
   }
 }