diff --git a/.babelrc b/.babelrc
deleted file mode 100644
index 190b5038c3..0000000000
--- a/.babelrc
+++ /dev/null
@@ -1,66 +0,0 @@
-{
- "presets": [
- "react",
- [
- "env",
- {
- "exclude": ["transform-async-to-generator", "transform-regenerator"],
- "loose": true,
- "modules": false,
- "targets": {
- "browsers": ["last 2 versions", "IE >= 11", "iOS >= 9"]
- }
- }
- ]
- ],
- "plugins": [
- "syntax-dynamic-import",
- ["transform-object-rest-spread", { "useBuiltIns": true }],
- "transform-decorators-legacy",
- "transform-class-properties",
- [
- "react-intl",
- {
- "messagesDir": "./build/messages"
- }
- ],
- "preval"
- ],
- "env": {
- "development": {
- "plugins": [
- "transform-react-jsx-source",
- "transform-react-jsx-self"
- ]
- },
- "production": {
- "plugins": [
- "lodash",
- [
- "transform-react-remove-prop-types",
- {
- "mode": "remove",
- "removeImport": true,
- "additionalLibraries": [
- "react-immutable-proptypes"
- ]
- }
- ],
- "transform-react-inline-elements",
- [
- "transform-runtime",
- {
- "helpers": true,
- "polyfill": false,
- "regenerator": false
- }
- ]
- ]
- },
- "test": {
- "plugins": [
- "transform-es2015-modules-commonjs"
- ]
- }
- }
-}
diff --git a/Gemfile b/Gemfile
index 09e18669d8..0c2cf54903 100644
--- a/Gemfile
+++ b/Gemfile
@@ -87,7 +87,7 @@ gem 'tty-command', '~> 0.8', require: false
gem 'tty-prompt', '~> 0.16', require: false
gem 'twitter-text', '~> 1.14'
gem 'tzinfo-data', '~> 1.2018'
-gem 'webpacker', '~> 3.4'
+gem 'webpacker', '~> 3.5'
gem 'webpush'
gem 'json-ld', '~> 2.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8fc58395cc..ccdb3e1465 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -627,7 +627,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
- webpacker (3.4.3)
+ webpacker (3.5.5)
activesupport (>= 4.2)
rack-proxy (>= 0.6.1)
railties (>= 4.2)
@@ -758,7 +758,7 @@ DEPENDENCIES
twitter-text (~> 1.14)
tzinfo-data (~> 1.2018)
webmock (~> 3.3)
- webpacker (~> 3.4)
+ webpacker (~> 3.5)
webpush
RUBY VERSION
diff --git a/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap b/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap
index c3f018d90e..5c04e09799 100644
--- a/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap
+++ b/app/javascript/mastodon/components/__tests__/__snapshots__/button-test.js.snap
@@ -3,7 +3,6 @@
exports[` adds class "button-secondary" if props.secondary given 1`] = `
adds class "button-secondary" if props.secondary given 1`] =
exports[` renders a button element 1`] = `
renders a disabled attribute if props.disabled given 1`] = `
exports[` renders class="button--block" if props.block given 1`] = `
renders class="button--block" if props.block given 1`] = `
exports[` renders the children 1`] = `
renders the children 1`] = `
exports[` renders the given text 1`] = `
renders the given text 1`] = `
exports[` renders the props.text instead of children 1`] = `