react-rails 1.8.2 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05bdf78ad02169578227f8c9d3ea5f1c5e48924d
-  data.tar.gz: 70964006fa4e5ffc253df1f1f632e49eb938f0ee
+  metadata.gz: 908ecff764f2cb0ca4c4f3bfd190473b2aa25843
+  data.tar.gz: 6b3262ab4494e36f51185c6dbbfa23c6dfc5e936
 SHA512:
-  metadata.gz: 99a66d4d850b409390205d7362797d2c71f9e59341e8c3452d4e76f01e2d3cc5371de9f1ad6fbae0da5170c6072dd343d18278cac4624f8839fe87da98c04e2e
-  data.tar.gz: b283b0cc9a0e77c93358f24f6c3ff24aecd899424d772e97149666151a3383ca6e9c0eacbe3abb43224d0c70ea5a698702dc6143fece4407393cfc2a12fd9f52
+  metadata.gz: 2884a67467eb7f64fb7e7cd3875d63cfe26398d1c0fac87391f726ba4bbd6a6a3498d550fbb465f49359537df5ace2ccc53acb07dca00da2eb468e3a2966e983
+  data.tar.gz: 5abf1e17ce029213a45697e5a7d7a51f16d3db7ced7971acc82e7ac5aa138e33d2e37b3d738542463d9c99d799aa7b98992d91db7123f20cc670b55e90b8dcb5

data/CHANGELOG.md

@@ -8,6 +8,29 @@
 
 #### Bug Fixes
 
+## 1.9.0 (October 6, 2016)
+
+#### Breaking Changes
+
+#### New Features
+
+- Accept extra JS code in `code:` option for SprocketsRenderer #604
+
+#### Bug Fixes
+
+- Use `asset_prefix` for YamlContainer #598
+- Fix requiring `.js` from `.es6.jsx` #591
+
+## 1.8.2 (August 9, 2016)
+
+#### New Features
+
+- Update to React 15.3.0 #583
+
+#### Bug Fixes
+
+- Fix `//= require` on Sprockets 3.7+ #582
+
 ## 1.8.1 (July 29, 2016)
 
 #### New Features

data/lib/react/jsx.rb

@@ -3,6 +3,7 @@ require 'react/jsx/processor'
 require 'react/jsx/template'
 require 'react/jsx/jsx_transformer'
 require 'react/jsx/babel_transformer'
+require 'react/jsx/sprockets_strategy'
 require 'rails'
 
 module React

data/lib/react/jsx/sprockets_strategy.rb

@@ -0,0 +1,53 @@
+module React
+  module JSX
+    # Depending on the Sprockets version,
+    # attach JSX transformation the the Sprockets environment.
+    #
+    # You can override it with `config.sprockets_strategy`
+    # @example Specifying a Sprockets strategy
+    #   app.config.react.sprockets_strategy = :register_engine
+    #
+    # @example Opting out of any Sprockets strategy
+    #   app.config.react.sprockets_strategy = false
+    #
+    module SprocketsStrategy
+      module_function
+
+      # @param [Sprockets::Environment] the environment to attach JSX to
+      # @param [Symbol, Nil] A strategy name, or `nil` to detect a strategy
+      def attach_with_strategy(sprockets_env, strategy_or_nil)
+        strategy = strategy_or_nil || detect_strategy
+        self.public_send(strategy, sprockets_env)
+      end
+
+      # @return [Symbol] based on the environment, return a method name to call with the sprockets environment
+      def detect_strategy
+        sprockets_version = Gem::Version.new(Sprockets::VERSION)
+        if sprockets_version >= Gem::Version.new("4.x")
+          :register_processors
+        elsif sprockets_version >= Gem::Version.new("3.0.0")
+          :register_engine_with_mime_type
+        else
+          :register_engine
+        end
+      end
+
+      def register_engine(sprockets_env)
+        sprockets_env.register_engine(".jsx", React::JSX::Template)
+      end
+
+      def register_engine_with_mime_type(sprockets_env)
+        sprockets_env.register_engine(".jsx", React::JSX::Processor, mime_type: "application/javascript", silence_deprecation: true)
+      end
+
+      def register_processors(sprockets_env)
+        sprockets_env.register_mime_type("application/jsx", extensions: [".jsx", ".js.jsx", ".es.jsx", ".es6.jsx"])
+        sprockets_env.register_mime_type("application/jsx+coffee", extensions: [".jsx.coffee", ".js.jsx.coffee"])
+        sprockets_env.register_transformer("application/jsx", "application/javascript", React::JSX::Processor)
+        sprockets_env.register_transformer("application/jsx+coffee", "application/jsx", Sprockets::CoffeeScriptProcessor)
+        sprockets_env.register_preprocessor("application/jsx", Sprockets::DirectiveProcessor.new(comments: ["//", ["/*", "*/"]]))
+        sprockets_env.register_preprocessor("application/jsx+coffee", Sprockets::DirectiveProcessor.new(comments: ["#", ["###", "###"]]))
+      end
+    end
+  end
+end

data/lib/react/rails/railtie.rb

@@ -10,6 +10,7 @@ module React
       config.react.jsx_transform_options = {}
       config.react.jsx_transformer_class = nil # defaults to BabelTransformer
       config.react.camelize_props = false # pass in an underscored hash but get a camelized hash
+      config.react.sprockets_strategy = nil # how to attach JSX to the asset pipeline (or `false` for none)
 
       # Server rendering:
       config.react.server_renderer_pool_size  = 1   # increase if you're on JRuby
@@ -100,19 +101,12 @@ module React
         # Sprockets 3.x expects this in a different place
         sprockets_env = app.assets || defined?(Sprockets) && Sprockets
 
-        if !sprockets_env.nil?
-          if Gem::Version.new(Sprockets::VERSION) >= Gem::Version.new("3.7.0")
-            sprockets_env.register_mime_type("application/jsx", extensions: [".jsx", ".js.jsx", ".es.jsx", ".es6.jsx"])
-            sprockets_env.register_mime_type("application/jsx+coffee", extensions: [".jsx.coffee", ".js.jsx.coffee"])
-            sprockets_env.register_transformer("application/jsx", "application/javascript", React::JSX::Processor)
-            sprockets_env.register_transformer("application/jsx+coffee", "application/jsx", Sprockets::CoffeeScriptProcessor)
-            sprockets_env.register_preprocessor("application/jsx", Sprockets::DirectiveProcessor.new(comments: ["//", ["/*", "*/"]]))
-            sprockets_env.register_preprocessor("application/jsx+coffee", Sprockets::DirectiveProcessor.new(comments: ["#", ["###", "###"]]))
-          elsif Gem::Version.new(Sprockets::VERSION) >= Gem::Version.new("3.0.0")
-            sprockets_env.register_engine(".jsx", React::JSX::Processor, mime_type: "application/javascript")
-          else
-            sprockets_env.register_engine(".jsx", React::JSX::Template)
-          end
+        if app.config.react.sprockets_strategy == false
+          # pass, Sprockets opt-out
+        elsif sprockets_env.present?
+          React::JSX::SprocketsStrategy.attach_with_strategy(sprockets_env, app.config.react.sprockets_strategy)
+        else
+          # pass, Sprockets is not preset
         end
       end
     end

data/lib/react/rails/version.rb

@@ -2,6 +2,6 @@ module React
   module Rails
     # If you change this, make sure to update VERSIONS.md
     # And the version hint in README.md, if needed
-    VERSION = "1.8.2"
+    VERSION = "1.9.0"
   end
 end

data/lib/react/server_rendering/sprockets_renderer.rb

@@ -17,6 +17,7 @@ module React
         @replay_console = options.fetch(:replay_console, true)
         filenames = options.fetch(:files, ["react-server.js", "components.js"])
         js_code = CONSOLE_POLYFILL.dup
+        js_code << options.fetch(:code, '')
 
         filenames.each do |filename|
           js_code << asset_container.find_asset(filename)

data/lib/react/server_rendering/yaml_manifest_container.rb

@@ -6,12 +6,12 @@ module React
     # but sometimes, they're compiled to other directories (or other servers)
     class YamlManifestContainer
       def initialize
-        @assets = YAML.load_file(::Rails.root.join("public/assets/manifest.yml"))
+        @assets = YAML.load_file(::Rails.root.join("public", ::Rails.application.config.assets.prefix, "manifest.yml"))
       end
 
       def find_asset(logical_path)
         asset_path = @assets[logical_path] || raise("No compiled asset for #{logical_path}, was it precompiled?")
-        asset_full_path = ::Rails.root.join("public", "assets", asset_path)
+        asset_full_path = ::Rails.root.join("public", ::Rails.application.config.assets.prefix, asset_path)
         File.read(asset_full_path)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react-rails
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.9.0
 platform: ruby
 authors:
 - Paul O’Shannessy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -315,6 +315,7 @@ files:
 - lib/react/jsx/babel_transformer.rb
 - lib/react/jsx/jsx_transformer.rb
 - lib/react/jsx/processor.rb
+- lib/react/jsx/sprockets_strategy.rb
 - lib/react/jsx/template.rb
 - lib/react/rails.rb
 - lib/react/rails/asset_variant.rb