react-manifest-rails 0.2.29 → 0.2.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8688e621b55d1a5b9db497668b4942fc97c8f4aad5f7778c7a7fc4a412990d04
-  data.tar.gz: c46872893e465f9684c68688a8f8ca02d361afd7bfa8421eb1b69b0180f8c3d9
+  metadata.gz: 1331513cb5939f583960098fa86106a9901a0b3ef126b64f5ac9ae545a51f930
+  data.tar.gz: f89ef2eff49327f1e4a4a3aed0657167d5dacabd0bae3735a1a4744c0ca45332
 SHA512:
-  metadata.gz: 76a4b4aed865531470d641be4bb0d6608d30410d66463aad17e71b37a73acafe2fb4a825c5f3f89c0bc5e6a91d7016396699572d575950dca71a242378cbc6f3
-  data.tar.gz: 2bbd77ad7db859306d6cfdb6a75a476bfca219b1e22cf0b3aa54bd12f3c42d8a441c35a1e07dbb4e5a0c3c198b968683a15f814fd64bf59a55a91b1ca3d2b9d1
+  metadata.gz: 6fe469fdebbd0bb563f46c59e01c3931fbcf67485e8d0141cd9628f95969912716f42622454055f758c98e0a4e9482183f79a4a1c025c9e8a9b86a6690dd8f0c
+  data.tar.gz: 36fcaa4b86a562227966018d98355894526ada5f6744427749938dd64b21ed6e5cd4f390c08c309f4500201f220647fe868a7f223ede977fbbafc15960d5ed51

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.30".freeze
 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

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.30
 platform: ruby
 authors:
 - Oliver Noonan