bridgetown-core 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89df4836f5a8105ce2872c48db38dcf7f710f190e760cb7d083c4610653a6952
-  data.tar.gz: 54b22de4c1cf9e952c680d74fbef3f042c217bfa822a359bd8f5830e096ab8c8
+  metadata.gz: c61ad30c885a073e5b971cab23538dd307ae100d1acbccf8cb62e6d773cedd7f
+  data.tar.gz: 18400fd73d5e012ac9e9e7f728aa49074d3317d4eaf0373f57925e54eba44a0c
 SHA512:
-  metadata.gz: b3e795be0418ead09205b2d46ab7501ba25d5df443973f4f49eaa599b2c91caad5218a279cb50385cf5dfc86146671d7a52e7bcd90631a27be9d547c5e14169e
-  data.tar.gz: 4045cde9174adb8d58208e7032bbac1446ba31983d9aa7853af5ec5f9194789e706ebb01a06171d0282cd0faf87827b0f222f75168cf312bc51dc23324e99256
+  metadata.gz: 56d2548389959f4ab4bf8387d63b44149411beff8dcefc6ed906b53719aacb4b132399daae07691262ce0c977821d0e3e822b7b4e4abd0b3c2bc90643934807d
+  data.tar.gz: 96853e7021946b336f44f9c8160056cc9126a07d14ab621f6589477ea01f7a2833bafe3ea86f746fc947dc754a0eac0b1328fc50b942337e807e6a37731bd53f

data/lib/bridgetown-core/commands/console.rb

@@ -8,10 +8,7 @@ module Bridgetown
       site = Bridgetown::Current.site
 
       I18n.reload! # make sure any locale files get read again
-      Bridgetown::Hooks.trigger :site, :pre_reload, site
-      Bridgetown::Hooks.clear_reloadable_hooks
-      site.loaders_manager.reload_loaders
-      Bridgetown::Hooks.trigger :site, :post_reload, site
+      site.loaders_manager.reload_loaders(site)
 
       ConsoleMethods.site_reset(site)
     end

data/lib/bridgetown-core/commands/esbuild/esbuild.defaults.js.erb

@@ -43,7 +43,7 @@ const generateSourceMappingURL = sourceMap => {
 // Import Sass if available
 let sass
 if (moduleAvailable("sass")) {
-  sass = (await import("sass")).default
+  sass = await import("sass")
 }
 
 // Glob plugin derived from:

data/lib/bridgetown-core/concerns/site/fast_refreshable.rb

@@ -58,10 +58,7 @@ class Bridgetown::Site
       if full_abort || (marked_resources.empty? && !found_gen_pages && !found_route_file)
         # Darn, a full reload is needed (unless we're on a super-fast track)
         if reload_if_needed
-          Bridgetown::Hooks.trigger :site, :pre_reload, self, paths
-          Bridgetown::Hooks.clear_reloadable_hooks
-          loaders_manager.reload_loaders
-          Bridgetown::Hooks.trigger :site, :post_reload, self, paths
+          loaders_manager.reload_loaders(self, paths)
           process # bring out the big guns
         end
         return

data/lib/bridgetown-core/configuration.rb

@@ -29,9 +29,10 @@ module Bridgetown
     DEFAULTS = {
       # Where things are
       "root_dir"                     => Dir.pwd,
-      "plugins_dir"                  => "plugins",
       "source"                       => "src",
       "destination"                  => "output",
+      "plugins_dir"                  => "plugins",
+      "server_dir"                   => "server",
       "collections_dir"              => "",
       "cache_dir"                    => ".bridgetown-cache",
       "layouts_dir"                  => "_layouts",

data/lib/bridgetown-core/converters/erb_templates.rb

@@ -1,63 +1,98 @@
 # frozen_string_literal: true
 
 require "tilt/erubi"
+require "erubi/capture_block"
 
 module Bridgetown
-  class OutputBuffer < ActiveSupport::SafeBuffer
-    def initialize(*)
-      super
-      encode!
+  class OutputBuffer
+    extend Forwardable
+
+    def_delegators :@buffer,
+                   :empty?,
+                   :encode,
+                   :encode!,
+                   :encoding,
+                   :force_encoding,
+                   :length,
+                   :lines,
+                   :reverse,
+                   :strip,
+                   :valid_encoding?
+
+    def initialize(buffer = "")
+      @buffer = String.new(buffer)
+      @buffer.encode!
     end
 
+    def initialize_copy(other)
+      @buffer = other.to_str
+    end
+
+    # Concatenation for <%= %> expressions, whose output is escaped.
     def <<(value)
       return self if value.nil?
 
-      super(value.to_s)
+      value = value.to_s
+      value = Erubi.h(value) unless value.html_safe?
+
+      @buffer << value
+
+      self
     end
     alias_method :append=, :<<
 
+    # Concatenation for <%== %> expressions, whose output is not escaped.
+    #
+    # rubocop:disable Naming/BinaryOperatorParameterName
+    def |(value)
+      return self if value.nil?
+
+      safe_concat(value.to_s)
+    end
+    # rubocop:enable Naming/BinaryOperatorParameterName
+
+    def ==(other)
+      other.instance_of?(OutputBuffer) &&
+        @buffer == other.to_str
+    end
+
+    def html_safe?
+      true
+    end
+
+    def html_safe = to_s
+
+    def safe_concat(value)
+      @buffer << value
+      self
+    end
+    alias_method :safe_append=, :safe_concat
+
     def safe_expr_append=(val)
       return self if val.nil? # rubocop:disable Lint/ReturnInVoidContext
 
       safe_concat val.to_s
     end
 
-    alias_method :safe_append=, :safe_concat
+    def to_s
+      @buffer.html_safe
+    end
+
+    def to_str
+      @buffer.dup
+    end
   end
 
-  class ERBEngine < Erubi::Engine
+  class ERBEngine < Erubi::CaptureBlockEngine
     private
 
-    def add_code(code)
-      @src << code
-      @src << ";#{@bufvar};" if code.strip.split(".").first == "end"
-      @src << ";" unless code[Erubi::RANGE_LAST] == "\n"
-    end
-
     def add_text(text)
       return if text.empty?
 
-      src << bufvar << ".safe_append='"
+      src << bufvar << ".safe_concat'"
       src << text.gsub(%r{['\\]}, '\\\\\&')
       src << "'.freeze;"
     end
-
-    # pulled from Rails' ActionView
-    BLOCK_EXPR = %r!\s*((\s+|\))do|\{)(\s*\|[^|]*\|)?\s*\Z!
-
-    def add_expression(indicator, code)
-      src << bufvar << if (indicator == "==") || @escape
-                         ".safe_expr_append="
-                       else
-                         ".append="
-                       end
-
-      if BLOCK_EXPR.match?(code)
-        src << " " << code
-      else
-        src << "(" << code << ");"
-      end
-    end
   end
 
   module ERBCapture
@@ -67,8 +102,9 @@ module Bridgetown
       result = yield(*args)
       result = @_erbout.presence || result
       @_erbout = previous_buffer_state
+      return result.to_s if result.is_a?(OutputBuffer)
 
-      result.is_a?(String) ? ERB::Util.h(result) : result
+      result.is_a?(String) ? Erubi.h(result) : result
     end
   end
 

data/lib/bridgetown-core/filters/url_filters.rb

@@ -70,7 +70,14 @@ module Bridgetown
       # @return [String]
       def strip_extname(input)
         Pathname.new(input.to_s).then do |path|
-          path.dirname + path.basename(".*")
+          basename = path.basename
+          while basename.to_s.include?(".")
+            new_basename = basename.basename(".*")
+            break if new_basename == basename
+
+            basename = new_basename
+          end
+          path.dirname + basename
         end.to_s
       end
 

data/lib/bridgetown-core/helpers.rb

@@ -154,7 +154,7 @@ module Bridgetown
 
         if key&.start_with?(".")
           view_path = Bridgetown::Filters::URLFilters.strip_extname(view.resource.relative_path)
-          key = "#{view_path.tr("_/", " .").lstrip}#{key}"
+          key = "#{view_path.tr("/", ".").lstrip.delete_prefix("_")}#{key}"
         end
 
         return I18n.translate(key, **options) unless %r{(?:_|\b)html\z}.match?(key)

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

@@ -22,12 +22,11 @@ module Bridgetown
     # Roda app is provided the preloaded Bridgetown site configuration. Handle
     # any uncaught Roda errors.
     def self.boot(*)
-      self.loaders_manager =
-        Bridgetown::Utils::LoadersManager.new(Bridgetown::Current.preloaded_configuration)
-      Bridgetown::Current.preloaded_configuration.run_initializers! context: :server
-      LoaderHooks.autoload_server_folder(
-        File.join(Bridgetown::Current.preloaded_configuration.root_dir, "server")
-      )
+      config = Bridgetown::Current.preloaded_configuration
+      self.loaders_manager = Bridgetown::Utils::LoadersManager.new(config)
+
+      config.run_initializers! context: :server
+      LoaderHooks.autoload_server_folder(File.join(config.root_dir, config.server_dir))
     end
   end
 end

data/lib/bridgetown-core/utils/loaders_manager.rb

@@ -61,7 +61,10 @@ module Bridgetown
         end
       end
 
-      def reload_loaders
+      def reload_loaders(site, paths = [])
+        Bridgetown::Hooks.trigger :site, :pre_reload, site, paths
+        Bridgetown::Hooks.clear_reloadable_hooks
+
         FileUtils.rm_f(Bridgetown.build_errors_path)
 
         @loaders.each do |load_path, loader|
@@ -72,6 +75,8 @@ module Bridgetown
           loader.eager_load if config.eager_load_paths.include?(load_path)
           Bridgetown::Hooks.trigger :loader, :post_reload, loader, load_path
         end
+
+        Bridgetown::Hooks.trigger :site, :post_reload, site, paths
       end
     end
   end

data/lib/bridgetown-core/watcher.rb

@@ -101,12 +101,7 @@ module Bridgetown
         I18n.reload! # make sure any locale files get read again
         Bridgetown::Current.sites[site.label] = site # needed in SSR mode apparently
         catch :halt do
-          unless fast_refreshable
-            Bridgetown::Hooks.trigger :site, :pre_reload, site, paths
-            Bridgetown::Hooks.clear_reloadable_hooks
-            site.loaders_manager.reload_loaders
-            Bridgetown::Hooks.trigger :site, :post_reload, site, paths
-          end
+          site.loaders_manager.reload_loaders(site, paths) unless fast_refreshable
 
           if site.ssr?
             site.reset(soft: true)

data/lib/site_template/package.json.erb

@@ -8,19 +8,18 @@
     "esbuild-dev": "node esbuild.config.js --watch"
   },
   "devDependencies": {
-    "esbuild": "^0.20.2",
-    "glob": "^10.3.3",
+    "esbuild": "^0.25.11",
+    "glob": "^11.0.3",
     <%- unless disable_postcss? -%>
-    "postcss": "^8.4.29",
+    "postcss": "^8.5.6",
     "postcss-flexbugs-fixes": "^5.0.2",
-    "postcss-import": "^15.1.0",
-    "postcss-load-config": "^4.0.1",
-    "postcss-preset-env": "^9.1.2",
+    "postcss-import": "^16.1.0",
+    "postcss-load-config": "^6.0.1",
+    "postcss-preset-env": "^10.4.0",
     "read-cache": "^1.0.0"<%= "," unless postcss_option  %>
     <%- end -%>
     <%- unless postcss_option -%>
-    "sass": "^1.66.1",
-    "sass-loader": "^13.3.2"
+    "sass": "^1.93.2"
     <%- end -%>
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-03 00:00:00.000000000 Z
+date: 2025-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -64,14 +64,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement