Merge tag 'v1.7.16'

# Conflicts:
#	Gemfile.lock

.circleci/config.yml

@@ -26,7 +26,7 @@ aliases:
       paths:
         - node_modules
   - &ruby_node_browsers_docker_image
-      - image: cimg/ruby:3.3.2-browsers
+      - image: cimg/ruby:3.3.3-browsers
         environment:
           PGHOST: localhost
           PGUSER: untitled_application

.ruby-version

@@ -1 +1 @@
-3.3.2
+3.3.3

Gemfile

@@ -112,7 +112,7 @@ end
 
 # We use a constant here so that we can ensure that all of the bullet_train-*
 # packages are on the same version.
-BULLET_TRAIN_VERSION = "1.7.15"
+BULLET_TRAIN_VERSION = "1.7.16"
 
 # Core packages.
 gem "bullet_train", BULLET_TRAIN_VERSION

Gemfile.lock

@@ -126,7 +126,7 @@ GEM
     bootsnap (1.17.1)
       msgpack (~> 1.2)
     builder (3.2.4)
-    bullet_train (1.7.15)
+    bullet_train (1.7.16)
       awesome_print
       bullet_train-has_uuid
       bullet_train-roles
@@ -159,7 +159,7 @@ GEM
       unicode-emoji
       valid_email
       xxhash
-    bullet_train-api (1.7.15)
+    bullet_train-api (1.7.16)
       bullet_train
       bullet_train-super_scaffolding
       colorizer
@@ -170,61 +170,61 @@ GEM
       pagy_cursor
       rack-cors
       rails (>= 6.0.0)
-    bullet_train-fields (1.7.15)
+    bullet_train-fields (1.7.16)
       chronic
       cloudinary
       phonelib
       rails (>= 6.0.0)
-    bullet_train-has_uuid (1.7.15)
+    bullet_train-has_uuid (1.7.16)
       rails (>= 6.0.0)
-    bullet_train-incoming_webhooks (1.7.15)
+    bullet_train-incoming_webhooks (1.7.16)
       bullet_train
       bullet_train-api
       bullet_train-super_scaffolding
       rails (>= 6.0.0)
-    bullet_train-integrations (1.7.15)
+    bullet_train-integrations (1.7.16)
       rails (>= 6.0.0)
-    bullet_train-integrations-stripe (1.7.15)
+    bullet_train-integrations-stripe (1.7.16)
       omniauth
       omniauth-rails_csrf_protection
       omniauth-stripe-connect
       rails (>= 6.0.0)
       stripe
-    bullet_train-obfuscates_id (1.7.15)
+    bullet_train-obfuscates_id (1.7.16)
       hashids
       rails (>= 6.0.0)
-    bullet_train-outgoing_webhooks (1.7.15)
+    bullet_train-outgoing_webhooks (1.7.16)
       public_suffix
       rails (>= 6.0.0)
-    bullet_train-roles (1.7.15)
+    bullet_train-roles (1.7.16)
       active_hash
       activesupport
       cancancan
     bullet_train-routes (1.0.0)
       rails (>= 6.0.0)
-    bullet_train-scope_questions (1.7.15)
+    bullet_train-scope_questions (1.7.16)
       rails (>= 6.0.0)
-    bullet_train-scope_validator (1.7.15)
+    bullet_train-scope_validator (1.7.16)
       rails
-    bullet_train-sortable (1.7.15)
+    bullet_train-sortable (1.7.16)
       rails (>= 6.0.0)
-    bullet_train-super_load_and_authorize_resource (1.7.15)
+    bullet_train-super_load_and_authorize_resource (1.7.16)
       cancancan
       rails (>= 6.0.0)
-    bullet_train-super_scaffolding (1.7.15)
+    bullet_train-super_scaffolding (1.7.16)
       colorizer
       indefinite_article
       masamune-ast (~> 2.0.2)
       rails (>= 6.0.0)
-    bullet_train-themes (1.7.15)
+    bullet_train-themes (1.7.16)
       bullet_train-fields
       nice_partials (~> 0.9)
       rails (>= 6.0.0)
-    bullet_train-themes-light (1.7.15)
+    bullet_train-themes-light (1.7.16)
       bullet_train-themes-tailwind_css
       masamune-ast (~> 2.0.2)
       rails (>= 6.0.0)
-    bullet_train-themes-tailwind_css (1.7.15)
+    bullet_train-themes-tailwind_css (1.7.16)
       bullet_train-themes
       rails (>= 6.0.0)
     cable_ready (5.0.5)
@@ -314,8 +314,9 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (2.9.2)
+    faraday (2.10.0)
       faraday-net_http (>= 2.0, < 3.2)
+      logger
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
     faraday-multipart (1.0.4)
@@ -373,6 +374,7 @@ GEM
     letter_opener (1.8.1)
       launchy (>= 2.2, < 3)
     lint_roller (1.1.0)
+    logger (1.6.0)
     loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -397,7 +399,7 @@ GEM
     microscope (1.1.1)
       activerecord (>= 4.1.0)
       activesupport (>= 4.1.0)
-    mini_magick (4.13.1)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
     minitest (5.20.0)
@@ -644,7 +646,7 @@ GEM
     stimulus-rails (1.3.0)
       railties (>= 6.0.0)
     stringio (3.0.8)
-    stripe (12.0.0)
+    stripe (12.1.0)
     terser (1.1.20)
       execjs (>= 0.3.0, < 3)
     thor (1.3.0)
@@ -700,24 +702,24 @@ DEPENDENCIES
   avo (>= 3.1.7)
   aws-sdk-s3
   bootsnap
-  bullet_train (= 1.7.15)
-  bullet_train-api (= 1.7.15)
-  bullet_train-fields (= 1.7.15)
-  bullet_train-has_uuid (= 1.7.15)
-  bullet_train-incoming_webhooks (= 1.7.15)
-  bullet_train-integrations (= 1.7.15)
-  bullet_train-integrations-stripe (= 1.7.15)
-  bullet_train-obfuscates_id (= 1.7.15)
-  bullet_train-outgoing_webhooks (= 1.7.15)
-  bullet_train-roles (= 1.7.15)
-  bullet_train-scope_questions (= 1.7.15)
-  bullet_train-scope_validator (= 1.7.15)
-  bullet_train-sortable (= 1.7.15)
-  bullet_train-super_load_and_authorize_resource (= 1.7.15)
-  bullet_train-super_scaffolding (= 1.7.15)
-  bullet_train-themes (= 1.7.15)
-  bullet_train-themes-light (= 1.7.15)
-  bullet_train-themes-tailwind_css (= 1.7.15)
+  bullet_train (= 1.7.16)
+  bullet_train-api (= 1.7.16)
+  bullet_train-fields (= 1.7.16)
+  bullet_train-has_uuid (= 1.7.16)
+  bullet_train-incoming_webhooks (= 1.7.16)
+  bullet_train-integrations (= 1.7.16)
+  bullet_train-integrations-stripe (= 1.7.16)
+  bullet_train-obfuscates_id (= 1.7.16)
+  bullet_train-outgoing_webhooks (= 1.7.16)
+  bullet_train-roles (= 1.7.16)
+  bullet_train-scope_questions (= 1.7.16)
+  bullet_train-scope_validator (= 1.7.16)
+  bullet_train-sortable (= 1.7.16)
+  bullet_train-super_load_and_authorize_resource (= 1.7.16)
+  bullet_train-super_scaffolding (= 1.7.16)
+  bullet_train-themes (= 1.7.16)
+  bullet_train-themes-light (= 1.7.16)
+  bullet_train-themes-tailwind_css (= 1.7.16)
   capybara (~> 3.39)
   capybara-email
   capybara-lockstep
@@ -764,7 +766,7 @@ DEPENDENCIES
   web-console
 
 RUBY VERSION
-   ruby 3.3.2p78
+   ruby 3.3.3p89
 
 BUNDLED WITH
    2.4.10

app/views/active_storage/blobs/_blob.html.erb

@@ -0,0 +1,14 @@
+<figure class="attachment attachment--<%= blob.representable? ? "preview" : "file" %> attachment--<%= blob.filename.extension %>">
+  <% if blob.representable? %>
+    <%= image_tag blob.representation(resize_to_limit: local_assigns[:in_gallery] ? [ 800, 600 ] : [ 1024, 768 ]) %>
+  <% end %>
+
+  <figcaption class="attachment__caption">
+    <% if caption = blob.try(:caption) %>
+      <%= caption %>
+    <% else %>
+      <span class="attachment__name"><%= blob.filename %></span>
+      <span class="attachment__size"><%= number_to_human_size blob.byte_size %></span>
+    <% end %>
+  </figcaption>
+</figure>

app/views/layouts/action_text/contents/_content.html.erb

@@ -0,0 +1,3 @@
+<div class="trix-content">
+  <%= yield -%>
+</div>

bin/setup-scripts/check_yarn.rb

@@ -15,7 +15,7 @@
 end
 
 message = "Bullet Train requires yarn #{required_yarn} and `yarn -v` returns #{actual_yarn}."
-if actual_yarn == :not_found
+if actual_yarn == :not_found || actual_yarn == ""
   puts "You don't have yarn installed. We can't proceed without it. Try `npm install -g yarn && corepack enable`.".red
   exit
 elsif Gem::Version.new(actual_yarn) >= Gem::Version.new(required_yarn)

config/initializers/action_text_bug_fix.rb

@@ -0,0 +1,19 @@
+# TODO: Remove this monkey patch initializer when the following issue has been resolved in rails core:
+# https://github.com/rails/rails/issues/52233
+
+require "action_text/content"
+
+module ActionText
+  class Content
+    def render_attachments(**options, &block)
+      content = fragment.replace(ActionText::Attachment.tag_name) do |node|
+        if node.key?("content")
+          sanitized_content = sanitize_content_attachment(node.remove_attribute("content").to_s)
+          node["content"] = sanitized_content if sanitized_content.present?
+        end
+        block.call(attachment_for_node(node, **options))
+      end
+      self.class.new(content, canonicalize: false)
+    end
+  end
+end

package.json

@@ -2,9 +2,9 @@
   "name": "app",
   "private": true,
   "dependencies": {
-    "@bullet-train/bullet-train": "1.7.15",
-    "@bullet-train/bullet-train-sortable": "1.7.15",
-    "@bullet-train/fields": "1.7.15",
+    "@bullet-train/bullet-train": "1.7.16",
+    "@bullet-train/bullet-train-sortable": "1.7.16",
+    "@bullet-train/fields": "1.7.16",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@fullhuman/postcss-purgecss": "6.0.0",
     "@hotwired/turbo-rails": "^8.0.4",
@@ -20,7 +20,7 @@
     "autoprefixer": "^10.4.19",
     "cable_ready": "^5.0.5",
     "dragula": "^3.7.3",
-    "esbuild": "^0.21.5",
+    "esbuild": "^0.23.0",
     "glob": "^10.3.12",
     "jstz": "^2.1.1",
     "postcss": "^8.4.38",