react_on_rails 14.2.1 → 16.1.1

data/lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/actions/helloWorldActionCreators.ts

@@ -0,0 +1,18 @@
+/* eslint-disable import/prefer-default-export */
+
+import { HELLO_WORLD_NAME_UPDATE } from '../constants/helloWorldConstants';
+
+// Action interface
+export interface UpdateNameAction {
+  type: typeof HELLO_WORLD_NAME_UPDATE;
+  text: string;
+}
+
+// Union type for all actions
+export type HelloWorldAction = UpdateNameAction;
+
+// Action creator with proper TypeScript typing
+export const updateName = (text: string): UpdateNameAction => ({
+  type: HELLO_WORLD_NAME_UPDATE,
+  text,
+});

data/lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/components/HelloWorld.jsx

@@ -1,4 +1,3 @@
-import PropTypes from 'prop-types';
 import React from 'react';
 import * as style from './HelloWorld.module.css';
 
@@ -18,9 +17,4 @@ const HelloWorld = ({ name, updateName }) => (
   </div>
 );
 
-HelloWorld.propTypes = {
-  name: PropTypes.string.isRequired,
-  updateName: PropTypes.func.isRequired,
-};
-
 export default HelloWorld;

data/lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/components/HelloWorld.module.css

@@ -0,0 +1,4 @@
+.bright {
+  color: green;
+  font-weight: bold;
+}

data/lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/components/HelloWorld.tsx

@@ -0,0 +1,24 @@
+import React from 'react';
+import * as style from './HelloWorld.module.css';
+import type { PropsFromRedux } from '../containers/HelloWorldContainer';
+
+// Component props are inferred from Redux container
+type HelloWorldProps = PropsFromRedux;
+
+const HelloWorld: React.FC<HelloWorldProps> = ({ name, updateName }) => (
+  <div>
+    <h3>
+      Hello,
+      {name}!
+    </h3>
+    <hr />
+    <form>
+      <label className={style.bright} htmlFor="name">
+        Say hello to:
+        <input id="name" type="text" value={name} onChange={(e) => updateName(e.target.value)} />
+      </label>
+    </form>
+  </div>
+);
+
+export default HelloWorld;

data/lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/constants/helloWorldConstants.ts

@@ -0,0 +1,6 @@
+/* eslint-disable import/prefer-default-export */
+
+export const HELLO_WORLD_NAME_UPDATE = 'HELLO_WORLD_NAME_UPDATE' as const;
+
+// Action type for TypeScript
+export type HelloWorldActionType = typeof HELLO_WORLD_NAME_UPDATE;

data/lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/containers/HelloWorldContainer.ts

@@ -0,0 +1,20 @@
+// Simple example of a React "smart" component
+
+import { connect, ConnectedProps } from 'react-redux';
+import HelloWorld from '../components/HelloWorld';
+import * as actions from '../actions/helloWorldActionCreators';
+import type { HelloWorldState } from '../reducers/helloWorldReducer';
+
+// Which part of the Redux global state does our component want to receive as props?
+const mapStateToProps = (state: HelloWorldState) => ({ name: state.name });
+
+// Create the connector
+const connector = connect(mapStateToProps, actions);
+
+// Infer the props from Redux state and actions
+export type PropsFromRedux = ConnectedProps<typeof connector>;
+
+// Don't forget to actually use connect!
+// Note that we don't export HelloWorld, but the redux "connected" version of it.
+// See https://github.com/reactjs/react-redux/blob/master/docs/api.md#examples
+export default connector(HelloWorld);

data/lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/reducers/helloWorldReducer.js

@@ -1,7 +1,7 @@
 import { combineReducers } from 'redux';
 import { HELLO_WORLD_NAME_UPDATE } from '../constants/helloWorldConstants';
 
-const name = (state = '', action) => {
+const name = (state = '', action = {}) => {
   switch (action.type) {
     case HELLO_WORLD_NAME_UPDATE:
       return action.text;

data/lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/reducers/helloWorldReducer.ts

@@ -0,0 +1,22 @@
+import { combineReducers } from 'redux';
+import { HELLO_WORLD_NAME_UPDATE } from '../constants/helloWorldConstants';
+import { HelloWorldAction } from '../actions/helloWorldActionCreators';
+
+// State interface
+export interface HelloWorldState {
+  name: string;
+}
+
+// Individual reducer with TypeScript types
+const name = (state: string = '', action: HelloWorldAction): string => {
+  switch (action.type) {
+    case HELLO_WORLD_NAME_UPDATE:
+      return action.text;
+    default:
+      return state;
+  }
+};
+
+const helloWorldReducer = combineReducers<HelloWorldState>({ name });
+
+export default helloWorldReducer;

data/lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/startup/HelloWorldApp.client.tsx

@@ -0,0 +1,23 @@
+import { useMemo, type FC } from 'react';
+import { Provider } from 'react-redux';
+
+import configureStore, { type RailsProps } from '../store/helloWorldStore';
+import HelloWorldContainer from '../containers/HelloWorldContainer';
+
+// Props interface matches what Rails will pass from the controller
+interface HelloWorldAppProps extends RailsProps {}
+
+// See documentation for https://github.com/reactjs/react-redux.
+// This is how you get props from the Rails view into the redux store.
+// This code here binds your smart component to the redux store.
+const HelloWorldApp: FC<HelloWorldAppProps> = (props) => {
+  const store = useMemo(() => configureStore(props), [props]);
+
+  return (
+    <Provider store={store}>
+      <HelloWorldContainer />
+    </Provider>
+  );
+};
+
+export default HelloWorldApp;

data/lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/startup/HelloWorldApp.server.jsx

@@ -0,0 +1,5 @@
+import HelloWorldApp from './HelloWorldApp.client';
+// This could be specialized for server rendering
+// For example, if using React Router, we'd have the SSR setup here.
+
+export default HelloWorldApp;

data/lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/startup/HelloWorldApp.server.tsx

@@ -0,0 +1,5 @@
+import HelloWorldApp from './HelloWorldApp.client';
+// This could be specialized for server rendering
+// For example, if using React Router, we'd have the SSR setup here.
+
+export default HelloWorldApp;

data/lib/generators/react_on_rails/templates/redux/base/app/javascript/bundles/HelloWorld/store/helloWorldStore.ts

@@ -0,0 +1,18 @@
+import { createStore } from 'redux';
+import type { Store, PreloadedState } from 'redux';
+import helloWorldReducer from '../reducers/helloWorldReducer';
+import type { HelloWorldState } from '../reducers/helloWorldReducer';
+
+// Rails props interface - customize based on your Rails controller
+export interface RailsProps {
+  name: string;
+  [key: string]: any; // Allow additional props from Rails
+}
+
+// Store type
+export type HelloWorldStore = Store<HelloWorldState>;
+
+const configureStore = (railsProps: RailsProps): HelloWorldStore =>
+  createStore(helloWorldReducer, railsProps as PreloadedState<HelloWorldState>);
+
+export default configureStore;

data/lib/react_on_rails/configuration.rb

@@ -9,6 +9,9 @@ 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
 
   def self.configuration
     @configuration ||= Configuration.new(
@@ -17,6 +20,9 @@ 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,
@@ -39,10 +45,20 @@ module ReactOnRails
       i18n_output_format: nil,
       components_subdirectory: nil,
       make_generated_server_bundle_the_entrypoint: false,
-      defer_generated_component_packs: true,
-      # forces the loading of React components
-      force_load: 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",
+      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
@@ -52,27 +68,30 @@ module ReactOnRails
                   :generated_assets_dirs, :generated_assets_dir, :components_subdirectory,
                   :webpack_generated_files, :rendering_extension, :build_test_command,
                   :build_production_command, :i18n_dir, :i18n_yml_dir, :i18n_output_format,
-                  :i18n_yml_safe_load_options,
+                  :i18n_yml_safe_load_options, :defer_generated_component_packs,
                   :server_render_method, :random_dom_id, :auto_load_bundle,
                   :same_bundle_for_client_and_server, :rendering_props_extension,
                   :make_generated_server_bundle_the_entrypoint,
-                  :defer_generated_component_packs,
-                  :force_load
+                  :generated_component_packs_loading_strategy, :immediate_hydration, :rsc_bundle_js_file,
+                  :react_client_manifest_file, :react_server_client_manifest_file, :component_registry_timeout,
+                  :server_bundle_output_path, :enforce_private_server_bundles
 
     # 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,
-                   trace: nil, development_mode: nil,
+                   trace: nil, development_mode: nil, defer_generated_component_packs: nil,
                    logging_on_server: nil, server_renderer_pool_size: nil,
                    server_renderer_timeout: nil, raise_on_prerender_error: true,
                    skip_display_none: nil, generated_assets_dirs: nil,
                    generated_assets_dir: nil, webpack_generated_files: nil,
                    rendering_extension: nil, build_test_command: nil,
-                   build_production_command: nil, defer_generated_component_packs: nil,
+                   build_production_command: nil, generated_component_packs_loading_strategy: nil,
                    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, force_load: 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,
+                   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
       self.generated_assets_dir = generated_assets_dir
@@ -96,9 +115,13 @@ module ReactOnRails
       self.raise_on_prerender_error = raise_on_prerender_error
       self.skip_display_none = skip_display_none
       self.rendering_props_extension = rendering_props_extension
+      self.component_registry_timeout = component_registry_timeout
 
       # 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
@@ -111,7 +134,10 @@ 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.force_load = force_load
+      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
     end
     # rubocop:enable Metrics/AbcSize
 
@@ -121,24 +147,95 @@ module ReactOnRails
       ensure_webpack_generated_files_exists
       configure_generated_assets_dirs_deprecation
       configure_skip_display_none_deprecation
-      ensure_generated_assets_dir_present
       check_server_render_method_is_only_execjs
       error_if_using_packer_and_generated_assets_dir_not_match_public_output_path
       # check_deprecated_settings
       adjust_precompile_task
+      check_component_registry_timeout
+      validate_generated_component_packs_loading_strategy
+      validate_enforce_private_server_bundles
     end
 
     private
 
+    def check_component_registry_timeout
+      self.component_registry_timeout = DEFAULT_COMPONENT_REGISTRY_TIMEOUT if component_registry_timeout.nil?
+
+      return if component_registry_timeout.is_a?(Integer) && component_registry_timeout >= 0
+
+      raise ReactOnRails::Error, "component_registry_timeout must be a positive integer"
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    def validate_generated_component_packs_loading_strategy
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+      if defer_generated_component_packs
+        if %i[async sync].include?(generated_component_packs_loading_strategy)
+          Rails.logger.warn "**WARNING** ReactOnRails: config.defer_generated_component_packs is " \
+                            "superseded by config.generated_component_packs_loading_strategy"
+        else
+          Rails.logger.warn "[DEPRECATION] ReactOnRails: Use config." \
+                            "generated_component_packs_loading_strategy = :defer rather than " \
+                            "defer_generated_component_packs"
+          self.generated_component_packs_loading_strategy ||= :defer
+        end
+      end
+
+      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
+        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
+      elsif generated_component_packs_loading_strategy.nil?
+        Rails.logger.warn("**WARNING** #{msg}")
+        self.generated_component_packs_loading_strategy = :sync
+      elsif generated_component_packs_loading_strategy == :async
+        raise ReactOnRails::Error, "**ERROR** #{msg}"
+      end
+
+      return if %i[async defer sync].include?(generated_component_packs_loading_strategy)
+
+      raise ReactOnRails::Error, "generated_component_packs_loading_strategy must be either :async, :defer, or :sync"
+    end
+
+    def validate_enforce_private_server_bundles
+      return unless enforce_private_server_bundles
+
+      # Check if server_bundle_output_path is nil
+      if server_bundle_output_path.nil?
+        raise ReactOnRails::Error, "enforce_private_server_bundles is set to true, but " \
+                                   "server_bundle_output_path is nil. Please set server_bundle_output_path " \
+                                   "to a directory outside of the public directory."
+      end
+
+      # Check if server_bundle_output_path is inside public directory
+      # Skip validation if Rails.root is not available (e.g., in tests)
+      return unless defined?(Rails) && Rails.root
+
+      public_path = Rails.root.join("public").to_s
+      server_output_path = File.expand_path(server_bundle_output_path, Rails.root.to_s)
+
+      return unless server_output_path.start_with?(public_path)
+
+      raise ReactOnRails::Error, "enforce_private_server_bundles is set to true, but " \
+                                 "server_bundle_output_path (#{server_bundle_output_path}) is inside " \
+                                 "the public directory. Please set it to a directory outside of public."
+    end
+
+    def check_minimum_shakapacker_version
+      ReactOnRails::PackerUtils.raise_shakapacker_version_incompatible_for_basic_pack_generation unless
+        ReactOnRails::PackerUtils.supports_basic_pack_generation?
+    end
+
     def check_autobundling_requirements
-      raise_missing_components_subdirectory if auto_load_bundle && !components_subdirectory.present?
-      return unless components_subdirectory.present?
+      raise_missing_components_subdirectory unless components_subdirectory.present?
 
-      ReactOnRails::PackerUtils.raise_shakapacker_not_installed unless ReactOnRails::PackerUtils.using_packer?
       ReactOnRails::PackerUtils.raise_shakapacker_version_incompatible_for_autobundling unless
-        ReactOnRails::PackerUtils.shakapacker_version_requirement_met?(
-          ReactOnRails::PacksGenerator::MINIMUM_SHAKAPACKER_VERSION
-        )
+        ReactOnRails::PackerUtils.supports_autobundling?
       ReactOnRails::PackerUtils.raise_nested_entries_disabled unless ReactOnRails::PackerUtils.nested_entries?
     end
 
@@ -157,8 +254,8 @@ module ReactOnRails
         # We set it very big so that it is not used, and then clean just
         # removes files older than 1 hour.
         versions = 100_000
-        puts "Invoking task #{ReactOnRails::PackerUtils.packer_type}:clean from React on Rails"
-        Rake::Task["#{ReactOnRails::PackerUtils.packer_type}:clean"].invoke(versions)
+        puts "Invoking task shakapacker:clean from React on Rails"
+        Rake::Task["shakapacker:clean"].invoke(versions)
       }
 
       if Rake::Task.task_defined?("assets:precompile")
@@ -173,22 +270,20 @@ module ReactOnRails
     end
 
     def error_if_using_packer_and_generated_assets_dir_not_match_public_output_path
-      return unless ReactOnRails::PackerUtils.using_packer?
-
       return if generated_assets_dir.blank?
 
       packer_public_output_path = ReactOnRails::PackerUtils.packer_public_output_path
 
       if File.expand_path(generated_assets_dir) == packer_public_output_path.to_s
         Rails.logger.warn("You specified generated_assets_dir in `config/initializers/react_on_rails.rb` " \
-                          "with #{ReactOnRails::PackerUtils.packer_type}. " \
+                          "with Shakapacker. " \
                           "Remove this line from your configuration file.")
       else
         msg = <<~MSG
-          Error configuring /config/initializers/react_on_rails.rb: You are using #{ReactOnRails::PackerUtils.packer_type}
+          Error configuring /config/initializers/react_on_rails.rb: You are using Shakapacker
           and your specified value for generated_assets_dir = #{generated_assets_dir}
           that does not match the value for public_output_path specified in
-          #{ReactOnRails::PackerUtils.packer_type}.yml = #{packer_public_output_path}. You should remove the configuration
+          shakapacker.yml = #{packer_public_output_path}. You should remove the configuration
           value for "generated_assets_dir" from your config/initializers/react_on_rails.rb file.
         MSG
         raise ReactOnRails::Error, msg
@@ -207,44 +302,33 @@ module ReactOnRails
       raise ReactOnRails::Error, msg
     end
 
-    def ensure_generated_assets_dir_present
-      return if generated_assets_dir.present? || ReactOnRails::PackerUtils.using_packer?
-
-      self.generated_assets_dir = DEFAULT_GENERATED_ASSETS_DIR
-      Rails.logger.warn "ReactOnRails: Set generated_assets_dir to default: #{DEFAULT_GENERATED_ASSETS_DIR}"
-    end
-
     def configure_generated_assets_dirs_deprecation
       return if generated_assets_dirs.blank?
 
-      if ReactOnRails::PackerUtils.using_packer?
-        packer_public_output_path = ReactOnRails::PackerUtils.packer_public_output_path
-        # rubocop:disable Layout/LineLength
-        Rails.logger.warn "Error configuring config/initializers/react_on_rails. Define neither the generated_assets_dirs nor " \
-                          "the generated_assets_dir when using #{ReactOnRails::PackerUtils.packer_type.upcase_first}. This is defined by " \
-                          "public_output_path specified in #{ReactOnRails::PackerUtils.packer_type}.yml = #{packer_public_output_path}."
-        # rubocop:enable Layout/LineLength
-        return
-      end
+      packer_public_output_path = ReactOnRails::PackerUtils.packer_public_output_path
 
-      Rails.logger.warn "[DEPRECATION] ReactOnRails: Use config.generated_assets_dir rather than " \
-                        "generated_assets_dirs"
-      if generated_assets_dir.blank?
-        self.generated_assets_dir = generated_assets_dirs
-      else
-        Rails.logger.warn "[DEPRECATION] ReactOnRails. You have both generated_assets_dirs and " \
-                          "generated_assets_dir defined. Define ONLY generated_assets_dir if NOT using Shakapacker " \
-                          "and define neither if using Webpacker"
-      end
+      msg = <<~MSG
+        ReactOnRails Configuration Warning: The 'generated_assets_dirs' configuration option is no longer supported.
+        Since Shakapacker is now required, public asset paths are automatically determined from your shakapacker.yml configuration.
+        Please remove 'config.generated_assets_dirs' from your config/initializers/react_on_rails.rb file.
+        Public assets will be loaded from: #{packer_public_output_path}
+        If you need to customize the public output path, configure it in config/shakapacker.yml under 'public_output_path'.
+        Note: Private server bundles are configured separately via server_bundle_output_path.
+      MSG
+
+      Rails.logger.warn msg
     end
 
     def ensure_webpack_generated_files_exists
       return unless webpack_generated_files.empty?
 
-      files = ["manifest.json"]
-      files << server_bundle_js_file if server_bundle_js_file.present?
-
-      self.webpack_generated_files = files
+      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
     end
 
     def configure_skip_display_none_deprecation
@@ -266,13 +350,13 @@ module ReactOnRails
     def compile_command_conflict_message
       <<~MSG
 
-        React on Rails and #{ReactOnRails::PackerUtils.packer_type.upcase_first} error in configuration!
+        React on Rails and Shakapacker error in configuration!
         In order to use config/react_on_rails.rb config.build_production_command,
-        you must edit config/#{ReactOnRails::PackerUtils.packer_type}.yml to include this value in the default configuration:
-        '#{ReactOnRails::PackerUtils.packer_type}_precompile: false'
+        you must edit config/shakapacker.yml to include this value in the default configuration:
+        'shakapacker_precompile: false'
 
         Alternatively, remove the config/react_on_rails.rb config.build_production_command and the
-        default bin/#{ReactOnRails::PackerUtils.packer_type} script will be used for assets:precompile.
+        default bin/shakapacker script will be used for assets:precompile.
 
       MSG
     end

data/lib/react_on_rails/controller.rb

@@ -9,12 +9,16 @@ 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.
     #
     # 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: {})
+    def redux_store(store_name, props: {}, immediate_hydration: nil)
+      immediate_hydration = ReactOnRails.configuration.immediate_hydration if immediate_hydration.nil?
       redux_store_data = { store_name: store_name,
-                           props: props }
+                           props: props,
+                           immediate_hydration: immediate_hydration }
       @registered_stores_defer_render ||= []
       @registered_stores_defer_render << redux_store_data
     end

data/lib/react_on_rails/dev/file_manager.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module ReactOnRails
+  module Dev
+    class FileManager
+      class << self
+        def cleanup_stale_files
+          socket_cleanup = cleanup_overmind_sockets
+          pid_cleanup = cleanup_rails_pid_file
+
+          socket_cleanup || pid_cleanup
+        end
+
+        private
+
+        def cleanup_overmind_sockets
+          return false if overmind_running?
+
+          socket_files = [".overmind.sock", "tmp/sockets/overmind.sock"]
+          cleaned_any = false
+
+          socket_files.each do |socket_file|
+            cleaned_any = true if remove_file_if_exists(socket_file, "stale socket")
+          end
+
+          cleaned_any
+        end
+
+        def cleanup_rails_pid_file
+          server_pid_file = "tmp/pids/server.pid"
+          return false unless File.exist?(server_pid_file)
+
+          pid_content = File.read(server_pid_file).strip
+          begin
+            pid = Integer(pid_content)
+            # PIDs must be > 1 (0 is kernel, 1 is init)
+            if pid <= 1
+              remove_file_if_exists(server_pid_file, "stale Rails pid file")
+              return true
+            end
+          rescue ArgumentError, TypeError
+            remove_file_if_exists(server_pid_file, "stale Rails pid file")
+            return true
+          end
+
+          return false if process_running?(pid)
+
+          remove_file_if_exists(server_pid_file, "stale Rails pid file")
+        end
+
+        def overmind_running?
+          !`pgrep -f "overmind" 2>/dev/null`.split("\n").empty?
+        end
+
+        def process_running?(pid)
+          Process.kill(0, pid)
+          true
+        rescue Errno::ESRCH, ArgumentError, RangeError
+          # Process doesn't exist or invalid PID
+          false
+        rescue Errno::EPERM
+          # Process exists but we don't have permission to signal it
+          true
+        end
+
+        def remove_file_if_exists(file_path, description)
+          return false unless File.exist?(file_path)
+
+          puts "   🧹 Cleaning up #{description}: #{file_path}"
+          File.delete(file_path)
+          true
+        rescue StandardError
+          false
+        end
+      end
+    end
+  end
+end

data/lib/react_on_rails/dev/pack_generator.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "English"
+
+module ReactOnRails
+  module Dev
+    class PackGenerator
+      class << self
+        def generate(verbose: false)
+          if verbose
+            puts "📦 Generating React on Rails packs..."
+            success = system "bundle exec rake react_on_rails:generate_packs"
+          else
+            print "📦 Generating packs... "
+            success = system "bundle exec rake react_on_rails:generate_packs > /dev/null 2>&1"
+            puts success ? "✅" : "❌"
+          end
+
+          return if success
+
+          puts "❌ Pack generation failed"
+          exit 1
+        end
+      end
+    end
+  end
+end