Disable middleware if Propshaft is installed

amatsuda · Aug 12, 2023 · 40bbf24 · 40bbf24
1 parent 01b70de
commit 40bbf24
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/heavens_door/engine.rb b/lib/heavens_door/engine.rb
@@ -7,7 +7,9 @@ class Engine < ::Rails::Engine #:nodoc:
     initializer 'HeavensDoor' do |app|
       app.middleware.use HeavensDoor::Middleware
 
-      app.config.assets.precompile += %w(heavens_door.js heavens_door.css)
+      if !defined?(Propshaft)
+        app.config.assets.precompile += %w(heavens_door.js heavens_door.css)
+      end
     end
   end
 end
diff --git a/lib/heavens_door/middleware.rb b/lib/heavens_door/middleware.rb
@@ -20,7 +20,9 @@ def call(env)
         end
 
         body = body.dup if body.frozen?
-        body.sub!(/<\/head[^>]*>/) { %Q[<link rel="stylesheet" href="#{Rails.application.config.assets.prefix}/heavens_door.css" /><script src="#{Rails.application.config.assets.prefix}/heavens_door.js"></script>\n#{$~}] }
+        if !defined?(Propshaft)
+          body.sub!(/<\/head[^>]*>/) { %Q[<link rel="stylesheet" href="#{Rails.application.config.assets.prefix}/heavens_door.css" /><script src="#{Rails.application.config.assets.prefix}/heavens_door.js"></script>\n#{$~}] }
+        end
         body.sub!(/<body[^>]*>/) { %Q[#{$~}\n<div id="heavens-door" class="heavens-door-custom"><span id="heavens-door-open" class="heavens-door-button">⏺</span><span id="heavens-door-close" class="heavens-door-button">⏹</span><span id="heavens-door-copy" class="heavens-door-button">📋</span></div>] }
 
         [status, headers, [body]]