Remove sprockets-es6 from dependency

zetachang · zetachang · commit 7597201d42ee · 2015-05-03T21:13:27.000+08:00
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,19 +4,18 @@ PATH
     react.rb (0.2.1)
       opal (~> 0.6.0)
       opal-activesupport (~> 0)
-      sprockets-es6 (~> 0)
+      react-jsx (~> 0.8.0)
+      sprockets (>= 2.2.3, < 3.0.0)
       therubyracer (~> 0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    babel-source (4.7.16)
-    babel-transpiler (0.6.0)
-      babel-source (>= 4.0, < 5)
-      execjs (~> 2.0)
-    execjs (2.4.0)
+    execjs (2.5.2)
+    hike (1.2.3)
     json (1.8.2)
     libv8 (3.16.14.7)
+    multi_json (1.11.0)
     opal (0.6.3)
       source_map
       sprockets
@@ -30,6 +29,10 @@ GEM
     rack-protection (1.5.3)
       rack
     rake (10.4.2)
+    react-jsx (0.8.0)
+      execjs (>= 2.0.2)
+      json (>= 1.8.0)
+      react-source (>= 0.4.1)
     react-source (0.12.2)
     ref (1.0.5)
     sinatra (1.4.6)
@@ -38,15 +41,15 @@ GEM
       tilt (>= 1.3, < 3)
     source_map (3.0.1)
       json
-    sprockets (3.0.0.beta.10)
+    sprockets (2.12.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
-    sprockets-es6 (0.6.0)
-      babel-transpiler
-      sprockets (~> 3.0.0.beta)
-    therubyracer (0.12.1)
+      tilt (~> 1.1, != 1.3.0)
+    therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
-    tilt (2.0.1)
+    tilt (1.4.1)
 
 PLATFORMS
   ruby
@@ -55,6 +58,6 @@ DEPENDENCIES
   opal-jquery (~> 0)
   opal-rspec (~> 0.3.0.beta3)
   rake (~> 10)
-  react-source (~> 0.12)
+  react-source (~> 0.12.0)
   react.rb!
   sinatra (~> 1)
diff --git a/lib/react/ext/jsx_support.rb b/lib/react/ext/jsx_support.rb
@@ -1,16 +1,21 @@
-require "execjs"
+require 'react/jsx'
+require 'tilt'
 require "sprockets"
-require "sprockets/es6"
 
-module ExecJS
-  class Runtime
-    alias_method :orig_compile, :compile
-    def compile(source)
-      context = orig_compile("var console = {error: function(){}, log: function(){}, warn: function(){}, info: function(){}};" + source)
-      context
+module React
+  module JSX
+
+    class Template < Tilt::Template
+      self.default_mime_type = 'application/javascript'
+
+      def prepare
+      end
+
+      def evaluate(scope, locals, &block)
+        @output ||= React::JSX.compile(data)
+      end
     end
   end
 end
 
-Sprockets.register_mime_type 'text/jsx', extensions: ['.jsx']
-Sprockets.register_transformer 'text/jsx', 'application/javascript', Sprockets::ES6.new('whitelist' => ['react'])
+Sprockets.register_engine '.jsx', React::JSX::Template
diff --git a/react.rb.gemspec b/react.rb.gemspec
@@ -18,9 +18,10 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'opal', '~> 0.6.0'
   s.add_runtime_dependency 'opal-activesupport', '~> 0'
-  s.add_runtime_dependency 'sprockets-es6', '~> 0'
   s.add_runtime_dependency 'therubyracer', '~> 0'
-  s.add_development_dependency 'react-source', '~> 0.12'
+  s.add_runtime_dependency 'react-jsx', '~> 0.8.0'
+  s.add_runtime_dependency 'sprockets', '>= 2.2.3', '< 3.0.0'
+  s.add_development_dependency 'react-source', '~> 0.12.0'
   s.add_development_dependency 'opal-rspec', '~> 0.3.0.beta3'
   s.add_development_dependency 'sinatra', '~> 1'
   s.add_development_dependency 'opal-jquery', '~> 0'
