bridgetown-core 1.1.0.beta2 → 1.1.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 423677a019c8efddafcee904aa9c5aaa8bb9faed27e9ef7c33afc0bf42994b5a
-  data.tar.gz: 0ac8e9e2f6b954dac8e43892ed9313e7068d4c5038fe8fe3186949f288818a87
+  metadata.gz: afc674e5aa40d66a2b9e4f24c0aad39108f47e70c8d4756cbfa86623ed2dc7e0
+  data.tar.gz: 4bf462c506c3fcdd09a4750bedae19cb2ee4ff429b57a6266dd56d62645d4926
 SHA512:
-  metadata.gz: e43c335ccf732d3ff398b4e141d38ff77c8ef1a0d3d583b9c7f1a3632f55a4ef0441f09db48e8a80544e29edfda3ef7f7f52facd3f912ab3fd2524d7d7b1117e
-  data.tar.gz: 5dac3b8ff53a144f61106debf2dcfd44a0c4c05e31951d1b81c48c5c815382ea2c256a1d5a155a0c5668dae4efd1f9293e9200f32596688b603cf0b34f48a234
+  metadata.gz: 5baaa3f133d0e1cbd5e7e972645f107361088d9d11b5bebb38374573d898b67a07b318b4d19e1e5731a696dafe88a3b2ded6ba1c068b869e5bad750200905417
+  data.tar.gz: 4a88c972c98f54ac8b98538fec81f907797cb423f6fa89907cab21a58c29d5961b5e6bf156a3d2846a6d2fd831656696fa9a2afd76d2c2a6f3f5b62663db2c8d

data/bridgetown-core.gemspec

@@ -44,7 +44,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("kramdown-parser-gfm",   "~> 1.0")
   s.add_runtime_dependency("liquid",                "~> 5.0")
   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")

data/lib/bridgetown-core/collection.rb

@@ -343,8 +343,8 @@ module Bridgetown
     end
 
     def order_with_warning(sort_key, resource, order)
-      Bridgetown.logger.warn "Sort warning:", "'#{sort_key}' not defined in" \
-                                              " #{resource.relative_path}"
+      Bridgetown.logger.warn "Sort warning:", "'#{sort_key}' not defined in " \
+                                              "#{resource.relative_path}"
       order
     end
 

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

@@ -58,9 +58,9 @@ module Bridgetown
         automation_command = args.empty? ? "bridgetown.automation.rb" : args[0]
 
         if args.empty? && !File.exist?("bridgetown.automation.rb")
-          raise ArgumentError, "You must specify a path or a URL," \
-                               " or add bridgetown.automation.rb to the" \
-                               " current folder."
+          raise ArgumentError, "You must specify a path or a URL, " \
+                               "or add bridgetown.automation.rb to the " \
+                               "current folder."
         end
 
         Bridgetown.with_unbundled_env do

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

@@ -22,8 +22,8 @@ module Bridgetown
                    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}\")"
+        Bridgetown.logger.info "Starting:", "Bridgetown v#{Bridgetown::VERSION.magenta} " \
+                                            "(codename \"#{Bridgetown::CODE_NAME.yellow}\")"
       end
 
       # Build your bridgetown site
@@ -45,8 +45,8 @@ module Bridgetown
         @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."
+          Bridgetown.logger.warn "Build Warning:", "Skipping the initial build. " \
+                                                   "This may result in an out-of-date site."
         else
           build_site(config_options)
         end
@@ -77,8 +77,8 @@ module Bridgetown
         end
         Bridgetown.logger.info "Generating…"
         @site.process
-        Bridgetown.logger.info "Done! 🎉", "#{"Completed".bold.green} in less than" \
-                                          " #{(Time.now - t).ceil(2)} seconds."
+        Bridgetown.logger.info "Done! 🎉", "#{"Completed".bold.green} in less than " \
+                                          "#{(Time.now - t).ceil(2)} seconds."
 
         return unless config_options[:using_puma]
 

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

@@ -21,8 +21,8 @@ module Bridgetown
                            desc: "Destination directory (defaults to output)"
         klass.class_option :root_dir,
                            aliases: "-r",
-                           desc: "The top-level root folder" \
-                                 " where config files are located"
+                           desc: "The top-level root folder " \
+                                 "where config files are located"
         klass.class_option :plugins_dir,
                            aliases: "-p",
                            type: :array,

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

@@ -64,9 +64,9 @@ module Bridgetown
         require "irb/ext/save-history"
         require "amazing_print" unless options[:"bypass-ap"]
 
-        Bridgetown.logger.info "Starting:", "Bridgetown v#{Bridgetown::VERSION.magenta}" \
-                                            " (codename \"#{Bridgetown::CODE_NAME.yellow}\")" \
-                                            " console…"
+        Bridgetown.logger.info "Starting:", "Bridgetown v#{Bridgetown::VERSION.magenta} " \
+                                            "(codename \"#{Bridgetown::CODE_NAME.yellow}\") " \
+                                            "console…"
         Bridgetown.logger.info "Environment:", Bridgetown.environment.cyan
         site = Bridgetown::Site.new(configuration_with_overrides(options))
 
@@ -80,8 +80,8 @@ module Bridgetown
         IRB.conf[:MAIN_CONTEXT] = irb.context
         Bridgetown.logger.info "Console:", "Your site is now available as #{"site".cyan}"
         Bridgetown.logger.info "",
-                               "You can also access #{"collections".cyan} or perform a" \
-                               " #{"reload!".cyan}"
+                               "You can also access #{"collections".cyan} or perform a " \
+                               "#{"reload!".cyan}"
 
         trap("SIGINT") do
           irb.signal_handle

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

@@ -62,8 +62,8 @@ module Bridgetown
           next unless paths.size > 1
 
           conflicting_urls = true
-          Bridgetown.logger.warn "Conflict:", "The URL '#{url}' is the destination" \
-                                              " for the following pages: #{paths.join(", ")}"
+          Bridgetown.logger.warn "Conflict:", "The URL '#{url}' is the destination " \
+                                              "for the following pages: #{paths.join(", ")}"
         end
         conflicting_urls
       end
@@ -77,8 +77,8 @@ module Bridgetown
           urls_only_differ_by_case = true
           Bridgetown.logger.warn(
             "Warning:",
-            "The following URLs only differ by case. On a case-insensitive file system one of the" \
-            " URLs will be overwritten by the other: #{real_urls.join(", ")}"
+            "The following URLs only differ by case. On a case-insensitive file system one of " \
+            "the URLs will be overwritten by the other: #{real_urls.join(", ")}"
           )
         end
         urls_only_differ_by_case
@@ -121,7 +121,7 @@ module Bridgetown
       def url_exists?(url)
         return true unless url.nil? || url.empty?
 
-        Bridgetown.logger.warn "Warning:", "You didn't set an URL in the config file, "\
+        Bridgetown.logger.warn "Warning:", "You didn't set an URL in the config file, " \
                                            "you may encounter problems with some plugins."
         false
       end
@@ -132,7 +132,7 @@ module Bridgetown
       # Addressable::URI#parse only raises a TypeError
       # https://git.io/vFfbx
       rescue TypeError
-        Bridgetown.logger.warn "Warning:", "The site URL does not seem to be valid, "\
+        Bridgetown.logger.warn "Warning:", "The site URL does not seem to be valid, " \
                                            "check the value of `url` in your config file."
         false
       end
@@ -140,7 +140,7 @@ module Bridgetown
       def url_absolute(url)
         return true if url.is_a?(String) && Addressable::URI.parse(url).absolute?
 
-        Bridgetown.logger.warn "Warning:", "Your site URL does not seem to be absolute, "\
+        Bridgetown.logger.warn "Warning:", "Your site URL does not seem to be absolute, " \
                                            "check the value of `url` in your config file."
         false
       end

data/lib/bridgetown-core/commands/esbuild/migrate-from-webpack.rb

@@ -2,11 +2,6 @@
 
 # rubocop:disable Layout/LineLength
 
-if package_json["devDependencies"].key?("sass")
-  say "Unable to migrate, project uses Sass. Please migrate to PostCSS first before migrating to esbuild."
-  return
-end
-
 remove_file "webpack.config.js"
 remove_file "config/webpack.defaults.js"
 
@@ -16,7 +11,7 @@ default_postcss_config = File.expand_path("../../../site_template/postcss.config
 template default_postcss_config, "postcss.config.js"
 
 unless Bridgetown.environment.test?
-  required_packages = %w(esbuild glob postcss postcss-flexbugs-fixes postcss-preset-env postcss-import postcss-load-config)
+  required_packages = %w(esbuild glob postcss postcss-flexbugs-fixes postcss-preset-env postcss-import postcss-load-config@3.1.4)
   redundant_packages = %w(esbuild-loader webpack webpack-cli webpack-manifest-plugin webpack-merge css-loader file-loader mini-css-extract-plugin postcss-loader)
 
   say "Installing required packages"

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

@@ -68,8 +68,8 @@ module Bridgetown
         if preserve_source_location?(new_site_path, options)
           say_status :conflict, "#{new_site_path} exists and is not empty.", :red
           Bridgetown.logger.abort_with(
-            "Ensure #{new_site_path} is empty or else try again with `--force` to proceed and" \
-            " overwrite any files."
+            "Ensure #{new_site_path} is empty or else try again with `--force` to proceed and " \
+            "overwrite any files."
           )
         end
 
@@ -194,18 +194,18 @@ module Bridgetown
         logger = Bridgetown.logger
         bt_start = "bin/bridgetown start"
         logger.info ""
-        logger.info "Success!".green, "🎉 Your new Bridgetown site was" \
-                                      " generated in #{cli_path.cyan}."
+        logger.info "Success!".green, "🎉 Your new Bridgetown site was " \
+                                      "generated in #{cli_path.cyan}."
         if options["skip-yarn"]
           logger.info "You can now #{"cd".cyan} #{cli_path.cyan} to get started."
-          logger.info "You'll probably also want to #{"yarn install".cyan}" \
-                      " to load in your frontend assets."
+          logger.info "You'll probably also want to #{"yarn install".cyan} " \
+                      "to load in your frontend assets."
         else
-          logger.info "You can now #{"cd".cyan} #{cli_path.cyan} and run #{bt_start.cyan}" \
-                      " to get started."
+          logger.info "You can now #{"cd".cyan} #{cli_path.cyan} and run #{bt_start.cyan} " \
+                      "to get started."
         end
-        logger.info "Then check out our online documentation for" \
-                    " next steps: #{DOCSURL.cyan}"
+        logger.info "Then check out our online documentation for " \
+                    "next steps: #{DOCSURL.cyan}"
 
         if @skipped_bundle
           logger.info "Bundle install skipped.".yellow

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

@@ -13,6 +13,9 @@ module Bridgetown
       end
 
       desc "list", "List information about installed plugins"
+      option :verbose,
+             type: :boolean,
+             desc: "Print the source path of each plugin"
       def list
         site = Bridgetown::Site.new(configuration_with_overrides(options))
         site.reset
@@ -32,7 +35,7 @@ module Bridgetown
           end
         end
 
-        Bridgetown.logger.info("Source Manifests:", "---") unless pm.class.source_manifests.empty?
+        Bridgetown.logger.info("Source Manifests:", "----") unless pm.class.source_manifests.empty?
 
         pm.class.source_manifests.each do |manifest|
           Bridgetown.logger.info("Origin:", (manifest.origin || "n/a").to_s.green)
@@ -40,20 +43,27 @@ module Bridgetown
           Bridgetown.logger.info("Content:", (manifest.content || "n/a").to_s.cyan)
           Bridgetown.logger.info("Layouts:", (manifest.layouts || "n/a").to_s.cyan)
 
-          Bridgetown.logger.info("", "---")
+          Bridgetown.logger.info("", "----")
         end
 
         unless Bridgetown.autoload? :Builder
           builders = Bridgetown::Builder.descendants
           Bridgetown.logger.info("Builders:", builders.length.to_s.yellow.bold)
 
-          builders.each do |builder|
-            name = builder.respond_to?(:custom_name) ? builder.custom_name : builder.name
+          builders.sort.each do |builder|
+            name = plugin_name_for(builder)
             name_components = name.split("::")
             last_name = name_components.pop
             name_components.push last_name.magenta
             Bridgetown.logger.info("", name_components.join("::"))
+            next unless options[:verbose]
+
+            Bridgetown.logger.info(
+              "", "PATH: " + builder_path_for(builder)
+            )
+            Bridgetown.logger.info("")
           end
+          Bridgetown.logger.info("", "----")
         end
 
         Bridgetown.logger.info("Converters:", site.converters.length.to_s.yellow.bold)
@@ -64,8 +74,16 @@ module Bridgetown
           last_name = name_components.pop
           name_components.push last_name.magenta
           Bridgetown.logger.info("", name_components.join("::"))
+          next unless options[:verbose]
+
+          Bridgetown.logger.info(
+            "", "PATH: " + converter_path_for(converter)
+          )
+          Bridgetown.logger.info("")
         end
 
+        Bridgetown.logger.info("", "----")
+
         Bridgetown.logger.info("Generators:", site.generators.length.to_s.yellow.bold)
 
         site.generators.each do |generator|
@@ -74,6 +92,12 @@ module Bridgetown
           last_name = name_components.pop
           name_components.push last_name.magenta
           Bridgetown.logger.info("", name_components.join("::"))
+          next unless options[:verbose]
+
+          Bridgetown.logger.info(
+            "", "PATH: " + generator_path_for(generator)
+          )
+          Bridgetown.logger.info("")
         end
       end
 
@@ -196,11 +220,23 @@ module Bridgetown
       protected
 
       def plugin_name_for(plugin)
-        if plugin.class.respond_to?(:custom_name)
-          plugin.class.custom_name
-        else
-          plugin.class.name
-        end
+        klass = plugin.is_a?(Class) ? plugin : plugin.class
+        klass.respond_to?(:custom_name) ? klass.custom_name : klass.name
+      end
+
+      def builder_path_for(plugin)
+        klass = plugin.is_a?(Class) ? plugin : plugin.class
+        klass.instance_method(:build).source_location[0]
+      end
+
+      def converter_path_for(plugin)
+        klass = plugin.is_a?(Class) ? plugin : plugin.class
+        klass.instance_method(:convert).source_location[0]
+      end
+
+      def generator_path_for(plugin)
+        klass = plugin.is_a?(Class) ? plugin : plugin.class
+        klass.instance_method(:generate).source_location[0]
       end
     end
   end

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

@@ -4,12 +4,11 @@ module Bridgetown
   module Commands
     module Registrations
       def self.registrations
-        @registrations || []
+        @registrations ||= []
       end
 
       def self.register(&block)
-        @registrations ||= []
-        @registrations.push(block)
+        registrations << block
       end
     end
   end

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

@@ -178,8 +178,8 @@ module Bridgetown
 
           Process.detach(pid)
           Bridgetown.logger.info "Server detached with pid '#{pid}'.", \
-                                 "Run `pkill -f bridgetown' or `kill -9 #{pid}'" \
-                                 " to stop the server."
+                                 "Run `pkill -f bridgetown' or `kill -9 #{pid}' " \
+                                 "to stop the server."
         else
           t = Thread.new { server.start }
           trap("INT") { server.shutdown }

data/lib/bridgetown-core/component.rb

@@ -136,7 +136,7 @@ module Bridgetown
       end
     rescue StandardError => e
       Bridgetown.logger.error "Component error:",
-                              "#{self.class} encountered an error while "\
+                              "#{self.class} encountered an error while " \
                               "rendering `#{self.class.path_for_errors}'"
       raise e
     end

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

@@ -23,7 +23,7 @@ module Bridgetown
         output.html_safe
       rescue StandardError => e
         Bridgetown.logger.error "Conversion error:",
-                                "#{converter.class} encountered an error while "\
+                                "#{converter.class} encountered an error while " \
                                 "converting `#{document.relative_path}'"
         raise e
       end
@@ -53,7 +53,7 @@ module Bridgetown
         layout_output
       rescue StandardError => e
         Bridgetown.logger.error "Conversion error:",
-                                "#{converter.class} encountered an error while "\
+                                "#{converter.class} encountered an error while " \
                                 "converting `#{document.relative_path}'"
         raise e
       end

data/lib/bridgetown-core/configuration.rb

@@ -208,8 +208,8 @@ module Bridgetown
           config = Utils.deep_merge_hashes(self, new_config)
         end
       rescue ArgumentError => e
-        Bridgetown.logger.warn "WARNING:", "Error reading configuration. Using defaults" \
-                                           " (and options)."
+        Bridgetown.logger.warn "WARNING:", "Error reading configuration. Using defaults " \
+                                           "(and options)."
         warn e
       end
 

data/lib/bridgetown-core/configurations/turbo/turbo_transitions.js

@@ -16,7 +16,7 @@ document.addEventListener("turbo:visit", () => {
       { opacity: 1, transform: "translateY(0px) scale(1)" },
       { opacity: 0, transform: `translateY(${movement}) scale(${scale})` }
     ],
-    { duration: 300, easing: "cubic-bezier(0.45, 0, 0.55, 1)" }
+    { duration: 300, easing: "cubic-bezier(0.45, 0, 0.55, 1)", fill: "forwards" }
   );
 
   Promise.all(main.getAnimations().map(animation => animation.finished)).then(() => {

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

@@ -79,10 +79,15 @@ module Bridgetown
       Erubi.h(input)
     end
 
-    def partial(partial_name, options = {})
+    def partial(partial_name = nil, **options, &block)
+      partial_name = options[:template] if partial_name.nil? && options[:template]
       options.merge!(options[:locals]) if options[:locals]
-      options[:content] = yield if block_given?
+      options[:content] = capture(&block) if block
 
+      _render_partial partial_name, options
+    end
+
+    def _render_partial(partial_name, options)
       partial_path = _partial_path(partial_name, "erb")
       tmpl = site.tmp_cache["partial-tmpl:#{partial_path}"] ||= Tilt::ErubiTemplate.new(
         partial_path,

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

@@ -7,10 +7,7 @@ module Bridgetown
   class SerbeaView < ERBView
     include Serbea::Helpers
 
-    def partial(partial_name, options = {}, &block)
-      options.merge!(options[:locals]) if options[:locals]
-      options[:content] = capture(&block) if block
-
+    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)

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

@@ -152,8 +152,8 @@ module Bridgetown
           return attributes[key]
         end
 
-        Bridgetown.logger.warn "key `#{method_name}' not found in attributes for" \
-                               " #{attributes[:id].presence || "new #{self.class}"}"
+        Bridgetown.logger.warn "key `#{method_name}' not found in attributes for " \
+                               "#{attributes[:id].presence || "new #{self.class}"}"
         nil
       end
 

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

@@ -33,8 +33,8 @@ module Bridgetown
     rescue Roda::RodaError => e
       if e.message.include?("sessions plugin :secret option")
         raise Bridgetown::Errors::InvalidConfigurationError,
-              "The Roda sessions plugin can't find a valid secret. Run `bin/bridgetown secret'" \
-              " and put the key in a ENV var you can use to configure the session in `roda_app.rb'"
+              "The Roda sessions plugin can't find a valid secret. Run `bin/bridgetown secret' " \
+              "and put the key in a ENV var you can use to configure the session in `roda_app.rb'"
       end
 
       raise e

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "rack/indifferent"
-
 begin
   # If it's in the Gemfile's :bridgetown_plugins group it's already been required, but we'll try
   # again just to be on the safe side:
@@ -12,7 +10,16 @@ end
 class Roda
   module RodaPlugins
     module BridgetownSSR
+      module InstanceMethods
+        # Helper shorthand for Bridgetown::Current.site
+        # @return [Bridgetown::Site]
+        def bridgetown_site
+          Bridgetown::Current.site
+        end
+      end
+
       def self.configure(app, _opts = {}, &block)
+        app.include Bridgetown::Filters::URLFilters
         app.opts[:bridgetown_site] =
           Bridgetown::Site.start_ssr!(loaders_manager: Bridgetown::Rack.loaders_manager, &block)
       end
@@ -21,14 +28,6 @@ class Roda
     register_plugin :bridgetown_ssr, BridgetownSSR
 
     module BridgetownBoot
-      module InstanceMethods
-        # Helper shorthand for Bridgetown::Current.site
-        # @return [Bridgetown::Site]
-        def bridgetown_site
-          Bridgetown::Current.site
-        end
-      end
-
       Roda::RodaRequest.alias_method :_previous_roda_cookies, :cookies
 
       module RequestMethods
@@ -53,10 +52,13 @@ end
 module Bridgetown
   module Rack
     class Roda < ::Roda
+      SiteContext = Struct.new(:registers) # for use by Liquid-esque URL helpers
+
       plugin :hooks
       plugin :common_logger, Bridgetown::Rack::Logger.new($stdout), method: :info
       plugin :json
       plugin :json_parser
+      plugin :indifferent_params
       plugin :cookies
       plugin :streaming
       plugin :bridgetown_boot
@@ -141,6 +143,7 @@ module Bridgetown
         if self.class.opts[:bridgetown_site]
           # The site had previously been initialized via the bridgetown_ssr plugin
           Bridgetown::Current.site ||= self.class.opts[:bridgetown_site]
+          @context ||= SiteContext.new({ site: self.class.opts[:bridgetown_site] })
         end
         Bridgetown::Current.preloaded_configuration ||=
           self.class.opts[:bridgetown_preloaded_config]

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

@@ -181,6 +181,11 @@ module Bridgetown
         model.origin.id
       end
 
+      # @return [String]
+      def output_ext
+        destination&.output_ext
+      end
+
       def date
         data["date"] ||= site.time
       end

data/lib/bridgetown-core/ruby_template_view.rb

@@ -22,16 +22,16 @@ module Bridgetown
       @site = page.site
     end
 
-    def partial(_partial_name, _options = {})
+    def partial(_partial_name = nil, **_options)
       raise "Must be implemented in a subclass"
     end
 
-    def render(item, options = {}, &block)
+    def render(item, **options, &block)
       if item.respond_to?(:render_in)
         result = item.render_in(self, &block)
         result&.html_safe
       else
-        partial(item, options, &block)&.html_safe
+        partial(item, **options, &block)&.html_safe
       end
     end
 

data/lib/bridgetown-core/static_file.rb

@@ -108,7 +108,7 @@ module Bridgetown
       self.class.mtimes[path] = mtime
 
       FileUtils.mkdir_p(File.dirname(dest_path))
-      FileUtils.rm(dest_path) if File.exist?(dest_path)
+      FileUtils.rm_rf(dest_path)
       Bridgetown.logger.debug "Saving file:", dest_path
       copy_file(dest_path)
 

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

@@ -88,7 +88,7 @@ module Bridgetown
           "class=\"language-#{@lang.to_s.tr("+", "-")}\"",
           "data-lang=\"#{@lang}\"",
         ].join(" ")
-        "<figure class=\"highlight\"><pre><code #{code_attributes}>"\
+        "<figure class=\"highlight\"><pre><code #{code_attributes}>" \
           "#{code.chomp}</code></pre></figure>"
       end
     end

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

@@ -80,7 +80,7 @@ module Bridgetown
           next unless @post.deprecated_equality document
 
           Bridgetown::Deprecator.deprecation_message(
-            "A call to "\
+            "A call to " \
             "'{% post_url #{@post.name} %}' did not match " \
             "a post using the new matching method of checking name " \
             "(path-date-slug) equality. Please make sure that you " \

data/lib/bridgetown-core/url.rb

@@ -100,7 +100,7 @@ module Bridgetown
         winner = pool.find { |key| @placeholders.key?(key) }
         if winner.nil?
           raise NoMethodError,
-                "The URL template doesn't have #{pool.join(" or ")} keys. "\
+                "The URL template doesn't have #{pool.join(" or ")} keys. " \
                 "Check your permalink template!"
         end
 

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "1.1.0.beta2"
+  VERSION = "1.1.0.beta3"
   CODE_NAME = "Belmont"
 end

data/lib/bridgetown-core/watcher.rb

@@ -99,8 +99,8 @@ module Bridgetown
 
           site.process
         end
-        Bridgetown.logger.info "Done! 🎉", "#{"Completed".bold.green} in less than" \
-                                          " #{(Time.now - time).ceil(2)} seconds."
+        Bridgetown.logger.info "Done! 🎉", "#{"Completed".bold.green} in less than " \
+                                          "#{(Time.now - time).ceil(2)} seconds."
       rescue StandardError => e
         Bridgetown::Errors.print_build_error(e, trace: options[:trace])
       end

data/lib/site_template/Gemfile.erb

@@ -24,6 +24,10 @@ gem "bridgetown", "~> <%= Bridgetown::VERSION %>"
 # Uncomment to add file-based dynamic routing to your project:
 # gem "bridgetown-routes", "~> <%= Bridgetown::VERSION %>", group: :bridgetown_plugins
 
+# Uncomment to use the Inspectors API to manipulate the output
+# of your HTML or XML resources:
+# gem "nokogiri", "~> 1.13"
+
 # Puma is a Rack-compatible server used by Bridgetown
 # (you can optionally limit this to the "development" group)
 gem "puma", "~> 5.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta2
+  version: 1.1.0.beta3
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -218,20 +218,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rack-indifferent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement