bridgetown-core 0.21.3 → 1.0.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93f29ed24b8de3b277f80f77581605e3e0ed4aa8a40f87bb5b3e3cbc68fa8dfa
-  data.tar.gz: 9da3d6b3c608d7b067fdd9a65f6c05f1f40479c752d5c4fc5c523bcb9074e41b
+  metadata.gz: 2c5f6a5f0fc27c9e3f7d45161e91317fd42e7dbeb789d8c38a103a610efb9d46
+  data.tar.gz: 68431d8ead8cdb11107db03aa57ae3d4607d0809e60f3fd30d7045d58e1c67f0
 SHA512:
-  metadata.gz: 63578f5534657f1ce647edd2f8d63ab7603d95d2ab3e2090a67baee046aa851f25eebca7d140525e39d5291f7101a286e0667eddedfe3dbbfe25a9f5a965f6ec
-  data.tar.gz: a0d39c95cd660de86debb328c6aecd8e884ef2154caedd5e8d61b5de7c9268e3df4feb4c7f2ebc0706ec5d7eef40ce40b46be38190ce68a7679d42abd4dffd68
+  metadata.gz: 57daec3a249941fc6303a22e470cd8fc8e1641be8527a6533c7c73527a93fc04321b774407865a07fb99df95566902d035cfdf84fd68f8aa6e440fac6860d266
+  data.tar.gz: f42ce24666c948ad8616ef25cb36a766392279e216716a397d27308ae5b06acb58305887264f04c83faedf3ed6a68fcdbbf716e648935bb92de8c019997c1c03

data/.rubocop.yml

@@ -0,0 +1,35 @@
+---
+inherit_from: ../.rubocop.yml
+
+AllCops:
+  Exclude:
+    - "*.gemspec"
+    - bin/**/*
+    - exe/**/*
+    - benchmark/**/*
+    - script/**/*
+    - vendor/**/*
+    - tmp/**/*
+    - test/source/**/*
+    - lib/site_template/Rakefile
+    - lib/site_template/config.ru
+    - lib/site_template/config/**/*
+    - lib/site_template/plugins/site_builder.rb
+
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - test/test_filters.rb
+    - test/test_liquid_extensions.rb
+    - test/test_site.rb
+
+Lint/MissingSuper:
+  Exclude:
+    - test/test_liquid_extensions.rb
+
+Performance/CollectionLiteralInLoop:
+  Exclude:
+    - test/test_filters.rb
+
+Style/StringConcatenation:
+  Exclude:
+    - test/test_apply_command.rb

data/Rakefile

@@ -13,16 +13,16 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'yard'
+require "yard"
 YARD::Rake::YardocTask.new(:yard) do |t|
- t.files   = ['lib/**/*.rb']
- t.options = ['--no-output']
- t.stats_options = ['--list-undoc']
+  t.files = ["lib/**/*.rb"]
+  t.options = ["--no-output"]
+  t.stats_options = ["--list-undoc"]
 end
 
 namespace :yard do
   task :serve do
-    port = ENV['YARD_PORT'] || "8808"
+    port = ENV["YARD_PORT"] || "8808"
     sh("yard server --reload -p #{port}")
   end
 end

data/bin/bridgetown

@@ -24,5 +24,7 @@ output_version = if ARGV[0] == "-v"
                    true
                  end
 
+ENV["RACK_ENV"] = ENV["BRIDGETOWN_ENV"]
+
 require "bridgetown-core/commands/base"
 Bridgetown::Commands::Base.start unless output_version

data/bridgetown-core.gemspec

@@ -46,6 +46,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("liquid",                "~> 5.0")
   s.add_runtime_dependency("liquid-component",      ">= 0.1")
   s.add_runtime_dependency("listen",                "~> 3.0")
+  s.add_runtime_dependency("rack-indifferent",      ">= 1.2.0")
+  s.add_runtime_dependency("rake",                  ">= 13.0")
+  s.add_runtime_dependency("roda",                  "~> 3.46")
   s.add_runtime_dependency("rouge",                 "~> 3.0")
   s.add_runtime_dependency("terminal-table",        "~> 1.8")
   s.add_runtime_dependency("thor",                  "~> 1.1")

data/lib/bridgetown-core/cache.rb

@@ -82,11 +82,9 @@ module Bridgetown
       return @cache[key] if @cache.key?(key)
 
       path = path_to(hash(key))
-      if disk_cache_enabled? && File.file?(path) && File.readable?(path)
-        @cache[key] = load(path)
-      else
-        raise
-      end
+      raise unless disk_cache_enabled? && File.file?(path) && File.readable?(path)
+
+      @cache[key] = load(path)
     end
 
     # Add an item to cache

data/lib/bridgetown-core/cleaner.rb

@@ -3,7 +3,7 @@
 module Bridgetown
   # Handles the cleanup of a site's destination before it is built.
   class Cleaner
-    HIDDEN_FILE_REGEX = %r!\/\.{1,2}$!.freeze
+    HIDDEN_FILE_REGEX = %r!/\.{1,2}$!.freeze
     attr_reader :site
 
     def initialize(site)
@@ -13,7 +13,6 @@ module Bridgetown
     # Cleans up the site's destination directory
     def cleanup!
       FileUtils.rm_rf(obsolete_files)
-      FileUtils.rm_rf(metadata_file) unless @site.incremental?
     end
 
     private
@@ -28,13 +27,6 @@ module Bridgetown
       out
     end
 
-    # Private: The metadata file storing dependency tree and build history
-    #
-    # Returns an Array with the metdata file as the only item
-    def metadata_file
-      [site.regenerator.metadata_file]
-    end
-
     # Private: The list of existing files, apart from those included in
     # keep_files and hidden files.
     #
@@ -112,7 +104,7 @@ module Bridgetown
     #
     # Returns the regular expression
     def keep_file_regex
-      %r!\A#{Regexp.quote(site.dest)}\/(#{Regexp.union(site.config.keep_files).source})!
+      %r!\A#{Regexp.quote(site.dest)}/(#{Regexp.union(site.config.keep_files).source})!
     end
   end
 end

data/lib/bridgetown-core/collection.rb

@@ -6,7 +6,6 @@ module Bridgetown
     attr_reader :site
 
     attr_reader :label, :metadata
-    attr_writer :docs
 
     attr_writer :resources
 
@@ -24,22 +23,10 @@ module Bridgetown
       label.in? %w(posts pages data).freeze
     end
 
-    def legacy_reader?
-      label.in? %w(posts data).freeze
-    end
-
     def data?
       label == "data"
     end
 
-    # Fetch the Documents in this collection.
-    # Defaults to an empty array if no documents have been read in.
-    #
-    # @return [Array<Bridgetown::Document>]
-    def docs
-      @docs ||= []
-    end
-
     # Fetch the Resources in this collection.
     # Defaults to an empty array if no resources have been read in.
     #
@@ -48,10 +35,23 @@ module Bridgetown
       @resources ||= []
     end
 
-    # Iterate over either Resources or Documents depending on how the site is
-    # configured
+    # Fetch the collection resources and arrange them by slug in a hash.
+    #
+    # @return [Hash<String, Bridgetown::Resource::Base>]
+    def resources_by_slug
+      resources.group_by { |item| item.data.slug }.transform_values(&:first)
+    end
+
+    # Fetch the collection resources and arrange them by relative URL in a hash.
+    #
+    # @return [Hash<String, Bridgetown::Resource::Base>]
+    def resources_by_relative_url
+      resources.group_by(&:relative_url).transform_values(&:first)
+    end
+
+    # Iterate over Resources
     def each(&block)
-      site.uses_resource? ? resources.each(&block) : docs.each(&block)
+      resources.each(&block)
     end
 
     # Fetch the static files in this collection.
@@ -67,38 +67,32 @@ module Bridgetown
       static_files
     end
 
-    # Read the allowed documents into the collection's array of docs.
+    # Read the allowed resources into the collection's array of resources.
     #
     # @return [Bridgetown::Collection] self
-    def read # rubocop:todo Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+    def read
       filtered_entries.each do |file_path|
         full_path = collection_dir(file_path)
         next if File.directory?(full_path)
 
-        if site.uses_resource?
-          next if File.basename(file_path).starts_with?("_")
+        next if File.basename(file_path).starts_with?("_")
 
-          if label == "data" || Utils.has_yaml_header?(full_path) ||
-              Utils.has_rbfm_header?(full_path)
-            read_resource(full_path)
-          else
-            read_static_file(file_path, full_path)
-          end
-        elsif Utils.has_yaml_header? full_path
-          read_document(full_path)
+        if label == "data" || Utils.has_yaml_header?(full_path) ||
+            Utils.has_rbfm_header?(full_path)
+          read_resource(full_path)
         else
           read_static_file(file_path, full_path)
         end
       end
       site.static_files.concat(static_files)
-      sort_docs!
+      sort_resources!
 
       self
     end
 
     # All the entries in this collection.
     #
-    # @return [Array<String>] file paths to the documents in this collection
+    # @return [Array<String>] file paths to the resources in this collection
     #   relative to the collection's folder
     def entries
       return [] unless exists?
@@ -178,7 +172,7 @@ module Bridgetown
       @entry_filter ||= Bridgetown::EntryFilter.new(
         site,
         base_directory: folder_name,
-        include_underscores: site.uses_resource?
+        include_underscores: true
       )
     end
 
@@ -186,7 +180,7 @@ module Bridgetown
     #
     # @return [String]
     def inspect
-      "#<#{self.class} @label=#{label} docs=#{docs} resources=#{resources}>"
+      "#<#{self.class} @label=#{label} resources=#{resources}>"
     end
 
     # Produce a sanitized label name
@@ -196,13 +190,13 @@ module Bridgetown
     # @param label [String] the possibly-unsafe label
     # @return [String] sanitized version of the label.
     def sanitize_label(label)
-      label.gsub(%r![^a-z0-9_\-\.]!i, "")
+      label.gsub(%r![^a-z0-9_\-.]!i, "")
     end
 
     # Produce a representation of this Collection for use in Liquid.
     # Exposes two attributes:
     #   - label
-    #   - docs
+    #   - resources
     #
     # @return [Bridgetown::Drops::CollectionDrop] representation of this
     #   collection for use in Liquid
@@ -210,7 +204,7 @@ module Bridgetown
       Drops::CollectionDrop.new self
     end
 
-    # Whether the collection's documents ought to be written as individual
+    # Whether the collection's resources ought to be written as individual
     #   files in the output.
     #
     # @return [Boolean] true if the 'write' metadata is true, false otherwise.
@@ -221,18 +215,7 @@ module Bridgetown
     # Used by Resource's permalink processor
     # @return [String]
     def default_permalink
-      metadata.fetch("permalink") do
-        "/:collection/:path/"
-      end
-    end
-
-    # LEGACY: The URL template to render collection's documents at.
-    #
-    # @return [String]
-    def url_template
-      @url_template ||= metadata.fetch("permalink") do
-        Utils.add_permalink_suffix("/:collection/:path", site.permalink_style)
-      end
+      metadata.fetch("permalink", "/:collection/:path/")
     end
 
     # Extract options for this collection from the site configuration.
@@ -242,7 +225,7 @@ module Bridgetown
       site.config.collections[label] || HashWithDotAccess::Hash.new
     end
 
-    def merge_data_resources # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
+    def merge_data_resources # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       data_contents = {}
 
       sanitize_filename = ->(name) do
@@ -287,11 +270,30 @@ module Bridgetown
 
     # Read in resource from repo path
     # @param full_path [String]
-    def read_resource(full_path)
-      id = "repo://#{label}.collection/" + Addressable::URI.escape(
-        Pathname(full_path).relative_path_from(Pathname(site.source)).to_s
-      )
-      resource = Bridgetown::Model::Base.find(id).to_resource.read!
+    def read_resource(full_path, manifest: nil) # rubocop:todo Metrics/AbcSize
+      scheme = manifest ? "plugin" : "repo"
+      id = +"#{scheme}://#{label}.collection/"
+      id += "#{manifest.origin}/" if manifest
+      id += Addressable::URI.escape(
+        Pathname(full_path).relative_path_from(
+          manifest ? Pathname(manifest.content) : Pathname(site.source)
+        ).to_s
+      ).gsub("#", "%23")
+      model = Bridgetown::Model::Base.find(id)
+
+      if model.attributes.key?(:locale) && model.locale.to_sym == :multi
+        site.config.available_locales.each do |locale|
+          model.locale = locale
+          add_model_resource model
+        end
+        return
+      end
+
+      add_model_resource model
+    end
+
+    def add_model_resource(model)
+      resource = model.to_resource.read!
       resources << resource if site.config.unpublished || resource.published?
     end
 
@@ -301,50 +303,24 @@ module Bridgetown
       @container ||= site.config["collections_dir"]
     end
 
-    def read_document(full_path)
-      doc = Document.new(full_path, site: site, collection: self).tap(&:read)
-      docs << doc if site.config.unpublished || doc.published?
-    end
-
-    def sort_docs!
+    def sort_resources!
       if metadata["sort_by"].is_a?(String)
-        sort_docs_by_key!
         sort_resources_by_key!
       else
-        docs.sort!
         resources.sort!
       end
-      docs.reverse! if metadata.sort_direction == "descending"
       resources.reverse! if metadata.sort_direction == "descending"
     end
 
     # A custom sort function based on Schwartzian transform
     # Refer https://byparker.com/blog/2017/schwartzian-transform-faster-sorting/ for details
-    def sort_docs_by_key!
-      meta_key = metadata["sort_by"]
-      # Modify `docs` array to cache document's property along with the Document instance
-      docs.map! { |doc| [doc.data[meta_key], doc] }.sort! do |apples, olives|
-        order = determine_sort_order(meta_key, apples, olives)
-
-        # Fall back to `Document#<=>` if the properties were equal or were non-sortable
-        # Otherwise continue with current sort-order
-        if order.nil? || order.zero?
-          apples[-1] <=> olives[-1]
-        else
-          order
-        end
-
-        # Finally restore the `docs` array with just the Document objects themselves
-      end.map!(&:last)
-    end
-
     def sort_resources_by_key!
       meta_key = metadata["sort_by"]
-      # Modify `docs` array to cache document's property along with the Document instance
-      resources.map! { |doc| [doc.data[meta_key], doc] }.sort! do |apples, olives|
+      # Modify array to cache property along with the Resource instance
+      resources.map! { |r| [r.data[meta_key], r] }.sort! do |apples, olives|
         order = determine_sort_order(meta_key, apples, olives)
 
-        # Fall back to `Document#<=>` if the properties were equal or were non-sortable
+        # Fall back to `Resource::Base#<=>` if the properties were equal or were non-sortable
         # Otherwise continue with current sort-order
         if order.nil? || order.zero?
           apples[-1] <=> olives[-1]
@@ -352,7 +328,7 @@ module Bridgetown
           order
         end
 
-        # Finally restore the `docs` array with just the Document objects themselves
+        # Finally restore the `resources` array with just the objects themselves
       end.map!(&:last)
     end
 
@@ -369,9 +345,9 @@ module Bridgetown
       end
     end
 
-    def order_with_warning(sort_key, document, order)
+    def order_with_warning(sort_key, resource, order)
       Bridgetown.logger.warn "Sort warning:", "'#{sort_key}' not defined in" \
-                              " #{document.relative_path}"
+                                              " #{resource.relative_path}"
       order
     end
 

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

@@ -17,13 +17,58 @@ module Bridgetown
       class << self
         # Override single character commands if necessary
         def find_command_possibilities(subcommand)
-          if subcommand == "c"
+          case subcommand
+          when "c"
             ["console"]
+          when "s"
+            ["start"]
           else
             super
           end
         end
+
+        def display_rake_tasks(rake)
+          rake.options.show_all_tasks = true
+          rake.options.show_task_pattern = Regexp.new("")
+          rake.options.show_tasks = :tasks
+          rake.display_tasks_and_comments
+        end
+
+        # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Style/GlobalVars
+        def handle_no_command_error(cmd, _has_namespace = $thor_runner)
+          require "rake"
+          Rake::TaskManager.record_task_metadata = true
+
+          Rake.with_application do |rake|
+            rake.instance_variable_set(:@name, "bridgetown")
+            rake.standard_exception_handling do
+              rakefile, _location = rake.find_rakefile_location
+              unless rakefile
+                puts "No Rakefile found (searching: #{rake.class::DEFAULT_RAKEFILES.join(", ")})\n"
+                new.invoke("help")
+                return # rubocop:disable Lint/NonLocalExitFromIterator
+              end
+              rake.load_rakefile
+              rake.top_level
+            end
+            cmd = cmd.split("[")
+            args = []
+            if cmd[1]
+              args = cmd[1].gsub("\\,", "__COMMA__").delete_suffix!("]").split(",").map do |item|
+                item.gsub("__COMMA__", ",")
+              end
+            end
+
+            if Rake::Task.task_defined?(cmd[0])
+              Rake::Task[cmd[0]].invoke(*args)
+            else
+              puts "Unknown task: #{cmd[0]}\n\nHere's a list of tasks you can run:"
+              display_rake_tasks(rake)
+            end
+          end
+        end
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Style/GlobalVars
 
       desc "dream", "There's a place where that idea still exists as a reality"
       def dream
@@ -35,7 +80,7 @@ module Bridgetown
       end
 
       desc "help <command>", "Show detailed command usage information and exit"
-      def help(subcommand = nil)
+      def help(subcommand = nil) # rubocop:disable Metrics/MethodLength
         if subcommand && respond_to?(subcommand)
           klass = Kernel.const_get("Bridgetown::Commands::#{subcommand.capitalize}")
           klass.start(["-h"])
@@ -47,6 +92,21 @@ module Bridgetown
           puts "  bridgetown <command> [options]"
           puts ""
           super
+
+          require "rake"
+          Rake::TaskManager.record_task_metadata = true
+          Rake.with_application do |rake|
+            rake.instance_variable_set(:@name, "  bridgetown")
+            rake.standard_exception_handling do
+              rakefile, _location = rake.find_rakefile_location
+              return unless rakefile # rubocop:disable Lint/NonLocalExitFromIterator
+
+              rake.load_rakefile
+              rake.top_level
+              puts "Available Rake Tasks:"
+              self.class.display_rake_tasks(rake)
+            end
+          end
         end
       end
     end

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

@@ -21,21 +21,32 @@ module Bridgetown
                    aliases: "-w",
                    desc: "Watch for changes and rebuild"
 
+      def self.print_startup_message
+        Bridgetown.logger.info "Starting:", "Bridgetown v#{Bridgetown::VERSION.magenta}" \
+                                            " (codename \"#{Bridgetown::CODE_NAME.yellow}\")"
+      end
+
       # Build your bridgetown site
       # Continuously watch if `watch` is set to true in the config.
       def build
         Bridgetown.logger.adjust_verbosity(options)
 
-        Bridgetown.logger.info "Starting:", "Bridgetown v#{Bridgetown::VERSION.magenta}" \
-                               " (codename \"#{Bridgetown::CODE_NAME.yellow}\")"
+        unless caller_locations.find do |loc|
+          loc.to_s.include?("bridgetown-core/commands/start.rb")
+        end
+          self.class.print_startup_message
+        end
+
+        config_options = (
+          Bridgetown::Current.preloaded_configuration || configuration_with_overrides(options)
+        ).merge(options)
 
-        config_options = Serve.loaded_config || configuration_with_overrides(options)
         config_options["serving"] = false unless config_options["serving"]
         @site = Bridgetown::Site.new(config_options)
 
         if config_options.fetch("skip_initial_build", false)
           Bridgetown.logger.warn "Build Warning:", "Skipping the initial build." \
-                                 " This may result in an out-of-date site."
+                                                   " This may result in an out-of-date site."
         else
           build_site(config_options)
         end
@@ -64,13 +75,23 @@ module Bridgetown
           Bridgetown.logger.info "Unpublished mode:",
                                  "enabled. Processing documents marked unpublished"
         end
-        incremental = config_options["incremental"]
-        Bridgetown.logger.info "Incremental build:",
-                               (incremental ? "enabled" : "disabled. Enable with --incremental")
         Bridgetown.logger.info "Generating…"
         @site.process
         Bridgetown.logger.info "Done! 🎉", "#{"Completed".green} in less than" \
-                                " #{(Time.now - t).ceil(2)} seconds."
+                                          " #{(Time.now - t).ceil(2)} seconds."
+
+        return unless config_options[:using_puma]
+
+        require "socket"
+        external_ip = Socket.ip_address_list.find do |ai|
+          ai.ipv4? && !ai.ipv4_loopback?
+        end&.ip_address
+        scheme = config_options.bind&.split("://")&.first == "ssl" ? "https" : "http"
+        port = config_options.bind&.split(":")&.last || ENV["BRIDGETOWN_PORT"] || 4000
+        Bridgetown.logger.info ""
+        Bridgetown.logger.info "Now serving at:", "#{scheme}://localhost:#{port}".magenta
+        Bridgetown.logger.info "", "#{scheme}://#{external_ip}:#{port}".magenta if external_ip
+        Bridgetown.logger.info ""
       end
 
       # Watch for file changes and rebuild the site.
@@ -94,10 +115,10 @@ module Bridgetown
         Bridgetown.logger.info "Source:", source
         Bridgetown.logger.info "Destination:", destination
         # TODO: work with arrays
-        if config_options["plugins_dir"].is_a?(String)
-          plugins_dir = File.expand_path(config_options["plugins_dir"])
-          Bridgetown.logger.info "Custom Plugins:", plugins_dir if Dir.exist?(plugins_dir)
-        end
+        return unless config_options["plugins_dir"].is_a?(String)
+
+        plugins_dir = File.expand_path(config_options["plugins_dir"])
+        Bridgetown.logger.info "Custom Plugins:", plugins_dir if Dir.exist?(plugins_dir)
       end
     end
   end

data/lib/bridgetown-core/commands/concerns/actions.rb

@@ -25,7 +25,7 @@ module Bridgetown
         create_file("plugins/builders/#{filename}", data, verbose: false)
       end
 
-      def javascript_import(data = nil, filename: "index.js")
+      def javascript_import(data = nil, filename: "index.js") # rubocop:todo Metrics/PerceivedComplexity
         data ||= yield if block_given?
         data += "\n" unless data.chars.last == "\n"
 
@@ -97,7 +97,7 @@ module Bridgetown
         github_match = GITHUB_REGEX.match(arg)
 
         arg = if arg.start_with?("https://gist.github.com")
-                arg.sub(
+                arg.sub( # rubocop:disable Style/StringConcatenation
                   "https://gist.github.com", "https://gist.githubusercontent.com"
                 ) + "/raw"
               elsif github_match

data/lib/bridgetown-core/commands/concerns/build_options.rb

@@ -33,18 +33,15 @@ module Bridgetown
         klass.class_option :future,
                            type: :boolean,
                            desc: "Publishes posts with a future date"
-        klass.class_option :limit_posts,
-                           type: :numeric,
-                           desc: "Limits the number of posts to parse and publish"
+        klass.class_option :url,
+                           aliases: "-u",
+                           desc: "Override the configured url for the website"
         klass.class_option :base_path,
                            aliases: "-b",
                            desc: "Serve the website from the given base path"
         klass.class_option :force_polling,
                            type: :boolean,
                            desc: "Force watch to use polling"
-        klass.class_option :lsi,
-                           type: :boolean,
-                           desc: "Use LSI for improved related posts"
         klass.class_option :unpublished,
                            type: :boolean,
                            aliases: "-U",
@@ -63,10 +60,6 @@ module Bridgetown
                            aliases: "-V",
                            type: :boolean,
                            desc: "Print verbose output."
-        klass.class_option :incremental,
-                           aliases: "-I",
-                           type: :boolean,
-                           desc: "Enable incremental rebuild."
         klass.class_option :strict_front_matter,
                            type: :boolean,
                            desc: "Fail if errors are present in front matter"

data/lib/bridgetown-core/commands/concerns/configuration_overridable.rb

@@ -11,7 +11,9 @@ module Bridgetown
       def configuration_with_overrides(options)
         return options if options.is_a?(Bridgetown::Configuration)
 
-        Bridgetown.configuration(options)
+        Bridgetown.configuration(options).tap do |new_config|
+          Bridgetown::Current.preloaded_configuration = new_config
+        end
       end
     end
   end