Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js

1 files changed, 44 insertions, 36 deletions

diff --git a/package.json b/package.json
index 5636cb883..8a79938ae 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,8 @@
   },
   "scripts": {
     "postversion": "git push --tags",
-    "build:development": "cross-env RAILS_ENV=development ./bin/webpack",
-    "build:production": "cross-env RAILS_ENV=production ./bin/webpack",
+    "build:development": "cross-env RAILS_ENV=development NODE_ENV=development ./bin/webpack",
+    "build:production": "cross-env RAILS_ENV=production NODE_ENV=production ./bin/webpack",
     "manage:translations": "node ./config/webpack/translationRunner.js",
     "start": "node ./streaming/index.js",
     "test": "npm-run-all test:lint test:jest",
@@ -18,33 +18,39 @@
     "type": "git",
     "url": "https://github.com/tootsuite/mastodon.git"
   },
+  "browserslist": [
+    "last 2 versions",
+    "IE >= 11",
+    "iOS >= 9"
+  ],
   "private": true,
   "dependencies": {
+    "@babel/core": "^7.0.1",
+    "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "@babel/plugin-proposal-decorators": "^7.0.0",
+    "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
+    "@babel/plugin-transform-react-inline-elements": "^7.0.0",
+    "@babel/plugin-transform-react-jsx-self": "^7.0.0",
+    "@babel/plugin-transform-react-jsx-source": "^7.0.0",
+    "@babel/plugin-transform-runtime": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/preset-react": "^7.0.0",
+    "@babel/runtime": "^7.0.0",
     "array-includes": "^3.0.3",
     "atrament": "^0.2.3",
     "autoprefixer": "^8.6.5",
     "axios": "~0.16.2",
-    "babel-core": "^6.26.3",
-    "babel-loader": "^7.1.5",
+    "babel-core": "^7.0.0-bridge.0",
+    "babel-loader": "^8.0.2",
     "babel-plugin-lodash": "^3.3.4",
-    "babel-plugin-preval": "^1.6.1",
-    "babel-plugin-react-intl": "^2.4.0",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-decorators-legacy": "^1.3.5",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
-    "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.13",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-react": "^6.24.1",
+    "babel-plugin-preval": "^3.0.1",
+    "babel-plugin-react-intl": "^3.0.0",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.15",
     "classnames": "^2.2.5",
-    "compression-webpack-plugin": "^1.1.11",
+    "compression-webpack-plugin": "^2.0.0",
     "cross-env": "^5.1.4",
-    "css-loader": "^0.28.11",
+    "css-loader": "^1.0.0",
     "detect-passive-events": "^1.0.2",
     "dotenv": "^4.0.0",
     "emoji-mart": "Gargron/emoji-mart#build",
@@ -53,9 +59,10 @@
     "exif-js": "^2.3.0",
     "express": "^4.16.2",
     "favico.js": "^0.3.10",
-    "file-loader": "^1.1.11",
+    "file-loader": "^2.0.0",
     "font-awesome": "^4.7.0",
     "glob": "^7.1.1",
+    "history": "^4.7.2",
     "http-link-header": "^0.8.0",
     "immutable": "^3.8.2",
     "imports-loader": "^0.8.0",
@@ -68,7 +75,7 @@
     "lodash": "^4.17.5",
     "mark-loader": "^0.1.6",
     "marky": "^1.2.0",
-    "mini-css-extract-plugin": "^0.4.1",
+    "mini-css-extract-plugin": "^0.4.2",
     "mkdirp": "^0.5.1",
     "node-sass": "^4.9.2",
     "npm-run-all": "^4.1.2",
@@ -79,28 +86,28 @@
     "offline-plugin": "^5.0.5",
     "path-complete-extname": "^1.0.0",
     "pg": "^6.4.0",
-    "postcss-loader": "^2.1.6",
+    "postcss-loader": "^3.0.0",
     "postcss-object-fit-images": "^1.1.2",
     "postcss-smart-import": "^0.7.6",
     "precss": "^3.1.2",
     "prop-types": "^15.5.10",
     "punycode": "^2.1.0",
     "rails-ujs": "^5.2.0",
-    "react": "^16.3.0",
-    "react-dom": "^16.3.0",
+    "react": "^16.5.0",
+    "react-dom": "^16.5.0",
     "react-hotkeys": "^0.10.0",
     "react-immutable-proptypes": "^2.1.0",
     "react-immutable-pure-component": "^1.1.1",
     "react-intl": "^2.4.0",
     "react-motion": "^0.5.2",
-    "react-notification": "^6.8.2",
+    "react-notification": "^6.8.4",
     "react-overlays": "^0.8.3",
     "react-redux": "^5.0.4",
     "react-redux-loading-bar": "^2.9.3",
     "react-router-dom": "^4.1.1",
     "react-router-scroll-4": "^1.0.0-beta.1",
     "react-sparklines": "^1.7.0",
-    "react-swipeable-views": "0.12.13",
+    "react-swipeable-views": "^0.12.17",
     "react-textarea-autosize": "^5.2.1",
     "react-toggle": "^4.0.1",
     "redis": "^2.7.1",
@@ -113,34 +120,35 @@
     "rimraf": "^2.6.1",
     "sass-loader": "^7.0.3",
     "stringz": "^0.3.0",
-    "style-loader": "^0.21.0",
+    "style-loader": "^0.23.0",
     "substring-trie": "^1.0.2",
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
     "uglifyjs-webpack-plugin": "^1.2.7",
     "uuid": "^3.1.0",
     "uws": "10.148.0",
-    "webpack": "^4.16.0",
+    "webpack": "^4.18.0",
     "webpack-bundle-analyzer": "^2.13.1",
     "webpack-cli": "^3.0.8",
-    "webpack-manifest-plugin": "^2.0.3",
+    "webpack-manifest-plugin": "^2.0.4",
     "webpack-merge": "^4.1.3",
     "websocket.js": "^0.1.12"
   },
   "devDependencies": {
-    "babel-eslint": "^8.2.6",
-    "enzyme": "^3.2.0",
-    "enzyme-adapter-react-16": "^1.1.0",
+    "babel-eslint": "^9.0.0",
+    "babel-jest": "^23.6.0",
+    "enzyme": "^3.6.0",
+    "enzyme-adapter-react-16": "^1.5.0",
     "eslint": "^4.19.1",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-jsx-a11y": "^6.0.3",
     "eslint-plugin-promise": "^3.8.0",
     "eslint-plugin-react": "^7.8.2",
-    "jest": "^21.2.1",
+    "jest": "^23.6.0",
     "raf": "^3.4.0",
     "react-intl-translations-manager": "^5.0.3",
-    "react-test-renderer": "^16.2.0",
-    "webpack-dev-server": "^3.1.4",
+    "react-test-renderer": "^16.5.0",
+    "webpack-dev-server": "^3.1.8",
     "yargs": "^8.0.2"
   },
   "optionalDependencies": {