react_on_rails 16.2.0.beta.3 → 16.2.0.beta.4

data/bin/ci-switch-config

@@ -39,14 +39,120 @@ check_version_manager() {
     echo "mise"
   elif command -v asdf &> /dev/null; then
     echo "asdf"
+  elif command -v rvm &> /dev/null && command -v nvm &> /dev/null; then
+    echo "rvm+nvm"
+  elif command -v rvm &> /dev/null; then
+    echo "rvm"
+  elif command -v nvm &> /dev/null; then
+    echo "nvm"
   else
-    print_error "No version manager found. Please install mise or asdf:"
+    print_error "No version manager found. Please install one of:"
     echo "  mise (recommended): https://mise.jdx.dev/"
-    echo "  asdf (legacy):      https://asdf-vm.com/"
+    echo "  asdf:               https://asdf-vm.com/"
+    echo "  rvm + nvm:          https://rvm.io/ + https://github.com/nvm-sh/nvm"
     exit 1
   fi
 }
 
+set_ruby_version() {
+  local version="$1"
+  local version_manager="$2"
+
+  case "$version_manager" in
+    mise|asdf)
+      # Handled via .tool-versions
+      ;;
+    rvm|rvm+nvm)
+      print_header "Setting Ruby $version with rvm"
+      # Check if version exists using rvm list rubies for consistent output
+      # Anchor to start of line to avoid false matches (e.g., 3.2.8 shouldn't match 13.2.8)
+      # Allow optional leading whitespace and ruby- prefix, no end anchor to allow patch suffixes
+      if ! rvm list rubies | grep -qE "^[[:space:]]*(ruby-)?${version}"; then
+        print_warning "Ruby $version not installed. Installing..."
+        if ! rvm install "$version"; then
+          print_error "Failed to install Ruby $version with rvm"
+          print_warning "Make sure rvm is properly configured. Try running: source ~/.rvm/scripts/rvm"
+          exit 1
+        fi
+      fi
+      if ! rvm use "$version"; then
+        print_error "Failed to switch to Ruby $version"
+        print_warning "Make sure rvm is properly configured. Try running: source ~/.rvm/scripts/rvm"
+        exit 1
+      fi
+      print_success "Switched to Ruby $version"
+      ;;
+    nvm)
+      print_error "Cannot set Ruby version: nvm doesn't manage Ruby"
+      echo "Please install one of the following to manage Ruby versions:"
+      echo "  - rvm:  https://rvm.io/"
+      echo "  - mise: https://mise.jdx.dev/ (recommended, manages both Ruby and Node)"
+      echo "  - asdf: https://asdf-vm.com/ (manages both Ruby and Node)"
+      exit 1
+      ;;
+  esac
+}
+
+set_node_version() {
+  local version="$1"
+  local version_manager="$2"
+
+  case "$version_manager" in
+    mise|asdf)
+      # Handled via .tool-versions
+      ;;
+    nvm|rvm+nvm)
+      print_header "Setting Node $version with nvm"
+
+      # Source nvm if not already loaded - try multiple common locations
+      if ! command -v nvm &> /dev/null; then
+        # Try standard nvm location
+        if [ -s "$HOME/.nvm/nvm.sh" ]; then
+          export NVM_DIR="$HOME/.nvm"
+          \. "$NVM_DIR/nvm.sh"
+        # Try Homebrew location (macOS)
+        elif [ -s "/opt/homebrew/opt/nvm/nvm.sh" ]; then
+          export NVM_DIR="/opt/homebrew/opt/nvm"
+          \. "/opt/homebrew/opt/nvm/nvm.sh"
+        # Try XDG config location
+        elif [ -s "${XDG_CONFIG_HOME:-$HOME/.config}/nvm/nvm.sh" ]; then
+          export NVM_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/nvm"
+          \. "$NVM_DIR/nvm.sh"
+        else
+          print_error "Could not find nvm installation"
+          print_warning "Tried locations: ~/.nvm, /opt/homebrew/opt/nvm, ~/.config/nvm"
+          echo "Please source nvm manually or install it from: https://github.com/nvm-sh/nvm"
+          exit 1
+        fi
+      fi
+
+      # Check if version is already installed using nvm version for reliability
+      if ! nvm version "$version" &> /dev/null; then
+        print_warning "Node $version not installed. Installing..."
+        if ! nvm install "$version"; then
+          print_error "Failed to install Node $version with nvm"
+          exit 1
+        fi
+      fi
+
+      if ! nvm use "$version"; then
+        print_error "Failed to switch to Node $version"
+        print_warning "Make sure nvm is properly configured. Try running: nvm use $version"
+        exit 1
+      fi
+      print_success "Switched to Node $version"
+      ;;
+    rvm)
+      print_error "Cannot set Node version: rvm doesn't manage Node"
+      echo "Please install one of the following to manage Node versions:"
+      echo "  - nvm:  https://github.com/nvm-sh/nvm"
+      echo "  - mise: https://mise.jdx.dev/ (recommended, manages both Ruby and Node)"
+      echo "  - asdf: https://asdf-vm.com/ (manages both Ruby and Node)"
+      exit 1
+      ;;
+  esac
+}
+
 show_status() {
   print_header "Current Configuration"
   echo ""
@@ -121,12 +227,32 @@ switch_to_minimum() {
   fi
 
   # Set Ruby and Node versions
-  print_header "Setting runtime versions in .tool-versions"
-  cat > "$PROJECT_ROOT/.tool-versions" <<EOF
+  case "$VERSION_MANAGER" in
+    mise|asdf)
+      print_header "Setting runtime versions in .tool-versions"
+      cat > "$PROJECT_ROOT/.tool-versions" <<EOF
 ruby 3.2.8
 nodejs 20.18.1
 EOF
-  print_success "Created .tool-versions with Ruby 3.2.8 and Node 20.18.1"
+      print_success "Created .tool-versions with Ruby 3.2.8 and Node 20.18.1"
+      ;;
+    rvm|rvm+nvm)
+      print_header "Creating .ruby-version for rvm"
+      echo "3.2.8" > "$PROJECT_ROOT/.ruby-version"
+      print_success "Created .ruby-version with Ruby 3.2.8"
+      ;;
+  esac
+
+  case "$VERSION_MANAGER" in
+    nvm|rvm+nvm)
+      print_header "Creating .nvmrc for nvm"
+      echo "20.18.1" > "$PROJECT_ROOT/.nvmrc"
+      print_success "Created .nvmrc with Node 20.18.1"
+      ;;
+  esac
+
+  set_ruby_version "3.2.8" "$VERSION_MANAGER"
+  set_node_version "20.18.1" "$VERSION_MANAGER"
 
   # Run conversion script
   print_header "Running script/convert to downgrade dependencies"
@@ -158,22 +284,60 @@ EOF
 
   # Reload version manager to pick up new versions
   print_header "Reloading $VERSION_MANAGER to use new versions"
-  if [[ "$VERSION_MANAGER" == "mise" ]]; then
-    # mise will auto-detect .tool-versions on next cd
-    :
-  elif [ -f "$HOME/.asdf/asdf.sh" ]; then
-    source "$HOME/.asdf/asdf.sh"
-  fi
+  case "$VERSION_MANAGER" in
+    mise)
+      # mise will auto-detect .tool-versions on next cd
+      ;;
+    asdf)
+      # Note: This only affects the script's subshell, not the user's current shell
+      if [ -f "$HOME/.asdf/asdf.sh" ]; then
+        source "$HOME/.asdf/asdf.sh"
+      fi
+      ;;
+    rvm|rvm+nvm)
+      # Versions already set via rvm use
+      ;;
+    nvm)
+      # Version already set via nvm use
+      ;;
+  esac
 
   echo ""
   print_success "Switched to MINIMUM configuration"
-  print_warning "Run these commands to reload your shell and verify:"
+
+  case "$VERSION_MANAGER" in
+    rvm+nvm|rvm|nvm)
+      print_warning "IMPORTANT: Version changes in this script don't persist to your current shell."
+      print_warning "The rvm/nvm commands run in a subshell and cannot affect your terminal."
+      echo ""
+      print_warning "Choose one of these options to activate the new versions:"
+      echo "  Option 1 (Recommended): Open a new terminal and cd into the project"
+      echo "  Option 2: Source your shell config:"
+      [ "$VERSION_MANAGER" = "rvm" ] || [ "$VERSION_MANAGER" = "rvm+nvm" ] && echo "    source ~/.rvm/scripts/rvm"
+      [ "$VERSION_MANAGER" = "nvm" ] || [ "$VERSION_MANAGER" = "rvm+nvm" ] && echo "    source \$NVM_DIR/nvm.sh"
+      echo ""
+      ;;
+  esac
+
+  print_warning "After activating versions, verify with:"
   echo "  cd $PROJECT_ROOT"
-  if [[ "$VERSION_MANAGER" == "mise" ]]; then
-    echo "  mise current"
-  else
-    echo "  asdf current"
-  fi
+  case "$VERSION_MANAGER" in
+    mise)
+      echo "  mise current"
+      ;;
+    asdf)
+      echo "  asdf current"
+      ;;
+    rvm+nvm)
+      echo "  rvm current && nvm current"
+      ;;
+    rvm)
+      echo "  rvm current"
+      ;;
+    nvm)
+      echo "  nvm current"
+      ;;
+  esac
   echo ""
   print_warning "Next steps to build and test:"
   echo "  rake node_package"
@@ -201,12 +365,32 @@ restore_to_latest() {
   fi
 
   # Set Ruby and Node versions
-  print_header "Setting runtime versions in .tool-versions"
-  cat > "$PROJECT_ROOT/.tool-versions" <<EOF
+  case "$VERSION_MANAGER" in
+    mise|asdf)
+      print_header "Setting runtime versions in .tool-versions"
+      cat > "$PROJECT_ROOT/.tool-versions" <<EOF
 ruby 3.4.3
 nodejs 22.12.0
 EOF
-  print_success "Created .tool-versions with Ruby 3.4.3 and Node 22.12.0"
+      print_success "Created .tool-versions with Ruby 3.4.3 and Node 22.12.0"
+      ;;
+    rvm|rvm+nvm)
+      print_header "Creating .ruby-version for rvm"
+      echo "3.4.3" > "$PROJECT_ROOT/.ruby-version"
+      print_success "Created .ruby-version with Ruby 3.4.3"
+      ;;
+  esac
+
+  case "$VERSION_MANAGER" in
+    nvm|rvm+nvm)
+      print_header "Creating .nvmrc for nvm"
+      echo "22.12.0" > "$PROJECT_ROOT/.nvmrc"
+      print_success "Created .nvmrc with Node 22.12.0"
+      ;;
+  esac
+
+  set_ruby_version "3.4.3" "$VERSION_MANAGER"
+  set_node_version "22.12.0" "$VERSION_MANAGER"
 
   # Restore files from git
   print_header "Restoring dependency files from git"
@@ -238,22 +422,60 @@ EOF
 
   # Reload version manager to pick up new versions
   print_header "Reloading $VERSION_MANAGER to use new versions"
-  if [[ "$VERSION_MANAGER" == "mise" ]]; then
-    # mise will auto-detect .tool-versions on next cd
-    :
-  elif [ -f "$HOME/.asdf/asdf.sh" ]; then
-    source "$HOME/.asdf/asdf.sh"
-  fi
+  case "$VERSION_MANAGER" in
+    mise)
+      # mise will auto-detect .tool-versions on next cd
+      ;;
+    asdf)
+      # Note: This only affects the script's subshell, not the user's current shell
+      if [ -f "$HOME/.asdf/asdf.sh" ]; then
+        source "$HOME/.asdf/asdf.sh"
+      fi
+      ;;
+    rvm|rvm+nvm)
+      # Versions already set via rvm use
+      ;;
+    nvm)
+      # Version already set via nvm use
+      ;;
+  esac
 
   echo ""
   print_success "Restored to LATEST configuration"
-  print_warning "Run these commands to reload your shell and verify:"
+
+  case "$VERSION_MANAGER" in
+    rvm+nvm|rvm|nvm)
+      print_warning "IMPORTANT: Version changes in this script don't persist to your current shell."
+      print_warning "The rvm/nvm commands run in a subshell and cannot affect your terminal."
+      echo ""
+      print_warning "Choose one of these options to activate the new versions:"
+      echo "  Option 1 (Recommended): Open a new terminal and cd into the project"
+      echo "  Option 2: Source your shell config:"
+      [ "$VERSION_MANAGER" = "rvm" ] || [ "$VERSION_MANAGER" = "rvm+nvm" ] && echo "    source ~/.rvm/scripts/rvm"
+      [ "$VERSION_MANAGER" = "nvm" ] || [ "$VERSION_MANAGER" = "rvm+nvm" ] && echo "    source \$NVM_DIR/nvm.sh"
+      echo ""
+      ;;
+  esac
+
+  print_warning "After activating versions, verify with:"
   echo "  cd $PROJECT_ROOT"
-  if [[ "$VERSION_MANAGER" == "mise" ]]; then
-    echo "  mise current"
-  else
-    echo "  asdf current"
-  fi
+  case "$VERSION_MANAGER" in
+    mise)
+      echo "  mise current"
+      ;;
+    asdf)
+      echo "  asdf current"
+      ;;
+    rvm+nvm)
+      echo "  rvm current && nvm current"
+      ;;
+    rvm)
+      echo "  rvm current"
+      ;;
+    nvm)
+      echo "  nvm current"
+      ;;
+  esac
   echo ""
   print_warning "Next steps to build and test:"
   echo "  rake node_package"

data/bin/lefthook/check-trailing-newlines

@@ -16,23 +16,13 @@ else
   echo "🔍 Checking trailing newlines on $CONTEXT files..."
 fi
 
-failed_files=""
 for file in $files; do
   if [ -f "$file" ] && [ -s "$file" ]; then
     if ! tail -c 1 "$file" | grep -q '^$'; then
-      echo "❌ Missing trailing newline: $file"
-      failed_files="$failed_files $file"
+      echo "🔧 Adding trailing newline to: $file"
+      echo >> "$file"
     fi
   fi
 done
 
-if [ -n "$failed_files" ]; then
-  echo ""
-  echo "❌ Trailing newline check failed!"
-  echo "💡 Add trailing newlines to:$failed_files"
-  echo "🔧 Quick fix: for file in$failed_files; do echo >> \"\$file\"; done"
-  echo "🚫 Skip hook: git commit --no-verify"
-  exit 1
-fi
-
 echo "✅ All files have proper trailing newlines"

data/bin/lefthook/eslint-lint

@@ -34,11 +34,6 @@ if [ -n "$root_and_packages_pro_files" ]; then
   if ! yarn run eslint $root_and_packages_pro_files --fix; then
     exit_code=1
   fi
-
-  # Re-stage files if running on staged or all-changed context
-  if [ "$CONTEXT" = "staged" ] || [ "$CONTEXT" = "all-changed" ]; then
-    echo $root_and_packages_pro_files | xargs -r git add
-  fi
 fi
 
 # Lint react_on_rails_pro files (using Pro gem's ESLint config)
@@ -56,11 +51,6 @@ if [ -n "$react_on_rails_pro_files" ]; then
   if ! (cd react_on_rails_pro && yarn run eslint $react_on_rails_pro_files_relative --fix); then
     exit_code=1
   fi
-
-  # Re-stage files if running on staged or all-changed context
-  if [ "$CONTEXT" = "staged" ] || [ "$CONTEXT" = "all-changed" ]; then
-    echo $react_on_rails_pro_files | xargs -r git add
-  fi
 fi
 
 if [ $exit_code -eq 0 ]; then

data/bin/lefthook/prettier-format

@@ -24,11 +24,6 @@ if [ -n "$root_files" ]; then
   printf "  %s\n" $root_files
 
   yarn run prettier --write $root_files
-
-  # Re-stage files if running on staged or all-changed context
-  if [ "$CONTEXT" = "staged" ] || [ "$CONTEXT" = "all-changed" ]; then
-    echo $root_files | xargs -r git add
-  fi
 fi
 
 # Format Pro files (using Pro's Prettier config)
@@ -44,11 +39,6 @@ if [ -n "$pro_files" ]; then
   pro_files_relative=$(echo "$pro_files" | sed 's|^react_on_rails_pro/||')
 
   (cd react_on_rails_pro && yarn run prettier --write $pro_files_relative)
-
-  # Re-stage files if running on staged or all-changed context
-  if [ "$CONTEXT" = "staged" ] || [ "$CONTEXT" = "all-changed" ]; then
-    echo $pro_files | xargs -r git add
-  fi
 fi
 
 echo "✅ Prettier formatting complete"

data/bin/lefthook/ruby-autofix

@@ -19,8 +19,4 @@ printf "  %s\n" $files
 
 bundle exec rake autofix
 
-# Re-stage files if running on staged or all-changed context
-if [ "$CONTEXT" = "staged" ] || [ "$CONTEXT" = "all-changed" ]; then
-  echo $files | xargs -r git add
-  echo "✅ Re-staged formatted files"
-fi
+echo "✅ Auto-fix complete (fixed files staged automatically)"

data/lib/react_on_rails/configuration.rb

@@ -41,8 +41,6 @@ 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.
@@ -64,10 +62,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,
+                  :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,
@@ -81,7 +124,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,
+                   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
@@ -122,7 +165,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,9 +196,9 @@ module ReactOnRails
       raise ReactOnRails::Error, "component_registry_timeout must be a positive integer"
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def validate_generated_component_packs_loading_strategy
-      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       if defer_generated_component_packs
         if %i[async sync].include?(generated_component_packs_loading_strategy)
@@ -176,11 +218,13 @@ module ReactOnRails
         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 generated_component_packs_loading_strategy.nil?
-        # Use defer as the default to ensure generated component packs load and register
-        # components before main bundle executes, avoiding race conditions with async loading
-        self.generated_component_packs_loading_strategy = :defer
-      elsif generated_component_packs_loading_strategy == :async && !PackerUtils.supports_async_loading?
+      if PackerUtils.supports_async_loading?
+        # 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
+      elsif generated_component_packs_loading_strategy == :async
         raise ReactOnRails::Error, "**ERROR** #{msg}"
       end
 

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 }

data/lib/react_on_rails/doctor.rb

@@ -732,10 +732,12 @@ module ReactOnRails
       auto_load_match = content.match(/config\.auto_load_bundle\s*=\s*([^\s\n,]+)/)
       checker.add_info("  auto_load_bundle: #{auto_load_match[1]}") if auto_load_match
 
-      # Immediate hydration (Pro feature)
+      # Deprecated immediate_hydration setting
       immediate_hydration_match = content.match(/config\.immediate_hydration\s*=\s*([^\s\n,]+)/)
       if immediate_hydration_match
-        checker.add_info("  immediate_hydration: #{immediate_hydration_match[1]} (React on Rails Pro)")
+        checker.add_warning("  ⚠️  immediate_hydration: #{immediate_hydration_match[1]} (DEPRECATED)")
+        checker.add_info("    💡 This setting is no longer used. Immediate hydration is now automatic for Pro users.")
+        checker.add_info("    💡 Remove this line from your config/initializers/react_on_rails.rb file.")
       end
 
       # Component registry timeout

data/lib/react_on_rails/helper.rb

@@ -155,10 +155,10 @@ module ReactOnRails
     # 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: false -- 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: 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)
-      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,

data/lib/react_on_rails/pro_helper.rb

@@ -2,10 +2,6 @@
 
 module ReactOnRails
   module ProHelper
-    IMMEDIATE_HYDRATION_PRO_WARNING = "[REACT ON RAILS] The 'immediate_hydration' feature requires a " \
-                                      "React on Rails Pro license. " \
-                                      "Please visit https://shakacode.com/react-on-rails-pro to learn more."
-
     # Generates the complete component specification script tag.
     # Handles both immediate hydration (Pro feature) and standard cases.
     def generate_component_script(render_options)
@@ -36,17 +32,12 @@ module ReactOnRails
                    component_specification_tag
                  end
 
-      pro_warning_badge = pro_warning_badge_if_needed(render_options.explicitly_disabled_pro_options)
-      "#{pro_warning_badge}\n#{spec_tag}".html_safe
+      spec_tag.html_safe
     end
 
     # Generates the complete store hydration script tag.
     # Handles both immediate hydration (Pro feature) and standard cases.
     def generate_store_script(redux_store_data)
-      pro_options_check_result = ReactOnRails::ProUtils.disable_pro_render_options_if_not_licensed(redux_store_data)
-      redux_store_data = pro_options_check_result[:raw_options]
-      explicitly_disabled_pro_options = pro_options_check_result[:explicitly_disabled_pro_options]
-
       store_hydration_data = content_tag(:script,
                                          json_safe_and_pretty(redux_store_data[:props]).html_safe,
                                          type: "application/json",
@@ -67,40 +58,7 @@ module ReactOnRails
                                   store_hydration_data
                                 end
 
-      pro_warning_badge = pro_warning_badge_if_needed(explicitly_disabled_pro_options)
-      "#{pro_warning_badge}\n#{store_hydration_scripts}".html_safe
-    end
-
-    def pro_warning_badge_if_needed(explicitly_disabled_pro_options)
-      return "" unless explicitly_disabled_pro_options.any?
-
-      disabled_features_message = disabled_pro_features_message(explicitly_disabled_pro_options)
-      warning_message = "[REACT ON RAILS] #{disabled_features_message}\n" \
-                        "Please visit https://shakacode.com/react-on-rails-pro to learn more."
-      puts warning_message
-      Rails.logger.warn warning_message
-
-      tooltip_text = "#{disabled_features_message} Click to learn more."
-
-      <<~HTML.strip
-        <a href="https://shakacode.com/react-on-rails-pro" target="_blank" rel="noopener noreferrer" title="#{tooltip_text}">
-          <div style="position: fixed; top: 0; right: 0; width: 180px; height: 180px; overflow: hidden; z-index: 9999; pointer-events: none;">
-            <div style="position: absolute; top: 50px; right: -40px; transform: rotate(45deg); background-color: rgba(220, 53, 69, 0.85); color: white; padding: 7px 40px; text-align: center; font-weight: bold; font-family: sans-serif; font-size: 12px; box-shadow: 0 2px 8px rgba(0,0,0,0.3); pointer-events: auto;">
-              React On Rails Pro Required
-            </div>
-          </div>
-        </a>
-      HTML
-    end
-
-    def disabled_pro_features_message(explicitly_disabled_pro_options)
-      return "".html_safe unless explicitly_disabled_pro_options.any?
-
-      feature_list = explicitly_disabled_pro_options.join(", ")
-      feature_word = explicitly_disabled_pro_options.size == 1 ? "feature" : "features"
-      "The '#{feature_list}' #{feature_word} " \
-        "#{explicitly_disabled_pro_options.size == 1 ? 'requires' : 'require'} a " \
-        "React on Rails Pro license. "
+      store_hydration_scripts.html_safe
     end
   end
 end