bridgetown-core 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97de36caa078103a75226bcc77072ba86c958e58f77a22fb7282fe4d1ef4ef22
-  data.tar.gz: e3fc1723d1c4acc2b3f715ba138de15c77ad0cabaeaca75bf8e5b9b359f61cdb
+  metadata.gz: d46961118b45c011dc48d776d5e3f451d761850930074608cfee29263b4e7a88
+  data.tar.gz: 2f5bea8f1c837c05c7376dce35951543510abcef5ccc82f7b37061e3b4bcade4
 SHA512:
-  metadata.gz: 8d19ca716967ef3aae5a991a965ecd89805eb05135ebf8a87c0e320421986b4a2275c63eedf7dcdb41dd35b77c497bb823501849cf824432010a6f9f63d8e315
-  data.tar.gz: 4b06864b42beb7693c50ee75853ad3c4237fc997d8570d5ea5eb8bc41b19af3d12740b58204d0320475b9b1cbf823847dc7449d54ea20819c3b2b954443a2516
+  metadata.gz: e6e13e95c141d995d83dab36e5419e63b359c1065416920396c51235f3e728f0c8f6cb17d4088cd71649662d9b814e04ce70d56bd8416058ba31038865a0fee3
+  data.tar.gz: 0e64b349975e75e2d49af405288343ea54a39d9f894be7a4b51895becc72afd09ee138b69ca0f0ed3cf6d814842b60b2dbdf43f9fe6be20fe0f42364f21259da

data/bridgetown-core.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("addressable",               "~> 2.4")
   s.add_runtime_dependency("amazing_print",             "~> 1.2")
   s.add_runtime_dependency("colorator",                 "~> 1.0")
+  s.add_runtime_dependency("csv",                       "~> 3.2")
   s.add_runtime_dependency("erubi",                     "~> 1.9")
   s.add_runtime_dependency("faraday",                   "~> 2.0")
   s.add_runtime_dependency("faraday-follow_redirects",  "~> 0.3")
@@ -47,7 +48,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("listen",                    "~> 3.0")
   s.add_runtime_dependency("rake",                      ">= 13.0")
   s.add_runtime_dependency("roda",                      "~> 3.46")
-  s.add_runtime_dependency("rouge",                     "~> 3.0")
+  s.add_runtime_dependency("rouge",                     [">= 3.0", "< 5.0"])
   s.add_runtime_dependency("serbea",                    "~> 1.0")
   s.add_runtime_dependency("thor",                      "~> 1.1")
   s.add_runtime_dependency("tilt",                      "~> 2.0")

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

@@ -2,17 +2,11 @@
 
 module Bridgetown
   module ConsoleMethods
-    def site
-      Bridgetown::Current.site
-    end
-
-    def collections
-      site.collections
-    end
-
     def reload!
       Bridgetown.logger.info "Reloading site..."
 
+      site = Bridgetown::Current.site
+
       I18n.reload! # make sure any locale files get read again
       Bridgetown::Hooks.trigger :site, :pre_reload, site
       Bridgetown::Hooks.clear_reloadable_hooks
@@ -66,9 +60,15 @@ module Bridgetown
                    type: :boolean,
                    desc: "Print verbose output."
 
-      def console
+      def console # rubocop:disable Metrics
         require "irb"
-        require "irb/ext/save-history"
+        new_history_behavior = false
+        begin
+          require "irb/ext/save-history"
+        rescue LoadError
+          # Code path for Ruby 3.3+
+          new_history_behavior = true
+        end
         require "amazing_print" unless options[:"bypass-ap"]
 
         Bridgetown.logger.adjust_verbosity(options)
@@ -93,9 +93,12 @@ module Bridgetown
         IRB::ExtendCommandBundle.include ConsoleMethods
         IRB.setup(nil)
         workspace = IRB::WorkSpace.new
+        workspace.main.define_singleton_method(:site) { Bridgetown::Current.site }
+        workspace.main.define_singleton_method(:collections) { site.collections }
         irb = IRB::Irb.new(workspace)
         IRB.conf[:IRB_RC]&.call(irb.context)
         IRB.conf[:MAIN_CONTEXT] = irb.context
+        irb.context.io.load_history if new_history_behavior
         Bridgetown.logger.info "Console:", "Your site is now available as #{"site".cyan}"
         Bridgetown.logger.info "",
                                "You can also access #{"collections".cyan} or perform a " \
@@ -117,6 +120,7 @@ module Bridgetown
           end
         ensure
           IRB.conf[:AT_EXIT].each(&:call)
+          irb.context.io.save_history if new_history_behavior
         end
       end
     end

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

@@ -128,14 +128,19 @@ const importPostCssPlugin = (options, configuration) => ({
       })
 
       // Process the file through PostCSS
-      const result = await postcss([importPlugin, ...options.plugins]).process(css, {
-        map: true,
-        ...options.options,
-        from: args.path,
-      });
-
+      let outputCSS = ""
+      try {
+        const result = await postcss([importPlugin, ...options.plugins]).process(css, {
+          map: true,
+          ...options.options,
+          from: args.path,
+        })
+        outputCSS = result.css
+      } catch(err) {
+        console.error(`\nerror: "${err.reason}" while processing CSS file:\n${err.file}:${err.line}:${err.column}\n`)
+      }
       return {
-        contents: result.css,
+        contents: outputCSS,
         loader: "css",
         watchFiles: [args.path, ...additionalFilePaths],
       }

data/lib/bridgetown-core/commands/esbuild/jsconfig.json

@@ -6,5 +6,5 @@
         "$javascript/*": ["./frontend/javascript/*"],
         "$components/*": ["./src/_components/*"]
     }
-  }, 
+  },
 }

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

@@ -13,12 +13,24 @@ module Bridgetown
                    end
 
       matching_resources = result_set.select do |item|
-        item.relative_path.parent == relative_path.parent && item.data.slug == data.slug
+        matches_resource?(item)
       end
 
       matching_resources.sort_by do |item|
         site.config.available_locales.index item.data.locale
       end
     end
+
+    def matches_resource?(item)
+      if item.relative_path.is_a?(String)
+        item.localeless_path == localeless_path
+      else
+        item.relative_path.parent == relative_path.parent
+      end && item.data.slug == data.slug
+    end
+
+    def localeless_path
+      relative_path.gsub(%r{\A#{data.locale}/}, "")
+    end
   end
 end

data/lib/bridgetown-core/configurations/netlify/netlify.toml

@@ -1,23 +1,25 @@
+[dev]
+  command = "bin/bridgetown dev"
+  targetPort = 4000
+  port = 8888
+  publish = "output"
+  autoLaunch = true
+  framework = "#custom"
+
+[context.dev.build.environment]
+  NODE_ENV = "development"
+  BRIDGETOWN_ENV = "development"
+
 [build]
-  command = "bin/bridgetown deploy && bin/netlify.sh"
+  command = "bin/bridgetown deploy"
   publish = "output"
 
 [build.environment]
   NODE_ENV = "development"
   BRIDGETOWN_ENV = "production"
 
-[build.processing]
-  skip_processing = false
-[build.processing.css]
-  bundle = false
-  minify = true
-[build.processing.js]
-  bundle = false
-  minify = true
 [build.processing.html]
   pretty_urls = true
-[build.processing.images]
-  compress = true
 
 [[headers]]
   for = "*"
@@ -29,15 +31,6 @@
     Referrer-Policy = "no-referrer-when-downgrade"
     Cache-Control = "public, max-age=604800, s-max-age=604800"
 
-[[headers]]
-  for = "/"
-  [headers.values]
-    Link = [
-      "<CSS_PATH>; rel=preload; as=style",
-      "<JS_PATH>; rel=preload; as=script",
-      "<https://NETLIFY_IMAGES_CDN_DOMAIN>; rel=preconnect"
-    ]
-
 [[headers]]
   for = "/*.(png|jpg|js|css|svg|woff|ttf|eot|ico|woff2)"
   [headers.values]

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

@@ -1,5 +1,3 @@
 # frozen_string_literal: true
 
 copy_file in_templates_dir("netlify.toml"), "netlify.toml"
-copy_file in_templates_dir("netlify.sh"), "bin/netlify.sh"
-`chmod a+x ./bin/netlify.sh`

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

@@ -37,8 +37,8 @@ append_to_file(File.join(javascript_dir, "index.js")) do
         if (filename.includes("_controller.") || filename.includes("-controller.")) {
           const identifier = filename.replace("./controllers/", "")
             .replace(/[_-]controller\\..*$/, "")
-            .replace("_", "-")
-            .replace("/", "--")
+            .replace(/_/g, "-")
+            .replace(/\\//g, "--")
 
           Stimulus.register(identifier, controller.default)
         }

data/lib/bridgetown-core/generated_page.rb

@@ -168,7 +168,7 @@ module Bridgetown
     #
     # @return [String]
     def output_ext
-      @output_ext ||= (permalink_ext || converter_output_ext)
+      @output_ext ||= permalink_ext || converter_output_ext
     end
 
     def permalink_ext

data/lib/bridgetown-core/helpers.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_support/html_safe_translation"
+
 module Bridgetown
   class RubyTemplateView
     class Helpers
@@ -128,21 +130,49 @@ module Bridgetown
         safe(segments.join(" "))
       end
 
-      # Forward all arguments to I18n.t method
+      # Delegates to <tt>I18n#translate</tt> but also performs two additional
+      # functions.
+      #
+      # First, if the key starts with a period <tt>translate</tt> will scope
+      # the key by the current view. Calling <tt>translate(".foo")</tt> from
+      # the <tt>people/index.html.erb</tt> template is equivalent to calling
+      # <tt>translate("people.index.foo")</tt>. This makes it less
+      # repetitive to translate many keys within the same view and provides
+      # a convention to scope keys consistently.
+      #
+      # Second, the translation will be marked as <tt>html_safe</tt> if the key
+      # has the suffix "_html" or the last element of the key is "html". Calling
+      # <tt>translate("footer_html")</tt> or <tt>translate("footer.html")</tt>
+      # will return an HTML safe string that won't be escaped by other HTML
+      # helper methods. This naming convention helps to identify translations
+      # that include HTML tags so that you know what kind of output to expect
+      # when you call translate in a template and translators know which keys
+      # they can provide HTML values for.
       #
       # @return [String] the translated string
       # @see I18n
-      def t(*args, **kwargs)
-        I18n.send :t, *args, **kwargs
+      def translate(key, **options) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        return key.map { |k| translate(k, **options) } if key.is_a?(Array)
+
+        key = key&.to_s
+
+        if key&.start_with?(".")
+          view_path = view&.page&.relative_path&.to_s&.split(".")&.first
+          key = "#{view_path.tr("/", ".")}#{key}" if view_path.present?
+        end
+
+        ActiveSupport::HtmlSafeTranslation.translate(key, **options)
       end
+      alias_method :t, :translate
 
-      # Forward all arguments to I18n.l method
+      # Delegates to <tt>I18n.localize</tt> with no additional functionality.
       #
       # @return [String] the localized string
       # @see I18n
-      def l(*args, **kwargs)
-        I18n.send :l, *args, **kwargs
+      def localize(...)
+        I18n.localize(...)
       end
+      alias_method :l, :localize
 
       # For template contexts where ActiveSupport's output safety is loaded, we
       # can ensure a string has been marked safe

data/lib/bridgetown-core/log_writer.rb

@@ -2,18 +2,12 @@
 
 module Bridgetown
   class LogWriter < ::Logger
-    def initialize # rubocop:disable Lint/MissingSuper
-      @progname = nil
-      @level = DEBUG
-      @default_formatter = Formatter.new
-      @logdev = $stdout
-      @formatter = proc do |_, _, _, msg|
-        msg.to_s
-      end
+    def initialize
+      super($stdout, formatter: proc { |_, _, _, msg| msg.to_s })
     end
 
     def enable_prefix
-      @formatter = proc do |_, _, _, msg|
+      self.formatter = proc do |_, _, _, msg|
         "\e[32m[Bridgetown]\e[0m #{msg}"
       end
     end

data/lib/bridgetown-core/plugin_manager.rb

@@ -129,6 +129,24 @@ module Bridgetown
                               "Required #{required_gems.map(&:name).join(", ")}")
     end
 
+    def self.package_manager
+      @package_manager ||= if File.exist?("yarn.lock")
+                             "yarn"
+                           elsif File.exist?("package-lock.json")
+                             "npm"
+                           elsif File.exist?("pnpm-lock.yaml")
+                             "pnpm"
+                           else
+                             ""
+                           end
+    end
+
+    def self.package_manager_install_command
+      package_manager == "npm" ? "install" : "add"
+    end
+
+    # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+
     # Iterates through loaded gems and finds yard-add gemspec metadata.
     # If that exact package hasn't been installed, execute yarn add
     #
@@ -146,18 +164,22 @@ module Bridgetown
                          required_gems
                        end
 
+      # all right, time to install the package
       gems_to_search.each do |loaded_gem|
         yarn_dependency = find_yarn_dependency(loaded_gem)
         next unless add_yarn_dependency?(yarn_dependency, package_json)
 
-        # all right, time to install the package
-        cmd = "yarn add #{yarn_dependency.join("@")}"
+        next if package_manager.empty?
+
+        cmd = "#{package_manager} #{package_manager_install_command} #{yarn_dependency.join("@")}"
         system cmd
       end
 
       gems_to_search
     end
 
+    # rubocop:enable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity
+
     def self.find_yarn_dependency(loaded_gem)
       yarn_dependency = loaded_gem.to_spec&.metadata&.dig("yarn-add")&.match(YARN_DEPENDENCY_REGEXP)
       return nil if yarn_dependency&.length != 3 || yarn_dependency[2] == ""

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

@@ -48,7 +48,7 @@ module Bridgetown
     end
 
     # @param root [String] root of Bridgetown site, defaults to config value
-    def self.autoload_server_folder( # rubocop:todo Metrics/MethodLength
+    def self.autoload_server_folder( # rubocop:todo Metrics
       root: Bridgetown::Current.preloaded_configuration.root_dir
     )
       server_folder = File.join(root, "server")
@@ -62,7 +62,18 @@ module Bridgetown
         loader.do_not_eager_load(File.join(server_folder, "roda_app.rb"))
 
         unless ENV["BRIDGETOWN_ENV"] == "production"
-          Listen.to(server_folder) do |_modified, _added, _removed|
+          Listen.to(server_folder) do |modified, added, removed|
+            c = modified + added + removed
+            n = c.length
+
+            Bridgetown.logger.info(
+              "Reloading…",
+              "#{n} file#{"s" if n > 1} changed at #{Time.now.strftime("%Y-%m-%d %H:%M:%S")}"
+            )
+            c.each do |path|
+              Bridgetown.logger.info "", "- #{path["#{File.dirname(server_folder)}/".length..]}"
+            end
+
             loader.reload
             loader.eager_load
             Bridgetown::Rack::Routes.reload_subclasses

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

@@ -349,7 +349,7 @@ module Bridgetown
       end
 
       def import_taxonomies_from_data
-        taxonomies.each do |_label, metadata|
+        taxonomies.each_value do |metadata|
           Array(data[metadata.type.key]).each do |term|
             metadata.terms << TaxonomyTerm.new(
               resource: self, label: term, type: metadata.type

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

@@ -24,7 +24,7 @@ module Bridgetown
       def relation_types
         @relation_types ||= begin
           types = []
-          relation_schema&.each do |_relation_type, collections|
+          relation_schema&.each_value do |collections|
             types << collections
             types << Array(collections).map { |item| ActiveSupport::Inflector.pluralize(item) }
           end

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

@@ -20,9 +20,7 @@ module Bridgetown
       def unload_loaders
         return if @loaders.keys.empty?
 
-        @loaders.each do |_path, loader|
-          loader.unload
-        end
+        @loaders.each_value(&:unload)
         @loaders = {}
       end
 
@@ -41,9 +39,11 @@ module Bridgetown
         end
 
         # TODO: this could probably be refactored to work like the above
-        ActiveSupport::DescendantsTracker.class_variable_get(
-          :@@direct_descendants
-        )[value.superclass]&.reject! { _1 == value }
+        if ActiveSupport::DescendantsTracker.class_variables.include?(:@@direct_descendants)
+          ActiveSupport::DescendantsTracker.class_variable_get(
+            :@@direct_descendants
+          )[value.superclass]&.reject! { _1 == value }
+        end
       end
 
       def setup_loaders(autoload_paths = []) # rubocop:todo Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity

data/lib/bridgetown-core/version.rb

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

data/lib/bridgetown-core/yaml_parser.rb

@@ -6,12 +6,23 @@ module Bridgetown
 
     class << self
       def load_file(filename, **kwargs)
-        kwargs = { permitted_classes: PERMITTED_CLASSES }.merge(kwargs)
-        YAML.safe_load_file(filename, **kwargs)
+        YAML.safe_load_file filename, **merge_permitted_classes(kwargs)
       end
 
-      def load(yaml)
-        YAML.safe_load yaml, permitted_classes: PERMITTED_CLASSES
+      def load(yaml, **kwargs)
+        YAML.safe_load yaml, **merge_permitted_classes(kwargs)
+      end
+
+      private
+
+      def merge_permitted_classes(kwargs)
+        if kwargs.key?(:permitted_classes)
+          kwargs[:permitted_classes] |= PERMITTED_CLASSES
+        else
+          kwargs[:permitted_classes] = PERMITTED_CLASSES
+        end
+
+        kwargs
       end
     end
   end

data/lib/site_template/postcss.config.js.erb

@@ -1,4 +1,4 @@
-module.exports = {  
+module.exports = {
   plugins: {
     'postcss-flexbugs-fixes': {},
     'postcss-preset-env': {
@@ -8,4 +8,4 @@ module.exports = {
       stage: 3
     }
   }
-}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - Bridgetown Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2024-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -92,6 +92,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: erubi
   requirement: !ruby/object:Gem::Requirement
@@ -250,16 +264,22 @@ dependencies:
   name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: serbea
   requirement: !ruby/object:Gem::Requirement
@@ -401,7 +421,6 @@ files:
 - lib/bridgetown-core/configurations/lit/lit-ssr.config.js
 - lib/bridgetown-core/configurations/minitesting.rb
 - lib/bridgetown-core/configurations/netlify.rb
-- lib/bridgetown-core/configurations/netlify/netlify.sh
 - lib/bridgetown-core/configurations/netlify/netlify.toml
 - lib/bridgetown-core/configurations/open-props.rb
 - lib/bridgetown-core/configurations/open-props/variables.css.erb
@@ -578,7 +597,7 @@ metadata:
   changelog_uri: https://github.com/bridgetownrb/bridgetown/releases
   homepage_uri: https://www.bridgetownrb.com
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -594,8 +613,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: A next-generation, progressive site generator & fullstack framework, powered
   by Ruby

data/lib/bridgetown-core/configurations/netlify/netlify.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-# Taken from https://docs.netlify.com/configure-builds/file-based-configuration/#inject-environment-variable-values
-
-echo "Updating netlify.toml with references to our built files"
-
-CSS_PATH=`find output/_bridgetown/static/css/*.css -type f | sed -e 's,output\/,/,g'`
-JS_PATH=`find output/_bridgetown/static/js/*.js -type f | sed -e 's,output\/,/,g'`
-
-echo "CSS Path: ${CSS_PATH}"
-echo "JS Path: ${JS_PATH}"
-
-sed -i s,CSS_PATH,${CSS_PATH},g netlify.toml
-sed -i s,JS_PATH,${JS_PATH},g netlify.toml
-sed -i s,NETLIFY_IMAGES_CDN_DOMAIN,${NETLIFY_IMAGES_CDN_DOMAIN},g netlify.toml