bridgetown-core 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 720a0e8daaec6fd5f3055201c6eae904179743de9c924395d676b79804f6ed3b
-  data.tar.gz: 693ba47d4f8713542c4bec6c90fae536ee17d16d8955adb7380246f91c5d9130
+  metadata.gz: ada32cd419f97f08f79cfc7a13630e040b1d41838d8d7045bc06374d9bbe12fc
+  data.tar.gz: eedd7b9d6b867a12a65e56cd85660aa2900d2154f08296dd58984d84e7bcaa48
 SHA512:
-  metadata.gz: 2c02d909955985ddb60ae402b4f1fe0f8af2e024ecc3d8f284a4f527d349ebefbbe81503030b870382e262ff7ab27bb604d49d571d164eed5262c9309c56ddc4
-  data.tar.gz: 91b8a62070fca0daeabec83e0238d6c210a6baeb6683e8d1d87ebc8fac3c56e22a908227c7c90781430723bbb613c9fde581c1f4077e68ee5a744702464d5c7a
+  metadata.gz: abb68767e3e6961f8144c045d48d3d540382a563e126349cf61ef053bf3ecc2195ebbab0134497b60c0539b49e7be741cc918553314328192db3f6b98a15193f
+  data.tar.gz: a6ad84682b36b5b85f6020dd29671d33fe86c92dd32842c23be51d54872566c9241c9ad01efbe2a62ca8e7e3361a20c22823991190b8f05a611a431c518806d1

data/lib/bridgetown-core/rack/live_reload.rb

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+# rubocop:disable Style/RedundantBegin, Style/RedundantSelf
+module Bridgetown
+  module Rack
+    class LiveReload
+      SLEEP_INTERVAL = 0.5
+
+      def initialize(file_to_check:, errors_file:)
+        @file_to_check = file_to_check
+        @errors_file = errors_file
+
+        @last_modified = self.current_modified
+      end
+
+      def event_stream
+        proc do |stream|
+          begin
+            run_loop(stream)
+          ensure
+            stream.close
+          end
+        end
+      end
+
+      def threaded_event_stream
+        proc do |stream|
+          Thread.new do
+            run_loop(stream)
+          ensure
+            stream.close
+          end
+        end
+      end
+
+      private
+
+      def run_loop(stream)
+        loop do
+          latest_modified = current_modified
+
+          if @last_modified < latest_modified
+            stream.write "data: reloaded!\n\n"
+            break
+          elsif File.exist?(@errors_file)
+            stream.write "event: builderror\ndata: #{File.read(@errors_file).to_json}\n\n"
+          else
+            stream.write "data: #{latest_modified}\n\n"
+          end
+
+          sleep SLEEP_INTERVAL
+        rescue Errno::EPIPE # User refreshed the page
+          break
+        end
+      end
+
+      def current_modified
+        File.exist?(@file_to_check) ? File.stat(@file_to_check).mtime.to_i : 0
+      end
+    end
+  end
+end
+# rubocop:enable Style/RedundantBegin, Style/RedundantSelf

data/lib/bridgetown-core/rack/routes.rb

@@ -109,52 +109,29 @@ module Bridgetown
         end
 
         # @param app [Roda]
-        def setup_live_reload(app) # rubocop:disable Metrics
-          sleep_interval = 0.5
+        def setup_live_reload(app)
+          require_relative "live_reload"
+
           file_to_check = Bridgetown.live_reload_path
           errors_file = Bridgetown.build_errors_path
+          live_reload = Bridgetown::Rack::LiveReload.new(
+            file_to_check: file_to_check,
+            errors_file: errors_file
+          )
 
-          # rubocop:disable Metrics/BlockLength
           app.request.get "_bridgetown/live_reload" do
-            @_mod = File.exist?(file_to_check) ? File.stat(file_to_check).mtime.to_i : 0
-            event_stream = proc do |stream|
-              # We don't need to do this when using Falcon.
-              # Puma hangs with Ctrl+C without this manual interruption.
-              # Very very hacky, but it's only in dev.
-              # https://github.com/puma/puma/issues/3569
-              unless defined? Falcon
-                trap(:INT) do
-                  stream.close
-                  raise Interrupt
-                end
-              end
-
-              loop do
-                new_mod = File.exist?(file_to_check) ? File.stat(file_to_check).mtime.to_i : 0
-
-                if @_mod < new_mod
-                  stream.write "data: reloaded!\n\n"
-                  break
-                elsif File.exist?(errors_file)
-                  stream.write "event: builderror\ndata: #{File.read(errors_file).to_json}\n\n"
-                else
-                  stream.write "data: #{new_mod}\n\n"
-                end
-
-                sleep sleep_interval
-              rescue Errno::EPIPE # User refreshed the page
-                break
+            event_stream =
+              if defined? Falcon
+                live_reload.event_stream
+              else
+                live_reload.threaded_event_stream
               end
-            ensure
-              stream.close
-            end
 
             app.request.halt [200, {
               "Content-Type"  => "text/event-stream",
               "cache-control" => "no-cache",
             }, event_stream,]
           end
-          # rubocop:enable Metrics/BlockLength
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-14 00:00:00.000000000 Z
+date: 2026-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -568,6 +568,7 @@ files:
 - lib/bridgetown-core/plugin_manager.rb
 - lib/bridgetown-core/rack/boot.rb
 - lib/bridgetown-core/rack/default_config.ru
+- lib/bridgetown-core/rack/live_reload.rb
 - lib/bridgetown-core/rack/loader_hooks.rb
 - lib/bridgetown-core/rack/logger.rb
 - lib/bridgetown-core/rack/routes.rb