From 27b6e1e33f098a09973edd1235b860ff241ea4f4 Mon Sep 17 00:00:00 2001 From: "vu.vo" Date: Mon, 24 Jun 2024 09:49:28 +0700 Subject: [PATCH 1/2] fix: [#189] Fix .hamlc is unexpectedly processed by JstProcessor --- lib/haml_coffee_assets/rails/engine.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/haml_coffee_assets/rails/engine.rb b/lib/haml_coffee_assets/rails/engine.rb index 3d1c6c8..3a36817 100644 --- a/lib/haml_coffee_assets/rails/engine.rb +++ b/lib/haml_coffee_assets/rails/engine.rb @@ -35,9 +35,10 @@ class Engine < ::Rails::Engine config.assets.configure do |env| if env.respond_to?(:register_transformer) - env.register_mime_type 'text/hamlc', extensions: ['.hamlc', '.jst.hamlc'] + env.register_mime_type 'text/hamlc', extensions: ['.hamlc'] + env.register_mime_type 'text/jst+hamlc', extensions: ['.jst.hamlc'] env.register_transformer 'text/hamlc', 'application/javascript', ::HamlCoffeeAssets::Transformer - env.register_transformer 'text/hamlc', 'application/javascript+function', ::HamlCoffeeAssets::Transformer + env.register_transformer 'text/jst+hamlc', 'application/javascript+function', ::HamlCoffeeAssets::Transformer end if env.respond_to?(:register_engine) From 3b34656cc17f94b602fca9974af4151c883c6e03 Mon Sep 17 00:00:00 2001 From: "vu.vo" Date: Sat, 20 Jul 2024 11:21:16 +0700 Subject: [PATCH 2/2] fix: [#189] resolve merge conflict --- lib/haml_coffee_assets/rails/engine.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/haml_coffee_assets/rails/engine.rb b/lib/haml_coffee_assets/rails/engine.rb index cc26cf1..43eb013 100644 --- a/lib/haml_coffee_assets/rails/engine.rb +++ b/lib/haml_coffee_assets/rails/engine.rb @@ -38,12 +38,11 @@ class Engine < ::Rails::Engine env.register_mime_type 'text/hamlc', extensions: ['.hamlc'] env.register_mime_type 'text/jst+hamlc', extensions: ['.jst.hamlc'] env.register_transformer 'text/hamlc', 'application/javascript', ::HamlCoffeeAssets::Transformer - # delete? env.register_transformer 'text/hamlc', 'application/javascript+function', ::HamlCoffeeAssets::Transformer + env.register_transformer 'text/jst+hamlc', 'application/javascript+function', ::HamlCoffeeAssets::Transformer # support for chaining via ERB, documented via https://github.com/rails/sprockets/pull/807 env.register_mime_type 'text/hamlc+ruby', extensions: ['.hamlc.erb', '.jst.hamlc.erb'] env.register_transformer 'text/hamlc+ruby', 'text/hamlc', ::Sprockets::ERBProcessor - env.register_transformer 'text/jst+hamlc', 'application/javascript+function', ::HamlCoffeeAssets::Transformer end if env.respond_to?(:register_engine)