about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNolan Lawson <nolan@nolanlawson.com>2017-04-23 17:19:10 -0700
committerEugen <eugen@zeonfederated.com>2017-04-24 02:19:10 +0200
commit1e2a5dded749649c3e8fe9e6dc6be5d516cca35a (patch)
treeaf78f473a313a786c11a4ae9eafbe6559d819448
parent549ce78cf597523f8c43520823094bc20490ab67 (diff)
Simplify browserify+babelify config (#2377)
-rw-r--r--config/application.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb
index 50dc2a10b..3db8558de 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