Merge upstream!! #64 <3 <3

1 files changed, 8 insertions, 7 deletions

diff --git a/package.json b/package.json
index 60f9af1e9..4c5a3f1d9 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
     "array-includes": "^3.0.3",
     "autoprefixer": "^7.1.0",
     "axios": "^0.16.2",
-    "babel-cli": "^6.24.1",
     "babel-core": "^6.25.0",
     "babel-loader": "^7.1.0",
     "babel-plugin-lodash": "^3.2.11",
@@ -33,6 +32,7 @@
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.23.0",
+    "babel-plugin-transform-react-inline-elements": "^6.22.0",
     "babel-plugin-transform-react-jsx-self": "^6.22.0",
     "babel-plugin-transform-react-jsx-source": "^6.22.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.6",
@@ -71,7 +71,7 @@
     "pg": "^6.4.0",
     "postcss-loader": "^2.0.6",
     "postcss-smart-import": "^0.7.4",
-    "precss": "^1.4.0",
+    "precss": "^2.0.0",
     "prop-types": "^15.5.10",
     "punycode": "^2.1.0",
     "rails-ujs": "^5.1.2",
@@ -89,7 +89,7 @@
     "react-router-dom": "^4.1.1",
     "react-router-scroll": "ytase/react-router-scroll#build",
     "react-simple-dropdown": "^3.0.0",
-    "react-swipeable": "^4.0.1",
+    "react-swipeable-views": "^0.12.3",
     "react-textarea-autosize": "^5.0.7",
     "react-toggle": "^4.0.1",
     "redis": "^2.7.1",
@@ -103,10 +103,11 @@
     "sass-loader": "^6.0.6",
     "stringz": "^0.2.2",
     "style-loader": "^0.18.2",
+    "substring-trie": "^1.0.0",
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
     "uuid": "^3.1.0",
-    "uws": "^0.14.5",
+    "uws": "^8.14.0",
     "webpack": "^3.0.0",
     "webpack-bundle-analyzer": "^2.8.2",
     "webpack-manifest-plugin": "^1.1.0",
@@ -118,17 +119,17 @@
     "@storybook/react": "^3.1.6",
     "babel-eslint": "^7.2.3",
     "chai": "^4.0.1",
-    "chai-enzyme": "^0.7.1",
+    "chai-enzyme": "^0.8.0",
     "enzyme": "^2.9.1",
     "eslint": "^3.19.0",
     "eslint-plugin-jsx-a11y": "^4.0.0",
     "eslint-plugin-react": "^6.10.3",
-    "jsdom": "^10.1.0",
+    "jsdom": "^11.0.0",
     "mocha": "^3.4.1",
     "react-intl-translations-manager": "^5.0.0",
     "react-test-renderer": "^15.6.1",
     "sinon": "^2.3.5",
-    "webpack-dev-server": "lencioni/webpack-dev-server#patch-1",
+    "webpack-dev-server": "^2.5.1",
     "yargs": "^8.0.2"
   },
   "optionalDependencies": {