react-manifest-rails 0.2.29 → 0.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8688e621b55d1a5b9db497668b4942fc97c8f4aad5f7778c7a7fc4a412990d04
-  data.tar.gz: c46872893e465f9684c68688a8f8ca02d361afd7bfa8421eb1b69b0180f8c3d9
+  metadata.gz: fc0a4a583ea6c0b488c1fc9e4c0af46dec90e4ecdd6b93cd7eae48267ffdbfaa
+  data.tar.gz: 1a00e3b56139db55d5c473e22bc35cd43e2fc1dcb3ee50700602344c09d0c4db
 SHA512:
-  metadata.gz: 76a4b4aed865531470d641be4bb0d6608d30410d66463aad17e71b37a73acafe2fb4a825c5f3f89c0bc5e6a91d7016396699572d575950dca71a242378cbc6f3
-  data.tar.gz: 2bbd77ad7db859306d6cfdb6a75a476bfca219b1e22cf0b3aa54bd12f3c42d8a441c35a1e07dbb4e5a0c3c198b968683a15f814fd64bf59a55a91b1ca3d2b9d1
+  metadata.gz: b6db17954b9a91e080c0074ce203d322af67ba58d887be9ae4a1ada51add9fe3d36f7fc256b1587c274c2315c9324caa7576421c19740a6aeab40fa85f3f5606
+  data.tar.gz: 49dc6ae440709098ace838c583f492a516fa5abd0b1b332525cd3803ed3787ed656cd23871b53ad8cb91908a4c0d62e0f9d96b8394180fe950da8ee405068d6c

data/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.31] - 2026-07-01
+
+### Fixed
+- Controller manifests no longer pull in an unrelated bundle's files just because a component name collides (e.g. a generic `Show` component defined in two different `ux/app/*` dirs). A bundle now always satisfies a symbol from its own files first, instead of attributing it to whichever bundle happened to define that name first.
+- `react_component` no longer silently stops auto-injecting a component's bundle for the rest of the request after `react_bundle_tag` has rendered once. Previously, calling `react_component` for a component in an unrelated bundle (not the current controller's own bundle, e.g. from a haml/erb view mixing controller-based and component-based rendering) would render with no script tag at all if `react_bundle_tag` had already run earlier in the same request.
+
+### Removed
+- The gem version is no longer embedded in the `AUTO-GENERATED` manifest header. Previously every manifest's content digest changed on every gem upgrade, forcing a full regeneration of all `ux_*.js` files for no functional reason.
+
 ## [0.2.28] - 2026-05-11
 
 ### Fixed

data/lib/react_manifest/generator.rb

@@ -30,7 +30,6 @@ module ReactManifest
 
     HEADER = <<~JS.freeze
       // AUTO-GENERATED — DO NOT EDIT
-      // react-manifest-rails %<version>s
       // Run `rails react_manifest:generate` to regenerate.
     JS
 
@@ -130,6 +129,7 @@ module ReactManifest
     def build_controller_context(controller_dirs)
       bundle_files = {}
       symbol_to_bundle = {}
+      bundle_own_symbols = Hash.new { |h, k| h[k] = Set.new }
       external_symbol_to_require = {}
       dependencies = Hash.new { |h, k| h[k] = Set.new }
       external_requires = Hash.new { |h, k| h[k] = Set.new }
@@ -145,6 +145,7 @@ module ReactManifest
             next unless sym.match?(/\A[A-Z][A-Za-z0-9_]*\z/)
 
             symbol_to_bundle[sym] ||= bundle_name
+            bundle_own_symbols[bundle_name] << sym
           end
         end
       end
@@ -170,8 +171,16 @@ module ReactManifest
 
       # Compute per-bundle cross-app and external dependencies
       bundle_files.each do |bundle_name, files|
+        own_symbols = bundle_own_symbols[bundle_name]
+
         files.each do |file_path|
           extract_used_component_symbols(file_path).each do |sym|
+            # A symbol the bundle defines itself (in any of its own files) is
+            # always satisfied locally — never attribute it to another bundle
+            # or an external provider just because that symbol name happens
+            # to collide with something defined elsewhere.
+            next if own_symbols.include?(sym)
+
             dep_bundle = symbol_to_bundle[sym]
             dependencies[bundle_name] << dep_bundle if dep_bundle && dep_bundle != bundle_name
 
@@ -316,10 +325,7 @@ module ReactManifest
     # ----------------------------------------------------------- helpers
 
     def header_lines
-      [
-        format(HEADER, version: ReactManifest::VERSION),
-        ""
-      ].flatten
+      [HEADER, ""]
     end
 
     def js_files_in(dir)

data/lib/react_manifest/logging.rb

@@ -8,7 +8,7 @@ module ReactManifest
 
     def log_info(message)
       full = "[ReactManifest] #{message}"
-      Rails.logger.info(full)
+      Rails.logger.debug(full)
       $stdout.puts(full) if stdout_logging_needed?
     end
 

data/lib/react_manifest/railtie.rb

@@ -9,6 +9,7 @@ module ReactManifest
     # ----------------------------------------------------------------
     initializer "react_manifest.ensure_manifests", after: :load_config_initializers do
       next unless Rails.env.development?
+      next if defined?(Rails::Console)
 
       config = ReactManifest.configuration
 
@@ -60,6 +61,8 @@ module ReactManifest
     # Start the file watcher in development
     # ----------------------------------------------------------------
     initializer "react_manifest.start_watcher" do
+      next if defined?(Rails::Console)
+
       if Rails.env.development? && !ReactManifest::Watcher.running?
         begin
           ReactManifest::Watcher.start(ReactManifest.configuration)

data/lib/react_manifest/version.rb

@@ -1,3 +1,3 @@
 module ReactManifest
-  VERSION = "0.2.29".freeze
+  VERSION = "0.2.31".freeze
 end

data/lib/react_manifest/view_helpers.rb

@@ -26,7 +26,6 @@ module ReactManifest
       return "".html_safe if fresh_bundles.empty?
 
       fresh_bundles.each { |b| emitted << b }
-      mark_bundle_tag_rendered
 
       asset_names = fresh_bundles.map { |bundle| "#{bundle}.js" }
       javascript_include_tag(*asset_names, extname: false, **html_options)
@@ -38,7 +37,6 @@ module ReactManifest
     # This avoids strict dependence on controller_path -> bundle naming alignment.
     def react_component(*args, **kwargs, &block)
       html = super
-      return html if bundle_tag_rendered?
 
       component_name = args.first
       bundles = ReactManifest.resolve_bundles_for_component_direct(component_name)
@@ -78,17 +76,5 @@ module ReactManifest
         @emitted_bundles ||= []
       end
     end
-
-    def mark_bundle_tag_rendered
-      return unless respond_to?(:request, true) && request
-
-      request.env["react_manifest.bundle_tag_rendered"] = true
-    end
-
-    def bundle_tag_rendered?
-      return false unless respond_to?(:request, true) && request
-
-      request.env["react_manifest.bundle_tag_rendered"] == true
-    end
   end
 end

data/lib/react_manifest/watcher.rb

@@ -14,6 +14,7 @@ module ReactManifest
   # additional regeneration is queued (not one per file event).
   module Watcher
     DEBOUNCE_SECONDS = 0.3
+    BRANCH_SWITCH_COOLDOWN = 3
 
     class << self
       include ReactManifest::Logging
@@ -35,6 +36,9 @@ module ReactManifest
         end
 
         @regen_mutex = Mutex.new
+        @git_dir = detect_git_dir
+        @last_git_head = read_git_head
+        @branch_switch_until = nil
 
         log_info "Watching #{root.sub("#{Rails.root}/", '')} for changes..."
 
@@ -73,15 +77,61 @@ module ReactManifest
         @regen_thread  = nil
         @regen_pending = false
         @regen_mutex   = nil
+        @git_dir       = nil
+        @last_git_head = nil
+        @branch_switch_until = nil
       end
 
       private
 
       def handle_file_changes(modified, added, removed, config)
+        if branch_switch_detected?
+          log_info "Branch change detected — skipping regeneration"
+          return
+        end
+
         (modified + added + removed).each { |f| Scanner.invalidate(f) }
         schedule_regeneration(config)
       end
 
+      def branch_switch_detected?
+        return false unless @git_dir
+
+        return true if @branch_switch_until && Time.now < @branch_switch_until
+
+        current_head = read_git_head
+        return false unless current_head && @last_git_head
+
+        if current_head != @last_git_head
+          @last_git_head = current_head
+          @branch_switch_until = Time.now + BRANCH_SWITCH_COOLDOWN
+          return true
+        end
+
+        false
+      end
+
+      def detect_git_dir
+        git_path = File.join(Rails.root.to_s, ".git")
+        if File.file?(git_path)
+          content = File.read(git_path).strip
+          return content.sub("gitdir: ", "").strip if content.start_with?("gitdir: ")
+        elsif File.directory?(git_path)
+          return git_path
+        end
+        nil
+      rescue StandardError
+        nil
+      end
+
+      def read_git_head
+        return nil unless @git_dir
+
+        File.read(File.join(@git_dir, "HEAD")).strip
+      rescue StandardError
+        nil
+      end
+
       # Schedule a regeneration on the background thread. Coalesces rapid
       # back-to-back file events: if the regen thread is already running,
       # we just set @regen_pending and return immediately so the listen

data/lib/react_manifest.rb

@@ -146,6 +146,7 @@ module ReactManifest
 
       controller_dirs = TreeClassifier.new(config).classify.controller_dirs
       symbol_to_bundle = {}
+      bundle_own_symbols = Hash.new { |h, k| h[k] = Set.new }
       bundle_files = Hash.new { |h, k| h[k] = [] }
       bundle_dependencies = Hash.new { |h, k| h[k] = Set.new }
 
@@ -160,13 +161,21 @@ module ReactManifest
 
             # Keep first writer to ensure deterministic behavior if a symbol is duplicated.
             symbol_to_bundle[symbol] ||= bundle_name
+            bundle_own_symbols[bundle_name] << symbol
           end
         end
       end
 
       bundle_files.each do |bundle_name, files|
+        own_symbols = bundle_own_symbols[bundle_name]
+
         files.each do |file_path|
           extract_used_component_symbols(file_path).each do |symbol|
+            # A symbol the bundle defines itself is always satisfied locally —
+            # never attribute it to another bundle just because that symbol
+            # name happens to collide with something defined elsewhere.
+            next if own_symbols.include?(symbol)
+
             dep_bundle = symbol_to_bundle[symbol]
             next unless dep_bundle && dep_bundle != bundle_name
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react-manifest-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.29
+  version: 0.2.31
 platform: ruby
 authors:
 - Oliver Noonan
@@ -160,7 +160,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/olivernoonan/react-manifest-rails
   source_code_uri: https://github.com/olivernoonan/react-manifest-rails
-  changelog_uri: https://github.com/olivernoonan/react-manifest-rails/blob/main/CHANGELOG.md
+  changelog_uri: https://github.com/olivernoonan/react-manifest-rails/blob/master/CHANGELOG.md
   bug_tracker_uri: https://github.com/olivernoonan/react-manifest-rails/issues
   rubygems_mfa_required: 'true'
 rdoc_options: []