turbo-hmr 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19b1d88e6a573c42db7da38e73953a295aad477aebcf2476be112260cb7f38c5
-  data.tar.gz: 49137426f94f8da10d9aa630c2a051c59b47a8d4ea306ac5d8be4540172be5f3
+  metadata.gz: d78f1140f5ff9dacba63f4e12179411e37d791be3f77d06e9fed0541e5aa6c56
+  data.tar.gz: accaeef06f24858b22805398c543818caae5630cf4116ec307ee9f24b5a027b7
 SHA512:
-  metadata.gz: 9782bd09faa3a1e2d878fbc5c93b53b1a5f64a2991cee2a29e4b8117d4fa2f8eee8dc2bc701c7ef4a804e374345f4f60b56ea49d8dbd70a0fd0337ef0f2845f9
-  data.tar.gz: 9efc011f8d9c1620be37e2e6a5dd12842193f0adca30d39f1ef6aa10035c8d21d98e7ef63f928c6d701fca613372c3053af8f3f2852423fd5920c9fa08413066
+  metadata.gz: 6ef0326372951be494683776e414502f9bb922fa7c67832bc5fd422cdd5caa793c6f3c723d51845e9468a51833145bd45ec9c07776867c74adaaa98ff4a99849
+  data.tar.gz: e635500967145ec77204b73eb575326c657e0a6e7558162befe8d75f638026b99c3bb8770abb3e44c0a96da602b4b50955764e2db4b946452c12c970a469a659

data/app/javascript/turbo-hmr.js

@@ -8,7 +8,7 @@ class TurboHmr {
 
   start(application) {
     this.application = application
-    this.currentImportmap = this.extractImportmap(document)
+    this.currentImportmap = this.extractImportmapFromDoc(document)
 
     document.addEventListener("turbo:before-fetch-response", this.handleBeforeFetchResponse.bind(this))
     document.addEventListener("turbo:before-render", this.handleBeforeRender.bind(this))
@@ -17,9 +17,7 @@ class TurboHmr {
   async handleBeforeFetchResponse(event) {
     const response = event.detail.fetchResponse
     const html = await response.responseHTML
-    const parser = new DOMParser()
-    const doc = parser.parseFromString(html, "text/html")
-    this.pendingImportmap = this.extractImportmap(doc)
+    this.pendingImportmap = this.extractImportmapFromHtml(html)
   }
 
   handleBeforeRender(event) {
@@ -63,12 +61,23 @@ class TurboHmr {
     }
   }
 
-  extractImportmap(doc) {
+  extractImportmapFromDoc(doc) {
     const importmapScript = doc.querySelector('script[type="importmap"]')
     if (!importmapScript) return null
+    return this.parseImportmap(importmapScript.textContent)
+  }
+
+  extractImportmapFromHtml(html) {
+    // Avoid DOMParser: parsing HTML with inline style="..." attributes triggers
+    // style-src CSP violations in Firefox. Extract the importmap <script> content via regex.
+    const match = html.match(/<script[^>]*\btype\s*=\s*["']importmap["'][^>]*>([\s\S]*?)<\/script>/i)
+    if (!match) return null
+    return this.parseImportmap(match[1])
+  }
 
+  parseImportmap(text) {
     try {
-      return JSON.parse(importmapScript.textContent)
+      return JSON.parse(text)
     } catch (e) {
       console.error("turbo-hmr: Failed to parse importmap", e)
       return null

data/lib/turbo/hmr/engine.rb

@@ -11,8 +11,8 @@ module Turbo
       end
 
       initializer "turbo_hmr.importmap_helper" do
-        ActiveSupport.on_load(:action_controller_base) do
-          helper Turbo::Hmr::ImportmapHelper
+        ActiveSupport.on_load(:action_controller) do
+          ActionController::Base.helper Turbo::Hmr::ImportmapHelper
         end
       end
     end

data/lib/turbo/hmr/version.rb

@@ -2,6 +2,6 @@
 
 module Turbo
   module Hmr
-    VERSION = "0.0.2"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: turbo-hmr
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Micah Geisel
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Hot Module Replacement for Turbo
 test_files: []