From 1e2a5dded749649c3e8fe9e6dc6be5d516cca35a Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Sun, 23 Apr 2017 17:19:10 -0700
Subject: [PATCH] Simplify browserify+babelify config (#2377)

---
 config/application.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/application.rb b/config/application.rb
index 50dc2a10b5..3db8558dea 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -72,7 +72,8 @@ module Mastodon
     config.middleware.use Rack::Attack
     config.middleware.use Rack::Deflater
 
-    config.browserify_rails.commandline_options   = '--transform [ babelify --presets [ es2015 react ] --plugins [ transform-decorators-legacy ] ] --extension=".jsx"'
+    # babel config can be found in .babelrc
+    config.browserify_rails.commandline_options   = '--transform babelify --extension=".jsx"'
     config.browserify_rails.evaluate_node_modules = true
 
     config.to_prepare do
-- 
GitLab