react-manifest-rails 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9e734e50556ce1fafb042b8c906a2d8207080a79e5c82f6fa3088e6d3b0b1b9
-  data.tar.gz: 2e7f5e2ab8142287c150c31befcb47318c71f62f3620a3099930dcc323e33410
+  metadata.gz: 3d0636de70da440909d01ca2748f51e9b73533a2c787b59984d906bac001b34c
+  data.tar.gz: d5a1c1982d5e875b0794c0645b07391edfff54f210f3dc394c0650ab0929d76d
 SHA512:
-  metadata.gz: a7190fdd1cb329ec7c6a4012a681bdbfba92d2f2f787f876048c0052d120c600e4ca532fa504c82c54c1e3a24490cfc69c9e4c42482c1bbfa890dfff88739fad
-  data.tar.gz: 54b9869d89a3d658838895cb172429c996da94e3365271e6194f1c2be53ae5427f3d28399a93251f106ead4b15872dbe828cb65a66f75a33e384fab38a902fb7
+  metadata.gz: fd86d54537b980dfff2ad4a7ab620b483716a8df735fed7cb4a6f0cc92c65297552c2295f2eda81017bb5fe290e2fc9500c91e04e2ff1700637162749609f2e8
+  data.tar.gz: 3bad752f3e4404f33a01fabd28c35b4dea27216b8adb8f4e312a0d3748bdbba85e06250866adc166bb9d49a723c1846163b2b8f8a0d75c50aa589ff461eb34dd

data/CHANGELOG.md

@@ -5,6 +5,26 @@ 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.8] - 2026-04-15
+
+### Fixed
+- Prevented duplicate bundle conflicts by removing legacy root `ux_*.js` files when an equivalent generated manifest already exists in the manifest directory.
+- Ensured generated manifest directory has deterministic Sprockets precedence by prepending it in assets paths.
+
+### Changed
+- Added regression coverage for duplicate legacy-manifest cleanup behavior.
+
+## [0.2.7] - 2026-04-15
+
+### Added
+- Generated manifests now live in a dedicated folder (`app/assets/javascripts/ux_manifests` by default) to keep `app/assets/javascripts` tidy.
+- Automatic migration of legacy `ux_*.js` files from `output_dir` root into the manifest folder during generation.
+
+### Changed
+- Added `config.manifest_subdir` (default: `ux_manifests`) for explicit control over generated manifest placement.
+- `react_manifest:clean` now removes auto-generated manifests from both the dedicated manifest folder and legacy root location.
+- README and inline configuration docs updated to explain the clean manifest directory behavior.
+
 ## [0.2.6] - 2026-04-15
 
 ### Fixed

data/README.md

@@ -42,6 +42,7 @@ ReactManifest.configure do |config|
   config.ux_root = "app/assets/javascripts/ux"
   config.app_dir = "app"
   config.output_dir = "app/assets/javascripts"
+  config.manifest_subdir = "ux_manifests"
   config.shared_bundle = "ux_shared"
   config.always_include = []
   config.ignore = []
@@ -107,6 +108,8 @@ In development:
 
 - `ux_shared.js`: shared files outside `ux/app/`
 - `ux_<controller>.js`: one bundle per directory under `ux/app/`
+- Generated manifests are written to `app/assets/javascripts/ux_manifests/` by default.
+- Existing legacy `app/assets/javascripts/ux_*.js` files are moved automatically on generation.
 
 Example:
 - `ux/app/users/...` -> `ux_users.js`

data/lib/react_manifest/configuration.rb

@@ -17,6 +17,10 @@ module ReactManifest
     # Where generated ux_*.js manifests are written (relative to Rails.root)
     attr_accessor :output_dir
 
+    # Subdirectory under output_dir that holds generated ux_*.js manifests.
+    # Keeping generated files out of output_dir root avoids clutter.
+    attr_accessor :manifest_subdir
+
     # Bundle name for auto-generated shared bundle (all non-app/ dirs)
     attr_accessor :shared_bundle
 
@@ -54,6 +58,7 @@ module ReactManifest
       @ux_root           = "app/assets/javascripts/ux"
       @app_dir           = "app"
       @output_dir        = "app/assets/javascripts"
+      @manifest_subdir   = "ux_manifests"
       @shared_bundle     = "ux_shared"
       @always_include    = []
       @ignore            = []
@@ -99,5 +104,16 @@ module ReactManifest
     def abs_output_dir
       Rails.root.join(output_dir).to_s
     end
+
+    def abs_manifest_dir
+      subdir = normalized_manifest_subdir
+      return abs_output_dir if subdir.empty?
+
+      File.join(abs_output_dir, subdir)
+    end
+
+    def normalized_manifest_subdir
+      manifest_subdir.to_s.gsub(%r{\A/+|/+\z}, "")
+    end
   end
 end

data/lib/react_manifest/generator.rb

@@ -48,6 +48,8 @@ module ReactManifest
       manifests << build_shared(classification.shared_dirs)
       classification.controller_dirs.each { |ctrl| manifests << build_controller(ctrl) }
 
+      migrate_legacy_manifests!
+
       # Phase 2: write — each write is atomic (tmp + rename).
       results = manifests.map { |m| write_manifest(m[:filename], m[:content]) }
 
@@ -96,7 +98,7 @@ module ReactManifest
     # --------------------------------------------------------------- write
 
     def write_manifest(filename, content)
-      dest = File.join(@config.abs_output_dir, filename)
+      dest = File.join(@config.abs_manifest_dir, filename)
 
       # Safety: never touch files not bearing our AUTO-GENERATED header
       # (unless they don't exist yet)
@@ -131,6 +133,36 @@ module ReactManifest
       { path: dest, status: :written }
     end
 
+    def migrate_legacy_manifests!
+      legacy_dir   = @config.abs_output_dir
+      manifest_dir = @config.abs_manifest_dir
+      return if legacy_dir == manifest_dir
+
+      legacy_files = Dir.glob(File.join(legacy_dir, "ux_*.js"))
+      return if legacy_files.empty?
+
+      if @config.dry_run?
+        legacy_files.each do |legacy|
+          target = File.join(manifest_dir, File.basename(legacy))
+          $stdout.puts "[ReactManifest] DRY-RUN: would move #{legacy} -> #{target}"
+        end
+        return
+      end
+
+      FileUtils.mkdir_p(manifest_dir)
+      legacy_files.each do |legacy|
+        target = File.join(manifest_dir, File.basename(legacy))
+        if File.exist?(target)
+          # Prevent double-definition conflicts: if a legacy root manifest is
+          # auto-generated and a manifest-dir equivalent exists, drop the legacy file.
+          FileUtils.rm_f(legacy) if auto_generated?(legacy)
+          next
+        end
+
+        FileUtils.mv(legacy, target)
+      end
+    end
+
     # ----------------------------------------------------------- helpers
 
     def header_lines

data/lib/react_manifest/railtie.rb

@@ -35,6 +35,16 @@ module ReactManifest
     # Expose config as Rails.application.config.react_manifest
     config.react_manifest = ReactManifest.configuration
 
+    # Keep generated manifests in a dedicated folder while preserving logical
+    # asset names (ux_shared, ux_users, etc.) via an explicit Sprockets path.
+    initializer "react_manifest.assets_path" do |app|
+      next unless app.config.respond_to?(:assets)
+
+      manifest_dir = ReactManifest.configuration.abs_manifest_dir
+      app.config.assets.paths.delete(manifest_dir)
+      app.config.assets.paths.unshift(manifest_dir)
+    end
+
     # ----------------------------------------------------------------
     # Start the file watcher in development
     # ----------------------------------------------------------------
@@ -78,9 +88,9 @@ module ReactManifest
       private
 
       def missing_manifest_bundles(config)
-        output_dir = config.abs_output_dir
         expected_manifest_bundles(config).reject do |bundle_name|
-          File.exist?(File.join(output_dir, "#{bundle_name}.js"))
+          File.exist?(File.join(config.abs_manifest_dir, "#{bundle_name}.js")) ||
+            File.exist?(File.join(config.abs_output_dir, "#{bundle_name}.js"))
         end
       end
 

data/lib/react_manifest/version.rb

@@ -1,3 +1,3 @@
 module ReactManifest
-  VERSION = "0.2.6".freeze
+  VERSION = "0.2.8".freeze
 end

data/lib/react_manifest.rb

@@ -30,23 +30,25 @@ module ReactManifest
     # Used by the react_bundle_tag view helper.
     def resolve_bundles(ctrl_name)
       config  = configuration
-      output  = config.abs_output_dir
       bundles = []
 
       # 1. Shared bundle always first
-      bundles << config.shared_bundle if bundle_exists?(output, config.shared_bundle)
+      shared = resolve_bundle_reference(config, config.shared_bundle)
+      bundles << shared if shared
 
       # 2. always_include bundles (e.g. ux_main)
       config.always_include.each do |b|
-        bundles << b if bundle_exists?(output, b) && !bundles.include?(b)
+        resolved = resolve_bundle_reference(config, b)
+        bundles << resolved if resolved && !bundles.include?(resolved)
       end
 
       # 3. Controller-specific bundle
       # Try fully-namespaced first: admin/users → ux_admin_users
       # Then drop segments: ux_admin
       controller_candidates(ctrl_name).each do |candidate|
-        if bundle_exists?(output, candidate) && !bundles.include?(candidate)
-          bundles << candidate
+        resolved = resolve_bundle_reference(config, candidate)
+        if resolved && !bundles.include?(resolved)
+          bundles << resolved
           break
         end
       end
@@ -56,8 +58,15 @@ module ReactManifest
 
     private
 
-    def bundle_exists?(output_dir, bundle_name)
-      File.exist?(File.join(output_dir, "#{bundle_name}.js"))
+    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)
+
+      # Backward compatibility for apps still holding legacy manifests in output_dir root.
+      legacy_path = File.join(config.abs_output_dir, "#{bundle_name}.js")
+      return bundle_name if File.exist?(legacy_path)
+
+      nil
     end
 
     def controller_candidates(ctrl_name)

data/tasks/react_manifest.rake

@@ -68,19 +68,21 @@ namespace :react_manifest do
   desc "Remove all AUTO-GENERATED ux_*.js manifests"
   task clean: :environment do
     config    = ReactManifest.configuration
-    output    = config.abs_output_dir
+    targets   = [config.abs_manifest_dir, config.abs_output_dir].uniq
     removed   = 0
     skipped   = 0
 
-    Dir.glob(File.join(output, "ux_*.js")).each do |file|
-      first_line = File.foreach(file).first.to_s
-      if first_line.include?("AUTO-GENERATED")
-        File.delete(file)
-        puts "[ReactManifest] Removed: #{file.sub("#{Rails.root}/", '')}"
-        removed += 1
-      else
-        puts "[ReactManifest] Skipped (not auto-generated): #{file.sub("#{Rails.root}/", '')}"
-        skipped += 1
+    targets.each do |dir|
+      Dir.glob(File.join(dir, "ux_*.js")).each do |file|
+        first_line = File.foreach(file).first.to_s
+        if first_line.include?("AUTO-GENERATED")
+          File.delete(file)
+          puts "[ReactManifest] Removed: #{file.sub("#{Rails.root}/", '')}"
+          removed += 1
+        else
+          puts "[ReactManifest] Skipped (not auto-generated): #{file.sub("#{Rails.root}/", '')}"
+          skipped += 1
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: react-manifest-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Oliver Noonan