bridgetown-core 1.1.0.beta1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95b4ce1888886fbccd72391216d1298ce7d20e6bfb506ceedab3208881b4d25c
-  data.tar.gz: 712ddfbba10913becc4fb800a499ce602d9e2848f395b87cf8c205d97000ab2e
+  metadata.gz: e1a8e2712c8b2f218d0082a2d890bb53401efb354a055c323189bbefd1d9f9a6
+  data.tar.gz: 99d3049dabe2ba5e3e812240268fb754c842b1bbcf0acbe46345fbc1ada7194f
 SHA512:
-  metadata.gz: 1efd58dbca74ae1f3903bd91e225c28abb74131a5b1bc1885b7cac696d5f97a6a1ee7b973fed4d9ad2a90fec9ccc610f4ab19c4cb60666bfeafc0f4cda28f715
-  data.tar.gz: 545fe04a5338166bf02927395c131d65a822b524b551865bc558dd1e4ffa4c1438ace43bad4fe09a29e980c77d458bcc9876a249bbf4598d45764f471693521b
+  metadata.gz: d820196117aad565c3dd7150c535ccd98b08b1d4cdad4b439855ea4a2666ce58f67abe67a0b68dc40959fd3e9d7eac299bf9261a43f4ef119294549bd7a95595
+  data.tar.gz: 40a94f0d056e35ea8f1f34d2e0f5684ed0990ee2a2804aac4d91766d2d8ead3528dbdbbf555f14035878a1287a58cf60a70e9ffc7a60a41bcf6c1cfcf9b2bf31

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/commands/webpack/update.rb

@@ -8,7 +8,7 @@ say "🎉 Webpack configuration updated successfully!"
 return if Bridgetown.environment.test?
 
 required_packages = %w(esbuild esbuild-loader css-loader@6.7.1 webpack@5.72.0 webpack-cli@4.9.2 webpack-manifest-plugin@5.0.0)
-redundant_packages = %w(@babel/core @babel/plugin-proposal-class-properties @babel/plugin-proposal-decorators @babel/plugin-transform-runtime @babel/preset-env babel-loader)
+redundant_packages = %w(@babel/core @babel/plugin-proposal-class-properties @babel/plugin-proposal-decorators @babel/plugin-transform-runtime @babel/preset-env babel-loader file-loader)
 
 say "Installing required packages"
 run "yarn add -D --tilde #{required_packages.join(" ")}"

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

@@ -81,22 +81,18 @@ const cssRules = {
 
 const fontsRule = {
   test: /\.woff2?$|\.ttf$|\.eot$/,
-  loader: "file-loader",
-  options: {
-    name: "[name]-[contenthash].[ext]",
-    outputPath: "../fonts",
-    publicPath: "../fonts",
-  },
+  type: "asset/resource",
+  generator: {
+    filename: "../fonts/[name]-[hash][ext][query]"
+  }
 }
 
 const imagesRule = {
   test: /\.png?$|\.gif$|\.jpg$|\.svg$/,
-  loader: "file-loader",
-  options: {
-    name: "[path][name]-[contenthash].[ext]",
-    outputPath: "../",
-    publicPath: "../",
-  },
+  type: "asset/resource",
+  generator: {
+    filename: "../[path][name]-[hash][ext][query]"
+  }
 }
 
 // Default configuration object

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

@@ -48,7 +48,6 @@ module Bridgetown
       "content_engine"             => "resource",
       "markdown"                   => "kramdown",
       "highlighter"                => "rouge",
-      "excerpt_separator"          => "\n\n",
 
       # Serving
       "port"                       => "4000",
@@ -155,6 +154,8 @@ module Bridgetown
         raise ArgumentError,
               "No parser for '#{filename}' is available. Use a .y(a)ml or .toml file instead."
       end
+    rescue Psych::DisallowedClass => e
+      raise "Unable to parse `#{File.basename(filename)}'. #{e.message}"
     end
 
     # Public: Generate list of configuration files from the override
@@ -208,8 +209,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/purgecss.rb

@@ -10,33 +10,45 @@ create_builder "purgecss.rb" do
   <<~RUBY
     class Builders::Purgecss < SiteBuilder
       def build
-        unless config[:watch] # don't run in "watch mode"
-          hook :site, :post_write do
-            purgecss_file = site.in_root_dir("purgecss.config.js")
-            unless File.exist?(purgecss_file)
-              config_js = <<~PURGE
-                module.exports = {
-                  content: ['frontend/javascript/*.js','./output/**/*.html'],
-                  output: "./output/_bridgetown/static/css"
-                }
-              PURGE
-              File.write(purgecss_file, config_js.strip)
-            end
-            manifest_file = File.join(site.frontend_bundling_path, "manifest.json")
-            if File.exist?(manifest_file)
-              manifest = JSON.parse(File.read(manifest_file))
-              # TODO: make this work with esbuild too
+        return if config[:watch] # don't run in "watch mode"
+
+        hook :site, :post_write do
+          purgecss_file = site.in_root_dir("purgecss.config.js")
+
+          unless File.exist?(purgecss_file)
+            config_js = <<~PURGE
+              module.exports = {
+                content: ['frontend/javascript/*.js','./output/**/*.html'],
+                output: "./output/_bridgetown/static"
+              }
+            PURGE
+            File.write(purgecss_file, config_js.strip)
+          end
+
+          manifest_file = File.join(site.frontend_bundling_path, "manifest.json")
+
+          if File.exist?(manifest_file)
+            manifest = JSON.parse(File.read(manifest_file))
+
+            if Bridgetown::Utils.frontend_bundler_type == :esbuild
+              css_file = manifest["styles/index.css"].split("/").last
+              css_path = ["output", "_bridgetown", "static", css_file].join("/")
+            else
               css_file = manifest["main.css"].split("/").last
               css_path = ["output", "_bridgetown", "static", "css", css_file].join("/")
-              Bridgetown.logger.info "PurgeCSS", "Purging \#{css_file}"
-              oldsize = File.stat(css_path).size / 1000
-              system "./node_modules/.bin/purgecss -c purgecss.config.js -css \#{css_path}"
-              newsize = File.stat(css_path).size / 1000
-              if newsize < oldsize
-                Bridgetown.logger.info "PurgeCSS", "Done! File size reduced from \#{oldsize}kB to \#{newsize}kB"
-              else
-                Bridgetown.logger.info "PurgeCSS", "Done. No apparent change in file size (\#{newsize}kB)."
-              end
+            end
+
+            Bridgetown.logger.info "PurgeCSS", "Purging \#{css_file}"
+            oldsize = File.stat(css_path).size / 1000
+            system "./node_modules/.bin/purgecss -c purgecss.config.js -css \#{css_path}"
+            newsize = File.stat(css_path).size / 1000
+
+            if newsize < oldsize
+              Bridgetown.logger.info "PurgeCSS",
+                                     "Done! File size reduced from \#{oldsize}kB to \#{newsize}kB"
+            else
+              Bridgetown.logger.info "PurgeCSS",
+                                     "Done. No apparent change in file size (\#{newsize}kB)."
             end
           end
         end

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

@@ -4,14 +4,27 @@ say_status :shoelace, "Installing Shoelace..."
 
 run "yarn add @shoelace-style/shoelace"
 
+stylesheet_import = <<~CSS
+  /* Import the base Shoelace stylesheet: */
+  @import "@shoelace-style/shoelace/dist/themes/light.css";
+
+CSS
+
+if File.exist?("frontend/styles/index.css")
+  prepend_to_file "frontend/styles/index.css", stylesheet_import
+elsif File.exist?("frontend/styles/index.scss")
+  prepend_to_file "frontend/styles/index.scss", stylesheet_import
+else
+  say "\nPlease add the following lines to your CSS index file:"
+  say stylesheet_import
+end
+
 say 'Adding Shoelace to "frontend/javascript/index.js"...', :magenta
 
 javascript_import do
   <<~JS
-    // Import the base Shoelace stylesheet:
-    import "@shoelace-style/shoelace/dist/themes/light.css"
 
-    // Example components, mix 'n' match however you like!
+    // Example Shoelace components. Mix 'n' match however you like!
     import "@shoelace-style/shoelace/dist/components/button/button.js"
     import "@shoelace-style/shoelace/dist/components/icon/icon.js"
     import "@shoelace-style/shoelace/dist/components/spinner/spinner.js"
@@ -45,6 +58,15 @@ else
             '"webpack-dev": "yarn shoelace:copy-assets && webpack'
 end
 
+if File.exist?(".gitignore")
+  append_to_file ".gitignore" do
+    <<~FILES
+
+      src/shoelace-assets
+    FILES
+  end
+end
+
 say_status :shoelace, "Shoelace is now configured!"
 
 say 'For further reading, check out "https://shoelace.style"', :blue

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

@@ -45,11 +45,13 @@ insert_into_file "Rakefile",
   JS
 end
 
-append_to_file ".gitignore" do
-  <<~FILES
+if File.exist?(".gitignore")
+  append_to_file ".gitignore" do
+    <<~FILES
 
-    frontend/styles/jit-refresh.css
-  FILES
+      frontend/styles/jit-refresh.css
+    FILES
+  end
 end
 
 create_builder "tailwind_jit.rb" do

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.beta1"
+  VERSION = "1.1.0"
   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"

data/lib/site_template/TEMPLATES/liquid/_layouts/default.liquid

@@ -1,7 +1,7 @@
 <!doctype html>
 <html lang="{{ site.locale }}">
   <head>
-    {% render "head", metadata: site.metadata, title: page.title %}
+    {% render "head", metadata: site.metadata, title: resource.data.title %}
   </head>
   <body class="{{ resource.data.layout }} {{ resource.data.page_class }}">
     {% render "navbar", metadata: site.metadata, resource: resource %}

data/lib/site_template/package.json.erb

@@ -18,7 +18,6 @@
     "esbuild": "^0.14.39",
     <%- if frontend_bundling_option == "webpack" -%>
     "esbuild-loader": "^2.18.0",
-    "file-loader": "^6.2.0",
     "mini-css-extract-plugin": "^2.6.0",
     <%- else -%>
     "glob": "^8.0.1",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta1
+  version: 1.1.0
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-07-18 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
@@ -622,9 +608,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.4
 signing_key: