bridgetown-core 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7211217cbf20e2389a43565b4ccc0c140d50266ab43378c1f4cc12968ab26c7a
-  data.tar.gz: 3a760b37f3f19f2b998c97f8ba02458dad733ba8d714fb89d1db9c2d685a3eff
+  metadata.gz: e9715f653a27d94059baa731a1857efa33b69db2206ba2d18b8f4222765f093b
+  data.tar.gz: 0214baa25fa3ed326df7e62f24a3996f018c6586cc5e75b5882d91594bc26eb0
 SHA512:
-  metadata.gz: 895f9f4b5a00b006513b765d4f01c4cb604952358d5b9779a98755dc86a56b472bf765f498f4129a25998dce70a75dad798306ba543401bfaa01183c78d6f5ba
-  data.tar.gz: f4c0fb51cd8bb20367d47af49c5a6b6b8f52eb2b4cbe1dbf8df863e511f254f834196a02af3a92b47b113828169224d3f79067c6f9319b221ab7b84f6389a16b
+  metadata.gz: 7e74294c2a04ab34b80ea4ebe0e917dfc0d23b6b53003c355f25739a3d01ddc33eae1eb722b0cc3489c84d33dd3adfcc49dc2d497785932f4e6c0ee14b5ead75
+  data.tar.gz: 614ef83083050fcff1e2a8585dc06591917448273bcf95f29c9aaeba5650dc263d10a49652c9d1e29594543fc7465ebb7cbb8035c57e96ea60d8512a79f0e489

data/bin/bridgetown

@@ -31,7 +31,7 @@ custom_commands_file = File.expand_path("config/custom_commands.rb", Dir.pwd)
 require custom_commands_file if File.exist?(custom_commands_file)
 
 begin
-  Bridgetown::Commands::Application.parse(ARGV).call
+  Bridgetown::Commands::Application.parse(ARGV.dup).call
 rescue Samovar::MissingValueError => e
   puts "#{"Command error:".bold.red} #{e.message.to_s.yellow}\n\n"
   e.command.print_usage

data/bridgetown-core.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency("csv",                       "~> 3.2")
   spec.add_dependency("erubi",                     "~> 1.9")
   spec.add_dependency("faraday",                   "~> 2.0")
-  spec.add_dependency("faraday-follow_redirects",  "~> 0.3")
+  spec.add_dependency("faraday-follow_redirects",  "~> 0.5")
   spec.add_dependency("freyia",                    ">= 0.5")
   spec.add_dependency("i18n",                      "~> 1.0")
   spec.add_dependency("irb",                       ">= 1.14")

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "bridgetown-core/commands/start"
+
 module Bridgetown
   module Commands
     class Build < Bridgetown::Command
@@ -9,6 +11,7 @@ module Bridgetown
 
       options do
         BuildOptions.include_options(self)
+        Start::StartOptions.include_options(self) if ARGV[0] == "start"
         option "-w/--watch", "Watch for changes and rebuild"
       end
 

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

@@ -16,11 +16,10 @@ const autogeneratedBridgetownConfig = {
   "islandsDir": "_islands"
 }
 
-import path from "path"
-import fsLib from "fs"
+import path from "node:path"
+import fsLib from "node:fs"
 const fs = fsLib.promises
-import { pathToFileURL, fileURLToPath } from "url"
-import { glob } from "glob"
+import { pathToFileURL, fileURLToPath } from "node:url"
 import postcss from "postcss"
 import postCssImport from "postcss-import"
 import readCache from "read-cache"
@@ -72,7 +71,7 @@ const importGlobPlugin = (options, bridgetownConfig) => ({
     })
 
     build.onLoad({ filter: /.*/, namespace: "import-glob" }, async (args) => {
-      const files = glob.sync(args.pluginData.path, {
+      const files = fsLib.globSync(args.pluginData.path, {
         cwd: args.pluginData.resolveDir,
       })
         .filter(module => options.excludeFilter ? !options.excludeFilter.test(module) : true)
@@ -317,7 +316,7 @@ export default async (esbuildOptions, ...args) => {
   const entryPoints = esbuildOptions.entryPoints || ["./frontend/javascript/index.js"]
   if (esbuildOptions.entryPoints) delete esbuildOptions.entryPoints
 
-  const islands = glob.sync(`./${bridgetownConfig.source}/${bridgetownConfig.islandsDir}/*.{js,js.rb}`).map(item => `./${item}`)
+  const islands = fsLib.globSync(`./${bridgetownConfig.source}/${bridgetownConfig.islandsDir}/*.{js,js.rb}`).map(item => `./${item}`)
   const islandsAsObject = islands.reduce((obj, str) => obj[str] = str, {})
 
   esbuild.context({

data/lib/bridgetown-core/commands/esbuild/update.rb

@@ -16,7 +16,8 @@ end
 gsub_file "postcss.config.js", "module.exports =", "export default"
 gsub_file "esbuild.config.js", 'const build = require("./config/esbuild.defaults.js")',
           'import build from "./config/esbuild.defaults.js"'
-add_npm_package "esbuild@latest glob@latest" unless Bridgetown.env.test?
+add_npm_package "esbuild@latest" unless Bridgetown.env.test?
+remove_npm_package "glob"
 
 say "\n🎉 esbuild configuration updated successfully!"
 say "You may need to add `$styles/` to the front of your main CSS imports."

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

@@ -5,7 +5,7 @@ module Bridgetown
     class Help < Bridgetown::Command
       self.description = "Show detailed command usage information and exit"
 
-      one :command, "The name of a Bridgetown command", required: true
+      one :command, "The name of a Bridgetown command", required: false
 
       def call
         found_command = parent.class.table[:command].commands[command]
@@ -14,7 +14,7 @@ module Bridgetown
 
         return if found_command
 
-        puts "Unknown command: #{command}\n\n"
+        puts "Unknown command: #{command}\n\n" if command
         parent.print_usage
       end
     end

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

@@ -18,6 +18,7 @@ module Bridgetown
                "Comma separated list of bundled configurations to perform"
         option "-h/--help", "Print help for the new command"
         option "-t/--templates <erb|serbea|liquid>", "Preferred template engine (defaults to ERB)"
+        option "-s/--server <falcon|puma>", "The Rack-compliant web server to install"
         option "--force", "Force creation even if PATH already exists"
         option "--skip-bundle", "Skip 'bundle install'"
         option "--skip-npm", "Skip 'npm install'"
@@ -25,6 +26,7 @@ module Bridgetown
       end
 
       DOCSURL = "https://bridgetownrb.com/docs"
+      SUPPORTED_RACK_SERVERS = %w[falcon puma].freeze
 
       def self.exit_on_failure?
         false
@@ -83,6 +85,10 @@ module Bridgetown
         !options[:use_sass]
       end
 
+      def rack_server_option
+        SUPPORTED_RACK_SERVERS.find { _1 == options[:server] } || "falcon"
+      end
+
       def disable_postcss?
         # TODO: add option not to use postcss/sass at all
         false
@@ -105,6 +111,8 @@ module Bridgetown
         template("src/posts.md.erb", "src/posts.md")
         copy_file("frontend/styles/syntax-highlighting.css")
 
+        setup_rack_server
+
         case options[:templates]
         when "serbea"
           setup_serbea_templates
@@ -144,6 +152,14 @@ module Bridgetown
         RUBY
       end
 
+      def setup_rack_server
+        if rack_server_option == "puma"
+          template "config/puma.erb", "config/puma.rb"
+        else
+          template "config/falcon.erb", "config/falcon.rb"
+        end
+      end
+
       def configure_sass
         template("postcss.config.js.erb", "postcss.config.js") unless disable_postcss?
         copy_file("frontend/styles/index.css", "frontend/styles/index.scss")

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

@@ -15,10 +15,6 @@ module Bridgetown
       server.to_s.split("::").last
     end
 
-    def using_puma?
-      name == "Puma"
-    end
-
     def serveable?
       server
       true
@@ -29,6 +25,19 @@ module Bridgetown
 
   module Commands
     class Start < Bridgetown::Command
+      module StartOptions
+        def self.include_options(klass)
+          klass.option "-P/--port <NUM>",
+                       "Serve your site on the specified port. Defaults to 4000",
+                       type: Integer
+          klass.option "-B/--bind <IP>", "IP address for the server to bind to", default: "0.0.0.0"
+          klass.option "--skip-frontend",
+                       "Don't load the frontend bundler (always true for production)"
+          klass.option "--skip-live-reload",
+                       "Don't use the live reload functionality (always true for production)"
+        end
+      end
+
       include ConfigurationOverridable
       include Freyia::Setup
       include Inclusive
@@ -37,13 +46,7 @@ module Bridgetown
 
       options do
         BuildOptions.include_options(self)
-        option "-P/--port <NUM>",
-               "Serve your site on the specified port. Defaults to 4000",
-               type: Integer
-        option "-B/--bind <IP>", "IP address for the server to bind to", default: "0.0.0.0"
-        option "--skip-frontend", "Don't load the frontend bundler (always true for production)"
-        option "--skip-live-reload",
-               "Don't use the live reload functionality (always true for production)"
+        StartOptions.include_options(self)
       end
 
       def call # rubocop:disable Metrics
@@ -58,7 +61,7 @@ module Bridgetown
         # Load Bridgetown configuration into thread memory
         bt_options = configuration_with_overrides(options)
         bt_options.port = port = load_env_and_determine_port(bt_options, options)
-        # TODO: support Puma serving HTTPS directly?
+        # TODO: support Falcon serving HTTPS directly
         bt_bound_url = "http://#{bt_options.bind}:#{port}"
 
         # Set a local site URL in the config if one is not available
@@ -66,6 +69,10 @@ module Bridgetown
           bt_options.url = bt_bound_url.sub("0.0.0.0", "localhost")
         end
 
+        # Temporary hack to silence `Errno::EPIPE: Broken pipe` errors in dev.
+        # Only happens when using Falcon with HTTP/1.1.
+        # When we can use Falcon with HTTP/2 in dev, we can remove this line.
+        ENV["CONSOLE_ERROR"] = "Async::Task"
         Bridgetown::Server.new({
           Host: bt_options.bind,
           Port: port,
@@ -74,7 +81,7 @@ module Bridgetown
           if server.serveable?
             pid_tracker.create_pid_dir
 
-            bt_options.skip_live_reload ||= !server.using_puma?
+            bt_options.skip_live_reload ||= false
 
             build_args = ["-w"] + Array(ARGV[1..])
             build_pid = Process.fork { Bridgetown::Commands::Build[*build_args].() }

data/lib/bridgetown-core/concerns/localizable.rb

@@ -2,23 +2,16 @@
 
 module Bridgetown
   module Localizable
+    # Sort items by their locale's position in the configured available_locales list.
+    # Items with unknown locales sort last.
+    def self.sort_by_locale(items, available_locales)
+      items.sort_by { |item| available_locales.index(item.data.locale) || Float::INFINITY }
+    end
+
     def all_locales
-      result_set = case self
-                   when Bridgetown::Resource::Base
-                     collection.resources
-                   when Bridgetown::GeneratedPage
-                     site.generated_pages
-                   else
-                     []
-                   end
-
-      matching_resources = result_set.select do |item|
-        matches_resource?(item)
-      end
-
-      matching_resources.sort_by do |item|
-        site.config.available_locales.index item.data.locale
-      end
+      return @all_locales if @all_locales
+
+      @all_locales = site.tmp_cache.dig(:locale_index, locale_index_key) || find_matching_locales
     end
 
     def matches_resource?(item)
@@ -32,5 +25,28 @@ module Bridgetown
     def localeless_path
       relative_path.gsub(%r{\A#{data.locale}/}, "")
     end
+
+    # Key used to group locale variants of the same content in the locale index.
+    # Uses the same matching criteria as matches_resource? (slug + path identity).
+    def locale_index_key
+      slug = data.slug
+      return unless slug
+
+      path_key = relative_path.is_a?(String) ? localeless_path : relative_path.parent.to_s
+      prefix   = respond_to?(:collection) ? collection.label : "generated"
+
+      "#{prefix}:#{slug}:#{path_key}"
+    end
+
+    private
+
+    def find_matching_locales
+      result_set = respond_to?(:collection) ? collection.resources : site.generated_pages
+
+      Bridgetown::Localizable.sort_by_locale(
+        result_set.select { |item| matches_resource?(item) },
+        site.config.available_locales
+      )
+    end
   end
 end

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

@@ -9,6 +9,7 @@ class Bridgetown::Site
     # @see Document
     def render
       Bridgetown::Hooks.trigger :site, :pre_render, self
+      build_locale_index
       execute_inline_ruby_for_layouts!
       render_resources
       generated_pages.each(&:transform!)
@@ -97,6 +98,26 @@ class Bridgetown::Site
       )
     end
 
+    # Builds a lookup index grouping resources by their locale-independent identity
+    # (collection + slug + localeless path). This turns `all_locales` from an O(n)
+    # linear scan into an O(1) hash lookup per resource, which is critical for sites
+    # with many localized pages.
+    #
+    # @return [void]
+    def build_locale_index
+      groups = Hash.new { |h, k| h[k] = [] }
+
+      collections.each_value.flat_map(&:resources).concat(generated_pages).each do |item|
+        key = item.locale_index_key
+        groups[key] << item if key
+      end
+
+      locale_order = config.available_locales
+      tmp_cache[:locale_index] = groups.transform_values do |items|
+        Bridgetown::Localizable.sort_by_locale(items, locale_order).freeze
+      end.freeze
+    end
+
     # Renders all resources
     #
     # @return [void]

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

@@ -45,7 +45,6 @@ class Bridgetown::Site
     end
 
     def ssr_first_read
-      Bridgetown::Hooks.trigger :site, :pre_read, self
       defaults_reader.tap do |d|
         d.path_defaults.clear
         d.read

data/lib/bridgetown-core/configuration/configuration_dsl.rb

@@ -244,23 +244,41 @@ module Bridgetown
       #   Control the behavior of Bridgetown's live reload functionality in development
       #   @param bool [Boolean] - default: `true`
 
-      # @!method exclude(files_list)
-      #   Exclude source directories and/or files from the build conversion
-      #   @param files_list [Array<String>]
+      # Exclude source directories and/or files from the build conversion
+      # @param files_list [Array<String>] - you can pass multiple string arguments
+      #   in lieu of an array
+      def exclude(*files_list)
+        files_list = Array(files_list[0]) if files_list.length == 1
+        get("exclude").tap do |value|
+          files_list.each { value << _1 }
+        end
+      end
 
-      # @!method include(files_list)
-      #   Force inclusion of directories and/or files in the conversion (e.g. starting with
-      #   underscores or dots)
-      #   @param files_list [Array<String>]
+      # Force inclusion of directories and/or files in the conversion (e.g. starting with
+      # underscores or dots)
+      # @param files_list [Array<String>] - you can pass multiple string arguments
+      #   in lieu of an array
+      def include(*files_list)
+        files_list = Array(files_list[0]) if files_list.length == 1
+        get("include").tap do |value|
+          files_list.each { value << _1 }
+        end
+      end
 
-      # @!method keep_files(files_list)
-      #   Files to keep when clobbering the site destination (aka not generated in typical
-      #   Bridgetown builds)
-      #   @param files_list [Array<String>]
+      # Files to keep when clobbering the site destination (aka not generated in typical
+      # Bridgetown builds)
+      # @param files_list [Array<String>] - you can pass multiple string arguments
+      #   in lieu of an array
+      def keep_files(*files_list)
+        files_list = Array(files_list[0]) if files_list.length == 1
+        get("keep_files").tap do |value|
+          files_list.each { value << _1 }
+        end
+      end
 
       # @!method autoload_paths
-      #   Add paths to the Zeitwerk autoloader. Use a `config.defaults << "..."` syntax or a more
-      #   advanced hash config
+      #   Add paths to the Zeitwerk autoloader. Use a `config.autoload_paths << "..."` syntax or
+      #   a more advanced hash config
       #   @example Add a new path for autoloading and eager load on boot
       #       config.autoload_paths << {
       #         path: "loadme",

data/lib/bridgetown-core/configuration.rb

@@ -6,7 +6,7 @@ module Bridgetown
     using Bridgetown::Refinements
 
     # Built-in initializer list which isn't Gem-backed:
-    REQUIRE_DENYLIST = %i(external_sources parse_routes ssr) # rubocop:disable Style/MutableConstant
+    REQUIRE_DENYLIST = %i(external_sources parse_routes ssr wikilinks) # rubocop:disable Style/MutableConstant
 
     Initializer = Struct.new(:name, :block, :completed) do
       def to_s

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

@@ -79,6 +79,7 @@ module Bridgetown
             site:,
             page: payload["page"],
             cached_partials: self.class.cached_partials,
+            resource: document,
           },
           strict_filters: site.config["liquid"]["strict_filters"],
           strict_variables: site.config["liquid"]["strict_variables"],

data/lib/bridgetown-core/generated_page.rb

@@ -25,6 +25,13 @@ module Bridgetown
       .htm
     ).freeze
 
+    # NOTE: these are no-op methods, only here to provide "compatibility" with
+    # `Bridgetown::Resource::Base` in edge case rendering contexts. There's
+    # actually no case when a GeneratedPage will have a linkage with the Roda
+    # app because GeneratedPage instances are only used in static builds.
+    def roda_app=(*); end
+    def roda_app = nil
+
     # Initialize a new GeneratedPage
     #
     # @param site [Bridgetown::Site]

data/lib/bridgetown-core/helpers.rb

@@ -30,7 +30,7 @@ module Bridgetown
         @site = site || Bridgetown::Current.site
 
         # duck typing for Liquid context
-        @context = Context.new({ site: })
+        @context = Context.new({ site: self.site })
       end
 
       def asset_path(asset_type)

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

@@ -114,29 +114,39 @@ module Bridgetown
           file_to_check = Bridgetown.live_reload_path
           errors_file = Bridgetown.build_errors_path
 
+          # 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|
-              Thread.new do
-                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
+              # 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
-              ensure
-                stream.close
+
+                sleep sleep_interval
+              rescue Errno::EPIPE # User refreshed the page
+                break
               end
+            ensure
+              stream.close
             end
 
             app.request.halt [200, {
@@ -144,6 +154,7 @@ module Bridgetown
               "cache-control" => "no-cache",
             }, event_stream,]
           end
+          # rubocop:enable Metrics/BlockLength
         end
       end
 

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

@@ -23,6 +23,7 @@ module Bridgetown
       end
     end
 
+    # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def read_content_root(collection_name, content_dir)
       collection = site.collections[collection_name]
       unless collection
@@ -35,10 +36,16 @@ module Bridgetown
 
       Find.find(content_dir) do |path|
         if File.directory?(path)
-          Find.prune if EntryFilter::SPECIAL_LEADING_CHAR_REGEX.match?(File.basename(path))
+          if rejected_by_external_sources_filter?(path, collection_name) ||
+              EntryFilter::SPECIAL_LEADING_CHAR_REGEX.match?(File.basename(path))
+            Find.prune
+          end
+
           next
         end
 
+        next if rejected_by_external_sources_filter?(path, collection_name)
+
         if File.symlink?(path)
           Bridgetown.logger.warn "Plugin content reader:", "Ignored symlinked asset: #{path}"
         else
@@ -46,6 +53,14 @@ module Bridgetown
         end
       end
     end
+    # rubocop:enable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+    def rejected_by_external_sources_filter?(path, collection_name)
+      filter = site.config.external_sources_filters&.dig(collection_name)
+      return false unless filter
+
+      !filter.call(File.basename(path), path)
+    end
 
     # @param collection [Bridgetown::Collection]
     def read_content_file(content_dir, path, collection)

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

@@ -368,7 +368,7 @@ module Bridgetown
         correct_locale = origin_data["locale"] || origin_data[:locale] || data.locale
         model.attributes = origin_data
         model.attributes.locale = correct_locale.to_s == "multi" ? data.locale : correct_locale
-        @relative_url = @absolute_url = nil # wipe memoizations
+        @relative_url = @absolute_url = @all_locales = nil # wipe memoizations
         read!
         tax_diff = past_values.any? { |k, v| @data.peek[k] != v }
 

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Tags
+    class RubyRender < Liquid::Tag
+      using Bridgetown::Refinements
+
+      # @param tag_name [String] "ruby_render"
+      # @param input [String] The input to the tag: snake-case name of the
+      #   Ruby component, plus initialize args. Example:
+      #     '"card", title: "Hello", footer: "I am a card"'
+      # @param tokens [Hash] A hash of config tokens for Liquid
+      def initialize(tag_name, input, tokens)
+        super
+        @input = input
+
+        @attributes = {}
+        input.scan(Liquid::TagAttributes) do |key, value|
+          @attributes[key.to_sym] = parse_expression(value)
+        end
+      end
+
+      # @param context [Liquid::Context]
+      # @return [String]
+      def render(context)
+        view_context = Bridgetown::RubyTemplateView.new(context.registers[:resource])
+        component_class_name_snakecase = @input.split(",").first
+        component_class_name = component_class_name_snakecase.tr("\"'", "").camelize.strip
+        component_class = self.class.const_get(component_class_name)
+        @attributes.each do |key, value|
+          @attributes[key] = value.evaluate(context) if value.is_a?(Liquid::VariableLookup)
+        end
+        component_instance = component_class.new(**@attributes)
+
+        if component_instance.respond_to?(:render_in)
+          component_instance.render_in(view_context)
+        else
+          component_instance.to_s
+        end
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag("ruby_render", Bridgetown::Tags::RubyRender)

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

@@ -13,7 +13,7 @@ Bridgetown.initializer :ssr do |config, setup: nil, **options|
   end
 end
 
-Bridgetown.initializer :external_sources do |config, contents:|
+Bridgetown.initializer :external_sources do |config, contents:, filters: nil|
   Bridgetown::ExternalSources = Module.new
 
   contents.each do |coll, path|
@@ -35,6 +35,13 @@ Bridgetown.initializer :external_sources do |config, contents:|
   contents.each_value do |path|
     config.additional_watch_paths << path
   end
+
+  if filters
+    config.external_sources_filters = {}
+    filters.each do |coll, filter|
+      config.external_sources_filters[coll] = filter
+    end
+  end
 end
 
 Bridgetown.initializer :parse_routes do |config|
@@ -73,3 +80,7 @@ Bridgetown.initializer :parse_routes do |config|
 
   File.write(File.join(config.root_dir, ".routes.json"), routing_tree.to_json(json_gen_opts))
 end
+
+Bridgetown.initializer :wikilinks do |config|
+  Bridgetown::Utils::Wikilinks.setup_parsing_hook config
+end

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Utils
+    class Wikilinks
+      # @param config [Bridgetown::Configuration::ConfigurationDSL]
+      def self.setup_parsing_hook(config)
+        markdown_exts = config.markdown_ext.split(",").map { ".#{_1}" }
+
+        config.hook :resources, :pre_render, priority: :low do |resource|
+          next unless markdown_exts.include?(resource.relative_path.extname)
+          next if resource.data.bypass_wikilinks
+
+          Wikilinks.new(resource:).convert
+        end
+      end
+
+      # @param resource [Bridgetown::Resource::Base]
+      def initialize(resource:)
+        @resource = resource
+        @site = resource.site
+      end
+
+      # Sets the resource's new content to the parsed string where `[[Wiki-style Links]]` are
+      # turned into `[Wiki-style Links](...)`
+      def convert
+        @resource.content = parse_content(@resource.content)
+      end
+
+      # Parse all `[[wiki links]]` unless they're escaped, e.g. `\[[don't parse me bro]]`.
+      # You can use a pipe character to control the displayed text of the link:
+      # `[[Actual page title|Link text here]]`, and you can also add an anchor for the link:
+      # `[[Page Title#page_section_anchor]]`
+      # @param input [String]
+      # @return String
+      def parse_content(input)
+        input.gsub %r!(\\?)\[\[(.+?)\]\]! do
+          next "[[#{Regexp.last_match[2]}]]" if Regexp.last_match[1] == "\\"
+
+          search_title, printed_title =
+            Regexp.last_match[2].split("|").map(&:strip)
+          search_title, anchor = search_title.split("#")
+          anchor = "##{anchor}" if anchor
+          title = printed_title || search_title
+          found = @site.resources.find { _1.data.title == search_title }
+          if found
+            "[#{title}](#{found.relative_url}#{anchor}){:.wikilink}"
+          else
+            missing_title_strategy(title)
+          end
+        end
+      end
+
+      def missing_title_strategy(title)
+        # TODO: this should be configurable
+        "<u>#{title} (missing)</u>"
+      end
+    end
+  end
+end

data/lib/bridgetown-core/utils.rb

@@ -9,6 +9,7 @@ module Bridgetown
     autoload :RequireGems, "bridgetown-core/utils/require_gems"
     autoload :RubyExec, "bridgetown-core/utils/ruby_exec"
     autoload :SmartyPantsConverter, "bridgetown-core/utils/smarty_pants_converter"
+    autoload :Wikilinks, "bridgetown-core/utils/wikilinks"
 
     # Constants for use in #slugify
     SLUGIFY_MODES = %w(raw default pretty simple ascii latin).freeze
@@ -149,30 +150,30 @@ module Bridgetown
     # When mode is `pretty`, some non-alphabetic characters (`._~!$&'()+,;=@`)
     # are not replaced with hyphen.
     #
-    # When mode is `ascii`, some everything else except ASCII characters
-    # `a-z` (lowercase), `A-Z` (uppercase) and `0-9` (numbers) are not replaced with hyphen.
+    # When mode is `ascii`, everything else except ASCII characters
+    # `a-z` (lowercase), `A-Z` (uppercase) and `0-9` (numbers) are replaced with hyphen.
     #
     # When mode is `latin`, the input string is first preprocessed so that
     # any letters with accents are replaced with the plain letter. Afterwards,
     # it follows the `default` mode of operation.
     #
-    # If `cased` is `true`, all uppercase letters in the result string are
+    # If `cased` is `false`, all uppercase letters in the result string are
     # replaced with their lowercase counterparts.
     #
     # @example
     #   slugify("The _config.yml file")
     #   # => "the-config-yml-file"
     #
-    #   slugify("The _config.yml file", "pretty")
+    #   slugify("The _config.yml file", mode: "pretty")
     #   # => "the-_config.yml-file"
     #
-    #   slugify("The _config.yml file", "pretty", true)
-    #   # => "The-_config.yml file"
+    #   slugify("The _config.yml file", mode: "pretty", cased: true)
+    #   # => "The-_config.yml-file"
     #
-    #   slugify("The _config.yml file", "ascii")
+    #   slugify("The _config.yml file", mode: "ascii")
     #   # => "the-config-yml-file"
     #
-    #   slugify("The _config.yml file", "latin")
+    #   slugify("The _config.yml file", mode: "latin")
     #   # => "the-config-yml-file"
     #
     # @param string [String] filename or title to slugify

data/lib/site_template/Gemfile.erb

@@ -30,9 +30,13 @@ gem "bridgetown", "~> <%= Bridgetown::VERSION %>"
 # Uncomment to add file-based dynamic routing to your project:
 # gem "bridgetown-routes", "~> <%= Bridgetown::VERSION %>"
 
-# Puma is the Rack-compatible web server used by Bridgetown
+# The Rack-compliant web server
 # (you can optionally limit this to the "development" group)
+<% if rack_server_option == "puma" %>
 gem "puma", "< 8"
+<% else %>
+gem "falcon"
+<% end %>
 
 # Uncomment to use the Inspectors API to manipulate the output
 # of your HTML or XML resources:

data/lib/site_template/config/falcon.erb

@@ -0,0 +1,23 @@
+#!/usr/bin/env falcon-host
+# frozen_string_literal: true
+
+# This file configures Falcon for production.
+# It is ignored in development when using `bin/bt start`.
+#
+# Use `falcon host` to start Falcon in production.
+# `bundle exec falcon host config/falcon.rb`
+
+require "falcon/environment/rack"
+
+service "<%= @site_name %>" do
+  include Falcon::Environment::Rack
+
+  rackup_path \
+    File.expand_path("config.ru", Pathname.new(root).join(".."))
+  port ENV.fetch("BRIDGETOWN_PORT") { 4000 }
+
+  endpoint do
+    Async::HTTP::Endpoint
+      .parse("http://localhost", port: port)
+  end
+end

data/lib/site_template/package.json.erb

@@ -8,8 +8,7 @@
     "esbuild-dev": "node esbuild.config.js --watch"
   },
   "devDependencies": {
-    "esbuild": "^0.25.11",
-    "glob": "^11.0.3",
+    "esbuild": "^0.25.11"<%= "," unless disable_postcss? %>
     <%- unless disable_postcss? -%>
     "postcss": "^8.5.6",
     "postcss-flexbugs-fixes": "^5.0.2",

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Bridgetown Team
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -71,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: csv
   requirement: !ruby/object:Gem::Requirement
@@ -127,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: freyia
   requirement: !ruby/object:Gem::Requirement
@@ -595,6 +596,7 @@ files:
 - lib/bridgetown-core/tags/live_reload_dev_js.rb
 - lib/bridgetown-core/tags/post_url.rb
 - lib/bridgetown-core/tags/render_content.rb
+- lib/bridgetown-core/tags/ruby_render.rb
 - lib/bridgetown-core/tags/t.rb
 - lib/bridgetown-core/tags/with.rb
 - lib/bridgetown-core/tasks/bridgetown_tasks.rake
@@ -606,6 +608,7 @@ files:
 - lib/bridgetown-core/utils/require_gems.rb
 - lib/bridgetown-core/utils/ruby_exec.rb
 - lib/bridgetown-core/utils/smarty_pants_converter.rb
+- lib/bridgetown-core/utils/wikilinks.rb
 - lib/bridgetown-core/watcher.rb
 - lib/bridgetown-core/yaml_parser.rb
 - lib/roda/plugins/bridgetown_server.rb
@@ -640,8 +643,9 @@ files:
 - lib/site_template/TEMPLATES/serbea/_partials/_footer.serb
 - lib/site_template/TEMPLATES/serbea/_partials/_head.serb
 - lib/site_template/config.ru
+- lib/site_template/config/falcon.erb
 - lib/site_template/config/initializers.rb
-- lib/site_template/config/puma.rb
+- lib/site_template/config/puma.erb
 - lib/site_template/frontend/javascript/index.js.erb
 - lib/site_template/frontend/styles/index.css
 - lib/site_template/frontend/styles/syntax-highlighting.css
@@ -671,6 +675,7 @@ metadata:
   changelog_uri: https://github.com/bridgetownrb/bridgetown/releases
   homepage_uri: https://www.bridgetownrb.com
   rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -686,7 +691,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: A next-generation, progressive site generator & fullstack framework, powered
   by Ruby