hotwire-spark 0.1.3 → 0.1.5

data/app/javascript/hotwire/spark/helpers.js

@@ -20,7 +20,7 @@ export function cacheBustedUrl(urlString) {
 
 export async function reloadHtmlDocument() {
   let currentUrl = cacheBustedUrl(urlWithParams(window.location.href, { hotwire_spark: "true" }))
-  const response = await fetch(currentUrl)
+  const response = await fetch(currentUrl, { headers: { "Accept": "text/html" }})
 
   if (!response.ok) {
     throw new Error(`${response.status} when fetching ${currentUrl}`)

data/app/javascript/hotwire/spark/reloaders/stimulus_reloader.js

@@ -18,18 +18,26 @@ export class StimulusReloader {
     log("Reload Stimulus controllers...")
 
     this.application.stop()
-    await this.#reloadStimulusControllers()
+
+    await this.#reloadChangedStimulusControllers()
+    this.#unloadDeletedStimulusControllers()
+
     this.application.start()
   }
 
-  async #reloadStimulusControllers() {
+  async #reloadChangedStimulusControllers() {
     await Promise.all(
-      this.#stimulusControllerPaths.map(async moduleName => this.#reloadStimulusController(moduleName))
+      this.#stimulusControllerPathsToReload.map(async moduleName => this.#reloadStimulusController(moduleName))
     )
   }
 
+  get #stimulusControllerPathsToReload() {
+    this.controllerPathsToReload = this.controllerPathsToReload || this.#stimulusControllerPaths.filter(path => this.#shouldReloadController(path))
+    return this.controllerPathsToReload
+  }
+
   get #stimulusControllerPaths() {
-    return Object.keys(this.#stimulusPathsByModule).filter(path => path.endsWith("_controller") && this.#shouldReloadController(path))
+    return Object.keys(this.#stimulusPathsByModule).filter(path => path.endsWith("_controller"))
   }
 
   #shouldReloadController(path) {
@@ -57,6 +65,22 @@ export class StimulusReloader {
     this.#registerController(controllerName, module)
   }
 
+  #unloadDeletedStimulusControllers() {
+    this.#controllersToUnload.forEach(controller => this.#deregisterController(controller.identifier))
+  }
+
+  get #controllersToUnload() {
+    if (this.#didChangeTriggerAReload) {
+      return []
+    } else {
+      return this.application.controllers.filter(controller => this.filePattern.test(`${controller.identifier}_controller`))
+    }
+  }
+
+  get #didChangeTriggerAReload() {
+    return this.#stimulusControllerPathsToReload.length > 0
+  }
+
   #pathForModuleName(moduleName) {
     return this.#stimulusPathsByModule[moduleName]
   }
@@ -70,7 +94,12 @@ export class StimulusReloader {
   }
 
   #registerController(name, module) {
-    this.application.unload(name)
+    this.#deregisterController(name)
     this.application.register(name, module.default)
   }
+
+  #deregisterController(name) {
+    log(`\tRemoving controller ${name}`)
+    this.application.unload(name)
+  }
 }

data/lib/hotwire/spark/engine.rb

@@ -7,7 +7,7 @@ module Hotwire::Spark
     config.hotwire = ActiveSupport::OrderedOptions.new unless config.respond_to?(:hotwire)
     config.hotwire.spark = ActiveSupport::OrderedOptions.new
     config.hotwire.spark.merge! \
-      enabled: Rails.env.development?,
+      enabled: Rails.env.development? && defined?(Rails::Server),
       css_paths: File.directory?("app/assets/builds") ? %w[ app/assets/builds ] : %w[ app/assets/stylesheets ],
       html_paths: %w[ app/controllers app/helpers app/models app/views ],
       stimulus_paths: %w[ app/javascript/controllers ]

data/lib/hotwire/spark/file_watcher.rb

@@ -25,7 +25,11 @@ class Hotwire::Spark::FileWatcher
     end
 
     def paths
-      @callbacks_by_path.keys
+      only_existing_paths @callbacks_by_path.keys
+    end
+
+    def only_existing_paths(paths)
+      paths.select(&:exist?)
     end
 
     def process_changed_files(changed_files)

data/lib/hotwire/spark/version.rb

@@ -1,5 +1,5 @@
 module Hotwire
   module Spark
-    VERSION = "0.1.3"
+    VERSION = "0.1.5"
   end
 end

data/lib/hotwire-spark.rb

@@ -4,6 +4,7 @@ require "hotwire/spark/engine"
 require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.ignore("#{__dir__}/hotwire-spark.rb")
+loader.ignore("#{__dir__}/hotwire/spark/version.rb")
 loader.setup
 
 module Hotwire::Spark

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotwire-spark
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Jorge Manrubia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-18 00:00:00.000000000 Z
+date: 2024-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails