Merge tag 'v1.14.1'

# Conflicts:
#	Gemfile.lock

.github/workflows/_deploy_heroku.yml

@@ -22,6 +22,11 @@ jobs:
   heroku:
     runs-on: ubuntu-latest
     steps:
+      # TODO: Will the heroku-deploy action eventually handle this for us?
+      # https://github.com/AkhileshNS/heroku-deploy/issues/188
+      - name: Install Heroku CLI
+        run: |
+          curl https://cli-assets.heroku.com/install.sh | sh
       - uses: actions/checkout@v4
       - uses: akhileshns/heroku-deploy@v3.12.12 # This is the action
         with:

Gemfile

@@ -117,7 +117,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.14.0"
+BULLET_TRAIN_VERSION = "1.14.1"
 
 # Core packages.
 gem "bullet_train", BULLET_TRAIN_VERSION

Gemfile.lock

@@ -123,7 +123,7 @@ GEM
     bootsnap (1.18.4)
       msgpack (~> 1.2)
     builder (3.3.0)
-    bullet_train (1.14.0)
+    bullet_train (1.14.1)
       awesome_print
       bullet_train-fields
       bullet_train-has_uuid
@@ -155,7 +155,7 @@ GEM
       unicode-emoji
       valid_email
       xxhash
-    bullet_train-api (1.14.0)
+    bullet_train-api (1.14.1)
       bullet_train
       bullet_train-super_scaffolding
       colorizer
@@ -166,59 +166,59 @@ GEM
       pagy_cursor
       rack-cors
       rails (>= 6.0.0)
-    bullet_train-fields (1.14.0)
+    bullet_train-fields (1.14.1)
       chronic
       cloudinary
       phonelib
       rails (>= 6.0.0)
-    bullet_train-has_uuid (1.14.0)
+    bullet_train-has_uuid (1.14.1)
       rails (>= 6.0.0)
-    bullet_train-incoming_webhooks (1.14.0)
+    bullet_train-incoming_webhooks (1.14.1)
       bullet_train
       bullet_train-api
       bullet_train-super_scaffolding
       rails (>= 6.0.0)
-    bullet_train-integrations (1.14.0)
+    bullet_train-integrations (1.14.1)
       rails (>= 6.0.0)
-    bullet_train-integrations-stripe (1.14.0)
+    bullet_train-integrations-stripe (1.14.1)
       omniauth
       omniauth-rails_csrf_protection
       omniauth-stripe-connect
       rails (>= 6.0.0)
       stripe
-    bullet_train-obfuscates_id (1.14.0)
+    bullet_train-obfuscates_id (1.14.1)
       hashids
       rails (>= 6.0.0)
-    bullet_train-outgoing_webhooks (1.14.0)
+    bullet_train-outgoing_webhooks (1.14.1)
       public_suffix
       rails (>= 6.0.0)
-    bullet_train-roles (1.14.0)
+    bullet_train-roles (1.14.1)
       active_hash
       activesupport
       cancancan
-    bullet_train-scope_questions (1.14.0)
+    bullet_train-scope_questions (1.14.1)
       rails (>= 6.0.0)
-    bullet_train-scope_validator (1.14.0)
+    bullet_train-scope_validator (1.14.1)
       rails
-    bullet_train-sortable (1.14.0)
+    bullet_train-sortable (1.14.1)
       rails (>= 6.0.0)
-    bullet_train-super_load_and_authorize_resource (1.14.0)
+    bullet_train-super_load_and_authorize_resource (1.14.1)
       cancancan
       rails (>= 6.0.0)
-    bullet_train-super_scaffolding (1.14.0)
+    bullet_train-super_scaffolding (1.14.1)
       colorizer
       indefinite_article
       masamune-ast (~> 2.0.2)
       rails (>= 6.0.0)
-    bullet_train-themes (1.14.0)
+    bullet_train-themes (1.14.1)
       bullet_train-fields
       nice_partials (~> 0.9)
       rails (>= 6.0.0)
-    bullet_train-themes-light (1.14.0)
+    bullet_train-themes-light (1.14.1)
       bullet_train-themes-tailwind_css
       masamune-ast (~> 2.0.2)
       rails (>= 6.0.0)
-    bullet_train-themes-tailwind_css (1.14.0)
+    bullet_train-themes-tailwind_css (1.14.1)
       bullet_train-themes
       rails (>= 6.0.0)
     cable_ready (5.0.6)
@@ -261,8 +261,8 @@ GEM
     coderay (1.1.3)
     colorize (1.1.0)
     colorizer (0.0.2)
-    commonmarker (2.0.2-arm64-darwin)
-    commonmarker (2.0.2-x86_64-linux)
+    commonmarker (2.0.4-arm64-darwin)
+    commonmarker (2.0.4-x86_64-linux)
     concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     crass (1.0.6)
@@ -312,7 +312,7 @@ GEM
       multipart-post (~> 2.0)
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    fastimage (2.3.1)
+    fastimage (2.4.0)
     ffi (1.17.0)
     figaro (1.2.0)
       thor (>= 0.14.0, < 2)
@@ -646,7 +646,7 @@ GEM
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
     stringio (3.1.2)
-    stripe (13.3.0)
+    stripe (13.3.1)
     terser (1.2.4)
       execjs (>= 0.3.0, < 3)
     thor (1.3.2)
@@ -701,24 +701,24 @@ DEPENDENCIES
   avo (>= 3.1.7)
   aws-sdk-s3
   bootsnap
-  bullet_train (= 1.14.0)
-  bullet_train-api (= 1.14.0)
-  bullet_train-fields (= 1.14.0)
-  bullet_train-has_uuid (= 1.14.0)
-  bullet_train-incoming_webhooks (= 1.14.0)
-  bullet_train-integrations (= 1.14.0)
-  bullet_train-integrations-stripe (= 1.14.0)
-  bullet_train-obfuscates_id (= 1.14.0)
-  bullet_train-outgoing_webhooks (= 1.14.0)
-  bullet_train-roles (= 1.14.0)
-  bullet_train-scope_questions (= 1.14.0)
-  bullet_train-scope_validator (= 1.14.0)
-  bullet_train-sortable (= 1.14.0)
-  bullet_train-super_load_and_authorize_resource (= 1.14.0)
-  bullet_train-super_scaffolding (= 1.14.0)
-  bullet_train-themes (= 1.14.0)
-  bullet_train-themes-light (= 1.14.0)
-  bullet_train-themes-tailwind_css (= 1.14.0)
+  bullet_train (= 1.14.1)
+  bullet_train-api (= 1.14.1)
+  bullet_train-fields (= 1.14.1)
+  bullet_train-has_uuid (= 1.14.1)
+  bullet_train-incoming_webhooks (= 1.14.1)
+  bullet_train-integrations (= 1.14.1)
+  bullet_train-integrations-stripe (= 1.14.1)
+  bullet_train-obfuscates_id (= 1.14.1)
+  bullet_train-outgoing_webhooks (= 1.14.1)
+  bullet_train-roles (= 1.14.1)
+  bullet_train-scope_questions (= 1.14.1)
+  bullet_train-scope_validator (= 1.14.1)
+  bullet_train-sortable (= 1.14.1)
+  bullet_train-super_load_and_authorize_resource (= 1.14.1)
+  bullet_train-super_scaffolding (= 1.14.1)
+  bullet_train-themes (= 1.14.1)
+  bullet_train-themes-light (= 1.14.1)
+  bullet_train-themes-tailwind_css (= 1.14.1)
   capybara (~> 3.39)
   capybara-email
   capybara-lockstep

bin/setup

@@ -27,8 +27,20 @@ FileUtils.chdir APP_ROOT do
   # Now we check that you have base-level system dependencies installed.
   require "#{__dir__}/setup-scripts/check_postgres"
   require "#{__dir__}/setup-scripts/check_redis"
-  require "#{__dir__}/setup-scripts/check_icu"
-  require "#{__dir__}/setup-scripts/check_image_dependencies"  # Updated this line
+  require "#{__dir__}/setup-scripts/check_image_dependencies"
+
+  # NOTE: The starter repo itself doesn't require icu4c anymore, but the BulletTrain Conversations
+  # gem does. In order to make it relatively easy to check for icu4c when you're installing that
+  # gem we're leaving this sript in place so that we can tell people to run it before installing
+  # the conversations gem.
+  # Here we automatically run it if the conversations gem is installed. This is for setting up an
+  # existing project on a new machine. Or for new developers joining the team.
+  text = File.read("Gemfile")
+  if text.match "bullet_train-conversations"
+    require "#{__dir__}/setup-scripts/check_icu"
+  else
+    require "#{__dir__}/setup-scripts/skip_icu"
+  end
 
   require "#{__dir__}/setup-scripts/prepare_local_app"
 

bin/setup-scripts/skip_icu.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+require "#{__dir__}/utils"
+
+announce_section "Skipping icu4c"
+
+puts "The bullet_train-conversations gem is not in the Gemfile, so we're skipping icu4c.".yellow
+puts "If you want to manually run checks for icu4c you can run the following command:".yellow
+puts "./bin/setup-scripts/check_icu.rb".yellow
+puts ""

package.json

@@ -2,9 +2,9 @@
   "name": "app",
   "private": true,
   "dependencies": {
-    "@bullet-train/bullet-train": "1.14.0",
-    "@bullet-train/bullet-train-sortable": "1.14.0",
-    "@bullet-train/fields": "1.14.0",
+    "@bullet-train/bullet-train": "1.14.1",
+    "@bullet-train/bullet-train-sortable": "1.14.1",
+    "@bullet-train/fields": "1.14.1",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@fullhuman/postcss-purgecss": "7.0.2",
     "@hotwired/stimulus": "^3.2.2",
@@ -16,8 +16,8 @@
     "@rails/request.js": "^0.0.11",
     "@rails/ujs": "^7.1.501",
     "@redocly/cli": "^1.0.0-beta.111",
-    "@tailwindcss/forms": "^0.5.9",
-    "@tailwindcss/typography": "^0.5.15",
+    "@tailwindcss/forms": "^0.5.10",
+    "@tailwindcss/typography": "^0.5.16",
     "autoprefixer": "^10.4.20",
     "cable_ready": "^5.0.6",
     "dragula": "^3.7.3",