bridgetown-core 2.0.5 → 2.1.0.beta1

data/lib/bridgetown-core/model/plugin_origin.rb

@@ -27,7 +27,9 @@ module Bridgetown
       end
 
       def original_path
-        @original_path ||= relative_path.expand_path(manifest.content)
+        @original_path ||= relative_path.expand_path(
+          manifest.dig(:contents, collection.label.to_sym)
+        )
       end
     end
   end

data/lib/bridgetown-core/model/repo_origin.rb

@@ -36,7 +36,9 @@ module Bridgetown
 
       def read
         begin
-          @data = (in_data_collection? ? read_file_data : read_front_matter(original_path)) || {}
+          @data = (
+            in_data_collection? ? read_file_data : read_front_matter(original_path, bare_text:)
+          ) || {}
         rescue SyntaxError => e
           Bridgetown.logger.error "Error:",
                                   "Ruby Exception in #{e.message}"

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

@@ -29,7 +29,7 @@ module Bridgetown
           puts
           puts "Routes:"
           puts "=======\n"
-          if routes.blank?
+          if routes.empty?
             puts "No routes found. Have you commented all of your routes?"
             puts "Documentation: https://github.com/jeremyevans/roda-route_list#basic-usage-"
           end

data/lib/bridgetown-core/reader.rb

@@ -20,7 +20,7 @@ module Bridgetown
       read_includes
       sort_files!
       read_collections
-      site.config.source_manifests.select(&:content).each do |manifest|
+      site.config.source_manifests.each do |manifest|
         PluginContentReader.new(site, manifest).read
       end
     end
@@ -66,7 +66,7 @@ module Bridgetown
 
       entries = Dir.chdir(base) { filter_entries(Dir.entries("."), base) }
       entries.each do |entry|
-        file_path = @site.in_source_dir(base, entry)
+        file_path = site.in_source_dir(base, entry)
         if File.directory?(file_path)
           entries_dirs << entry
         elsif FrontMatter::Loaders.front_matter?(file_path)

data/lib/bridgetown-core/readers/plugin_content_reader.rb

@@ -2,37 +2,61 @@
 
 module Bridgetown
   class PluginContentReader
-    attr_reader :site, :manifest, :content_dir
+    attr_reader :site, :manifest, :content_dirs
 
     # @param site [Bridgetown::Site]
     # @param manifest [Bridgetown::Plugin::SourceManifest]
     def initialize(site, manifest)
       @site = site
       @manifest = manifest
-      @content_dir = manifest.content
+      @content_dirs = manifest.contents
       @content_files = Set.new
+      @supports_bare_text = manifest.bare_text
+      @bare_text_extensions = site.config.markdown_ext.split(",").map { ".#{_1}" } + [".html"]
     end
 
     def read
-      return unless content_dir
+      return if content_dirs.empty?
+
+      content_dirs.each do |collection_name, root|
+        read_content_root collection_name, root
+      end
+    end
+
+    def read_content_root(collection_name, content_dir)
+      collection = site.collections[collection_name]
+      unless collection
+        Bridgetown.logger.warn(
+          "Reading",
+          "Plugin requested missing collection #{collection_name}, cannot continue"
+        )
+        return
+      end
 
       Find.find(content_dir) do |path|
-        next if File.directory?(path)
+        if File.directory?(path)
+          Find.prune if EntryFilter::SPECIAL_LEADING_CHAR_REGEX.match?(File.basename(path))
+          next
+        end
 
         if File.symlink?(path)
           Bridgetown.logger.warn "Plugin content reader:", "Ignored symlinked asset: #{path}"
         else
-          read_content_file(path)
+          read_content_file(content_dir, path, collection)
         end
       end
     end
 
-    def read_content_file(path)
+    # @param collection [Bridgetown::Collection]
+    def read_content_file(content_dir, path, collection)
       dir = File.dirname(path.sub("#{content_dir}/", ""))
       name = File.basename(path)
+      extname = File.extname(path)
 
       @content_files << if FrontMatter::Loaders.front_matter?(path)
-                          site.collections.pages.read_resource(path, manifest:)
+                          collection.read_resource(path, manifest:)
+                        elsif @supports_bare_text && @bare_text_extensions.any? { extname == _1 }
+                          collection.read_resource(path, manifest:, bare_text: true)
                         else
                           Bridgetown::StaticFile.new(site, content_dir, "/#{dir}", name)
                         end

data/lib/bridgetown-core/resource/base.rb

@@ -19,6 +19,9 @@ module Bridgetown
       # @return [Bridgetown::Site]
       attr_reader :site
 
+      # @return [Roda]
+      attr_accessor :roda_app
+
       # @return [Array<Bridgetown::Slot>]
       attr_reader :slots
 
@@ -170,9 +173,9 @@ module Bridgetown
       # @return [String]
       def call(*) = transform!.output
 
-      def trigger_hooks(hook_name, *args)
-        Bridgetown::Hooks.trigger collection.label.to_sym, hook_name, self, *args if collection
-        Bridgetown::Hooks.trigger :resources, hook_name, self, *args
+      def trigger_hooks(hook_name, *)
+        Bridgetown::Hooks.trigger(collection.label.to_sym, hook_name, self, *) if collection
+        Bridgetown::Hooks.trigger(:resources, hook_name, self, *)
       end
 
       def around_hook(hook_suffix)
@@ -319,8 +322,8 @@ module Bridgetown
       def <=>(other) # rubocop:todo Metrics/AbcSize
         return nil unless other.respond_to?(:data)
 
-        cmp = if data.date.respond_to?(:to_datetime) && other.data.date.respond_to?(:to_datetime)
-                data.date.to_datetime <=> other.data.date.to_datetime
+        cmp = if data.date.respond_to?(:to_time) && other.data.date.respond_to?(:to_time)
+                data.date.to_time <=> other.data.date.to_time
               end
 
         cmp = data["date"] <=> other.data["date"] if cmp.nil?
@@ -387,6 +390,7 @@ module Bridgetown
       def ensure_default_data
         determine_locale
         merge_requested_site_data
+        normalize_date_as_time
 
         slug = if matches = relative_path.to_s.match(DATE_FILENAME_MATCHER) # rubocop:disable Lint/AssignmentInCondition
                  set_date_from_string(matches[1]) unless data.date
@@ -412,6 +416,11 @@ module Bridgetown
         end
       end
 
+      def normalize_date_as_time
+        data_date = data.date
+        data.date = data_date.to_time if data_date.is_a?(Date)
+      end
+
       def set_date_from_string(new_date) # rubocop:disable Naming/AccessorMethodName
         return unless new_date.is_a?(String)
 
@@ -441,9 +450,9 @@ module Bridgetown
         end
       end
 
-      def determine_locale # rubocop:todo Metrics/AbcSize
+      def determine_locale
         unless data.locale
-          data.locale = locale_from_alt_data_or_filename.presence || site.config.default_locale
+          data.locale = locale_from_alt_data_or_filename || site.config.default_locale
         end
 
         return unless data.locale_overrides.is_a?(Hash) && data.locale_overrides&.key?(data.locale)

data/lib/bridgetown-core/resource/destination.rb

@@ -33,7 +33,7 @@ module Bridgetown
 
       def output_path
         path = Utils.unencode_uri(relative_url)
-        if resource.site.base_path.present?
+        unless resource.site.base_path.empty?
           path = path.delete_prefix resource.site.base_path(strip_slash_only: true)
         end
         path = resource.site.in_dest_dir(path)

data/lib/bridgetown-core/resource/permalink_processor.rb

@@ -33,9 +33,9 @@ module Bridgetown
         # Strip out file extension and process each segment of a URL to swap out
         # placeholders such as :categories or :title
         url_segments = Bridgetown::Filters::URLFilters.strip_extname(permalink).split("/")
-        new_url = url_segments.map do |segment|
+        new_url = url_segments.filter_map do |segment|
           segment.starts_with?(":") ? process_segment(segment.sub(%r{^:}, "")) : segment
-        end.select(&:present?).join("/")
+        end.reject(&:empty?).join("/")
         # No relative URLs should ever end in /index.html
         new_url.sub!(%r{/index$}, "") if final_ext == ".html"
 
@@ -97,7 +97,7 @@ module Bridgetown
       end
 
       def ensure_base_path(permalink)
-        if resource.site.base_path.present?
+        unless resource.site.base_path.empty?
           return "#{resource.site.base_path(strip_slash_only: true)}#{permalink}"
         end
 
@@ -110,7 +110,7 @@ module Bridgetown
       register_placeholder :path, ->(resource) do
         {
           raw_value: resource.relative_path_basename_without_prefix.tap do |path|
-            if resource.site.config["collections_dir"].present?
+            if resource.site.config["collections_dir"].length.positive?
               path.delete_prefix! "#{resource.site.config["collections_dir"]}/"
             end
 

data/lib/bridgetown-core/static_file.rb

@@ -55,7 +55,7 @@ module Bridgetown
     def destination(dest)
       dest = site.in_dest_dir(dest)
       dest_url = url
-      if site.base_path.present? && collection
+      if site.base_path.length.positive? && collection
         dest_url = dest_url.delete_prefix site.base_path(strip_slash_only: true)
       end
       site.in_dest_dir(dest, Bridgetown::Utils.unencode_uri(dest_url))

data/lib/bridgetown-core/tags/class_map.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "set"
-
 module Bridgetown
   module Tags
     # A ClassMap class is meant to take a hash and append styles based on if the

data/lib/bridgetown-core/tasks/bridgetown_tasks.rake

@@ -37,14 +37,11 @@ namespace :roda do
 end
 
 desc "Prerequisite task which loads site and provides automation"
-task :environment do # rubocop:todo Metrics/BlockLength
-  class HammerActions < Thor # rubocop:disable Lint/ConstantDefinitionInBlock
-    include Thor::Actions
-    include Bridgetown::Commands::Actions
+task :environment do
+  require "freyia"
 
-    def self.source_root
-      Dir.pwd
-    end
+  class Hamr < Freyia::Base # rubocop:disable Lint/ConstantDefinitionInBlock
+    include Bridgetown::Commands::Automations
 
     def self.exit_on_failure?
       true
@@ -62,14 +59,14 @@ task :environment do # rubocop:todo Metrics/BlockLength
   end
 
   define_singleton_method :automation do |*args, &block|
-    @hammer ||= HammerActions.new
-    @hammer.instance_exec(*args, &block)
+    @hamr ||= Hamr.new(source: Dir.pwd, dest: Dir.pwd)
+    @hamr.instance_exec(*args, &block)
   end
 
   %i(site run_initializers).each do |meth|
     define_singleton_method meth do |**kwargs|
-      @hammer ||= HammerActions.new
-      @hammer.send(:site, **kwargs)
+      @hamr ||= Hamr.new(source: Dir.pwd, dest: Dir.pwd)
+      @hamr.send(:site, **kwargs)
     end
   end
 end

data/lib/bridgetown-core/{ruby_template_view.rb → template_view.rb}

@@ -19,7 +19,8 @@ module Bridgetown
     alias_method :macro, :helper
   end
 
-  class RubyTemplateView
+  # Holds context for page rendering and is subclassed by various template engines like ERB.
+  class TemplateView
     require "bridgetown-core/helpers"
 
     using Bridgetown::Refinements
@@ -28,6 +29,58 @@ module Bridgetown
     attr_reader :layout, :resource, :paginator, :site, :content
     alias_method :page, :resource
 
+    class << self
+      attr_accessor :extname_list
+
+      # View renderers can provide one or more extensions they accept. Examples:
+      #
+      # * `input :erb`
+      # * `input %i(rb ruby)`
+      #
+      # @param extnames [Array<Symbol>] extensions
+      def input(extnames)
+        extnames = Array(extnames)
+        self.extname_list ||= []
+        self.extname_list += extnames.map { |e| ".#{e.to_s.downcase}" }
+      end
+
+      # Returns a global "virtual" TemplateView for use in rendering out side of a specific
+      # context
+      #
+      # @return [TemplateView]
+      def virtual_view
+        # if site object has changed, clear previous state
+        @virtual_res = @virtual_view = nil if @virtual_res&.site != Bridgetown::Current.site
+
+        @virtual_res ||= Bridgetown::Model::Base.build(
+          { site: Bridgetown::Current.site }.as_dots, :pages, "VIRTUAL", {}
+        ).to_resource.read!
+        @virtual_view ||= new(@virtual_res)
+      end
+
+      # Creates a new virtual TemplateView with a "resource" containing the provided data
+      #
+      # @param virtual_path [String] a fictional "relative URL" for the resource
+      # @param **data [Hash] to be passed along to the resource
+      # @return [TemplateView]
+      def new_with_data(virtual_path = "VIRTUAL", **data)
+        res = Bridgetown::Model::Base.build(
+          { site: Bridgetown::Current.site }.as_dots, :pages, virtual_path, data
+        ).to_resource.read!
+
+        new(res)
+      end
+
+      # Calls the render method of a global TemplateView which lets you output partials and
+      # components outside of a specific rendering context
+      #
+      # @see {TemplateView#render}
+      # @param item [String, Bridgetown::Component]
+      # @param **locals [Array] - relevant for partials
+      # @return [String]
+      def render(...) = virtual_view.render(...)
+    end
+
     def initialize(convertible)
       if convertible.is_a?(Layout)
         @layout = convertible
@@ -48,14 +101,26 @@ module Bridgetown
 
     def site_drop = site.site_payload.site
 
-    def partial(_partial_name = nil, **_options) = raise("Must be implemented in a subclass")
+    def template_view_classes
+      @template_view_classes ||= TemplateView.descendants.each_with_object({}) do |klass, hsh|
+        klass.extname_list.each do |ext|
+          hsh[ext] = klass
+        end
+      end
+    end
 
-    def render(item, **options, &)
+    # Renders a partial, or a component object which responds to `render_in`
+    #
+    # @param item [String, Bridgetown::Component]
+    # @param **locals [Array] - relevant for partials
+    # @yield optional block which is passed along to the component's `render_in` method
+    # @return [String]
+    def render(item, **, &)
       if item.respond_to?(:render_in)
         result = item.render_in(self, &)
         result&.html_safe
       else
-        partial(item, **options, &)&.html_safe
+        partial(item, **, &)&.html_safe
       end
     end
 
@@ -73,6 +138,16 @@ module Bridgetown
       template.render!(options.as_dots, _liquid_context).html_safe
     end
 
+    def partial(partial_name = nil, **options, &)
+      partial_name = options[:template] if partial_name.nil? && options[:template]
+      found_file = _locate_partial(partial_name)
+      view_class = _view_class_for_partial(found_file)
+
+      view_class.new(resource).tap do |view|
+        view.resource.roda_app = self.class.virtual_view.resource.roda_app
+      end.partial(partial_name, **options, &)
+    end
+
     def helpers
       @helpers ||= Helpers.new(self, site)
     end
@@ -133,5 +208,34 @@ module Bridgetown
 
       site.in_source_dir(site.config[:partials_dir], "#{partial_name}.#{ext}")
     end
+
+    def _locate_partial(partial_name)
+      found_file = nil
+
+      # TODO: make this configurable
+      %w(erb serb rb slim haml).each do |ext|
+        next if found_file
+
+        path = _partial_path(partial_name, ext)
+        found_file = _partial_path_exist?(path) && path
+      end
+
+      raise "No matching partial could be found for #{partial_name}" unless found_file
+
+      found_file
+    end
+
+    def _partial_path_exist?(path) = site.tmp_cache["partial-tmpl:#{path}"] || File.exist?(path)
+
+    def _view_class_for_partial(path)
+      view_class = template_view_classes[File.extname(path)]
+
+      raise "No view renderer could be found for #{File.basename(path)}" unless view_class
+
+      view_class
+    end
   end
+
+  # TODO: this class alias is deprecated and will be removed in the next major Bridgetown release
+  RubyTemplateView = TemplateView
 end

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# Make sure you update REQUIRE_DENYLIST in `Bridgetown::Configuration` for initializers which
+# aren't Gem backed
+
 Bridgetown.initializer :dotenv do |config|
   Bridgetown.load_dotenv root: config.root_dir
 end
@@ -10,6 +13,30 @@ Bridgetown.initializer :ssr do |config, setup: nil, **options|
   end
 end
 
+Bridgetown.initializer :external_sources do |config, contents:|
+  Bridgetown::ExternalSources = Module.new
+
+  contents.each do |coll, path|
+    contents[coll] = File.expand_path(path, config.root_dir)
+  end
+
+  if config.context == :static
+    contents.each_value.with_index do |path, index|
+      Bridgetown.logger.info(index.zero? ? "External Sources:" : "", path)
+    end
+  end
+
+  config.source_manifest(
+    origin: Bridgetown::ExternalSources,
+    contents:,
+    bare_text: true
+  )
+
+  contents.each_value do |path|
+    config.additional_watch_paths << path
+  end
+end
+
 Bridgetown.initializer :parse_routes do |config|
   # This builds upon the work done here:
   # https://github.com/jeremyevans/roda-route_list/blob/master/bin/roda-parse_routes
@@ -33,7 +60,7 @@ Bridgetown.initializer :parse_routes do |config|
     file_contents = File.read(route_file)
     routes = parser.parse(file_contents)
 
-    next unless routes.present?
+    next if routes.empty?
 
     routes.each do |route|
       route["file"] = route_file

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

@@ -29,7 +29,8 @@ module Bridgetown
       end
 
       def setup_loaders(autoload_paths = []) # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
-        (autoload_paths.presence || config.autoload_paths).each do |load_path|
+        autoload_paths = config.autoload_paths if autoload_paths.empty?
+        autoload_paths.each do |load_path|
           if @loaders.key?(load_path)
             raise "Zeitwerk loader already added for `#{load_path}'. Please check your config"
           end

data/lib/bridgetown-core/utils.rb

@@ -398,7 +398,7 @@ module Bridgetown
     end
 
     def default_github_branch_name(repo_url)
-      repo_match = Bridgetown::Commands::Actions::GITHUB_REPO_REGEX.match(repo_url)
+      repo_match = Bridgetown::Commands::Automations::GITHUB_REPO_REGEX.match(repo_url)
       api_endpoint = "https://api.github.com/repos/#{repo_match[1]}"
       JSON.parse(Faraday.get(api_endpoint).body)["default_branch"] || "main"
     rescue StandardError => e
@@ -406,6 +406,24 @@ module Bridgetown
       "main"
     end
 
+    def default_gitlab_branch_name(repo_url)
+      repo_match = Bridgetown::Commands::Automations::GITLAB_REPO_REGEX.match(repo_url)
+      api_endpoint = "https://gitlab.com/api/v4/projects/#{repo_match[1].sub("/", "%2F")}"
+      JSON.parse(Faraday.get(api_endpoint).body)["default_branch"] || "main"
+    rescue StandardError => e
+      Bridgetown.logger.warn("Unable to connect to GitLab API: #{e.message}")
+      "main"
+    end
+
+    def default_codeberg_branch_name(repo_url)
+      repo_match = Bridgetown::Commands::Automations::CODEBERG_REPO_REGEX.match(repo_url)
+      api_endpoint = "https://codeberg.org/api/v1/repos/#{repo_match[1]}"
+      JSON.parse(Faraday.get(api_endpoint).body)["default_branch"] || "main"
+    rescue StandardError => e
+      Bridgetown.logger.warn("Unable to connect to Codeberg API: #{e.message}")
+      "main"
+    end
+
     def live_reload_js(site) # rubocop:disable Metrics/MethodLength
       return "" unless Bridgetown.env.development? && !site.config.skip_live_reload
 

data/lib/bridgetown-core/watcher.rb

@@ -65,12 +65,11 @@ module Bridgetown
         ignore: listen_ignore_paths(options),
         force_polling: options["force_polling"]
       ) do |modified, added, removed|
-        c = modified + added + removed
+        paths = modified + added + removed
 
-        # NOTE: inexplicably, this matcher doesn't work with the Listen gem, so
-        # we have to run it here manually
-        c.reject! { component_frontend_matcher(options).match? _1 }
-        n = c.length
+        filter_paths(paths, options)
+
+        n = paths.length
         next if n.zero?
 
         unless site.ssr?
@@ -78,13 +77,13 @@ module Bridgetown
             "Reloading…",
             "#{n} file#{"s" if n > 1} changed at #{Time.now.strftime("%Y-%m-%d %H:%M:%S")}"
           )
-          c.each { |path| Bridgetown.logger.info "", "- #{path["#{site.root_dir}/".length..]}" }
+          paths.each { Bridgetown.logger.info "", "- #{_1.delete_prefix("#{site.root_dir}/")}" }
         end
 
         reload_site(
           site,
           options,
-          paths: c,
+          paths:,
           fast_refreshable: site.config.fast_refresh && (added + removed).empty?
         )
       end.start
@@ -146,7 +145,7 @@ module Bridgetown
     # rubocop:enable Layout/LineLength
 
     def to_exclude(options)
-      [
+      @to_exclude ||= [
         options["destination"],
         custom_excludes(options),
       ].flatten
@@ -178,6 +177,15 @@ module Bridgetown
       end
     end
 
+    def filter_paths(paths, options)
+      # NOTE: inexplicably, this matcher doesn't work with the Listen gem, so
+      # we have to run it here manually
+      paths.reject! { component_frontend_matcher(options).match? _1 }
+      # Filter again by ignore exclusions, needed for "folder inversion" projects where the
+      # Bridgetown root is inside of the main folder being watched
+      paths.reject! { |path| to_exclude(options).any? { path == _1 || path.start_with?(_1) } }
+    end
+
     def sleep_forever
       sleep 0.5 until shutdown
     end

data/lib/bridgetown-core.rb

@@ -26,7 +26,6 @@ require "time"
 require "English"
 require "pathname"
 require "logger"
-require "set"
 require "csv"
 require "json"
 require "yaml"
@@ -35,10 +34,6 @@ require "yaml"
 require "bridgetown-foundation"
 
 # 3rd party
-require "active_support" # TODO: remove by the end of 2025
-require "active_support/core_ext/object/blank"
-require "active_support/core_ext/string/inflections"
-require "active_support/core_ext/string/output_safety"
 require "addressable/uri"
 require "liquid"
 require "listen"
@@ -46,8 +41,8 @@ require "kramdown"
 require "i18n"
 require "i18n/backend/fallbacks"
 require "faraday"
+require "samovar"
 require "signalize"
-require "thor"
 
 # Ensure we can set up fallbacks so the default locale gets used
 I18n::Backend::Simple.include I18n::Backend::Fallbacks
@@ -73,6 +68,7 @@ module Bridgetown
   autoload :Current,             "bridgetown-core/current"
   autoload :Cleaner,             "bridgetown-core/cleaner"
   autoload :Collection,          "bridgetown-core/collection"
+  autoload :Command,             "bridgetown-core/command"
   autoload :Component,           "bridgetown-core/component"
   autoload :DefaultsReader,      "bridgetown-core/readers/defaults_reader"
   autoload :Deprecator,          "bridgetown-core/deprecator"
@@ -81,7 +77,6 @@ module Bridgetown
   autoload :FrontMatter,         "bridgetown-core/front_matter"
   autoload :GeneratedPage,       "bridgetown-core/generated_page"
   autoload :Hooks,               "bridgetown-core/hooks"
-  autoload :Inflector,           "bridgetown-core/inflector"
   autoload :Layout,              "bridgetown-core/layout"
   autoload :LayoutPlaceable,     "bridgetown-core/concerns/layout_placeable"
   autoload :LayoutReader,        "bridgetown-core/readers/layout_reader"
@@ -93,20 +88,20 @@ module Bridgetown
   autoload :Prioritizable,       "bridgetown-core/concerns/prioritizable"
   autoload :Publishable,         "bridgetown-core/concerns/publishable"
   autoload :Reader,              "bridgetown-core/reader"
-  autoload :RubyTemplateView,    "bridgetown-core/ruby_template_view"
   autoload :LogWriter,           "bridgetown-core/log_writer"
   autoload :Signals,             "bridgetown-core/signals"
   autoload :Site,                "bridgetown-core/site"
   autoload :Slot,                "bridgetown-core/slot"
   autoload :StaticFile,          "bridgetown-core/static_file"
+  autoload :TemplateView,        "bridgetown-core/template_view"
   autoload :Transformable,       "bridgetown-core/concerns/transformable"
   autoload :Viewable,            "bridgetown-core/concerns/viewable"
   autoload :Utils,               "bridgetown-core/utils"
-  autoload :VERSION,             "bridgetown-core/version"
   autoload :Watcher,             "bridgetown-core/watcher"
   autoload :YAMLParser,          "bridgetown-core/yaml_parser"
 
   # extensions
+  require "bridgetown-core/commands/thor_shim"
   require "bridgetown-core/commands/registrations"
   require "bridgetown-core/plugin"
   require "bridgetown-core/converter"
@@ -265,7 +260,7 @@ module Bridgetown
     end
 
     def load_tasks
-      require "bridgetown-core/commands/base"
+      require "bridgetown-core/commands/application"
       unless Bridgetown::Current.preloaded_configuration
         Bridgetown::Current.preloaded_configuration = Bridgetown::Configuration::Preflight.new
       end

data/lib/roda/plugins/bridgetown_server.rb

@@ -3,7 +3,7 @@
 class Roda
   module RodaPlugins
     module BridgetownServer
-      SiteContext = Struct.new(:registers) # for use by Liquid-esque URL helpers
+      SiteContext = Data.define(:registers) # for use by Liquid-esque URL helpers
 
       def self.load_dependencies(app) # rubocop:disable Metrics
         unless Bridgetown::Current.preloaded_configuration