react_on_rails 16.3.0 → 16.4.0.rc.0

data/lib/react_on_rails/dev/server_manager.rb

@@ -4,6 +4,7 @@ require "English"
 require "open3"
 require "rainbow"
 require_relative "../packer_utils"
+require_relative "database_checker"
 require_relative "service_checker"
 
 module ReactOnRails
@@ -12,16 +13,20 @@ module ReactOnRails
       HELP_FLAGS = ["-h", "--help"].freeze
 
       class << self
-        def start(mode = :development, procfile = nil, verbose: false, route: nil, rails_env: nil)
+        def start(mode = :development, procfile = nil, verbose: false, route: nil, rails_env: nil,
+                  skip_database_check: false)
           case mode
           when :production_like
-            run_production_like(_verbose: verbose, route: route, rails_env: rails_env)
+            run_production_like(_verbose: verbose, route: route, rails_env: rails_env,
+                                skip_database_check: skip_database_check)
           when :static
             procfile ||= "Procfile.dev-static-assets"
-            run_static_development(procfile, verbose: verbose, route: route)
+            run_static_development(procfile, verbose: verbose, route: route,
+                                             skip_database_check: skip_database_check)
           when :development, :hmr
             procfile ||= "Procfile.dev"
-            run_development(procfile, verbose: verbose, route: route)
+            run_development(procfile, verbose: verbose, route: route,
+                                      skip_database_check: skip_database_check)
           else
             raise ArgumentError, "Unknown mode: #{mode}"
           end
@@ -151,7 +156,7 @@ module ReactOnRails
         # Flags that take a value as the next argument (not using = syntax)
         FLAGS_WITH_VALUES = %w[--route --rails-env].freeze
 
-        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
         def run_from_command_line(args = ARGV)
           require "optparse"
 
@@ -163,7 +168,7 @@ module ReactOnRails
           # Check if help flags are present in args (before OptionParser processes them)
           help_requested = args.any? { |arg| HELP_FLAGS.include?(arg) }
 
-          options = { route: nil, rails_env: nil, verbose: false }
+          options = { route: nil, rails_env: nil, verbose: false, skip_database_check: false }
 
           OptionParser.new do |opts|
             opts.banner = "Usage: dev [command] [options]"
@@ -180,6 +185,10 @@ module ReactOnRails
               options[:verbose] = true
             end
 
+            opts.on("--skip-database-check", "Skip database connectivity check (saves ~1-2s startup time)") do
+              options[:skip_database_check] = true
+            end
+
             opts.on("-h", "--help", "Prints this help") do
               show_help
               exit
@@ -200,22 +209,25 @@ module ReactOnRails
           case command
           when "production-assets", "prod"
             start(:production_like, nil, verbose: options[:verbose], route: options[:route],
-                                         rails_env: options[:rails_env])
+                                         rails_env: options[:rails_env],
+                                         skip_database_check: options[:skip_database_check])
           when "static"
-            start(:static, "Procfile.dev-static-assets", verbose: options[:verbose], route: options[:route])
+            start(:static, "Procfile.dev-static-assets", verbose: options[:verbose], route: options[:route],
+                                                         skip_database_check: options[:skip_database_check])
           when "kill"
             kill_processes
           when "help"
             show_help
           when "hmr", nil
-            start(:development, "Procfile.dev", verbose: options[:verbose], route: options[:route])
+            start(:development, "Procfile.dev", verbose: options[:verbose], route: options[:route],
+                                                skip_database_check: options[:skip_database_check])
           else
             puts "Unknown argument: #{command}"
             puts "Run 'dev help' for usage information"
             exit 1
           end
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
 
         private
 
@@ -300,13 +312,35 @@ module ReactOnRails
         def warn_if_shakapacker_version_too_old
           # Only warn for Shakapacker versions in the range 9.0.0 to 9.3.x
           # Versions below 9.0.0 don't use the precompile_hook feature
-          # Versions 9.4.0+ support SHAKAPACKER_SKIP_PRECOMPILE_HOOK environment variable
+          # Versions 9.4.0+ support SHAKAPACKER_SKIP_PRECOMPILE_HOOK environment variable natively
           has_precompile_hook_support = PackerUtils.shakapacker_version_requirement_met?("9.0.0")
           has_skip_env_var_support = PackerUtils.shakapacker_version_requirement_met?("9.4.0")
 
           return unless has_precompile_hook_support
           return if has_skip_env_var_support
 
+          hook_value = PackerUtils.shakapacker_precompile_hook_value
+          return unless hook_value
+
+          # Case 1: Script-based hook WITH self-guard -> fully protected, no warning needed
+          return if PackerUtils.hook_script_has_self_guard?(hook_value)
+
+          # Case 2: Script-based hook WITHOUT self-guard -> actionable warning
+          script_path = PackerUtils.resolve_hook_script_path(hook_value)
+          if script_path
+            puts ""
+            puts Rainbow("⚠️  Warning: #{script_path} is missing the self-guard line").yellow.bold
+            puts ""
+            puts Rainbow("   Without it, the precompile hook may run multiple times in HMR mode").yellow
+            puts Rainbow("   (once by bin/dev, and again by each webpack process).").yellow
+            puts ""
+            puts Rainbow("   Add this line near the top of your hook script:").cyan
+            puts Rainbow('   exit 0 if ENV["SHAKAPACKER_SKIP_PRECOMPILE_HOOK"] == "true"').cyan.bold
+            puts ""
+            return
+          end
+
+          # Case 3: Direct command hook -> suggest upgrade or switch to script-based hook
           puts ""
           puts Rainbow("⚠️  Warning: Shakapacker #{PackerUtils.shakapacker_version} detected").yellow.bold
           puts ""
@@ -315,8 +349,11 @@ module ReactOnRails
           puts Rainbow("   precompile_hook to run multiple times (once by bin/dev, and again").yellow
           puts Rainbow("   by each webpack process).").yellow
           puts ""
-          puts Rainbow("   Recommendation: Upgrade to Shakapacker 9.4.0 or later:").cyan
-          puts Rainbow("   bundle update shakapacker").cyan.bold
+          puts Rainbow("   Recommendations:").cyan
+          puts Rainbow("   1. Upgrade to Shakapacker 9.4.0 or later:").cyan
+          puts Rainbow("      bundle update shakapacker").cyan.bold
+          puts Rainbow("   2. Or switch to a script-based hook with a self-guard.").cyan
+          puts Rainbow("      See: https://www.shakacode.com/react-on-rails/docs/building-features/process-managers").cyan
           puts ""
         end
         # rubocop:enable Metrics/AbcSize
@@ -352,11 +389,13 @@ module ReactOnRails
               #{Rainbow('--route ROUTE').green.bold}        #{Rainbow('Specify route to display in URLs (default: root)').white}
               #{Rainbow('--rails-env ENV').green.bold}      #{Rainbow('Override RAILS_ENV for assets:precompile step only (prod mode only)').white}
               #{Rainbow('--verbose, -v').green.bold}        #{Rainbow('Enable verbose output for pack generation').white}
+              #{Rainbow('--skip-database-check').green.bold} #{Rainbow('Skip database connectivity check (saves ~1-2s startup time)').white}
 
             #{Rainbow('📝 EXAMPLES:').cyan.bold}
               #{Rainbow('bin/dev prod').green.bold}                    #{Rainbow('# NODE_ENV=production, RAILS_ENV=development').white}
               #{Rainbow('bin/dev prod --rails-env=production').green.bold}  #{Rainbow('# NODE_ENV=production, RAILS_ENV=production').white}
               #{Rainbow('bin/dev prod --route=dashboard').green.bold}       #{Rainbow('# Custom route in URLs').white}
+              #{Rainbow('bin/dev --skip-database-check').green.bold}        #{Rainbow('# Skip DB check for faster startup').white}
           OPTIONS
         end
         # rubocop:enable Metrics/AbcSize
@@ -373,6 +412,14 @@ module ReactOnRails
 
             #{Rainbow('Edit these files to customize the development environment for your needs.').white}
 
+            #{Rainbow('🗄️  DATABASE CHECK:').cyan.bold}
+            #{Rainbow('bin/dev checks database connectivity before starting (adds ~1-2s to startup).').white}
+            #{Rainbow('Disable this check if you don\'t use a database or want faster startup:').white}
+
+            #{Rainbow('•').yellow} #{Rainbow('CLI flag:').white}     #{Rainbow('bin/dev --skip-database-check').green.bold}
+            #{Rainbow('•').yellow} #{Rainbow('Environment:').white}  #{Rainbow('SKIP_DATABASE_CHECK=true bin/dev').green.bold}
+            #{Rainbow('•').yellow} #{Rainbow('Config:').white}       #{Rainbow('config.check_database_on_dev_start = false').green.bold} #{Rainbow('(in react_on_rails.rb)').white}
+
             #{Rainbow('🔍 SERVICE DEPENDENCIES:').cyan.bold}
             #{Rainbow('Configure required external services in').white} #{Rainbow('.dev-services.yml').green.bold}#{Rainbow(':').white}
 
@@ -426,7 +473,7 @@ module ReactOnRails
         # rubocop:enable Metrics/AbcSize
 
         # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
-        def run_production_like(_verbose: false, route: nil, rails_env: nil)
+        def run_production_like(_verbose: false, route: nil, rails_env: nil, skip_database_check: false)
           procfile = "Procfile.dev-prod-assets"
 
           features = [
@@ -441,6 +488,9 @@ module ReactOnRails
 
           print_procfile_info(procfile, route: route)
 
+          # Check database setup before starting
+          exit 1 unless DatabaseChecker.check_database(skip: skip_database_check)
+
           # Check required services before starting
           exit 1 unless ServiceChecker.check_services
 
@@ -563,9 +613,12 @@ module ReactOnRails
         end
         # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
-        def run_static_development(procfile, verbose: false, route: nil)
+        def run_static_development(procfile, verbose: false, route: nil, skip_database_check: false)
           print_procfile_info(procfile, route: route)
 
+          # Check database setup before starting
+          exit 1 unless DatabaseChecker.check_database(skip: skip_database_check)
+
           # Check required services before starting
           exit 1 unless ServiceChecker.check_services
 
@@ -592,9 +645,12 @@ module ReactOnRails
           ProcessManager.run_with_process_manager(procfile)
         end
 
-        def run_development(procfile, verbose: false, route: nil)
+        def run_development(procfile, verbose: false, route: nil, skip_database_check: false)
           print_procfile_info(procfile, route: route)
 
+          # Check database setup before starting
+          exit 1 unless DatabaseChecker.check_database(skip: skip_database_check)
+
           # Check required services before starting
           exit 1 unless ServiceChecker.check_services
 

data/lib/react_on_rails/doctor.rb

@@ -1193,7 +1193,7 @@ module ReactOnRails
             checker.add_info("  💡 These are mutually exclusive - use only one approach")
             checker.add_info("  💡 Recommended: Use compile: true in shakapacker.yml (simpler)")
             checker.add_info("  💡 Alternative: Use build_test_command with ReactOnRails::TestHelper (explicit control)")
-            checker.add_info("  📖 See: https://github.com/shakacode/react_on_rails/blob/master/docs/guides/testing-configuration.md")
+            checker.add_info("  📖 See: https://github.com/shakacode/react_on_rails/blob/master/docs/building-features/testing-configuration.md")
           elsif has_build_test_command && !uses_test_helper
             checker.add_warning("  ⚠️  build_test_command is set but ReactOnRails::TestHelper is not configured")
             checker.add_info("  💡 Add to spec/rails_helper.rb:")
@@ -1208,7 +1208,7 @@ module ReactOnRails
             checker.add_warning("  ⚠️  No test asset compilation configured")
             checker.add_info("  💡 Recommended: Add to shakapacker.yml test section:")
             checker.add_info("      compile: true")
-            checker.add_info("  📖 See: https://github.com/shakacode/react_on_rails/blob/master/docs/guides/testing-configuration.md")
+            checker.add_info("  📖 See: https://github.com/shakacode/react_on_rails/blob/master/docs/building-features/testing-configuration.md")
           elsif has_compile_true
             checker.add_success("  ✅ Test assets configured via Shakapacker auto-compilation")
             checker.add_info("      (compile: true in shakapacker.yml)")

data/lib/react_on_rails/helper.rb

@@ -151,15 +151,26 @@ module ReactOnRails
     # Instead, you should use the standard react_component view helper.
     #
     # store_name: name of the store, corresponding to your call to ReactOnRails.registerStores in your
-    #             JavaScript code.
+    #             JavaScript code. When using auto-bundling, this should match the filename of your
+    #             store file (e.g., "commentsStore" for commentsStore.js).
     # props: Ruby Hash or JSON string which contains the properties to pass to the redux store.
     # Options
     #    defer: false -- pass as true if you wish to render this below your component.
     #    immediate_hydration: nil -- React on Rails Pro (licensed) feature. When nil (default), Pro users
     #                        get immediate hydration, non-Pro users don't. Can be explicitly overridden.
-    def redux_store(store_name, props: {}, defer: false, immediate_hydration: nil)
+    #    auto_load_bundle: nil -- If true, automatically loads the generated pack for this store.
+    #                      Defaults to ReactOnRails.configuration.auto_load_bundle if not specified.
+    #                      Requires config.stores_subdirectory to be set (e.g., "ror_stores").
+    #                      Store files should be placed in directories matching this name, e.g.:
+    #                        app/javascript/bundles/ror_stores/commentsStore.js
+    #                      The store file must export default a store generator function.
+    def redux_store(store_name, props: {}, defer: false, immediate_hydration: nil, auto_load_bundle: nil)
       immediate_hydration = ReactOnRails::Utils.normalize_immediate_hydration(immediate_hydration, store_name, "Store")
 
+      # Auto-load store pack if configured
+      should_auto_load = auto_load_bundle.nil? ? ReactOnRails.configuration.auto_load_bundle : auto_load_bundle
+      load_pack_for_generated_store(store_name, explicit_auto_load: auto_load_bundle == true) if should_auto_load
+
       redux_store_data = { store_name: store_name,
                            props: props,
                            immediate_hydration: immediate_hydration }
@@ -348,6 +359,34 @@ module ReactOnRails
       append_stylesheet_pack_tag("generated/#{react_component_name}")
     end
 
+    def load_pack_for_generated_store(store_name, explicit_auto_load: false)
+      unless ReactOnRails.configuration.stores_subdirectory.present?
+        if explicit_auto_load
+          raise ReactOnRails::SmartError.new(
+            error_type: :configuration_error,
+            details: "auto_load_bundle is enabled for store " \
+                     "'#{store_name}', but " \
+                     "stores_subdirectory is not configured. " \
+                     "Set config.stores_subdirectory (e.g., " \
+                     "'ror_stores') in your ReactOnRails " \
+                     "configuration so that store packs can " \
+                     "be generated and loaded."
+          )
+        end
+        return
+      end
+
+      ReactOnRails::PackerUtils.raise_nested_entries_disabled unless ReactOnRails::PackerUtils.nested_entries?
+      if Rails.env.development?
+        is_store_pack_present = File.exist?(generated_stores_pack_path(store_name))
+        raise_missing_autoloaded_store_bundle(store_name) unless is_store_pack_present
+      end
+
+      options = { defer: ReactOnRails.configuration.generated_component_packs_loading_strategy == :defer }
+      options[:async] = true if ReactOnRails.configuration.generated_component_packs_loading_strategy == :async
+      append_javascript_pack_tag("generated/#{store_name}", **options)
+    end
+
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
     def registered_stores
@@ -376,6 +415,10 @@ module ReactOnRails
       "#{ReactOnRails::PackerUtils.packer_source_entry_path}/generated/#{component_name}.js"
     end
 
+    def generated_stores_pack_path(store_name)
+      "#{ReactOnRails::PackerUtils.packer_source_entry_path}/generated/#{store_name}.js"
+    end
+
     def build_react_component_result_for_server_rendered_string(
       server_rendered_html: required("server_rendered_html"),
       component_specification_tag: required("component_specification_tag"),
@@ -681,6 +724,14 @@ module ReactOnRails
         expected_path: generated_components_pack_path(react_component_name)
       )
     end
+
+    def raise_missing_autoloaded_store_bundle(store_name)
+      raise ReactOnRails::SmartError.new(
+        error_type: :missing_auto_loaded_store_bundle,
+        component_name: store_name,
+        expected_path: generated_stores_pack_path(store_name)
+      )
+    end
   end
 end
 # rubocop:enable Metrics/ModuleLength

data/lib/react_on_rails/locales/base.rb

@@ -4,6 +4,21 @@ require "erb"
 
 module ReactOnRails
   module Locales
+    # Compiles locale YAML files into JavaScript or JSON for use with React on Rails i18n.
+    #
+    # Reads YAML locale files from +config.i18n_yml_dir+ (or Rails i18n load path),
+    # generates output files in +config.i18n_dir+, and skips generation when output
+    # files are already up-to-date (unless +force+ is true).
+    #
+    # @param force [Boolean] when true, regenerate even if output files are current
+    # @return [ReactOnRails::Locales::ToJs, ReactOnRails::Locales::ToJson] the converter instance
+    # @raise [ReactOnRails::Error] if configured directories do not exist
+    #
+    # @example Basic usage (skips if up-to-date)
+    #   ReactOnRails::Locales.compile
+    #
+    # @example Force regeneration
+    #   ReactOnRails::Locales.compile(force: true)
     def self.compile(force: false)
       config = ReactOnRails.configuration
       check_config_directory_exists(

data/lib/react_on_rails/packer_utils.rb

@@ -179,15 +179,32 @@ module ReactOnRails
     end
 
     def self.extract_precompile_hook
-      # Access config data using private :data method since there's no public API
-      # to access the raw configuration hash needed for hook detection
+      # Prefer the public API (available in Shakapacker 9.0+)
+      return ::Shakapacker.config.precompile_hook if ::Shakapacker.config.respond_to?(:precompile_hook)
+
+      # Fallback: access config data using private :data method
       config_data = ::Shakapacker.config.send(:data)
 
       # Try symbol keys first (Shakapacker's internal format), then fall back to string keys
-      # The key is 'precompile_hook' at the top level of the config
       config_data&.[](:precompile_hook) || config_data&.[]("precompile_hook")
     end
 
+    # Regex pattern to detect pack generation in hook scripts
+    # Matches both:
+    # - The rake task: react_on_rails:generate_packs
+    # - The Ruby method: generate_packs_if_stale (used by generator template)
+    GENERATE_PACKS_PATTERN = /\b(react_on_rails:generate_packs|generate_packs_if_stale)\b/
+
+    # Pattern to detect a real self-guard statement that exits early when
+    # SHAKAPACKER_SKIP_PRECOMPILE_HOOK is true. This avoids false positives
+    # from comments or unrelated string literals.
+    SELF_GUARD_PATTERN = /
+      (?:^|\s)
+      (?:exit|return)
+      (?:\s+0)?
+      \s+if\s+ENV\[(["'])SHAKAPACKER_SKIP_PRECOMPILE_HOOK\1\]\s*==\s*(["'])true\2
+    /x
+
     def self.hook_contains_generate_packs?(hook_value)
       # The hook value can be either:
       # 1. A direct command containing the rake task
@@ -195,7 +212,7 @@ module ReactOnRails
       return false if hook_value.blank?
 
       # Check if it's a direct command first
-      return true if hook_value.to_s.match?(/\breact_on_rails:generate_packs\b/)
+      return true if hook_value.to_s.match?(GENERATE_PACKS_PATTERN)
 
       # Check if it's a script file path
       script_path = resolve_hook_script_path(hook_value)
@@ -203,7 +220,7 @@ module ReactOnRails
 
       # Read and check script contents
       script_contents = File.read(script_path)
-      script_contents.match?(/\breact_on_rails:generate_packs\b/)
+      script_contents.match?(GENERATE_PACKS_PATTERN)
     rescue StandardError
       # If we can't read the script, assume it doesn't contain generate_packs
       false
@@ -217,6 +234,21 @@ module ReactOnRails
       potential_path if potential_path.file?
     end
 
+    # Check if a hook script file contains the self-guard pattern that prevents
+    # duplicate execution when SHAKAPACKER_SKIP_PRECOMPILE_HOOK is set.
+    # Returns false for direct command hooks (non-script values).
+    def self.hook_script_has_self_guard?(hook_value)
+      return false if hook_value.blank?
+
+      script_path = resolve_hook_script_path(hook_value)
+      return false unless script_path
+
+      script_contents = File.read(script_path)
+      script_contents.match?(SELF_GUARD_PATTERN)
+    rescue StandardError
+      false
+    end
+
     # Returns the configured precompile hook value for logging/debugging
     # Returns nil if no hook is configured
     def self.shakapacker_precompile_hook_value

data/lib/react_on_rails/packs_generator.rb

@@ -48,12 +48,34 @@ module ReactOnRails
     private
 
     def generate_packs(verbose: false)
+      # Check for name conflicts between components and stores
+      check_for_component_store_name_conflicts
+
       common_component_to_path.each_value { |component_path| create_pack(component_path, verbose: verbose) }
       client_component_to_path.each_value { |component_path| create_pack(component_path, verbose: verbose) }
 
+      # Generate store packs if stores_subdirectory is configured
+      store_to_path.each_value { |store_path| create_store_pack(store_path, verbose: verbose) }
+
       create_server_pack(verbose: verbose) if ReactOnRails.configuration.server_bundle_js_file.present?
     end
 
+    def check_for_component_store_name_conflicts
+      component_names = common_component_to_path.keys + client_component_to_path.keys
+      store_names = store_to_path.keys
+      conflicts = component_names & store_names
+
+      return if conflicts.empty?
+
+      msg = <<~MSG
+        **ERROR** ReactOnRails: The following names are used for both components and stores: #{conflicts.join(', ')}.
+        This would cause pack file conflicts in the generated directory.
+        Please rename your components or stores to have unique names.
+      MSG
+
+      raise ReactOnRails::Error, msg
+    end
+
     def create_pack(file_path, verbose: false)
       output_path = generated_pack_path(file_path)
       content = pack_file_contents(file_path)
@@ -128,6 +150,27 @@ module ReactOnRails
       FILE_CONTENT
     end
 
+    def create_store_pack(file_path, verbose: false)
+      output_path = generated_store_pack_path(file_path)
+      content = store_pack_file_contents(file_path)
+
+      File.write(output_path, content)
+
+      puts(Rainbow("Generated Store Pack: #{output_path}").yellow) if verbose
+    end
+
+    def store_pack_file_contents(file_path)
+      registered_store_name = store_name(file_path)
+      relative_store_path = relative_store_path_from_generated_pack(file_path)
+
+      <<~FILE_CONTENT.strip
+        import ReactOnRails from '#{react_on_rails_npm_package}/client';
+        import #{registered_store_name} from '#{relative_store_path}';
+
+        ReactOnRails.registerStore({#{registered_store_name}});
+      FILE_CONTENT
+    end
+
     def create_server_pack(verbose: false)
       File.write(generated_server_bundle_file_path, generated_server_pack_file_content)
 
@@ -135,11 +178,13 @@ module ReactOnRails
       puts(Rainbow("Generated Server Bundle: #{generated_server_bundle_file_path}").orange) if verbose
     end
 
-    def build_server_pack_content(component_on_server_imports, server_components, client_components)
+    def build_server_pack_content(component_on_server_imports, server_components, client_components,
+                                  store_imports: [], store_names: [])
+      all_imports = component_on_server_imports + store_imports
       content = <<~FILE_CONTENT
         import ReactOnRails from '#{react_on_rails_npm_package}';
 
-        #{component_on_server_imports.join("\n")}\n
+        #{all_imports.join("\n")}\n
       FILE_CONTENT
 
       if server_components.any?
@@ -149,7 +194,11 @@ module ReactOnRails
         FILE_CONTENT
       end
 
-      content + "ReactOnRails.register({#{client_components.join(",\n")}});"
+      content += "ReactOnRails.register({#{client_components.join(",\n")}});" if client_components.any?
+
+      content += "\nReactOnRails.registerStore({#{store_names.join(",\n")}});" if store_names.any?
+
+      content
     end
 
     def generated_server_pack_file_content
@@ -169,7 +218,15 @@ module ReactOnRails
       end
       client_components = component_for_server_registration_to_path.keys - server_components
 
-      build_server_pack_content(component_on_server_imports, server_components, client_components)
+      # Include stores in server bundle
+      stores = store_to_path
+      store_imports = stores.map do |name, store_path|
+        "import #{name} from '#{relative_path(generated_server_bundle_file_path, store_path)}';"
+      end
+      store_names = stores.keys
+
+      build_server_pack_content(component_on_server_imports, server_components, client_components,
+                                store_imports: store_imports, store_names: store_names)
     end
 
     def add_generated_pack_to_server_bundle
@@ -193,7 +250,10 @@ module ReactOnRails
     def generated_server_bundle_file_path
       return server_bundle_entrypoint if ReactOnRails.configuration.make_generated_server_bundle_the_entrypoint
 
-      generated_interim_server_bundle_path = server_bundle_entrypoint.sub(".js", "-generated.js")
+      entrypoint_ext = File.extname(server_bundle_entrypoint)
+      generated_interim_server_bundle_path = server_bundle_entrypoint.sub(
+        /#{Regexp.escape(entrypoint_ext)}$/, "-generated#{entrypoint_ext}"
+      )
       generated_server_bundle_file_name = component_name(generated_interim_server_bundle_path)
       source_entrypoint_parent = Pathname(ReactOnRails::PackerUtils.packer_source_entry_path).parent
       generated_nonentrypoints_path = "#{source_entrypoint_parent}/generated"
@@ -220,6 +280,9 @@ module ReactOnRails
       common_component_to_path.each_value { |path| expected_pack_files << generated_pack_path(path) }
       client_component_to_path.each_value { |path| expected_pack_files << generated_pack_path(path) }
 
+      # Include store packs in expected files
+      store_to_path.each_value { |path| expected_pack_files << generated_store_pack_path(path) }
+
       if ReactOnRails.configuration.server_bundle_js_file.present?
         expected_server_bundle = generated_server_bundle_file_path
       end
@@ -347,11 +410,10 @@ module ReactOnRails
     end
 
     def relative_path(from, to)
-      from_path = Pathname.new(from)
+      from_dir = Pathname.new(from).dirname
       to_path = Pathname.new(to)
 
-      relative_path = to_path.relative_path_from(from_path)
-      relative_path.sub("../", "")
+      to_path.relative_path_from(from_dir)
     end
 
     def generated_pack_path(file_path)
@@ -410,6 +472,49 @@ module ReactOnRails
       "#{source_path}/**/#{ReactOnRails.configuration.components_subdirectory}"
     end
 
+    def stores_search_path
+      return nil unless ReactOnRails.configuration.stores_subdirectory.present?
+
+      source_path = ReactOnRails::PackerUtils.packer_source_path
+
+      "#{source_path}/**/#{ReactOnRails.configuration.stores_subdirectory}"
+    end
+
+    def store_to_path
+      return {} unless stores_search_path
+
+      store_paths = Dir.glob("#{stores_search_path}/*")
+      filtered_paths = filter_component_files(store_paths)
+      store_name_to_path(filtered_paths)
+    end
+
+    def store_name_to_path(paths)
+      result = {}
+      paths.each do |path|
+        name = store_name(path)
+        raise_duplicate_store_name(name, result[name], path) if result.key?(name)
+        result[name] = path
+      end
+      result
+    end
+
+    def store_name(file_path)
+      basename = File.basename(file_path, File.extname(file_path))
+      basename.sub(CONTAINS_CLIENT_OR_SERVER_REGEX, "")
+    end
+
+    def generated_store_pack_path(file_path)
+      "#{generated_packs_directory_path}/#{store_name(file_path)}.js"
+    end
+
+    def relative_store_path_from_generated_pack(store_path)
+      store_file_pathname = Pathname.new(store_path)
+      store_generated_pack_path = generated_store_pack_path(store_path)
+      generated_pack_pathname = Pathname.new(store_generated_pack_path)
+
+      relative_path(generated_pack_pathname, store_file_pathname)
+    end
+
     def raise_client_component_overrides_common(component_name)
       msg = <<~MSG
         **ERROR** ReactOnRails: client specific definition for Component '#{component_name}' overrides the \
@@ -439,14 +544,39 @@ module ReactOnRails
       raise ReactOnRails::Error, msg
     end
 
+    def raise_duplicate_store_name(name, existing_path, new_path)
+      msg = <<~MSG
+        **ERROR** ReactOnRails: Multiple store files resolve to the same name '#{name}':
+          - #{existing_path}
+          - #{new_path}
+        Rename one of the store files to have a unique base name.
+      MSG
+
+      raise ReactOnRails::Error, msg
+    end
+
     def stale_or_missing_packs?
       component_files = common_component_to_path.values + client_component_to_path.values
-      most_recent_mtime = Utils.find_most_recent_mtime(component_files).to_i
+      store_files = store_to_path.values
+      all_source_files = component_files + store_files
+
+      return false if all_source_files.empty?
+
+      most_recent_mtime = Utils.find_most_recent_mtime(all_source_files).to_i
 
-      component_files.each_with_object([]).any? do |file|
+      # Check component packs
+      component_files.each do |file|
         path = generated_pack_path(file)
-        !File.exist?(path) || File.mtime(path).to_i < most_recent_mtime
+        return true if !File.exist?(path) || File.mtime(path).to_i < most_recent_mtime
       end
+
+      # Check store packs
+      store_files.each do |file|
+        path = generated_store_pack_path(file)
+        return true if !File.exist?(path) || File.mtime(path).to_i < most_recent_mtime
+      end
+
+      false
     end
   end
   # rubocop:enable Metrics/ClassLength