react-rails 2.7.1 → 3.0.0.rc.0

data/lib/react/server_rendering/manifest_container.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module React
   module ServerRendering
     # Get asset content by reading the compiled file from disk using a Sprockets::Manifest.
@@ -10,8 +12,10 @@ module React
       end
 
       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_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)
         File.read(asset_full_path)
       end
 

data/lib/react/server_rendering/separate_server_bundle_container.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "open-uri"
+
+module React
+  module ServerRendering
+    # Get a compiled file from Shakapacker's output path
+    class SeparateServerBundleContainer
+      def self.compatible?
+        !!defined?(Shakapacker)
+      end
+
+      def find_asset(filename)
+        asset_path = Shakapacker.config.public_output_path.join(filename).to_s
+        File.read(asset_path)
+      end
+    end
+  end
+end

data/lib/react/server_rendering/yaml_manifest_container.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module React
   module ServerRendering
     # Get asset content by reading the compiled file from disk using the generated manifest.yml file
@@ -6,7 +8,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 +23,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

data/lib/react/server_rendering.rb

@@ -1,11 +1,13 @@
-require 'connection_pool'
-require 'react/server_rendering/exec_js_renderer'
-require 'react/server_rendering/bundle_renderer'
+# frozen_string_literal: true
+
+require "connection_pool"
+require "react/server_rendering/exec_js_renderer"
+require "react/server_rendering/bundle_renderer"
 
 module React
   module ServerRendering
     mattr_accessor :renderer, :renderer_options,
-      :pool_size, :pool_timeout
+                   :pool_size, :pool_timeout
 
     self.renderer_options = {}
 
@@ -14,7 +16,7 @@ module React
     # @return [void]
     def self.reset_pool
       options = { size: pool_size, timeout: pool_timeout }
-      @@pool = ConnectionPool.new(options) { self.renderer.new(self.renderer_options) }
+      @pool = ConnectionPool.new(options) { renderer.new(renderer_options) }
     end
 
     # Check a renderer out of the pool and use it to render the component.
@@ -23,21 +25,21 @@ module React
     # @param prerender_options [Hash] Renderer-specific options
     # @return [String] Prerendered HTML from `component_name`
     def self.render(component_name, props, prerender_options)
-      @@pool.with do |renderer|
+      @pool.with do |renderer|
         renderer.render(component_name, props, prerender_options)
       end
     end
 
     # Yield a renderer for an arbitrary block
-    def self.with_renderer
-      @@pool.with { |renderer| yield(renderer) }
+    def self.with_renderer(&block)
+      @pool.with(&block)
     end
 
     # Raised when something went wrong during server rendering.
     class PrerenderError < RuntimeError
       def initialize(component_name, props, js_message)
         message = ["Encountered error \"#{js_message.inspect}\" when prerendering #{component_name} with #{props}",
-                    js_message.backtrace.join("\n")].join("\n")
+                   js_message.backtrace.join("\n")].join("\n")
         super(message)
       end
     end

data/lib/react-rails.rb

@@ -1,10 +1,12 @@
-require 'react'
-require 'react/jsx'
-require 'react/rails'
-require 'react/server_rendering'
+# frozen_string_literal: true
+
+require "react"
+require "react/jsx"
+require "react/rails"
+require "react/server_rendering"
 
 module React
   module Rails
-    autoload :TestHelper, 'react/rails/test_helper'
+    autoload :TestHelper, "react/rails/test_helper"
   end
-end
+end

data/lib/react.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module React
   # Recursively camelize `props`, returning a new Hash
   # @param props [Object] If it's a Hash or Array, it will be recursed. Otherwise it will be returned.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react-rails
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 3.0.0.rc.0
 platform: ruby
 authors:
 - Paul O’Shannessy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-19 00:00:00.000000000 Z
+date: 2023-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -153,20 +153,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: webdrivers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -209,20 +195,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -237,20 +209,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: turbolinks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement
@@ -322,7 +280,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.0
 description: Render components in views or controller actions. Server-side rendering
-  powered by ExecJS. Transform JSX in the asset pipeline or use Webpacker.
+  powered by ExecJS. Transform JSX in the asset pipeline or use Shakapacker.
 email:
 - paul@oshannessy.com
 - rmosolgo@gmail.com
@@ -376,7 +334,7 @@ files:
 - lib/react/server_rendering/environment_container.rb
 - lib/react/server_rendering/exec_js_renderer.rb
 - lib/react/server_rendering/manifest_container.rb
-- lib/react/server_rendering/webpacker_manifest_container.rb
+- lib/react/server_rendering/separate_server_bundle_container.rb
 - lib/react/server_rendering/yaml_manifest_container.rb
 homepage: https://github.com/reactjs/react-rails
 licenses:
@@ -393,11 +351,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.4.12
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: React integration for Ruby on Rails

data/lib/react/server_rendering/webpacker_manifest_container.rb

@@ -1,96 +0,0 @@
-require 'open-uri'
-
-module React
-  module ServerRendering
-    # Get a compiled file from Webpacker. It may come from:
-    #
-    # - webpack-dev-server
-    # - compiled pack
-    class WebpackerManifestContainer
-
-      begin
-        MAJOR, MINOR, PATCH, _ = Bundler.locked_gems.specs.find { |gem_spec| gem_spec.name == 'webpacker' || gem_spec.name == 'shakapacker' }.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 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 = URI.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
-            # Remove the protocol and host from the asset path. Sometimes webpacker includes this, sometimes it does not
-            asset_path.slice!("#{ds.protocol}://#{ds.host_with_port}")
-            dev_server_asset = URI.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
-
-      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
-end