bridgetown-core 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97de36caa078103a75226bcc77072ba86c958e58f77a22fb7282fe4d1ef4ef22
-  data.tar.gz: e3fc1723d1c4acc2b3f715ba138de15c77ad0cabaeaca75bf8e5b9b359f61cdb
+  metadata.gz: 556799feca958f64e151dff3c039cc98240bc611a60cf650e3658f50490dcf79
+  data.tar.gz: 74bed3c07355d9b54107ce92334a0cf32a4d8909dd002efdeb4cbf6b0a729128
 SHA512:
-  metadata.gz: 8d19ca716967ef3aae5a991a965ecd89805eb05135ebf8a87c0e320421986b4a2275c63eedf7dcdb41dd35b77c497bb823501849cf824432010a6f9f63d8e315
-  data.tar.gz: 4b06864b42beb7693c50ee75853ad3c4237fc997d8570d5ea5eb8bc41b19af3d12740b58204d0320475b9b1cbf823847dc7449d54ea20819c3b2b954443a2516
+  metadata.gz: 8617f84687052ac6ed4b2413bbb4418fc3a332395fd647902379e75e4d22857d43a49edb30b8dbbb8aad7fe067412ad6c397fe0a05fd73ab5b3d3ea6866a7c55
+  data.tar.gz: 6c60464867cfb5fe8baf9e86d983a5392075a92f278f30499c68e1a1dec58b3be53991b7725b31de0c445f4afd448ca0056aa1841ecce79b2daa857c5cb43f6f

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")

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

@@ -66,9 +66,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)
@@ -96,6 +102,7 @@ module Bridgetown
         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 +124,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/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.sh

@@ -3,12 +3,11 @@
 
 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'`
+CSS_PATH=`find output/_bridgetown/static/*.css -type f | sed -e 's,output\/,/,g'`
+JS_PATH=`find output/_bridgetown/static/*.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

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

@@ -6,18 +6,8 @@
   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 = "*"
@@ -34,8 +24,7 @@
   [headers.values]
     Link = [
       "<CSS_PATH>; rel=preload; as=style",
-      "<JS_PATH>; rel=preload; as=script",
-      "<https://NETLIFY_IMAGES_CDN_DOMAIN>; rel=preconnect"
+      "<JS_PATH>; rel=preload; as=script"
     ]
 
 [[headers]]

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/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
 

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Bridgetown Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2024-01-02 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
@@ -578,7 +592,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 +608,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