Merge branch 'ruby-3.1-minimum' into replace-cucumber-with-minitest

bridgetownrb · Mar 17, 2024 · 6a872c6 · 6a872c6
2 parents fc16510 + dd4911f
commit 6a872c6
Show file tree

Hide file tree

Showing 31 changed files with 515 additions and 142 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [1.3.3] - 2024-03-16
+
+- Use global regex for Stimulus Configuration [#865](https://github.com/bridgetownrb/bridgetown/pull/865) ([@MSILycanthropy](https://github.com/MSILycanthropy))
+- Move site and collections console commands to locals [#853](https://github.com/bridgetownrb/bridgetown/pull/853) ([@mpace965](https://github.com/mpace965))
+- Relax the Rouge version requirement [#864](https://github.com/bridgetownrb/bridgetown/pull/864) ([@matiaskorhonen](https://github.com/matiaskorhonen))
+- esbuild: Add webp (and some others) to the file endings loaded as files [#863](https://github.com/bridgetownrb/bridgetown/pull/863) ([@moonglum](https://github.com/moonglum))
+- Improve Netlify bundled configuration [#839](https://github.com/bridgetownrb/bridgetown/pull/839) ([@jclusso](https://github.com/jclusso))
+- Improve localization helpers [#842](https://github.com/bridgetownrb/bridgetown/pull/842) ([@jclusso](https://github.com/jclusso))
+- Remove trailing whitespace from template resource [#838](https://github.com/bridgetownrb/bridgetown/pull/838) ([@unasuke](https://github.com/unasuke))
+- Thanks to @jclusso & @ayushn21 for docs improvements!
+
 ## [1.3.2] - 2024-01-01
 
 - Fix logs and console for Ruby 3.3 [#834](https://github.com/bridgetownrb/bridgetown/pull/834) ([jaredcwhite](https://github.com/jaredcwhite))
@@ -705,7 +716,7 @@ Final release of 0.21.0! See below for full changelog.
 ## 0.11.1 - 2020-04-24
 
 * Add a git init step to `bridgetown new` command [#18](https://github.com/bridgetownrb/bridgetown/pull/18)
-* Update sass-loader webpack config to support .sass [#14](https://github.com/bridgetownrb/bridgetown/pull/14) ([jaredmoody](https://github.com/jaredmoody)) 
+* Update sass-loader webpack config to support .sass [#14](https://github.com/bridgetownrb/bridgetown/pull/14) ([jaredmoody](https://github.com/jaredmoody))
 * Add customizable permalinks to Prototype Pages (aka `/path/to/:term/and/beyond`). Use hooks and in-memory caching to speed up Pagination. _Inspired by [use cases like this](https://annualbeta.com/blog/dynamic-social-sharing-images-with-eleventy/)…_ [#12](https://github.com/bridgetownrb/bridgetown/pull/12)
 
 ## 0.11.0 - 2020-04-21

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,13 +1,13 @@
 PATH
   remote: bridgetown-builder
   specs:
-    bridgetown-builder (1.3.2)
-      bridgetown-core (= 1.3.2)
+    bridgetown-builder (1.3.3)
+      bridgetown-core (= 1.3.3)
 
 PATH
   remote: bridgetown-core
   specs:
-    bridgetown-core (1.3.2)
+    bridgetown-core (1.3.3)
       activemodel (>= 6.0, < 8.0)
       activesupport (>= 6.0, < 8.0)
       addressable (~> 2.4)
@@ -25,7 +25,7 @@ PATH
       listen (~> 3.0)
       rake (>= 13.0)
       roda (~> 3.46)
-      rouge (~> 3.0)
+      rouge (>= 3.0, < 5.0)
       serbea (~> 1.0)
       thor (~> 1.1)
       tilt (~> 2.0)
@@ -34,23 +34,23 @@ PATH
 PATH
   remote: bridgetown-paginate
   specs:
-    bridgetown-paginate (1.3.2)
-      bridgetown-core (= 1.3.2)
+    bridgetown-paginate (1.3.3)
+      bridgetown-core (= 1.3.3)
 
 PATH
   remote: bridgetown
   specs:
-    bridgetown (1.3.2)
-      bridgetown-builder (= 1.3.2)
-      bridgetown-core (= 1.3.2)
-      bridgetown-paginate (= 1.3.2)
+    bridgetown (1.3.3)
+      bridgetown-builder (= 1.3.3)
+      bridgetown-core (= 1.3.3)
+      bridgetown-paginate (= 1.3.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.1.3)
-      activesupport (= 7.1.3)
-    activesupport (7.1.3)
+    activemodel (7.1.3.2)
+      activesupport (= 7.1.3.2)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -62,23 +62,22 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
-    amazing_print (1.5.0)
+    amazing_print (1.6.0)
     ansi (1.5.0)
     ast (2.4.2)
     backport (1.2.0)
     base64 (0.2.0)
     benchmark (0.3.0)
     benchmark-ips (2.13.0)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.7)
     builder (3.2.4)
     colorator (1.1.0)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     csv (3.2.8)
     diff-lcs (1.5.1)
     docile (1.4.0)
-    drb (2.2.0)
-      ruby2_keywords
+    drb (2.2.1)
     e2mmap (0.1.0)
     erubi (1.12.0)
     faraday (2.9.0)
@@ -90,7 +89,7 @@ GEM
     ffi (1.16.3)
     hash_with_dot_access (1.2.0)
       activesupport (>= 5.0.0, < 8.0)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.6)
     json (2.7.1)
@@ -100,12 +99,15 @@ GEM
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
     liquid (5.4.0)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     memory_profiler (1.0.1)
+    mime-types (3.5.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2024.0305)
     mini_portile2 (2.8.5)
-    minitest (5.22.2)
+    minitest (5.22.3)
     minitest-profile (0.0.2)
     minitest-reporters (1.6.1)
       ansi
@@ -115,14 +117,14 @@ GEM
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
-    nokogiri (1.16.2)
+    nokogiri (1.16.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.2-arm64-darwin)
+    nokogiri (1.16.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-darwin)
+    nokogiri (1.16.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-linux)
+    nokogiri (1.16.3-x86_64-linux)
       racc (~> 1.4)
     nokolexbor (0.5.3)
     nokolexbor (0.5.3-arm64-darwin)
@@ -134,7 +136,7 @@ GEM
       racc
     public_suffix (5.0.4)
     racc (1.7.3)
-    rack (3.0.9)
+    rack (3.0.9.1)
     rack-test (2.1.0)
       rack (>= 1.3)
     rainbow (3.1.1)
@@ -147,34 +149,42 @@ GEM
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.6)
-    roda (3.77.0)
+    roda (3.78.0)
       rack
-    rouge (3.30.0)
+    rouge (4.2.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
     rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.0)
-    rubocop (1.60.2)
+    rspec-support (3.13.1)
+    rubocop (1.62.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
     rubocop-bridgetown (0.4.1)
       rubocop (~> 1.23)
       rubocop-performance (~> 1.12)
     rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
     serbea (1.0.1)
       activesupport (>= 6.0)
       erubi (>= 1.10)
@@ -209,13 +219,13 @@ GEM
       yard (~> 0.9, >= 0.9.24)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.3.0)
+    thor (1.3.1)
     tilt (2.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
     uri (0.13.0)
-    yard (0.9.34)
+    yard (0.9.36)
     zeitwerk (2.6.13)
 
 PLATFORMS
@@ -247,4 +257,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.4.17
+   2.5.6
diff --git a/README.md b/README.md
@@ -181,10 +181,10 @@ Bridgetown is built by:
 |<a href="https://github.com/vvveebs">@vvveebs</a>|<a href="https://github.com/rickychilcott">@rickychilcott</a>|<a href="https://github.com/tommasongr">@tommasongr</a>|<a href="https://github.com/tombruijn">@tombruijn</a>|<a href="https://github.com/svoop">@svoop</a>|
 |London, UK|Ohio, US|Amsterdam, The Netherlands|Milan, IT|Europe|
 
-|<img src="https://avatars.githubusercontent.com/michaelherold?s=256" alt="michaelherold" width="128" />|<img src="https://avatars.githubusercontent.com/joemasilotti?s=256" alt="joemasilotti" width="128" />|<img src="https://avatars.githubusercontent.com/ikass?s=256" alt="ikass" width="128" />|<img src="https://avatars.githubusercontent.com/jw81?s=256" alt="jw81" width="128" />|
-|:---:|:---:|:---:|:---:|
-|<a href="https://github.com/michaelherold">@michaelherold</a>|<a href="https://github.com/joemasilotti">@joemasilotti</a>|<a href="https://github.com/Ikass">@ikass</a>|<a href="https://github.com/jw81">@jw81</a>|
-|Omaha, NE|Portland, OR|Latvia|Kansas City, MO|
+|<img src="https://avatars.githubusercontent.com/michaelherold?s=256" alt="michaelherold" width="128" />|<img src="https://avatars.githubusercontent.com/joemasilotti?s=256" alt="joemasilotti" width="128" />|<img src="https://avatars.githubusercontent.com/ikass?s=256" alt="ikass" width="128" />|<img src="https://avatars.githubusercontent.com/jw81?s=256" alt="jw81" width="128" />|<img src="https://avatars.githubusercontent.com/MSILycanthropy?s=256" alt="jw81" width="128" />
+|:---:|:---:|:---:|:---:|:---:|
+|<a href="https://github.com/michaelherold">@michaelherold</a>|<a href="https://github.com/joemasilotti">@joemasilotti</a>|<a href="https://github.com/Ikass">@ikass</a>|<a href="https://github.com/jw81">@jw81</a>|<a href="https://github.com/MSILycanthropy">@MSILycanthropy</a>|
+|Omaha, NE|Portland, OR|Latvia|Kansas City, MO|Kansas City, MO|
 
 |<img src="https://www.gravatar.com/avatar/00000000000000000000000000000000?d=identicon&s=128&" alt="" width="128" />|
 |:---:|

diff --git a/bridgetown-core/bridgetown-core.gemspec b/bridgetown-core/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")

diff --git a/bridgetown-core/lib/bridgetown-core/commands/console.rb b/bridgetown-core/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 @@ def console # rubocop:disable Metrics
         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

diff --git a/bridgetown-core/lib/bridgetown-core/configurations/netlify.rb b/bridgetown-core/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`
diff --git a/bridgetown-core/lib/bridgetown-core/configurations/netlify/netlify.sh b/bridgetown-core/lib/bridgetown-core/configurations/netlify/netlify.sh
diff --git a/bridgetown-core/lib/bridgetown-core/configurations/netlify/netlify.toml b/bridgetown-core/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]

diff --git a/bridgetown-core/lib/bridgetown-core/configurations/stimulus.rb b/bridgetown-core/lib/bridgetown-core/configurations/stimulus.rb
@@ -37,8 +37,8 @@
         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)
         }