bridgetown-core 1.3.4 → 2.0.0.beta1

data/lib/bridgetown-core/configurations/stimulus.rb

@@ -4,54 +4,35 @@ require "fileutils"
 
 say "Installing Stimulus...", :green
 
-run("yarn add @hotwired/stimulus")
-if Bridgetown::Utils.frontend_bundler_type == :webpack
-  run("yarn add @hotwired/stimulus-webpack-helpers")
-end
+add_npm_package "@hotwired/stimulus"
 
 say 'Adding Stimulus to "frontend/javascript/index.js"...', :magenta
 
 javascript_import do
-  if Bridgetown::Utils.frontend_bundler_type == :esbuild
-    <<~JS
-      import { Application } from "@hotwired/stimulus"
-    JS
-  else
-    <<~JS
-      import { Application } from "@hotwired/stimulus"
-      import { definitionsFromContext } from "@hotwired/stimulus-webpack-helpers"
-    JS
-  end
+  <<~JS
+    import { Application } from "@hotwired/stimulus"
+  JS
 end
 
 javascript_dir = File.join("frontend", "javascript")
 
 append_to_file(File.join(javascript_dir, "index.js")) do
-  if Bridgetown::Utils.frontend_bundler_type == :esbuild
-    <<~JS
-
-      window.Stimulus = Application.start()
+  <<~JS
 
-      import controllers from "./controllers/**/*.{js,js.rb}"
-      Object.entries(controllers).forEach(([filename, controller]) => {
-        if (filename.includes("_controller.") || filename.includes("-controller.")) {
-          const identifier = filename.replace("./controllers/", "")
-            .replace(/[_-]controller\\..*$/, "")
-            .replace(/_/g, "-")
-            .replace(/\\//g, "--")
+    window.Stimulus = Application.start()
 
-          Stimulus.register(identifier, controller.default)
-        }
-      })
-    JS
-  else
-    <<~JS
+    import controllers from "./controllers/**/*.{js,js.rb}"
+    Object.entries(controllers).forEach(([filename, controller]) => {
+      if (filename.includes("_controller.") || filename.includes("-controller.")) {
+        const identifier = filename.replace("./controllers/", "")
+          .replace(/[_-]controller\\..*$/, "")
+          .replace(/_/g, "-")
+          .replace(/\\//g, "--")
 
-      window.Stimulus = Application.start()
-      const context = require.context("./controllers", true, /\\.js$/)
-      Stimulus.load(definitionsFromContext(context))
-    JS
-  end
+        Stimulus.register(identifier, controller.default)
+      }
+    })
+  JS
 end
 
 controller_dir = File.join(javascript_dir, "controllers")

data/lib/bridgetown-core/configurations/turbo.rb

@@ -2,8 +2,7 @@
 
 say_status :turbo, "Installing Turbo..."
 
-run("yarn add @hotwired/turbo")
-run("yarn add turbo-shadow")
+add_npm_package "@hotwired/turbo turbo-shadow"
 
 say_status :turbo, 'Adding Turbo to "frontend/javascript/index.js"...', :magenta
 

data/lib/bridgetown-core/converter.rb

@@ -15,13 +15,17 @@ module Bridgetown
         self.extname_list += extnames.map { |e| ".#{e.to_s.downcase}" }
       end
 
-      def supports_slots?
-        @support_slots == true
-      end
+      def supports_slots? = @support_slots
 
       def support_slots(bool = true) # rubocop:disable Style/OptionalBooleanParameter
         @support_slots = bool == true
       end
+
+      def template_engine(name = nil)
+        return @template_engine unless name
+
+        @template_engine = name.to_s
+      end
     end
 
     # Initialize the converter.
@@ -35,7 +39,7 @@ module Bridgetown
     # Logic to do the content conversion.
     #
     # @param content [String] content of file (without front matter).
-    # @param convertible [Bridgetown::Document, Bridgetown::Layout, Bridgetown::Resource::Base]
+    # @param convertible [Bridgetown::Layout, Bridgetown::Resource::Base]
     #
     # @return [String] the converted content.
     def convert(content, convertible = nil) # rubocop:disable Lint/UnusedMethodArgument
@@ -46,26 +50,50 @@ module Bridgetown
     #
     # @param [String] ext
     #   The file's extension (including the dot)
+    # @param convertible [Bridgetown::Layout, Bridgetown::Resource::Base]
     #
     # @return [Boolean] Whether the extension matches one in the list
-    def matches(ext)
+    def matches(ext, _convertible = nil)
       (self.class.extname_list || []).include?(ext.downcase)
     end
 
-    # You can override this in Converter subclasses as needed. Default is ".html"
+    def determine_template_engine(convertible)
+      template_engine = self.class.template_engine
+      convertible_engine = convertible.data["template_engine"].to_s
+      convertible_engine == template_engine ||
+        (convertible_engine == "" && @config["template_engine"].to_s == template_engine)
+    end
+
+    # You can override this in Converter subclasses as needed. Default is ".html", unless the
+    # converter is a template engine and the input file doesn't match the normal template extension
     #
     # @param [String] ext
     #   The extension of the original file
     #
     # @return [String] The output file extension (including the dot)
-    def output_ext(_ext)
-      ".html"
+    def output_ext(ext)
+      if self.class.template_engine
+        (self.class.extname_list || []).include?(ext.downcase) ? ".html" : ext
+      else
+        ".html"
+      end
     end
 
-    def line_start(convertible)
+    def line_start(convertible) # rubocop:disable Metrics/PerceivedComplexity
       if convertible.is_a?(Bridgetown::Resource::Base) &&
           convertible.model.origin.respond_to?(:front_matter_line_count)
-        convertible.model.origin.front_matter_line_count + 4
+        if convertible.model.origin.front_matter_line_count.nil?
+          1
+        else
+          convertible.model.origin.front_matter_line_count + 4
+        end
+      elsif convertible.is_a?(Bridgetown::GeneratedPage) && convertible.original_resource
+        res = convertible.original_resource
+        if res.model.origin.respond_to?(:front_matter_line_count)
+          res.model.origin.front_matter_line_count + 4
+        else
+          1
+        end
       else
         1
       end

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

@@ -43,7 +43,7 @@ module Bridgetown
     end
 
     # pulled from Rails' ActionView
-    BLOCK_EXPR = %r!\s*((\s+|\))do|\{)(\s*\|[^|]*\|)?\s*\Z!.freeze
+    BLOCK_EXPR = %r!\s*((\s+|\))do|\{)(\s*\|[^|]*\|)?\s*\Z!
 
     def add_expression(indicator, code)
       src << bufvar << if (indicator == "==") || @escape
@@ -73,8 +73,6 @@ module Bridgetown
   end
 
   class ERBView < RubyTemplateView
-    include ERBCapture
-
     def h(input)
       Erubi.h(input)
     end
@@ -89,13 +87,18 @@ module Bridgetown
 
     def _render_partial(partial_name, options)
       partial_path = _partial_path(partial_name, "erb")
-      tmpl = site.tmp_cache["partial-tmpl:#{partial_path}"] ||= Tilt::ErubiTemplate.new(
+      site.tmp_cache["partial-tmpl:#{partial_path}"] ||= {
+        signal: site.config.fast_refresh ? Signalize.signal(1) : nil,
+      }
+      tmpl = site.tmp_cache["partial-tmpl:#{partial_path}"]
+      tmpl.template ||= Tilt::ErubiTemplate.new(
         partial_path,
         outvar: "@_erbout",
         bufval: "Bridgetown::OutputBuffer.new",
         engine_class: ERBEngine
       )
-      tmpl.render(self, options)
+      tmpl.signal&.value # subscribe so resources are attached to this partial within effect
+      tmpl.template.render(self, options)
     end
   end
 
@@ -103,6 +106,7 @@ module Bridgetown
     class ERBTemplates < Converter
       priority :highest
       input :erb
+      template_engine :erb
 
       # Logic to do the ERB content conversion.
       #
@@ -113,8 +117,6 @@ module Bridgetown
       #
       # @return [String] The converted content.
       def convert(content, convertible)
-        return content if convertible.data[:template_engine].to_s != "erb"
-
         erb_view = Bridgetown::ERBView.new(convertible)
 
         erb_renderer = Tilt::ErubiTemplate.new(
@@ -133,25 +135,6 @@ module Bridgetown
           erb_renderer.render(erb_view)
         end
       end
-
-      # @param ext [String]
-      # @param convertible [Bridgetown::Resource::Base, Bridgetown::GeneratedPage]
-      def matches(ext, convertible)
-        if convertible.data[:template_engine].to_s == "erb" ||
-            (convertible.data[:template_engine].nil? &&
-             @config[:template_engine].to_s == "erb")
-          convertible.data[:template_engine] = "erb"
-          return true
-        end
-
-        super(ext).tap do |ext_matches|
-          convertible.data[:template_engine] = "erb" if ext_matches
-        end
-      end
-
-      def output_ext(ext)
-        ext == ".erb" ? ".html" : ext
-      end
     end
   end
 end

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

@@ -15,7 +15,7 @@ module Bridgetown
       # _ext - The String extension to check (not relevant here)
       #
       # Returns true since it always matches.
-      def matches(_ext)
+      def matches(*)
         true
       end
 

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

@@ -5,6 +5,7 @@ module Bridgetown
     class LiquidTemplates < Converter
       priority :highest
       input :liquid
+      template_engine :liquid
 
       attr_reader :site, :document, :layout
 
@@ -24,8 +25,6 @@ module Bridgetown
       #
       # @return [String] The converted content.
       def convert(content, convertible)
-        return content if convertible.data[:template_engine] != "liquid"
-
         self.class.cached_partials ||= {}
         @payload = nil
 
@@ -56,23 +55,6 @@ module Bridgetown
       # rubocop: enable Metrics/MethodLength
       # rubocop: enable Metrics/AbcSize
 
-      # @param ext [String]
-      # @param convertible [Bridgetown::Resource::Base, Bridgetown::GeneratedPage]
-      def matches(ext, convertible)
-        if convertible.render_with_liquid?
-          convertible.data[:template_engine] = "liquid"
-          return true
-        end
-
-        super(ext).tap do |ext_matches|
-          convertible.data[:template_engine] = "liquid" if ext_matches
-        end
-      end
-
-      def output_ext(ext)
-        ext == ".liquid" ? ".html" : ext
-      end
-
       # Fetches the payload used in Liquid rendering.
       # Falls back to site.site_payload if no payload is set.
       #
@@ -95,7 +77,7 @@ module Bridgetown
       def liquid_context
         {
           registers: {
-            site: site,
+            site:,
             page: payload["page"],
             cached_partials: self.class.cached_partials,
           },

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

@@ -1,16 +1,74 @@
 # frozen_string_literal: true
 
+require "streamlined/renderable"
+
 module Bridgetown
+  class PureRubyView < ERBView
+    def render(item = nil, **options, &block) # rubocop:disable Metrics
+      return @_erbout if !block && options.empty? && item.nil?
+
+      if item.is_a?(Proc) || (block && item.nil?)
+        result = item.is_a?(Proc) ? item.() : yield
+        return result if result.is_a?(OutputBuffer)
+
+        @_erbout ||= OutputBuffer.new
+        @_erbout << result.to_s.html_safe
+
+        return @_erbout
+      end
+
+      if item.respond_to?(:render_in)
+        result = item.render_in(self, &block)
+        result&.to_s&.html_safe
+      else
+        partial(item, **options, &block)&.html_safe
+      end
+    end
+
+    def _render_partial(partial_name, options) # rubocop:todo Metrics
+      partial_path = _partial_path(partial_name, "rb")
+      return super unless File.exist?(partial_path)
+
+      (@_locals_stack ||= []).push(options)
+      (@_buffer_stack ||= []).push(@_erbout)
+      @_erbout = OutputBuffer.new
+
+      site.tmp_cache["partial-tmpl:#{partial_path}"] ||= {
+        signal: site.config.fast_refresh ? Signalize.signal(1) : nil,
+      }
+      tmpl = site.tmp_cache["partial-tmpl:#{partial_path}"]
+      tmpl.template ||= options.keys.map do |k|
+        "#{k}=locals[:#{k}];"
+      end.push(File.read(partial_path)).join
+      tmpl.signal&.value # subscribe so resources are attached to this partial within effect
+
+      instance_eval(tmpl.template).to_s.tap do
+        @_locals_stack.pop
+        @_erbout = @_buffer_stack.pop
+      end
+    end
+
+    def _output_buffer
+      @_erbout # might be nil
+    end
+
+    def locals
+      @_locals_stack&.last || {}
+    end
+  end
+
   module Converters
     class RubyTemplates < Converter
       priority :highest
       input :rb
+      template_engine :ruby
 
       def convert(content, convertible)
-        erb_view = Bridgetown::ERBView.new(convertible)
-        erb_view.instance_eval(
+        rb_view = Bridgetown::PureRubyView.new(convertible)
+        results = rb_view.instance_eval(
           content, convertible.path.to_s, line_start(convertible)
-        ).to_s
+        )
+        rb_view._output_buffer || results.to_s
       end
     end
   end

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

@@ -9,15 +9,20 @@ module Bridgetown
 
     def _render_partial(partial_name, options)
       partial_path = _partial_path(partial_name, "serb")
-      tmpl = site.tmp_cache["partial-tmpl:#{partial_path}"] ||=
-        Tilt::SerbeaTemplate.new(partial_path)
-      tmpl.render(self, options)
+      site.tmp_cache["partial-tmpl:#{partial_path}"] ||= {
+        signal: site.config.fast_refresh ? Signalize.signal(1) : nil,
+      }
+      tmpl = site.tmp_cache["partial-tmpl:#{partial_path}"]
+      tmpl.template ||= Tilt::SerbeaTemplate.new(partial_path)
+      tmpl.signal&.value # subscribe so resources are attached to this partial within effect
+      tmpl.template.render(self, options)
     end
   end
 
   module Converters
     class SerbeaTemplates < Converter
       priority :highest
+      template_engine :serbea
       input :serb
 
       # Logic to do the Serbea content conversion.
@@ -29,11 +34,11 @@ module Bridgetown
       #
       # @return [String] The converted content.
       def convert(content, convertible)
-        return content if convertible.data[:template_engine].to_s != "serbea"
-
         serb_view = Bridgetown::SerbeaView.new(convertible)
-
-        serb_renderer = Tilt::SerbeaTemplate.new(convertible.path) { content }
+        serb_renderer = Tilt::SerbeaTemplate.new(
+          convertible.path,
+          line_start(convertible)
+        ) { content }
 
         if convertible.is_a?(Bridgetown::Layout)
           serb_renderer.render(serb_view) do
@@ -43,23 +48,6 @@ module Bridgetown
           serb_renderer.render(serb_view)
         end
       end
-
-      def matches(ext, convertible)
-        if convertible.data[:template_engine].to_s == "serbea" ||
-            (convertible.data[:template_engine].nil? &&
-              @config[:template_engine].to_s == "serbea")
-          convertible.data[:template_engine] = "serbea"
-          return true
-        end
-
-        super(ext).tap do |ext_matches|
-          convertible.data[:template_engine] = "serbea" if ext_matches
-        end
-      end
-
-      def output_ext(ext)
-        ext == ".serb" ? ".html" : ext
-      end
     end
   end
 end

data/lib/bridgetown-core/current.rb

@@ -1,28 +1,30 @@
 # frozen_string_literal: true
 
+Thread.attr_accessor :bridgetown_state
+
 module Bridgetown
-  class Current < ActiveSupport::CurrentAttributes
-    # @!method self.preloaded_configuration
-    #   @return [Bridgetown::Configuration]
-    attribute :preloaded_configuration
+  class Current
+    class << self
+      def thread_state = Thread.current.bridgetown_state ||= {}
 
-    # @return [Bridgetown::Site, nil]
-    def self.site
-      sites[:main]
-    end
+      # @return [Bridgetown::Site, nil]
+      def site = sites[:main]
 
-    def self.site=(new_site)
-      sites[:main] = new_site
-    end
+      def site=(new_site)
+        sites[:main] = new_site
+      end
 
-    # @!method self.sites
-    #   @return [Hash<Symbol, Bridgetown::Site>]
+      # @return [Hash<Symbol, Bridgetown::Site>]
+      def sites
+        thread_state[:sites] ||= {}
+      end
 
-    attribute :sites
+      # @return [Bridgetown::Configuration]
+      def preloaded_configuration = thread_state[:preloaded_configuration]
 
-    def initialize
-      super
-      @attributes[:sites] = {}
+      def preloaded_configuration=(value)
+        thread_state[:preloaded_configuration] = value
+      end
     end
   end
 end

data/lib/bridgetown-core/drops/collection_drop.rb

@@ -8,7 +8,7 @@ module Bridgetown
       mutable false
 
       def_delegator  :@obj, :write?, :output
-      def_delegators :@obj, :label, :files, :relative_path, :resources, :static_files
+      def_delegators :@obj, :label, :relative_path, :resources, :static_files
 
       private def_delegator :@obj, :metadata, :fallback_data
 

data/lib/bridgetown-core/drops/drop.rb

@@ -24,7 +24,7 @@ module Bridgetown
 
       # Create a new Drop
       #
-      # obj - the Bridgetown Site, Collection, or Document required by the
+      # obj - the Bridgetown Site, Collection, or Resource required by the
       # drop.
       #
       # Returns nothing
@@ -159,8 +159,8 @@ module Bridgetown
       # block - a block which accepts one argument, the key
       #
       # Returns nothing.
-      def each_key(&block)
-        keys.each(&block)
+      def each_key(&)
+        keys.each(&)
       end
 
       def each

data/lib/bridgetown-core/drops/relations_drop.rb

@@ -3,16 +3,17 @@
 module Bridgetown
   module Drops
     class RelationsDrop < Drop
+      using Bridgetown::Refinements
       mutable false
 
       def [](type)
-        return nil unless type.to_s.in?(@obj.relation_types)
+        return nil unless type.to_s.within?(@obj.relation_types)
 
         @obj.resources_for_type(type)
       end
 
       def key?(type)
-        type.to_s.in?(@obj.relation_types)
+        type.to_s.within?(@obj.relation_types)
       end
 
       def fallback_data

data/lib/bridgetown-core/drops/site_drop.rb

@@ -8,7 +8,6 @@ module Bridgetown
       mutable false
 
       def_delegators :@obj,
-                     :baseurl, # deprecated
                      :base_path,
                      :data,
                      :locale,
@@ -24,10 +23,6 @@ module Bridgetown
 
       attr_writer :current_document
 
-      def uses_resource
-        @obj.uses_resource?
-      end
-
       def resources
         @resources ||= @obj.resources
       end

data/lib/bridgetown-core/entry_filter.rb

@@ -4,8 +4,8 @@ module Bridgetown
   class EntryFilter
     attr_reader :site
 
-    SPECIAL_LEADING_CHAR_REGEX = %r!\A#{Regexp.union([".", "_", "#", "~"])}!o.freeze
-    SPECIAL_LEADING_CHAR_NO_UNDERSCORES_REGEX = %r!\A#{Regexp.union([".", "#", "~"])}!o.freeze
+    SPECIAL_LEADING_CHAR_REGEX = %r!\A#{Regexp.union([".", "_", "#", "~"])}!o
+    SPECIAL_LEADING_CHAR_NO_UNDERSCORES_REGEX = %r!\A#{Regexp.union([".", "#", "~"])}!o
 
     def initialize(site, base_directory: nil, include_underscores: false)
       @site = site
@@ -49,11 +49,9 @@ module Bridgetown
     end
 
     def special?(entry)
-      use_regex = if @include_underscores
-                    SPECIAL_LEADING_CHAR_NO_UNDERSCORES_REGEX
-                  else
+      use_regex = @include_underscores ?
+                    SPECIAL_LEADING_CHAR_NO_UNDERSCORES_REGEX :
                     SPECIAL_LEADING_CHAR_REGEX
-                  end
 
       use_regex.match?(entry) || use_regex.match?(File.basename(entry))
     end

data/lib/bridgetown-core/errors.rb

@@ -15,7 +15,7 @@ module Bridgetown
     InvalidURLError             = Class.new(FatalException)
     InvalidConfigurationError   = Class.new(FatalException)
 
-    def self.print_build_error(exc, trace: false, logger: Bridgetown.logger, server: false) # rubocop:disable Metrics
+    def self.print_build_error(exc, trace: false, logger: Bridgetown.logger, server: false) # rubocop:todo Metrics
       logger.error "Exception raised:", exc.class.to_s.bold
       logger.error exc.message.reset_ansi
 
@@ -28,7 +28,7 @@ module Bridgetown
                  print_trace_msg = false
                  exc.backtrace
                else
-                 exc.backtrace[0..4]
+                 exc.backtrace.grep_v(%r!bridgetown-core.+method_missing!)[0..4]
                end
       traces.each_with_index do |backtrace_line, index|
         logger.error "#{index + 1}:", backtrace_line.reset_ansi

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

@@ -5,19 +5,15 @@ module Bridgetown
     module FromLiquid
       extend Liquid::StandardFilters
 
-      def strip_html(input)
-        FromLiquid.strip_html(input)
-      end
+      def strip_html(...) = FromLiquid.strip_html(...)
 
-      def strip_newlines(input)
-        FromLiquid.strip_newlines(input)
-      end
+      def strip_newlines(...) = FromLiquid.strip_newlines(...)
 
-      def newline_to_br(input)
-        FromLiquid.newline_to_br(input)
-      end
+      def newline_to_br(...) = FromLiquid.newline_to_br(...)
 
-      # FYI, truncate and truncate words are already provided by ActiveSupport! =)
+      def truncate(...) = FromLiquid.truncate(...)
+
+      def truncate_words(...) = FromLiquid.truncatewords(...)
     end
   end
 end

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

@@ -11,7 +11,7 @@ module Bridgetown
         locale ||= maybe_locale(format)
         format = nil if locale == format
 
-        I18n.l(date, format: format, locale: locale)
+        I18n.l(date, format:, locale:)
       end
 
       private

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

@@ -9,7 +9,7 @@ module Bridgetown
         count = options.delete(:count)
         options[:count] = count.to_i unless count.nil?
 
-        I18n.t(input.to_s, locale: locale, **options)
+        I18n.t(input.to_s, locale:, **options)
       rescue ArgumentError
         input
       end
@@ -17,7 +17,7 @@ module Bridgetown
       private
 
       def string_to_hash(options)
-        options.split(",").to_h { |e| e.split(":").map(&:strip) }.symbolize_keys
+        options.split(",").to_h { |e| e.split(":").map(&:strip) }.transform_keys(&:to_sym)
       end
     end
   end