jekyll-webawesome 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 248a4b65617851cba2e7b5cc7b1a14f9424fa38649b0efbe7f5af4417b71df7f
-  data.tar.gz: 157cfaef53cc8d38d1b7d3d0ddd6fc2c383a9a2989da6f5be9a62e9dc9d19bd0
+  metadata.gz: b925e93ad2a43e360c982ac4fbc9c25ee0a0c4573039ecf2c182fa566377d60b
+  data.tar.gz: 32e0685f36e0c5a3532900ffb964aa15809ba2fb5fbc9d71240dba39d5612427
 SHA512:
-  metadata.gz: fb931b98a57633b9924bbaf3143f4b3cda7bab15e3778f1d698775c95e349a3802d6f1d9fa537ebe8424e3e4debbf9d0d411101e2fd9481bbd9aee7224e86bc9
-  data.tar.gz: b0d50534280129717c3fa47445a66cf44313995b31061728679ad3324c05e9927934686e1b9a9343f7037f62fde575581c25571ebe437c2f1ed70c90cd8ba803
+  metadata.gz: 53d88906164176d32ad025c073d410c8d585f782643e0e3372ae5da51daf1fd5c65519dc77a9dd952aff2870c2c3a6453d454cd858cacefa4f0b19b993466258
+  data.tar.gz: 9cc2f919be3f5513ca7269f5d9f9c722ab9cd386a78be5f9e1dd968ffd699e7edab43546c4b099d9ebb8fa55f41e5dfa79b30bc39fa9b446f8d0c00806fb18c2

data/CHANGELOG.md

@@ -6,7 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 
 ## [Unreleased]
 
-- Placeholder
+## [0.4.1] - 2025-10-02
+
+- Code blocks inside custom elements (wa-details, wa-callout, etc.) are now properly protected from markdown processing
+  - Previously, code blocks would be corrupted with HTML entities and extra `<p>` tags when nested inside custom elements
 
 ## [0.4.0] - 2025-09-29
 

data/lib/jekyll/webawesome/code_block_transformer.rb

@@ -48,38 +48,38 @@ module Jekyll
           content.match?(callout_pattern) || content.match?(details_pattern) || content.match?(tabs_pattern)
         end
 
-        # Transform code blocks from markdown syntax to Jekyll highlight tags
-        def transform_code_blocks(content)
+        # Protect all code blocks by converting them to placeholders
+        # This prevents markdown processing from corrupting code blocks inside custom elements
+        def protect_all_code_blocks(content)
           counter = @@protected_blocks.size
 
-          # First pass: protect markdown code blocks that contain WebAwesome syntax
-          content = content.gsub(CODE_BLOCK_PATTERN) do |match|
-            language = Regexp.last_match(1)
-            code_content = Regexp.last_match(2).strip
-
-            # If this is a markdown code block containing WebAwesome syntax, protect it
-            if language && language.downcase == 'markdown' && contains_webawesome_syntax?(code_content)
-              placeholder = "<!--PROTECTED_WEBAWESOME_EXAMPLE_#{counter}-->"
-              @@protected_blocks[placeholder] = match
-              counter += 1
-              placeholder
-            else
-              match # Leave other code blocks for normal processing
-            end
-          end
-
-          # Second pass: transform remaining code blocks normally
           content.gsub(CODE_BLOCK_PATTERN) do |match|
-            language = Regexp.last_match(1)
-            code_content = Regexp.last_match(2).strip
+            placeholder = "<!--PROTECTED_CODE_BLOCK_#{counter}-->"
+            @@protected_blocks[placeholder] = match
+            counter += 1
+            placeholder
+          end
+        end
 
-            if language && language.downcase != 'plain'
-              transformed = "{% highlight #{language} %}\n#{code_content}\n{% endhighlight %}"
-              transformed
+        # Transform code blocks from markdown syntax to Jekyll highlight tags
+        # This should be called AFTER WebAwesome transformers have processed the content
+        def transform_code_blocks(content)
+          # Transform code blocks that were previously protected
+          @@protected_blocks.transform_values! do |match|
+            if match =~ CODE_BLOCK_PATTERN
+              language = Regexp.last_match(1)
+              code_content = Regexp.last_match(2).strip
+
+              if language && language.downcase != 'plain'
+                "{% highlight #{language} %}\n#{code_content}\n{% endhighlight %}"
+              else
+                match # Return original block if no language or 'plain'
+              end
             else
-              match # Return original block if no language or 'plain'
+              match
             end
           end
+          content
         end
 
         # Restore protected WebAwesome example blocks after WaElementTransformer processing
@@ -101,23 +101,42 @@ module Jekyll
         CodeBlockTransformer.clear_protected_blocks
       end
 
-      Jekyll::Hooks.register :documents, :pre_render, priority: 30 do |document|
+      # STEP 1: Protect all code blocks BEFORE any transformations (highest priority)
+      Jekyll::Hooks.register :documents, :pre_render, priority: 50 do |document|
+        next unless document.relative_path =~ /.*\.md$/i
+        next unless CodeBlockTransformer.transform_documents_enabled?(document.site)
+
+        puts "Jekyll::WebAwesome::CodeBlockTransformer protecting code blocks in document: #{document.relative_path}\n"
+        document.content = CodeBlockTransformer.protect_all_code_blocks(document.content)
+      end
+
+      Jekyll::Hooks.register :pages, :pre_render, priority: 50 do |page|
+        next unless page.relative_path =~ /.*\.md$/i
+        next unless CodeBlockTransformer.transform_pages_enabled?(page.site)
+
+        puts "Jekyll::WebAwesome::CodeBlockTransformer protecting code blocks in page: #{page.relative_path}\n"
+        page.content = CodeBlockTransformer.protect_all_code_blocks(page.content)
+      end
+
+      # STEP 2: Transform protected code blocks to Jekyll highlight syntax
+      # This happens AFTER WebAwesome transformers (priority 20) but BEFORE restoration
+      Jekyll::Hooks.register :documents, :pre_render, priority: 15 do |document|
         next unless document.relative_path =~ /.*\.md$/i
         next unless CodeBlockTransformer.transform_documents_enabled?(document.site)
 
-        puts "Jekyll::WebAwesome::CodeBlockTransformer processing document: #{document.relative_path}\n"
+        puts "Jekyll::WebAwesome::CodeBlockTransformer transforming code blocks in document: #{document.relative_path}\n"
         document.content = CodeBlockTransformer.transform_code_blocks(document.content)
       end
 
-      Jekyll::Hooks.register :pages, :pre_render, priority: 30 do |page|
+      Jekyll::Hooks.register :pages, :pre_render, priority: 15 do |page|
         next unless page.relative_path =~ /.*\.md$/i
         next unless CodeBlockTransformer.transform_pages_enabled?(page.site)
 
-        puts "Jekyll::WebAwesome::CodeBlockTransformer processing page: #{page.relative_path}\n"
+        puts "Jekyll::WebAwesome::CodeBlockTransformer transforming code blocks in page: #{page.relative_path}\n"
         page.content = CodeBlockTransformer.transform_code_blocks(page.content)
       end
 
-      # Register hooks to restore protected blocks after WaElementTransformer
+      # STEP 3: Restore protected blocks after transformation (lowest priority)
       Jekyll::Hooks.register :documents, :pre_render, priority: 10 do |document|
         next unless document.relative_path =~ /.*\.md$/i
         next unless CodeBlockTransformer.transform_documents_enabled?(document.site)

data/lib/jekyll/webawesome/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module WebAwesome
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-webawesome
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Janne Waren