react_on_rails 16.1.2 → 16.2.0

data/lib/generators/react_on_rails/templates/base/base/config/initializers/react_on_rails.rb.tt

@@ -1,51 +1,30 @@
 # frozen_string_literal: true
 
-# See https://github.com/shakacode/react_on_rails/blob/master/docs/guides/configuration.md
-# for many more options.
+# React on Rails configuration
+# See https://github.com/shakacode/react_on_rails/blob/master/docs/configuration/configuration.md
+# for complete documentation of all configuration options.
 
 ReactOnRails.configure do |config|
-  # This configures the script to run to build the production assets by webpack. Set this to nil
-  # if you don't want react_on_rails building this file for you.
-  # If nil, then the standard shakacode/shakapacker assets:precompile will run
-  # config.build_production_command = nil
-
-  ################################################################################
   ################################################################################
-  # TEST CONFIGURATION OPTIONS
-  # Below options are used with the use of this test helper:
-  # ReactOnRails::TestHelper.configure_rspec_to_compile_assets(config)
+  # Server Rendering (Recommended)
   ################################################################################
+  # Configure server bundle for server-side rendering with `prerender: true`
+  # Set to "" if you're not using server rendering
+  config.server_bundle_js_file = "server-bundle.js"
 
-  # If you are using this in your spec_helper.rb (or rails_helper.rb):
+  # ⚠️ RECOMMENDED: Use Shakapacker 9.0+ private_output_path instead
   #
-  # ReactOnRails::TestHelper.configure_rspec_to_compile_assets(config)
+  # If using Shakapacker 9.0+, add to config/shakapacker.yml:
+  #   private_output_path: ssr-generated
   #
-  # with rspec then this controls what npm command is run
-  # to automatically refresh your webpack assets on every test run.
+  # React on Rails will auto-detect this value, eliminating the need to set it here.
+  # This keeps your webpack and Rails configs in sync automatically.
   #
-  # Alternately, you can remove the `ReactOnRails::TestHelper.configure_rspec_to_compile_assets`
-  # and set the config/shakapacker.yml option for test to true.
-  config.build_test_command = "RAILS_ENV=test bin/shakapacker"
-
-  ################################################################################
-  ################################################################################
-  # SERVER RENDERING OPTIONS
-  ################################################################################
-  # This is the file used for server rendering of React when using `(prerender: true)`
-  # If you are never using server rendering, you should set this to "".
-  # Note, there is only one server bundle, unlike JavaScript where you want to minimize the size
-  # of the JS sent to the client. For the server rendering, React on Rails creates a pool of
-  # JavaScript execution instances which should handle any component requested.
-  #
-  # While you may configure this to be the same as your client bundle file, this file is typically
-  # different. You should have ONE server bundle which can create all of your server rendered
-  # React components.
+  # For older Shakapacker versions or custom setups, manually configure:
+  # config.server_bundle_output_path = "ssr-generated"
   #
-  config.server_bundle_js_file = "server-bundle.js"
-
-  # Configure where server bundles are output. Defaults to "ssr-generated".
-  # This should match your webpack configuration for server bundles.
-  config.server_bundle_output_path = "ssr-generated"
+  # The path is relative to Rails.root and should point to a private directory
+  # (outside of public/) for security. Run 'rails react_on_rails:doctor' to verify.
 
   # Enforce that server bundles are only loaded from private (non-public) directories.
   # When true, server bundles will only be loaded from the configured server_bundle_output_path.
@@ -53,15 +32,35 @@ ReactOnRails.configure do |config|
   config.enforce_private_server_bundles = true
 
   ################################################################################
+  # Test Configuration (Optional)
   ################################################################################
-  # FILE SYSTEM BASED COMPONENT REGISTRY
-  ################################################################################
-  # `components_subdirectory`  is the name of the matching directories that contain automatically registered components
-  # for use in the Rails views. The default is nil, you can enable the feature by updating it in the next line.
-  config.components_subdirectory = "ror_components"
+  # ⚠️ IMPORTANT: Two mutually exclusive approaches - use ONLY ONE:
+  #
+  # RECOMMENDED APPROACH: Set `compile: true` in config/shakapacker.yml test section
+  # - Simpler configuration (no additional setup needed)
+  # - Handled automatically by Shakapacker
   #
-  # For automated component registry, `render_component` view helper method tries to load bundle for component from
-  # generated directory. default is false, you can pass option at the time of individual usage or update the default
-  # in the following line
+  # ALTERNATIVE APPROACH: Uncomment below AND configure ReactOnRails::TestHelper
+  # - Provides explicit control over test asset compilation timing
+  # - Requires adding ReactOnRails::TestHelper to spec/rails_helper.rb
+  # - See: https://github.com/shakacode/react_on_rails/blob/master/docs/guides/testing-configuration.md
+  #
+  config.build_test_command = "RAILS_ENV=test bin/shakapacker"
+
   config.auto_load_bundle = true
+  config.components_subdirectory = "ror_components"
+  ################################################################################
+  # Advanced Configuration
+  ################################################################################
+  # Most configuration options have sensible defaults and don't need to be set.
+  # For advanced options including:
+  # - File-based component registry (components_subdirectory, auto_load_bundle)
+  # - Component loading strategies (async/defer/sync)
+  # - Server bundle security and organization
+  # - I18n configuration
+  # - Server rendering pool configuration
+  # - Custom rendering extensions
+  # - And more...
+  #
+  # See: https://github.com/shakacode/react_on_rails/blob/master/docs/configuration/configuration.md
 end

data/lib/generators/react_on_rails/templates/base/base/config/{shakapacker.yml → shakapacker.yml.tt}

@@ -29,6 +29,15 @@ default: &default
   # Location for manifest.json, defaults to {public_output_path}/manifest.json if unset
   # manifest_path: public/packs/manifest.json
 
+  # Location for private server-side bundles (e.g., for SSR)
+  # These bundles are not served publicly, unlike public_output_path
+  # Shakapacker 9.0+ feature - automatically detected by React on Rails
+<% if shakapacker_version_9_or_higher? -%>
+  private_output_path: ssr-generated
+<% else -%>
+  # private_output_path: ssr-generated  # Uncomment to enable (requires Shakapacker 9.0+)
+<% end -%>
+
   # Additional paths webpack should look up modules
   # ['app/assets', 'engine/foo/app/assets']
   additional_paths: []
@@ -36,12 +45,24 @@ default: &default
   # Reload manifest.json on all requests so we reload latest compiled packs
   cache_manifest: false
 
-  # Select loader to use, available options are 'babel' (default), 'swc' or 'esbuild'
-  webpack_loader: 'babel'
+  # Select JavaScript transpiler to use
+  # Available options: 'swc' (default, 20x faster), 'babel', 'esbuild', or 'none'
+  # Use 'none' when providing a completely custom webpack configuration
+  # Note: When using rspack, swc is used automatically regardless of this setting
+  javascript_transpiler: "swc"
+
+  # Select assets bundler to use
+  # Available options: 'webpack' (default) or 'rspack'
+  assets_bundler: "webpack"
 
   # Raises an error if there is a mismatch in the shakapacker gem and npm package being used
   ensure_consistent_versioning: true
 
+  # Hook to run before webpack compilation (e.g., for generating dynamic entry points)
+  # SECURITY: Only reference trusted scripts within your project. Ensure the hook path
+  # points to a file within the project root that you control.
+  precompile_hook: 'bin/shakapacker-precompile-hook'
+
   # Select whether the compiler will use SHA digest ('digest' option) or most recent modified timestamp ('mtime') to determine freshness
   compiler_strategy: digest
 
@@ -50,6 +71,11 @@ default: &default
   # https://webpack.js.org/guides/build-performance/#avoid-production-specific-tooling
   useContentHash: false
 
+  # On-demand compilation of packs when modified. Defaults to false.
+  # Set to false if using bin/shakapacker-dev-server or bin/shakapacker --watch via Procfiles.
+  # Set to true only in test environment for on-demand compilation.
+  compile: false
+
   # Setting the asset host here will override Rails.application.config.asset_host.
   # Here, you can set different asset_host per environment. Note that
   # SHAKAPACKER_ASSET_HOST will override both configurations.
@@ -67,7 +93,6 @@ default: &default
 
 development:
   <<: *default
-  compile: true
   compiler_strategy: mtime
 
   # Reference: https://webpack.js.org/configuration/dev-server/

data/lib/generators/react_on_rails/templates/base/base/config/webpack/development.js.tt

@@ -1,20 +1,26 @@
 <%= add_documentation_reference(config[:message], "// https://github.com/shakacode/react_on_rails_demo_ssr_hmr/blob/master/config/webpack/development.js") %>
 
-const { devServer, inliningCss } = require('shakapacker');
+const { devServer, inliningCss, config } = require('shakapacker');
 
 const generateWebpackConfigs = require('./generateWebpackConfigs');
 
 const developmentEnvOnly = (clientWebpackConfig, _serverWebpackConfig) => {
-  // React Refresh (Fast Refresh) setup - only when webpack-dev-server is running (HMR mode)
-  // This matches the condition in generateWebpackConfigs.js and babel.config.js
+  // React Refresh (Fast Refresh) setup - only when dev server is running (HMR mode)
   if (process.env.WEBPACK_SERVE) {
     // eslint-disable-next-line global-require
-    const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
-    clientWebpackConfig.plugins.push(
-      new ReactRefreshWebpackPlugin({
-        // Use default overlay configuration for better compatibility
-      }),
-    );
+    if (config.assets_bundler === 'rspack') {
+      // Rspack uses @rspack/plugin-react-refresh for React Fast Refresh
+      const ReactRefreshPlugin = require('@rspack/plugin-react-refresh');
+      clientWebpackConfig.plugins.push(new ReactRefreshPlugin());
+    } else {
+      // Webpack uses @pmmmwh/react-refresh-webpack-plugin
+      const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
+      clientWebpackConfig.plugins.push(
+        new ReactRefreshWebpackPlugin({
+          // Use default overlay configuration for better compatibility
+        }),
+      );
+    }
   }
 };
 

data/lib/generators/react_on_rails/templates/base/base/config/webpack/serverWebpackConfig.js.tt

@@ -3,7 +3,9 @@
 const { merge, config } = require('shakapacker');
 const commonWebpackConfig = require('./commonWebpackConfig');
 
-const webpack = require('webpack');
+const bundler = config.assets_bundler === 'rspack'
+  ? require('@rspack/core')
+  : require('webpack');
 
 const configureServer = () => {
   // We need to use "merge" because the clientConfigObject, EVEN after running
@@ -40,21 +42,55 @@ const configureServer = () => {
   serverWebpackConfig.optimization = {
     minimize: false,
   };
-  serverWebpackConfig.plugins.unshift(new webpack.optimize.LimitChunkCountPlugin({ maxChunks: 1 }));
+  serverWebpackConfig.plugins.unshift(new bundler.optimize.LimitChunkCountPlugin({ maxChunks: 1 }));
+
+  // Custom output for the server-bundle
+<% if shakapacker_version_9_or_higher? -%>
+  // Using Shakapacker 9.0+ privateOutputPath for automatic sync with shakapacker.yml
+  // This eliminates manual path configuration and keeps configs in sync.
+  // Falls back to hardcoded path if private_output_path is not configured.
+  const serverBundleOutputPath = config.privateOutputPath ||
+    require('path').resolve(__dirname, '../../ssr-generated');
+<% else -%>
+  // Using hardcoded path (Shakapacker < 9.0)
+  // For Shakapacker 9.0+, consider using config.privateOutputPath instead
+  // to automatically sync with shakapacker.yml private_output_path.
+  const serverBundleOutputPath = require('path').resolve(__dirname, '../../ssr-generated');
+<% end -%>
 
-  // Custom output for the server-bundle that matches the config in
-  // config/initializers/react_on_rails.rb
-  // Server bundles are output to a private directory (not public) for security
   serverWebpackConfig.output = {
     filename: 'server-bundle.js',
     globalObject: 'this',
     // If using the React on Rails Pro node server renderer, uncomment the next line
     // libraryTarget: 'commonjs2',
-    path: require('path').resolve(__dirname, '../../ssr-generated'),
+    path: serverBundleOutputPath,
     // No publicPath needed since server bundles are not served via web
     // https://webpack.js.org/configuration/output/#outputglobalobject
   };
 
+  // Validate server bundle output path configuration
+<% if shakapacker_version_9_or_higher? -%>
+  // For Shakapacker 9.0+, verify privateOutputPath is configured in shakapacker.yml
+  if (!config.privateOutputPath) {
+    console.warn('⚠️  Shakapacker 9.0+ detected but private_output_path not configured in shakapacker.yml');
+    console.warn('   Add to config/shakapacker.yml:');
+    console.warn('     private_output_path: ssr-generated');
+    console.warn('   Run: rails react_on_rails:doctor to validate your configuration');
+  }
+<% else -%>
+  // For Shakapacker < 9.0, verify hardcoded path syncs with Rails config
+  // 1. Ensure config/initializers/react_on_rails.rb has: config.server_bundle_output_path = "ssr-generated"
+  // 2. Run: rails react_on_rails:doctor to verify configuration
+  const fs = require('fs');
+  if (!fs.existsSync(serverBundleOutputPath)) {
+    console.warn(`⚠️  Server bundle output directory does not exist: ${serverBundleOutputPath}`);
+    console.warn('   It will be created during build, but ensure React on Rails is configured:');
+    console.warn('   config.server_bundle_output_path = "ssr-generated" in config/initializers/react_on_rails.rb');
+    console.warn('   Run: rails react_on_rails:doctor to validate your configuration');
+  }
+<% end -%>
+
+
   // Don't hash the server bundle b/c would conflict with the client manifest
   // And no need for the MiniCssExtractPlugin
   serverWebpackConfig.plugins = serverWebpackConfig.plugins.filter(

data/lib/react_on_rails/configuration.rb

@@ -1,5 +1,23 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/enumerable"
+require "active_support/core_ext/object/blank"
+
+# Polyfill for compact_blank (added in Rails 6.1) to support Rails 5.2-6.0
+unless [].respond_to?(:compact_blank)
+  module Enumerable
+    def compact_blank
+      reject(&:blank?)
+    end
+  end
+
+  class Array
+    def compact_blank
+      reject(&:blank?)
+    end
+  end
+end
+
 # rubocop:disable Metrics/ClassLength
 
 module ReactOnRails
@@ -9,9 +27,8 @@ module ReactOnRails
   end
 
   DEFAULT_GENERATED_ASSETS_DIR = File.join(%w[public webpack], Rails.env).freeze
-  DEFAULT_REACT_CLIENT_MANIFEST_FILE = "react-client-manifest.json"
-  DEFAULT_REACT_SERVER_CLIENT_MANIFEST_FILE = "react-server-client-manifest.json"
   DEFAULT_COMPONENT_REGISTRY_TIMEOUT = 5000
+  DEFAULT_SERVER_BUNDLE_OUTPUT_PATH = "ssr-generated"
 
   def self.configuration
     @configuration ||= Configuration.new(
@@ -20,9 +37,6 @@ module ReactOnRails
       # generated_assets_dirs is deprecated
       generated_assets_dir: "",
       server_bundle_js_file: "",
-      rsc_bundle_js_file: "",
-      react_client_manifest_file: DEFAULT_REACT_CLIENT_MANIFEST_FILE,
-      react_server_client_manifest_file: DEFAULT_REACT_SERVER_CLIENT_MANIFEST_FILE,
       prerender: false,
       auto_load_bundle: false,
       replay_console: true,
@@ -46,19 +60,14 @@ module ReactOnRails
       components_subdirectory: nil,
       make_generated_server_bundle_the_entrypoint: false,
       defer_generated_component_packs: false,
-      # React on Rails Pro (licensed) feature - enables immediate hydration of React components
-      immediate_hydration: false,
       # Maximum time in milliseconds to wait for client-side component registration after page load.
       # If exceeded, an error will be thrown for server-side rendered components not registered on the client.
       # Set to 0 to disable the timeout and wait indefinitely for component registration.
       component_registry_timeout: DEFAULT_COMPONENT_REGISTRY_TIMEOUT,
       generated_component_packs_loading_strategy: nil,
-      server_bundle_output_path: "ssr-generated",
+      server_bundle_output_path: DEFAULT_SERVER_BUNDLE_OUTPUT_PATH,
       enforce_private_server_bundles: false
     )
-    # TODO: Add automatic detection of server_bundle_output_path from shakapacker.yml
-    # See feature/shakapacker-yml-integration branch for implementation
-    # Requires Shakapacker v8.5.0+ and semantic version checking
   end
 
   class Configuration
@@ -72,10 +81,55 @@ module ReactOnRails
                   :server_render_method, :random_dom_id, :auto_load_bundle,
                   :same_bundle_for_client_and_server, :rendering_props_extension,
                   :make_generated_server_bundle_the_entrypoint,
-                  :generated_component_packs_loading_strategy, :immediate_hydration, :rsc_bundle_js_file,
-                  :react_client_manifest_file, :react_server_client_manifest_file, :component_registry_timeout,
+                  :generated_component_packs_loading_strategy,
+                  :component_registry_timeout,
                   :server_bundle_output_path, :enforce_private_server_bundles
 
+    # Class instance variable and mutex to track if deprecation warning has been shown
+    # Using mutex to ensure thread-safety in multi-threaded environments
+    @immediate_hydration_warned = false
+    @immediate_hydration_mutex = Mutex.new
+
+    class << self
+      attr_accessor :immediate_hydration_warned, :immediate_hydration_mutex
+    end
+
+    # Deprecated: immediate_hydration configuration has been removed
+    def immediate_hydration=(value)
+      warned = false
+      self.class.immediate_hydration_mutex.synchronize do
+        warned = self.class.immediate_hydration_warned
+        self.class.immediate_hydration_warned = true unless warned
+      end
+
+      return if warned
+
+      Rails.logger.warn <<~WARNING
+        [REACT ON RAILS] The 'config.immediate_hydration' configuration option is deprecated and no longer used.
+        Immediate hydration is now automatically enabled for React on Rails Pro users.
+        Please remove 'config.immediate_hydration = #{value}' from your config/initializers/react_on_rails.rb file.
+        See CHANGELOG.md for migration instructions.
+      WARNING
+    end
+
+    def immediate_hydration
+      warned = false
+      self.class.immediate_hydration_mutex.synchronize do
+        warned = self.class.immediate_hydration_warned
+        self.class.immediate_hydration_warned = true unless warned
+      end
+
+      return nil if warned
+
+      Rails.logger.warn <<~WARNING
+        [REACT ON RAILS] The 'config.immediate_hydration' configuration option is deprecated and no longer used.
+        Immediate hydration is now automatically enabled for React on Rails Pro users.
+        Please remove any references to 'config.immediate_hydration' from your config/initializers/react_on_rails.rb file.
+        See CHANGELOG.md for migration instructions.
+      WARNING
+      nil
+    end
+
     # rubocop:disable Metrics/AbcSize
     def initialize(node_modules_location: nil, server_bundle_js_file: nil, prerender: nil,
                    replay_console: nil, make_generated_server_bundle_the_entrypoint: nil,
@@ -89,8 +143,7 @@ module ReactOnRails
                    same_bundle_for_client_and_server: nil,
                    i18n_dir: nil, i18n_yml_dir: nil, i18n_output_format: nil, i18n_yml_safe_load_options: nil,
                    random_dom_id: nil, server_render_method: nil, rendering_props_extension: nil,
-                   components_subdirectory: nil, auto_load_bundle: nil, immediate_hydration: nil,
-                   rsc_bundle_js_file: nil, react_client_manifest_file: nil, react_server_client_manifest_file: nil,
+                   components_subdirectory: nil, auto_load_bundle: nil,
                    component_registry_timeout: nil, server_bundle_output_path: nil, enforce_private_server_bundles: nil)
       self.node_modules_location = node_modules_location.present? ? node_modules_location : Rails.root
       self.generated_assets_dirs = generated_assets_dirs
@@ -119,9 +172,6 @@ module ReactOnRails
 
       # Server rendering:
       self.server_bundle_js_file = server_bundle_js_file
-      self.rsc_bundle_js_file = rsc_bundle_js_file
-      self.react_client_manifest_file = react_client_manifest_file
-      self.react_server_client_manifest_file = react_server_client_manifest_file
       self.same_bundle_for_client_and_server = same_bundle_for_client_and_server
       self.server_renderer_pool_size = self.development_mode ? 1 : server_renderer_pool_size
       self.server_renderer_timeout = server_renderer_timeout # seconds
@@ -134,7 +184,6 @@ module ReactOnRails
       self.auto_load_bundle = auto_load_bundle
       self.make_generated_server_bundle_the_entrypoint = make_generated_server_bundle_the_entrypoint
       self.defer_generated_component_packs = defer_generated_component_packs
-      self.immediate_hydration = immediate_hydration
       self.generated_component_packs_loading_strategy = generated_component_packs_loading_strategy
       self.server_bundle_output_path = server_bundle_output_path
       self.enforce_private_server_bundles = enforce_private_server_bundles
@@ -154,6 +203,7 @@ module ReactOnRails
       check_component_registry_timeout
       validate_generated_component_packs_loading_strategy
       validate_enforce_private_server_bundles
+      auto_detect_server_bundle_path_from_shakapacker
     end
 
     private
@@ -184,12 +234,13 @@ module ReactOnRails
 
       msg = <<~MSG
         ReactOnRails: Your current version of shakapacker \
-        does not support async script loading,  which may cause performance issues. Please either:
-        1. Use :sync or :defer loading strategy instead of :async
+        does not support async script loading. Please either:
+        1. Use :defer or :sync loading strategy instead of :async
         2. Upgrade to Shakapacker v8.2.0 or above to enable async script loading
       MSG
       if PackerUtils.supports_async_loading?
-        self.generated_component_packs_loading_strategy ||= :async
+        # Default based on Pro license: Pro users get :async, non-Pro users get :defer
+        self.generated_component_packs_loading_strategy ||= (Utils.react_on_rails_pro? ? :async : :defer)
       elsif generated_component_packs_loading_strategy.nil?
         Rails.logger.warn("**WARNING** #{msg}")
         self.generated_component_packs_loading_strategy = :sync
@@ -226,6 +277,57 @@ module ReactOnRails
                                  "the public directory. Please set it to a directory outside of public."
     end
 
+    # Auto-detect server_bundle_output_path from Shakapacker 9.0+ private_output_path
+    # Checks if user explicitly set a value and warns them to use auto-detection instead
+    def auto_detect_server_bundle_path_from_shakapacker
+      # Skip if Shakapacker is not available
+      return unless defined?(::Shakapacker)
+
+      # Check if Shakapacker config has private_output_path method (9.0+)
+      return unless ::Shakapacker.config.respond_to?(:private_output_path)
+
+      # Get the private_output_path from Shakapacker
+      private_path = ::Shakapacker.config.private_output_path
+      return unless private_path
+
+      relative_path = ReactOnRails::Utils.normalize_to_relative_path(private_path)
+
+      # Check if user explicitly configured server_bundle_output_path
+      if server_bundle_output_path != ReactOnRails::DEFAULT_SERVER_BUNDLE_OUTPUT_PATH
+        warn_about_explicit_configuration(relative_path)
+        return
+      end
+
+      apply_shakapacker_private_output_path(relative_path)
+    rescue StandardError => e
+      # Fail gracefully - if auto-detection fails, keep the default
+      Rails.logger&.debug("ReactOnRails: Could not auto-detect server bundle path from " \
+                          "Shakapacker: #{e.message}")
+    end
+
+    def warn_about_explicit_configuration(shakapacker_path)
+      # Normalize both paths for comparison
+      normalized_config = server_bundle_output_path.to_s.chomp("/")
+      normalized_shakapacker = shakapacker_path.to_s.chomp("/")
+
+      # Only warn if there's a mismatch
+      return if normalized_config == normalized_shakapacker
+
+      Rails.logger&.warn(
+        "ReactOnRails: server_bundle_output_path is explicitly set to '#{server_bundle_output_path}' " \
+        "but shakapacker.yml private_output_path is '#{shakapacker_path}'. " \
+        "Consider removing server_bundle_output_path from your React on Rails initializer " \
+        "to use the auto-detected value from shakapacker.yml."
+      )
+    end
+
+    def apply_shakapacker_private_output_path(relative_path)
+      self.server_bundle_output_path = relative_path
+
+      Rails.logger&.debug("ReactOnRails: Auto-detected server_bundle_output_path from " \
+                          "shakapacker.yml private_output_path: '#{relative_path}'")
+    end
+
     def check_minimum_shakapacker_version
       ReactOnRails::PackerUtils.raise_shakapacker_version_incompatible_for_basic_pack_generation unless
         ReactOnRails::PackerUtils.supports_basic_pack_generation?
@@ -247,7 +349,14 @@ module ReactOnRails
       raise(ReactOnRails::Error, compile_command_conflict_message) if ReactOnRails::PackerUtils.precompile?
 
       precompile_tasks = lambda {
-        Rake::Task["react_on_rails:generate_packs"].invoke
+        # Skip generate_packs if shakapacker has a precompile hook configured
+        if ReactOnRails::PackerUtils.shakapacker_precompile_hook_configured?
+          hook_value = ReactOnRails::PackerUtils.shakapacker_precompile_hook_value
+          puts "Skipping react_on_rails:generate_packs (configured in shakapacker precompile hook: #{hook_value})"
+        else
+          Rake::Task["react_on_rails:generate_packs"].invoke
+        end
+
         Rake::Task["react_on_rails:assets:webpack"].invoke
 
         # VERSIONS is per the shakacode/shakapacker clean method definition.
@@ -320,15 +429,23 @@ module ReactOnRails
     end
 
     def ensure_webpack_generated_files_exists
-      return unless webpack_generated_files.empty?
-
-      self.webpack_generated_files = [
-        "manifest.json",
-        server_bundle_js_file,
-        rsc_bundle_js_file,
-        react_client_manifest_file,
-        react_server_client_manifest_file
-      ].compact_blank
+      all_required_files = ["manifest.json", server_bundle_js_file]
+
+      if ReactOnRails::Utils.react_on_rails_pro?
+        pro_config = ReactOnRailsPro.configuration
+        all_required_files << pro_config.rsc_bundle_js_file
+        all_required_files << pro_config.react_client_manifest_file
+        all_required_files << pro_config.react_server_client_manifest_file
+      end
+
+      all_required_files = all_required_files.compact_blank
+
+      if webpack_generated_files.empty?
+        self.webpack_generated_files = all_required_files
+      else
+        missing_files = all_required_files.reject { |file| webpack_generated_files.include?(file) }
+        self.webpack_generated_files += missing_files if missing_files.any?
+      end
     end
 
     def configure_skip_display_none_deprecation

data/lib/react_on_rails/controller.rb

@@ -9,13 +9,13 @@ module ReactOnRails
     #             JavaScript code.
     # props: Named parameter props which is a Ruby Hash or JSON string which contains the properties
     #        to pass to the redux store.
-    # immediate_hydration: React on Rails Pro (licensed) feature. Pass as true if you wish to hydrate this
-    #                      store immediately instead of waiting for the page to load.
+    # immediate_hydration: React on Rails Pro (licensed) feature. When nil (default), Pro users get
+    #                      immediate hydration, non-Pro users don't. Can be explicitly overridden.
     #
     # Be sure to include view helper `redux_store_hydration_data` at the end of your layout or view
     # or else there will be no client side hydration of your stores.
     def redux_store(store_name, props: {}, immediate_hydration: nil)
-      immediate_hydration = ReactOnRails.configuration.immediate_hydration if immediate_hydration.nil?
+      immediate_hydration = ReactOnRails::Utils.normalize_immediate_hydration(immediate_hydration, store_name, "Store")
       redux_store_data = { store_name: store_name,
                            props: props,
                            immediate_hydration: immediate_hydration }