bridgetown-core 1.3.0.beta3 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec81158ce54460fb44c4296bae6c3eb75c95c627492c6fe5891cbd853089a13c
-  data.tar.gz: e22e4e4cfd9b4c27a5eefefd1670e43c99badb7eb9c8be96105b47e024324543
+  metadata.gz: 97de36caa078103a75226bcc77072ba86c958e58f77a22fb7282fe4d1ef4ef22
+  data.tar.gz: e3fc1723d1c4acc2b3f715ba138de15c77ad0cabaeaca75bf8e5b9b359f61cdb
 SHA512:
-  metadata.gz: 6130dec47320b9b66406afbb6e98e5851ceba1664292c37be8d02a800c9e95a6c9678ccbc5c822dc2f64497e0b9b0826c0956dd72ab81c2526b9fb499b3d13a5
-  data.tar.gz: ac1d0032d102186ae07d41997bd29541bf96eb3e7aee7aa6ca25df8da5b3cebef18ebb7cb3d51c1ef58270df68c65d126271b55bb822f8fdd046927ccfee68b5
+  metadata.gz: 8d19ca716967ef3aae5a991a965ecd89805eb05135ebf8a87c0e320421986b4a2275c63eedf7dcdb41dd35b77c497bb823501849cf824432010a6f9f63d8e315
+  data.tar.gz: 4b06864b42beb7693c50ee75853ad3c4237fc997d8570d5ea5eb8bc41b19af3d12740b58204d0320475b9b1cbf823847dc7449d54ea20819c3b2b954443a2516

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

@@ -103,6 +103,8 @@ const importPostCssPlugin = (options, configuration) => ({
   async setup(build) {
     // Process .css files with PostCSS
     build.onLoad({ filter: (configuration.filter || /\.css$/) }, async (args) => {
+      if (args.path.endsWith(".lit.css")) return;
+
       const additionalFilePaths = []
       const css = await fs.readFile(args.path, "utf8")
 
@@ -307,6 +309,9 @@ module.exports = async (esbuildOptions, ...args) => {
   if (esbuildOptions.bridgetownConfig) delete esbuildOptions.bridgetownConfig
 
   const esbuild = require("esbuild")
+  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}`)
 
   esbuild.context({
@@ -325,7 +330,7 @@ module.exports = async (esbuildOptions, ...args) => {
     minify: process.argv.includes("--minify"),
     sourcemap: true,
     target: "es2020",
-    entryPoints: ["./frontend/javascript/index.js", ...islands],
+    entryPoints: [...entryPoints, ...islands],
     entryNames: "[dir]/[name].[hash]",
     outdir: path.join(process.cwd(), `${bridgetownConfig.destination}/_bridgetown/static`),
     publicPath: "/_bridgetown/static",

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

@@ -5,3 +5,5 @@ copy_file "jsconfig.json"
 say "🎉 esbuild configuration updated successfully!"
 say "You may need to add `$styles/` to the front of your main CSS imports."
 say "See https://www.bridgetownrb.com/docs/frontend-assets#esbuild-setup for details."
+say "⚠️ Don't forget to update the esbuild version in your `package.json` file to \"^0.19.2\""
+say "and run `yarn install`!"

data/lib/bridgetown-core/configuration.rb

@@ -41,6 +41,7 @@ module Bridgetown
         category: { key: "categories", title: "Category" }, tag: { key: "tags", title: "Tag" },
       },
       "autoload_paths"             => [],
+      "inflector"                  => nil,
       "eager_load_paths"           => [],
       "autoloader_collapsed_paths" => [],
       "additional_watch_paths"     => [],

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

@@ -28,7 +28,7 @@ insert_into_file "esbuild.config.js",
 end
 
 insert_into_file "esbuild.config.js",
-                 after: "  plugins: [" do
+                 after: "\n  plugins: [\n" do
   <<-JS
     ...plugins,
   JS

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

@@ -23,7 +23,7 @@ insert_into_file "esbuild.config.js",
 end
 
 insert_into_file "esbuild.config.js",
-                 after: "  plugins: [" do
+                 after: "\n  plugins: [\n" do
   <<-JS
     ruby2js(),
   JS

data/lib/bridgetown-core/drops/drop.rb

@@ -202,7 +202,8 @@ module Bridgetown
         return self[key] if key?(key)
         raise KeyError, %(key not found: "#{key}") if default.nil? && block.nil?
         return yield(key) unless block.nil?
-        return default unless default.nil?
+
+        default unless default.nil?
       end
 
       private

data/lib/bridgetown-core/filters/localization_filters.rb

@@ -3,8 +3,34 @@
 module Bridgetown
   module Filters
     module LocalizationFilters
-      def l(input)
-        I18n.l(input.to_s)
+      def l(input, format = nil, locale = nil)
+        date = Liquid::Utils.to_date(input)
+        return input if date.nil?
+
+        format = maybe_symbolized(format, date)
+        locale ||= maybe_locale(format)
+        format = nil if locale == format
+
+        I18n.l(date, format: format, locale: locale)
+      end
+
+      private
+
+      def maybe_locale(format)
+        return if format.nil?
+
+        Bridgetown::Current.site.config.available_locales.include?(format.to_sym) ? format : nil
+      end
+
+      def maybe_symbolized(format, object)
+        return if format.nil?
+
+        type = type_of(object)
+        I18n.t("#{type}.formats").key?(format.to_sym) ? format.to_sym : format
+      end
+
+      def type_of(object)
+        object.respond_to?(:sec) ? "time" : "date"
       end
     end
   end

data/lib/bridgetown-core/filters/translation_filters.rb

@@ -3,8 +3,21 @@
 module Bridgetown
   module Filters
     module TranslationFilters
-      def t(input)
-        I18n.t(input.to_s)
+      def t(input, options = "")
+        options = string_to_hash(options)
+        locale = options.delete(:locale)
+        count = options.delete(:count)
+        options[:count] = count.to_i unless count.nil?
+
+        I18n.t(input.to_s, locale: locale, **options)
+      rescue ArgumentError
+        input
+      end
+
+      private
+
+      def string_to_hash(options)
+        options.split(",").to_h { |e| e.split(":").map(&:strip) }.symbolize_keys
       end
     end
   end

data/lib/bridgetown-core/filters.rb

@@ -7,6 +7,8 @@ module Bridgetown
     include URLFilters
     include GroupingFilters
     include DateFilters
+    include LocalizationFilters
+    include TranslationFilters
     include ConditionHelpers
 
     # Convert a Markdown string into HTML output.
@@ -102,7 +104,7 @@ module Bridgetown
     def obfuscate_link(input, prefix = "mailto")
       link = "<a href=\"#{prefix}:#{input}\">#{input}</a>"
       script = "<script type=\"text/javascript\">document.currentScript.insertAdjacentHTML('"
-      script += "beforebegin', '#{rot47(link).gsub(%r!\\!, '\\\\\\')}'.replace(/[!-~]/g," # rubocop:disable Style/StringLiteralsInInterpolation
+      script += "beforebegin', '#{rot47(link).gsub("\\", '\\\\\\')}'.replace(/[!-~]/g," # rubocop:disable Style/StringLiteralsInInterpolation
       script += "function(c){{var j=c.charCodeAt(0);if((j>=33)&&(j<=126)){"
       script += "return String.fromCharCode(33+((j+ 14)%94));}"
       script += "else{return String.fromCharCode(j);}}}));</script>"
@@ -433,6 +435,3 @@ end
 Liquid::Template.register_filter(
   Bridgetown::Filters
 )
-Liquid::Template.register_filter(
-  Bridgetown::Filters::TranslationFilters
-)

data/lib/bridgetown-core/generators/prototype_generator.rb

@@ -144,9 +144,10 @@ module Bridgetown
     end
 
     def process_prototype_page_data(collection, search_term, term)
+      pagination_key = prototyped_page.data.key?("paginate") ? "paginate" : "pagination"
       # Fill in pagination details to be handled later by Bridgetown::Paginate
       data["pagination"] = Bridgetown::Utils.deep_merge_hashes(
-        prototyped_page.data["pagination"].to_h, {
+        prototyped_page.data[pagination_key].to_h, {
           "enabled"     => true,
           "collection"  => collection,
           "where_query" => [search_term, term],

data/lib/bridgetown-core/helpers.rb

@@ -97,10 +97,11 @@ module Bridgetown
       # @param options [Hash] key-value pairs of HTML attributes to add to the tag
       # @return [String] the anchor tag HTML
       # @raise [ArgumentError] if the file cannot be found
-      def link_to(text, relative_path = nil, options = {})
-        if block_given?
+      def link_to(text, relative_path = nil, options = {}, &block)
+        if block.present?
+          options = relative_path || {}
           relative_path = text
-          text = yield
+          text = view.respond_to?(:capture) ? view.capture(&block) : yield
         elsif relative_path.nil?
           raise ArgumentError, "You must provide a relative path"
         end
@@ -221,7 +222,7 @@ module Bridgetown
                      view.view_context.resource
                    end
 
-        return unless resource
+        return false unless resource
 
         name = name.to_s
         resource.slots.any? do |slot|

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

@@ -3,9 +3,11 @@
 module Bridgetown
   module Tags
     class LocalizationTag < Liquid::Tag
+      include Bridgetown::Filters::LocalizationFilters
+
       def render(_context)
-        key = @markup.strip
-        I18n.l(key)
+        input, format, locale = @markup.split.map(&:strip)
+        l(input, format, locale)
       end
     end
   end

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

@@ -3,9 +3,13 @@
 module Bridgetown
   module Tags
     class TranslationTag < Liquid::Tag
+      include Bridgetown::Filters::TranslationFilters
+
       def render(_context)
-        key = @markup.strip
-        I18n.t(key)
+        input, options = @markup.split.map(&:strip)
+        options ||= ""
+
+        t(input, options).to_s
       end
     end
   end

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

@@ -73,3 +73,14 @@ task :environment do # rubocop:todo Metrics/BlockLength
     end
   end
 end
+
+# rubocop:disable Bridgetown/NoPutsAllowed
+desc "Provides a time zone-aware date string you can use in front matter"
+task date: :environment do
+  run_initializers
+
+  puts "🗓️  Today's date & time in your site's timezone (#{ENV.fetch("TZ", "NOT SET")}):"
+  puts
+  puts "➡️  #{Time.now.strftime("%a, %d %b %Y %T %z")}"
+end
+# rubocop:enable Bridgetown/NoPutsAllowed

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

@@ -47,7 +47,7 @@ module Bridgetown
       end
 
       def setup_loaders(autoload_paths = []) # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
-        (autoload_paths.presence || config.autoload_paths).each do |load_path|
+        (autoload_paths.presence || config.autoload_paths).each do |load_path| # rubocop:todo Metrics/BlockLength
           if @loaders.key?(load_path)
             raise "Zeitwerk loader already added for `#{load_path}'. Please check your config"
           end
@@ -55,6 +55,7 @@ module Bridgetown
           next unless Dir.exist? load_path
 
           loader = Zeitwerk::Loader.new
+          loader.inflector = config.inflector if config.inflector
           begin
             loader.push_dir(load_path)
           rescue Zeitwerk::Error

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "1.3.0.beta3"
+  VERSION = "1.3.1"
   CODE_NAME = "Kelly Butte"
 end

data/lib/bridgetown-core/watcher.rb

@@ -133,6 +133,7 @@ module Bridgetown
 
     # rubocop:disable Layout/LineLength
     def component_frontend_matcher(options)
+      # TODO: maybe a negative lookbehind would make this regex cleaner?
       @fematcher ||=
         %r{(#{options[:components_dir]}|#{options[:islands_dir]})/(?:[^.]+|\.(?!dsd))+(\.js|\.jsx|\.js\.rb|\.css)$}
     end

data/lib/bridgetown-core.rb

@@ -77,7 +77,6 @@ module Bridgetown
   autoload :Cleaner,             "bridgetown-core/cleaner"
   autoload :Collection,          "bridgetown-core/collection"
   autoload :Component,           "bridgetown-core/component"
-  autoload :Configuration,       "bridgetown-core/configuration"
   autoload :DefaultsReader,      "bridgetown-core/readers/defaults_reader"
   autoload :Deprecator,          "bridgetown-core/deprecator"
   autoload :EntryFilter,         "bridgetown-core/entry_filter"
@@ -119,6 +118,7 @@ module Bridgetown
   require "bridgetown-core/liquid_extensions"
   require "bridgetown-core/filters"
 
+  require "bridgetown-core/configuration"
   require "bridgetown-core/drops/drop"
   require "bridgetown-core/drops/resource_drop"
   require_all "bridgetown-core/converters"

data/lib/site_template/config/initializers.rb

@@ -10,6 +10,26 @@ Bridgetown.configure do |config|
   # config.autoload_paths << "models"
   #
 
+  # You can configure the inflector used by Zeitwerk. In v2.0,
+  # ActiveSupport::Inflector will become the default.
+  #
+  # config.inflector = ActiveSupport::Inflector
+  #
+  # Add new inflection rules using the following format. Inflections
+  # are locale specific, and you may define rules for as many different
+  # locales as you wish. All of these examples are active by default:
+  # ActiveSupport::Inflector.inflections(:en) do |inflect|
+  #   inflect.plural /^(ox)$/i, "\\1en"
+  #   inflect.singular /^(ox)en/i, "\\1"
+  #   inflect.irregular "person", "people"
+  #   inflect.uncountable %w( fish sheep )
+  # end
+  #
+  # These inflection rules are supported but not enabled by default:
+  # ActiveSupport::Inflector.inflections(:en) do |inflect|
+  #   inflect.acronym "RESTful"
+  # end
+
   # You can use `init` to initialize various Bridgetown features or plugin gems.
   # For example, you can use the Dotenv gem to load environment variables from
   # `.env`. Just `bundle add dotenv` and then uncomment this:

data/lib/site_template/package.json.erb

@@ -13,17 +13,17 @@
   },
   "devDependencies": {
     <%- if frontend_bundling_option == "webpack" -%>
-    "css-loader": "^6.7.1",
+    "css-loader": "^6.8.1",
     <%- end -%>
-    "esbuild": "^0.17.19",
+    "esbuild": "^0.19.2",
     <%- if frontend_bundling_option == "webpack" -%>
-    "esbuild-loader": "^2.18.0",
-    "mini-css-extract-plugin": "^2.6.0",
+    "esbuild-loader": "^4.0.2",
+    "mini-css-extract-plugin": "^2.7.6",
     <%- else -%>
-    "glob": "^10.2.6",
+    "glob": "^10.3.3",
     <%- end -%>
     <%- unless disable_postcss? -%>
-    "postcss": "^8.4.23",
+    "postcss": "^8.4.29",
     "postcss-flexbugs-fixes": "^5.0.2",
     <%- if frontend_bundling_option == "esbuild" -%>
     "postcss-import": "^15.1.0",
@@ -31,20 +31,20 @@
     <%- else -%>
     "postcss-loader": "^6.2.1",
     <%- end -%>
-    "postcss-preset-env": "^8.4.1",
+    "postcss-preset-env": "^9.1.2",
     <%- if frontend_bundling_option == "esbuild" -%>
     "read-cache": "^1.0.0"<%= "," unless postcss_option  %>
     <%- end -%>
     <%- end -%>
     <%- unless postcss_option -%>
-    "sass": "^1.62.1",
-    "sass-loader": "^12.6.0"<%= "," if frontend_bundling_option == "webpack" %>
+    "sass": "^1.66.1",
+    "sass-loader": "^13.3.2"<%= "," if frontend_bundling_option == "webpack" %>
     <%- end -%>
     <%- if frontend_bundling_option == "webpack" -%>
-    "webpack": "^5.72.0",
-    "webpack-cli": "^4.9.2",
+    "webpack": "^5.88.2",
+    "webpack-cli": "^5.1.4",
     "webpack-manifest-plugin": "^5.0.0",
-    "webpack-merge": "^5.8.0"
+    "webpack-merge": "^5.9.0"
     <%- end -%>
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.3.0.beta3
+  version: 1.3.1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-18 00:00:00.000000000 Z
+date: 2023-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -590,9 +590,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: