react-rails 2.2.1 → 2.3.0

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 republish the UJS by updating package.json and `bundle exec rake ujs:publish`
-    VERSION = "2.2.1"
+    VERSION = '2.3.0'
   end
 end

data/lib/react/server_rendering.rb

@@ -13,7 +13,7 @@ module React
     # This will clear all state such as loaded code, JS VM state, or options.
     # @return [void]
     def self.reset_pool
-      options = {size: pool_size, timeout: pool_timeout}
+      options = { size: pool_size, timeout: pool_timeout }
       @@pool = ConnectionPool.new(options) { self.renderer.new(self.renderer_options) }
     end
 

data/lib/react/server_rendering/bundle_renderer.rb

@@ -1,7 +1,7 @@
-require "react/server_rendering/environment_container"
-require "react/server_rendering/manifest_container"
-require "react/server_rendering/webpacker_manifest_container"
-require "react/server_rendering/yaml_manifest_container"
+require 'react/server_rendering/environment_container'
+require 'react/server_rendering/manifest_container'
+require 'react/server_rendering/webpacker_manifest_container'
+require 'react/server_rendering/yaml_manifest_container'
 
 module React
   module ServerRendering
@@ -11,14 +11,14 @@ module React
     # - implements console replay
     class BundleRenderer < ExecJSRenderer
       # Reimplement console methods for replaying on the client
-      CONSOLE_POLYFILL = File.read(File.join(File.dirname(__FILE__), "bundle_renderer/console_polyfill.js"))
-      CONSOLE_REPLAY   = File.read(File.join(File.dirname(__FILE__), "bundle_renderer/console_replay.js"))
-      CONSOLE_RESET    = File.read(File.join(File.dirname(__FILE__), "bundle_renderer/console_reset.js"))
-      TIMEOUT_POLYFILL = File.read(File.join(File.dirname(__FILE__), "bundle_renderer/timeout_polyfill.js"))
+      CONSOLE_POLYFILL = File.read(File.join(File.dirname(__FILE__), 'bundle_renderer/console_polyfill.js'))
+      CONSOLE_REPLAY   = File.read(File.join(File.dirname(__FILE__), 'bundle_renderer/console_replay.js'))
+      CONSOLE_RESET    = File.read(File.join(File.dirname(__FILE__), 'bundle_renderer/console_reset.js'))
+      TIMEOUT_POLYFILL = File.read(File.join(File.dirname(__FILE__), 'bundle_renderer/timeout_polyfill.js'))
 
       def initialize(options={})
         @replay_console = options.fetch(:replay_console, true)
-        filenames = options.fetch(:files, ["server_rendering.js"])
+        filenames = options.fetch(:files, ['server_rendering.js'])
         js_code = CONSOLE_POLYFILL.dup
         js_code << TIMEOUT_POLYFILL.dup
         js_code << options.fetch(:code, '')
@@ -41,11 +41,11 @@ module React
       end
 
       def before_render(component_name, props, prerender_options)
-        @replay_console ? CONSOLE_RESET : ""
+        @replay_console ? CONSOLE_RESET : ''
       end
 
       def after_render(component_name, props, prerender_options)
-        @replay_console ? CONSOLE_REPLAY : ""
+        @replay_console ? CONSOLE_REPLAY : ''
       end
 
       class << self

data/lib/react/server_rendering/exec_js_renderer.rb

@@ -9,7 +9,7 @@ module React
       attr_reader :context
 
       def initialize(options={})
-        js_code = options[:code] || raise("Pass `code:` option to instantiate a JS context!")
+        js_code = options[:code] || raise('Pass `code:` option to instantiate a JS context!')
         @context = ExecJS.compile(GLOBAL_WRAPPER + js_code)
       end
 
@@ -23,8 +23,8 @@ module React
       end
 
       # Hooks for inserting JS before/after rendering
-      def before_render(component_name, props, prerender_options); ""; end
-      def after_render(component_name, props, prerender_options); ""; end
+      def before_render(component_name, props, prerender_options); ''; end
+      def after_render(component_name, props, prerender_options); ''; end
 
       # Handle Node.js & other ExecJS contexts
       GLOBAL_WRAPPER = <<-JS
@@ -40,7 +40,7 @@ module React
       end
 
       def main_render(component_name, props, prerender_options)
-        render_function = prerender_options.fetch(:render_function, "renderToString")
+        render_function = prerender_options.fetch(:render_function, 'renderToString')
         "this.ReactRailsUJS.serverRender('#{render_function}', '#{component_name}', #{props})"
       end
 

data/lib/react/server_rendering/manifest_container.rb

@@ -11,7 +11,7 @@ module React
 
       def find_asset(logical_path)
         asset_path = @manifest.assets[logical_path] || raise("No compiled asset for #{logical_path}, was it precompiled?")
-        asset_full_path = ::Rails.root.join("public", @manifest.dir, asset_path)
+        asset_full_path = ::Rails.root.join('public', @manifest.dir, asset_path)
         File.read(asset_full_path)
       end
 

data/lib/react/server_rendering/webpacker_manifest_container.rb

@@ -1,4 +1,4 @@
-require "open-uri"
+require 'open-uri'
 
 module React
   module ServerRendering
@@ -7,27 +7,87 @@ module React
     # - webpack-dev-server
     # - compiled pack
     class WebpackerManifestContainer
+
+      begin
+        MAJOR, MINOR, PATCH, _ = Bundler.locked_gems.specs.find { |gem_spec| gem_spec.name == 'webpacker' }.version.segments
+      rescue
+        MAJOR, MINOR, PATCH, _ = [0,0,0]
+      end
+
       # This pattern matches the code that initializes the dev-server client.
       CLIENT_REQUIRE = %r{__webpack_require__\(.*webpack-dev-server\/client\/index\.js.*\n}
 
-      def find_asset(logical_path)
-        # raises if not found
-        asset_path = Webpacker::Manifest.lookup(logical_path).to_s
-        if asset_path.start_with?("http")
-          # Get a file from the webpack-dev-server
-          dev_server_asset = open(asset_path).read
-          # Remove `webpack-dev-server/client/index.js` code which causes ExecJS to 💥
-          dev_server_asset.sub!(CLIENT_REQUIRE, '//\0')
-          dev_server_asset
-        else
-          # Read the already-compiled pack:
-          full_path = Webpacker::Manifest.lookup_path(logical_path).to_s
-          File.read(full_path)
+      def self.compatible?
+        !!defined?(Webpacker)
+      end
+
+      if MAJOR < 3
+        def find_asset(logical_path)
+          # raises if not found
+          asset_path = manifest.lookup(logical_path).to_s
+          if asset_path.start_with?('http')
+            # Get a file from the webpack-dev-server
+            dev_server_asset = open(asset_path).read
+            # Remove `webpack-dev-server/client/index.js` code which causes ExecJS to 💥
+            dev_server_asset.sub!(CLIENT_REQUIRE, '//\0')
+            dev_server_asset
+          else
+            # Read the already-compiled pack:
+            full_path = file_path(logical_path).to_s
+            File.read(full_path)
+          end
+        end
+      else
+        def find_asset(logical_path)
+          asset_path = Webpacker.manifest.lookup(logical_path).to_s
+          if Webpacker.dev_server.running?
+            ds = Webpacker.dev_server
+            dev_server_asset = open("#{ds.protocol}://#{ds.host_with_port}#{asset_path}").read
+            dev_server_asset.sub!(CLIENT_REQUIRE, '//\0')
+            dev_server_asset
+          else
+            File.read(file_path(logical_path))
+          end
         end
       end
 
-      def self.compatible?
-        !!defined?(Webpacker)
+      if MAJOR < 3
+        def manifest
+          Webpacker::Manifest
+        end
+      else
+        def manifest
+          Webpacker.manifest
+        end
+      end
+
+      if MAJOR < 3
+        def config
+          Webpacker::Configuration
+        end
+      else
+        def config
+          Webpacker.config
+        end
+      end
+
+      if (MAJOR == 1 && MINOR >= 2) || MAJOR == 2
+        def file_path path
+          manifest.lookup_path(path)
+        end
+      elsif MAJOR == 3
+        def file_path path
+          ::Rails.root.join('public', manifest.lookup(path)[1..-1])
+        end
+      else # 1.0 and 1.1 support
+        def file_path path
+          File.join(output_path, manifest.lookup(path).split('/')[2..-1])
+        end
+      end
+
+      def output_path
+        # Webpack1 /:output/:entry, Webpack3 /public/:output
+        config.respond_to?(:output_path) ? config.output_path : 'public'
       end
     end
   end

data/lib/react/server_rendering/yaml_manifest_container.rb

@@ -6,7 +6,7 @@ module React
     # but sometimes, they're compiled to other directories (or other servers)
     class YamlManifestContainer
       def initialize
-        @assets = YAML.load_file(public_asset_path("manifest.yml"))
+        @assets = YAML.load_file(public_asset_path('manifest.yml'))
       end
 
       def find_asset(logical_path)
@@ -21,7 +21,7 @@ module React
       private
 
       def public_asset_path(asset_name)
-        asset_path = File.join("public", ::Rails.application.config.assets.prefix, asset_name)
+        asset_path = File.join('public', ::Rails.application.config.assets.prefix, asset_name)
         ::Rails.root.join(asset_path)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react-rails
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Paul O’Shannessy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: React integration for Ruby on Rails