Merge pull request #216 from glitch-soc/merge-upstream-3023725

Merge upstream at commit 3023725

1 files changed, 26 insertions, 26 deletions

diff --git a/package.json b/package.json
index 8d24c7850..159181030 100644
--- a/package.json
+++ b/package.json
@@ -20,14 +20,13 @@
   "dependencies": {
     "array-includes": "^3.0.3",
     "atrament": "^0.2.3",
-    "autoprefixer": "^7.1.2",
-    "axios": "^0.16.2",
+    "autoprefixer": "^7.1.6",
+    "axios": "~0.16.2",
     "babel-core": "^6.25.0",
     "babel-loader": "^7.1.1",
     "babel-plugin-lodash": "^3.2.11",
-    "babel-plugin-preval": "^1.3.2",
+    "babel-plugin-preval": "^1.6.1",
     "babel-plugin-react-intl": "^2.3.1",
-    "babel-plugin-react-transform": "^2.0.2",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
@@ -36,30 +35,30 @@
     "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",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.10",
     "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.6.0",
+    "babel-preset-env": "^1.6.1",
     "babel-preset-react": "^6.24.1",
     "classnames": "^2.2.5",
-    "compression-webpack-plugin": "^0.4.0",
-    "cross-env": "^5.0.1",
+    "compression-webpack-plugin": "^1.0.1",
+    "cross-env": "^5.1.1",
     "css-loader": "^0.28.4",
     "detect-passive-events": "^1.0.2",
     "dotenv": "^4.0.0",
     "emoji-mart": "Gargron/emoji-mart#build",
     "es6-symbol": "^3.1.1",
     "escape-html": "^1.0.3",
-    "express": "^4.15.2",
-    "extract-text-webpack-plugin": "^2.1.2",
+    "express": "^4.16.2",
+    "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^0.11.2",
     "font-awesome": "^4.7.0",
     "glob": "^7.1.1",
     "http-link-header": "^0.8.0",
-    "immutable": "^3.8.1",
+    "immutable": "^3.8.2",
     "intersection-observer": "^0.4.0",
     "intl": "^1.2.5",
     "intl-messageformat": "^2.1.0",
-    "intl-relativeformat": "^2.0.0",
+    "intl-relativeformat": "^2.1.0",
     "is-nan": "^1.2.1",
     "js-yaml": "^3.9.0",
     "lodash": "^4.17.4",
@@ -73,7 +72,7 @@
     "offline-plugin": "^4.8.3",
     "path-complete-extname": "^0.1.0",
     "pg": "^6.4.0",
-    "postcss-loader": "^2.0.6",
+    "postcss-loader": "^2.0.8",
     "postcss-object-fit-images": "^1.1.2",
     "postcss-smart-import": "^0.7.5",
     "precss": "^2.0.0",
@@ -84,15 +83,15 @@
     "react-dom": "^16.0.0",
     "react-hotkeys": "^0.10.0",
     "react-immutable-proptypes": "^2.1.0",
-    "react-immutable-pure-component": "^1.0.0",
+    "react-immutable-pure-component": "^1.1.1",
     "react-intl": "^2.4.0",
-    "react-motion": "^0.5.0",
-    "react-notification": "^6.7.1",
-    "react-overlays": "^0.8.1",
+    "react-motion": "^0.5.2",
+    "react-notification": "^6.8.2",
+    "react-overlays": "^0.8.3",
     "react-redux": "^5.0.4",
-    "react-redux-loading-bar": "^2.9.2",
+    "react-redux-loading-bar": "^2.9.3",
     "react-router-dom": "^4.1.1",
-    "react-router-scroll": "Gargron/react-router-scroll#build",
+    "react-router-scroll-4": "^1.0.0-beta.1",
     "react-swipeable-views": "^0.12.3",
     "react-textarea-autosize": "^5.0.7",
     "react-toggle": "^4.0.1",
@@ -102,17 +101,17 @@
     "redux-thunk": "^2.2.0",
     "requestidlecallback": "^0.3.0",
     "reselect": "^3.0.1",
-    "resolve-url-loader": "^2.1.0",
+    "resolve-url-loader": "^2.2.0",
     "rimraf": "^2.6.1",
     "sass-loader": "^6.0.6",
     "stringz": "^0.2.2",
-    "style-loader": "^0.18.2",
+    "style-loader": "^0.19.0",
     "substring-trie": "^1.0.2",
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
     "uuid": "^3.1.0",
     "uws": "^8.14.0",
-    "webpack": "^3.4.1",
+    "webpack": "^3.8.1",
     "webpack-bundle-analyzer": "^2.8.3",
     "webpack-manifest-plugin": "^1.2.1",
     "webpack-merge": "^4.1.0",
@@ -121,19 +120,20 @@
   "devDependencies": {
     "babel-eslint": "^7.2.3",
     "enzyme": "^3.0.0",
-    "enzyme-adapter-react-16": "^1.0.0",
+    "enzyme-adapter-react-16": "^1.0.2",
     "eslint": "^3.19.0",
-    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-jsx-a11y": "^4.0.0",
     "eslint-plugin-react": "^6.10.3",
     "jest": "^21.2.1",
     "raf": "^3.4.0",
     "react-intl-translations-manager": "^5.0.0",
     "react-test-renderer": "^16.0.0",
-    "webpack-dev-server": "^2.6.1",
+    "webpack-dev-server": "^2.9.3",
     "yargs": "^8.0.2"
   },
   "optionalDependencies": {
-    "fsevents": "*"
+    "fsevents": "*",
+    "node-zopfli": "^2.0.2"
   }
 }