heartml 1.0.0.beta15 → 1.0.0.beta16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfdbab85b95fcabeed28ad97e9c66dfd4c5b7e03985d2dfdfc698f2cefab63b5
-  data.tar.gz: 5fd6e1c77155f8c85627e286ccdc1a51051d5eb20649052e1347d0149a2afe82
+  metadata.gz: 33b3883d286639fd0120ce59444d69f5a69a77fff208d5fcc057338210bcde4d
+  data.tar.gz: a385e62cf6d4232ba5ede351c4a0c6e885bd7260ea35afff78ee35eaf7449fee
 SHA512:
-  metadata.gz: 43758f1af356507a355f11c86e922435aa6dba79cb4c66a31d9c859078341db66453d2b8fde12e596ddf094c705f741c49628cfa96f5d96b98cb53da7420003e
-  data.tar.gz: 2e6c7abd7bba65f0aac17f248eee93cbd2ca7ac3a41f25440e638dc603f043cd6f4ae99e5d01a6e5eb7442b2289b8b92495619b4d4253cbc17efa9054a0cd706
+  metadata.gz: 4da9a2ac04771a7f7024caf8f2db678f6459a54f7090513a2a00402e6ec65626ed61a90abdf314219ace4a310d6d87eaafb65f97a6c1994b0fdf5861897bb051
+  data.tar.gz: d19f2e2285950719c5456087e6eff9f27577da175257ec8ec58cecd0188ee57690934d0e3f06c2156f1dc5e4828857284d0fdf0b0ab051c2af9441c89cbc6de0

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+## [1.0.0.beta16] — 2024-10-26
+
+- Fix rendering logic in Bridgetown 2.0 beta
+
 ## [1.0.0.beta15] — 2024-04-11
 
 - Fix Fast Refresh crash in Bridgetown 2.0 alpha

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heartml (1.0.0.beta15)
+    heartml (1.0.0.beta16)
       concurrent-ruby (~> 1.2)
       nokolexbor (>= 0.4.2)
 

data/lib/heartml/bridgetown_renderer.rb

@@ -2,6 +2,12 @@
 
 module Heartml
   class BridgetownRenderer < Bridgetown::Builder
+    # Called when a `Bridgetown::Component` includes `Heartml`, so we can bypass Bridgetown's
+    # normal component template handling
+    def self.component_overrides(klass)
+      klass.define_method(:template) { call }
+    end
+
     def build
       render_heart_modules
     end
@@ -18,9 +24,6 @@ module Heartml
 end
 
 Bridgetown.initializer :heartml do |config|
-  # TODO: maybe we can ditch this once we're off ActiveSupport in Bridgetown
-  Bridgetown::Component.extend ActiveSupport::DescendantsTracker
-
   Heartml.module_eval do
     def render_in(view_context, rendering_mode: :string, &block)
       self.rendering_mode = rendering_mode

data/lib/heartml/version.rb

@@ -2,5 +2,5 @@
 
 module Heartml
   # @return [String]
-  VERSION = "1.0.0.beta15"
+  VERSION = "1.0.0.beta16"
 end

data/lib/heartml.rb

@@ -66,6 +66,10 @@ module Heartml
     klass.include ContentMethod unless has_content_method
 
     ServerEffects.included_extras(klass)
+
+    return unless defined?(Bridgetown) && klass < Bridgetown::Component
+
+    BridgetownRenderer.component_overrides(klass)
   end
 
   # Extends the component class

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heartml
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta15
+  version: 1.0.0.beta16
 platform: ruby
 authors:
 - Jared White
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-12 00:00:00.000000000 Z
+date: 2024-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby