react-manifest-rails 0.2.9 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a26dc7e8929f42fed07d13c8d38d3390d99d8063c81e5887ac171e52c1d9303
-  data.tar.gz: defd50858d68d0e22fdd396d6be214af15edb6eb6c5c030c1047c17f1f2ab0e6
+  metadata.gz: 78103a797d9951bb67d7e9cd4fcbb0fbf5a6589cd5995f52f745de079b3d6824
+  data.tar.gz: 229244d4844f0accdc1c23538f0a5ec8965a35e5246a62abc91dfae3ce16676d
 SHA512:
-  metadata.gz: d94c1392eaaa325b56225b618f318d0af156c4696dc806a2ba238796c10c75f128c4a7369475a455d1e6f851edd8ca66a5a10e86ed246a0d15917ba00a198bab
-  data.tar.gz: 86ddf03428eb1889ea9bcabd463fa761bc5738a724e201197323228ef067cd1d400f85da40d273a69cc06bf7c8016a9bba732ddd36e6c56147d980d14bda74ce
+  metadata.gz: 43ba51a2daca72844e5d6606fa4e6c15dda1cef4b42582ab2db4d2a49037675157814a20030e41f60d9bc6c395dd2681f548f0244884b733104f37b66996c8a2
+  data.tar.gz: 01a71eda1dc257b0e0c151e34ac227323a2349c02c8d7709edd619975ba9051c9f759f89b440e317e6575d1e37edfba0c9da20ed2f306d57b587ddd239162ca1

data/CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.10] - 2026-04-16
+
+### Fixed
+- `ApplicationMigrator` now removes only `ux`-classified directives and preserves non-UX requires in `application*.js`, preventing accidental removal of root-level assets such as `mini-search`.
+- Re-running migration/setup no longer duplicates the managed header comment block in `application*.js`.
+
+### Added
+- Regression coverage for preserving unknown non-UX requires during migration.
+- Regression coverage for idempotent managed-header behavior on repeated migration runs.
+- Dummy app root-level fixture assets (`axios.min.js`, `mini-search.js`) and corresponding requires in `application.js` / `application_dev.js` to verify setup behavior before release.
+
 ## [0.2.9] - 2026-04-15
 
 ### Added

data/README.md

@@ -88,6 +88,8 @@ Generation is **directory-based** — deterministic and conservative by design.
 
 Namespace fallback for nested controllers: `admin/reports/summary` tries `ux_admin_reports_summary`, then `ux_admin_reports`, then `ux_admin`, then `ux_summary`. The most specific match wins.
 
+When using `react-rails`, `react_component("ComponentName")` is also component-aware: the helper infers the matching controller bundle from the component symbol and includes it at render time. This provides a fallback when controller naming and bundle naming do not align perfectly.
+
 The gem's scanner uses regex to detect which shared symbols are referenced in each controller directory (for the `react_manifest:analyze` report). Generation itself stays directory-based to avoid brittle runtime misses from dynamic component references.
 
 ## What Gets Generated
@@ -204,6 +206,16 @@ Check in order:
 - Restart the Rails server.
 - Without `listen`, run `react_manifest:generate` manually after making changes.
 
+### `ComponentName is not defined` from `react_component`
+
+If you see errors like `UserSignInForm is not defined` (often from `eval` inside `react-rails`), ensure your layout does **not** defer the bundle tag:
+
+```erb
+<%= react_bundle_tag %>
+```
+
+Using `defer: true` can cause `react_component` inline scripts to run before your `ux_*.js` bundles are executed.
+
 ## Compatibility
 
 - Ruby: 3.2+

data/lib/react_manifest/application_migrator.rb

@@ -1,6 +1,6 @@
 module ReactManifest
   # Rewrites application*.js files to remove UX/app code requires,
-  # keeping only vendor lib requires.
+  # while preserving all non-UX directives.
   #
   # Safety:
   #   - Creates a .bak backup before any write; aborts if backup fails
@@ -9,6 +9,12 @@ module ReactManifest
   #   - Adds a managed-by comment at the top
   class ApplicationMigrator
     MANAGED_COMMENT = <<~JS.freeze
+      // Non-UX libraries — loaded on every page.
+      // React app code is now served per-controller via react_bundle_tag.
+      // Managed by react-manifest-rails — do not add require_tree.
+    JS
+
+    LEGACY_MANAGED_COMMENT = <<~JS.freeze
       // Vendor libraries — loaded on every page.
       // React app code is now served per-controller via react_bundle_tag.
       // Managed by react-manifest-rails — do not add require_tree.
@@ -70,12 +76,13 @@ module ReactManifest
 
     def build_new_content(result)
       kept_lines = result.directives
-                         .select do |d|
-        %i[vendor
-           passthrough].include?(d.classification)
+                         .reject do |d|
+        d.classification == :ux_code
       end
                                           .map(&:original_line)
 
+      strip_managed_header!(kept_lines)
+
       # Remove leading blank lines from kept_lines
       kept_lines.shift while kept_lines.first&.strip&.empty?
 
@@ -87,6 +94,25 @@ module ReactManifest
       lines.join("\n")
     end
 
+    def strip_managed_header!(lines)
+      managed_variants = [MANAGED_COMMENT, LEGACY_MANAGED_COMMENT].map { |comment| comment.lines.map(&:chomp) }
+
+      loop do
+        matched = managed_variants.any? { |managed_lines| starts_with_lines?(lines, managed_lines) }
+        break unless matched
+
+        header_len = managed_variants.find { |managed_lines| starts_with_lines?(lines, managed_lines) }.length
+        lines.shift(header_len)
+        lines.shift while lines.first&.strip&.empty?
+      end
+    end
+
+    def starts_with_lines?(lines, prefix)
+      return false if lines.length < prefix.length
+
+      lines.first(prefix.length) == prefix
+    end
+
     def print_diff(file, new_content)
       old_lines = File.readlines(file, encoding: "utf-8").map(&:chomp)
       new_lines = new_content.lines.map(&:chomp)

data/lib/react_manifest/generator.rb

@@ -1,5 +1,4 @@
 require "digest"
-require "time"
 require "tmpdir"
 
 module ReactManifest
@@ -26,7 +25,7 @@ module ReactManifest
   class Generator
     HEADER = <<~JS.freeze
       // AUTO-GENERATED — DO NOT EDIT
-      // react-manifest-rails %<version>s | %<timestamp>s
+      // react-manifest-rails %<version>s
       // Run `rails react_manifest:generate` to regenerate.
     JS
 
@@ -82,8 +81,6 @@ module ReactManifest
 
     def build_controller(ctrl)
       lines = header_lines
-      lines << "//= require #{@config.shared_bundle}"
-      lines << ""
 
       files = js_files_in(ctrl[:path])
       if files.empty?
@@ -167,7 +164,7 @@ module ReactManifest
 
     def header_lines
       [
-        format(HEADER, version: ReactManifest::VERSION, timestamp: Time.now.utc.iso8601),
+        format(HEADER, version: ReactManifest::VERSION),
         ""
       ].flatten
     end
@@ -206,7 +203,7 @@ module ReactManifest
       # Build relative to output_dir (configurable) rather than a hardcoded path.
       base = @config.abs_output_dir + File::SEPARATOR
       rel  = abs_path.sub(base, "")
-      # Strip Sprockets-understood extensions: .js.jsx → "", .jsx → "", .js → ""
+      # Strip Sprockets-understood extensions: .js.jsx/.jsx/.js -> logical path.
       rel.sub(/\.js\.jsx$/, "").sub(/\.jsx$/, "").sub(/\.js$/, "")
     end
 

data/lib/react_manifest/layout_patcher.rb

@@ -10,8 +10,8 @@ module ReactManifest
   #   ReactManifest::LayoutPatcher.new(config).patch!
   class LayoutPatcher
     LAYOUTS_GLOB   = "app/views/layouts/*.html.{erb,haml,slim}".freeze
-    BUNDLE_TAG_ERB = "<%= react_bundle_tag defer: true %>\n".freeze
-    BUNDLE_TAG_HAML = "= react_bundle_tag defer: true\n".freeze
+    BUNDLE_TAG_ERB = "<%= react_bundle_tag %>\n".freeze
+    BUNDLE_TAG_HAML = "= react_bundle_tag\n".freeze
 
     Result = Struct.new(:file, :status, :detail, keyword_init: true)
 

data/lib/react_manifest/railtie.rb

@@ -43,6 +43,22 @@ module ReactManifest
       manifest_dir = ReactManifest.configuration.abs_manifest_dir
       app.config.assets.paths.delete(manifest_dir)
       app.config.assets.paths.unshift(manifest_dir)
+
+      app.config.assets.configure do |env|
+        next unless defined?(React::JSX::Processor)
+
+        begin
+          env.register_mime_type("application/jsx", extensions: [".jsx", ".js.jsx", ".es.jsx", ".es6.jsx"])
+        rescue StandardError
+          nil
+        end
+
+        begin
+          env.register_transformer("application/jsx", "application/javascript", React::JSX::Processor)
+        rescue StandardError
+          nil
+        end
+      end
     end
 
     # ----------------------------------------------------------------

data/lib/react_manifest/scanner.rb

@@ -177,7 +177,7 @@ module ReactManifest
       # Build relative to output_dir (configurable) rather than a hardcoded path.
       base = @config.abs_output_dir + File::SEPARATOR
       rel  = abs_path.sub(base, "")
-      # Strip Sprockets-understood extensions: .js.jsx → "", .jsx → "", .js → ""
+      # Strip Sprockets-understood extensions: .js.jsx/.jsx/.js -> logical path.
       rel.sub(/\.js\.jsx$/, "").sub(/\.jsx$/, "").sub(/\.js$/, "")
     end
 

data/lib/react_manifest/version.rb

@@ -1,3 +1,3 @@
 module ReactManifest
-  VERSION = "0.2.9".freeze
+  VERSION = "0.2.13".freeze
 end

data/lib/react_manifest/view_helpers.rb

@@ -2,7 +2,7 @@ module ReactManifest
   # Provides the `react_bundle_tag` view helper, included in ActionView::Base.
   #
   # Usage in layouts:
-  #   <%= react_bundle_tag defer: true %>
+  #   <%= react_bundle_tag %>
   #
   # Resolves which ux_*.js bundles to include based on controller_path:
   #   1. Always includes config.shared_bundle (e.g. "ux_shared")
@@ -21,7 +21,33 @@ module ReactManifest
       bundles = ReactManifest.resolve_bundles(ctrl)
       return "".html_safe if bundles.empty?
 
-      javascript_include_tag(*bundles, **html_options)
+      asset_names = bundles.map { |bundle| "#{bundle}.js" }
+      javascript_include_tag(*asset_names, extname: false, **html_options)
+    end
+
+    # react-rails integration:
+    # If a component-specific controller bundle can be inferred from the component
+    # symbol, include that bundle at the call site before delegating to react-rails.
+    # This avoids strict dependence on controller_path -> bundle naming alignment.
+    def react_component(*args, **kwargs, &block)
+      html = super
+
+      component_name = args.first
+      bundles = ReactManifest.resolve_bundles_for_component(component_name)
+      return html if bundles.empty?
+
+      emitted = (@_react_manifest_emitted_bundles ||= [])
+
+      new_tags = bundles.filter_map do |bundle|
+        next if emitted.include?(bundle)
+
+        emitted << bundle
+        javascript_include_tag("#{bundle}.js", extname: false)
+      end
+
+      return html if new_tags.empty?
+
+      safe_join(new_tags + [html])
     end
   end
 end

data/lib/react_manifest.rb

@@ -1,4 +1,5 @@
 require "fileutils"
+require "set"
 
 require "react_manifest/version"
 require "react_manifest/configuration"
@@ -58,8 +59,122 @@ module ReactManifest
       bundles
     end
 
+    # Resolve a controller bundle from a React component symbol.
+    #
+    # This is primarily used to support react-rails `react_component` calls,
+    # where the requested component name is known and may not align 1:1 with
+    # controller_path-derived bundle names.
+    def resolve_bundle_for_component(component_name)
+      resolve_bundles_for_component(component_name).last
+    end
+
+    # Resolve all controller bundles needed for a React component symbol.
+    # Includes transitive controller-bundle dependencies inferred from
+    # component symbol usage across ux/app/* directories.
+    def resolve_bundles_for_component(component_name)
+      name = component_name.to_s
+      return [] if name.empty?
+
+      config = configuration
+      maps = component_maps(config)
+      root_bundle = maps[:symbol_to_bundle][name]
+      return [] unless root_bundle
+
+      ordered = []
+      visiting = Set.new
+      visited = Set.new
+
+      walk = lambda do |bundle_name|
+        return if visited.include?(bundle_name) || visiting.include?(bundle_name)
+
+        visiting << bundle_name
+        maps[:bundle_dependencies].fetch(bundle_name, Set.new).each { |dep| walk.call(dep) }
+        visiting.delete(bundle_name)
+
+        visited << bundle_name
+        ordered << bundle_name
+      end
+
+      walk.call(root_bundle)
+
+      ordered.filter_map { |bundle_name| resolve_bundle_reference(config, bundle_name) }
+    end
+
     private
 
+    def component_bundle_map(config)
+      component_maps(config)[:symbol_to_bundle]
+    end
+
+    def component_maps(config)
+      controller_dirs = TreeClassifier.new(config).classify.controller_dirs
+      symbol_to_bundle = {}
+      bundle_files = Hash.new { |h, k| h[k] = [] }
+      bundle_dependencies = Hash.new { |h, k| h[k] = Set.new }
+
+      controller_dirs.each do |ctrl|
+        bundle_name = ctrl[:bundle_name]
+        files = js_files_in_controller(ctrl[:path], config)
+        bundle_files[bundle_name].concat(files)
+
+        files.each do |file_path|
+          extract_defined_symbols(file_path).each do |symbol|
+            next unless symbol.match?(/\A[A-Z][A-Za-z0-9_]*\z/)
+
+            # Keep first writer to ensure deterministic behavior if a symbol is duplicated.
+            symbol_to_bundle[symbol] ||= bundle_name
+          end
+        end
+      end
+
+      bundle_files.each do |bundle_name, files|
+        files.each do |file_path|
+          extract_used_component_symbols(file_path).each do |symbol|
+            dep_bundle = symbol_to_bundle[symbol]
+            next unless dep_bundle && dep_bundle != bundle_name
+
+            bundle_dependencies[bundle_name] << dep_bundle
+          end
+        end
+      end
+
+      {
+        symbol_to_bundle: symbol_to_bundle,
+        bundle_dependencies: bundle_dependencies
+      }
+    end
+
+    def js_files_in_controller(dir, config)
+      return [] unless Dir.exist?(dir)
+
+      Dir.glob(File.join(dir, "**", config.extensions_glob))
+         .reject { |f| File.directory?(f) }
+         .sort
+    end
+
+    def extract_defined_symbols(file_path)
+      content = File.read(file_path, encoding: "utf-8")
+      symbols = []
+      ReactManifest::Scanner::DEFINITION_PATTERNS.each do |pattern|
+        content.scan(pattern) { |m| symbols << m[0] }
+      end
+      symbols.uniq
+    rescue Errno::ENOENT, Errno::EACCES, Encoding::InvalidByteSequenceError
+      []
+    end
+
+    def extract_used_component_symbols(file_path)
+      content = File.read(file_path, encoding: "utf-8")
+      symbols = []
+
+      content.scan(ReactManifest::Scanner::JSX_ELEMENT_PATTERN) { |m| symbols << m[0] }
+      content.scan(ReactManifest::Scanner::REACT_CREATE_PATTERN) { |m| symbols << m[0] }
+
+      symbols.uniq
+    rescue Errno::ENOENT, Errno::EACCES, Encoding::InvalidByteSequenceError
+      []
+    end
+
     def resolve_bundle_reference(config, bundle_name)
       manifest_path = File.join(config.abs_manifest_dir, "#{bundle_name}.js")
       return bundle_name if File.exist?(manifest_path)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: react-manifest-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.13
 platform: ruby
 authors:
 - Oliver Noonan
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -161,7 +160,6 @@ metadata:
   changelog_uri: https://github.com/olivernoonan/react-manifest-rails/blob/main/CHANGELOG.md
   bug_tracker_uri: https://github.com/olivernoonan/react-manifest-rails/issues
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -176,8 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Zero-touch Sprockets manifest generation for react-rails apps
 test_files: []