bridgetown-core 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 556799feca958f64e151dff3c039cc98240bc611a60cf650e3658f50490dcf79
-  data.tar.gz: 74bed3c07355d9b54107ce92334a0cf32a4d8909dd002efdeb4cbf6b0a729128
+  metadata.gz: d46961118b45c011dc48d776d5e3f451d761850930074608cfee29263b4e7a88
+  data.tar.gz: 2f5bea8f1c837c05c7376dce35951543510abcef5ccc82f7b37061e3b4bcade4
 SHA512:
-  metadata.gz: 8617f84687052ac6ed4b2413bbb4418fc3a332395fd647902379e75e4d22857d43a49edb30b8dbbb8aad7fe067412ad6c397fe0a05fd73ab5b3d3ea6866a7c55
-  data.tar.gz: 6c60464867cfb5fe8baf9e86d983a5392075a92f278f30499c68e1a1dec58b3be53991b7725b31de0c445f4afd448ca0056aa1841ecce79b2daa857c5cb43f6f
+  metadata.gz: e6e13e95c141d995d83dab36e5419e63b359c1065416920396c51235f3e728f0c8f6cb17d4088cd71649662d9b814e04ce70d56bd8416058ba31038865a0fee3
+  data.tar.gz: 0e64b349975e75e2d49af405288343ea54a39d9f894be7a4b51895becc72afd09ee138b69ca0f0ed3cf6d814842b60b2dbdf43f9fe6be20fe0f42364f21259da

data/bridgetown-core.gemspec

@@ -48,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
@@ -99,6 +93,8 @@ 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

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

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

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

@@ -1,5 +1,17 @@
+[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]
@@ -19,14 +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"
-    ]
-
 [[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/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/utils/loaders_manager.rb

@@ -39,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.2"
+  VERSION = "1.3.3"
   CODE_NAME = "Kelly Butte"
 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.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-02 00:00:00.000000000 Z
+date: 2024-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -264,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
@@ -415,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

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

@@ -1,13 +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 -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