Merge pull request #39 from bullet-train-co/bullet-train-update/1.7.21

Bullet Train Update: 1.7.21
bullet-train-co · Aug 20, 2024 · 2616762 · 2616762
2 parents af4ba38 + 2604dc1
commit 2616762
Show file tree

Hide file tree

Showing 7 changed files with 284 additions and 275 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -26,7 +26,7 @@ aliases:
       paths:
         - node_modules
   - &ruby_node_browsers_docker_image
-      - image: cimg/ruby:3.3.3-browsers
+      - image: cimg/ruby:3.3.4-browsers
         environment:
           PGHOST: localhost
           PGUSER: untitled_application

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.3.3
+3.3.4
diff --git a/Gemfile b/Gemfile
@@ -110,9 +110,12 @@ end
 # BULLET TRAIN GEMS
 # This section is the list of Ruby gems included by default for Bullet Train.
 
+# TODO: Remove this after updating the core gems to 1.7.21
+gem "pagy", "< 7"
+
 # 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.16"
+BULLET_TRAIN_VERSION = "1.7.21"
 
 # Core packages.
 gem "bullet_train", BULLET_TRAIN_VERSION

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -126,7 +126,7 @@ GEM
     bootsnap (1.17.1)
       msgpack (~> 1.2)
     builder (3.2.4)
-    bullet_train (1.7.16)
+    bullet_train (1.7.21)
       awesome_print
       bullet_train-has_uuid
       bullet_train-roles
@@ -149,7 +149,7 @@ GEM
       microscope
       nice_partials (~> 0.9)
       omniauth
-      pagy
+      pagy (< 7)
       possessive
       premailer-rails
       rails (>= 6.0.0)
@@ -159,72 +159,72 @@ GEM
       unicode-emoji
       valid_email
       xxhash
-    bullet_train-api (1.7.16)
+    bullet_train-api (1.7.21)
       bullet_train
       bullet_train-super_scaffolding
       colorizer
       doorkeeper
       factory_bot
       jbuilder-schema (~> 2.6.6)
-      pagy
+      pagy (< 7)
       pagy_cursor
       rack-cors
       rails (>= 6.0.0)
-    bullet_train-fields (1.7.16)
+    bullet_train-fields (1.7.21)
       chronic
       cloudinary
       phonelib
       rails (>= 6.0.0)
-    bullet_train-has_uuid (1.7.16)
+    bullet_train-has_uuid (1.7.21)
       rails (>= 6.0.0)
-    bullet_train-incoming_webhooks (1.7.16)
+    bullet_train-incoming_webhooks (1.7.21)
       bullet_train
       bullet_train-api
       bullet_train-super_scaffolding
       rails (>= 6.0.0)
-    bullet_train-integrations (1.7.16)
+    bullet_train-integrations (1.7.21)
       rails (>= 6.0.0)
-    bullet_train-integrations-stripe (1.7.16)
+    bullet_train-integrations-stripe (1.7.21)
       omniauth
       omniauth-rails_csrf_protection
       omniauth-stripe-connect
       rails (>= 6.0.0)
       stripe
-    bullet_train-obfuscates_id (1.7.16)
+    bullet_train-obfuscates_id (1.7.21)
       hashids
       rails (>= 6.0.0)
-    bullet_train-outgoing_webhooks (1.7.16)
+    bullet_train-outgoing_webhooks (1.7.21)
       public_suffix
       rails (>= 6.0.0)
-    bullet_train-roles (1.7.16)
+    bullet_train-roles (1.7.21)
       active_hash
       activesupport
       cancancan
     bullet_train-routes (1.0.0)
       rails (>= 6.0.0)
-    bullet_train-scope_questions (1.7.16)
+    bullet_train-scope_questions (1.7.21)
       rails (>= 6.0.0)
-    bullet_train-scope_validator (1.7.16)
+    bullet_train-scope_validator (1.7.21)
       rails
-    bullet_train-sortable (1.7.16)
+    bullet_train-sortable (1.7.21)
       rails (>= 6.0.0)
-    bullet_train-super_load_and_authorize_resource (1.7.16)
+    bullet_train-super_load_and_authorize_resource (1.7.21)
       cancancan
       rails (>= 6.0.0)
-    bullet_train-super_scaffolding (1.7.16)
+    bullet_train-super_scaffolding (1.7.21)
       colorizer
       indefinite_article
       masamune-ast (~> 2.0.2)
       rails (>= 6.0.0)
-    bullet_train-themes (1.7.16)
+    bullet_train-themes (1.7.21)
       bullet_train-fields
       nice_partials (~> 0.9)
       rails (>= 6.0.0)
-    bullet_train-themes-light (1.7.16)
+    bullet_train-themes-light (1.7.21)
       bullet_train-themes-tailwind_css
       masamune-ast (~> 2.0.2)
       rails (>= 6.0.0)
-    bullet_train-themes-tailwind_css (1.7.16)
+    bullet_train-themes-tailwind_css (1.7.21)
       bullet_train-themes
       rails (>= 6.0.0)
     cable_ready (5.0.5)
@@ -252,11 +252,11 @@ GEM
       capybara (>= 3.0)
       ruby2_keywords
       selenium-webdriver (>= 4.0)
-    charlock_holmes (0.7.8)
+    charlock_holmes (0.7.9)
     choice (0.2.0)
     chronic (0.10.2)
     chunky_png (1.4.0)
-    cloudinary (2.1.1)
+    cloudinary (2.1.2)
       faraday (>= 2.0.1, < 3.0.0)
       faraday-follow_redirects (~> 0.3.0)
       faraday-multipart (~> 1.0, >= 1.0.4)
@@ -314,14 +314,14 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (2.10.0)
+    faraday (2.10.1)
       faraday-net_http (>= 2.0, < 3.2)
       logger
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (3.1.0)
+    faraday-net_http (3.1.1)
       net-http
     fastimage (2.3.1)
     ffi (1.16.3)
@@ -341,7 +341,7 @@ GEM
       multi_xml (>= 0.5.2)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    image_processing (1.12.2)
+    image_processing (1.13.0)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     indefinite_article (0.2.5)
@@ -425,7 +425,7 @@ GEM
       timeout
     net-smtp (0.4.0)
       net-protocol
-    nice_partials (0.10.0)
+    nice_partials (0.10.1)
       actionview (>= 4.2.6)
     nio4r (2.5.9)
     nokogiri (1.15.4)
@@ -453,22 +453,22 @@ GEM
       omniauth-oauth2 (~> 1.4)
     orm_adapter (0.5.0)
     pagy (6.4.2)
-    pagy_cursor (0.6.1)
+    pagy_cursor (0.8.0)
       activerecord (>= 5)
-      pagy (>= 6, < 7)
+      pagy (>= 6, < 9)
     parallel (1.25.1)
     parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.4)
-    phonelib (0.8.9)
+    phonelib (0.9.1)
     possessive (1.0.1)
     postmark (1.25.0)
       json
     postmark-rails (0.22.1)
       actionmailer (>= 3.0.0)
       postmark (>= 1.21.3, < 2.0)
-    premailer (1.23.0)
+    premailer (1.24.0)
       addressable
       css_parser (>= 1.12.0)
       htmlentities (>= 4.0.0)
@@ -646,7 +646,7 @@ GEM
     stimulus-rails (1.3.0)
       railties (>= 6.0.0)
     stringio (3.0.8)
-    stripe (12.1.0)
+    stripe (12.5.0)
     strscan (3.1.0)
     terser (1.1.20)
       execjs (>= 0.3.0, < 3)
@@ -703,24 +703,24 @@ DEPENDENCIES
   avo (>= 3.1.7)
   aws-sdk-s3
   bootsnap
-  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)
+  bullet_train (= 1.7.21)
+  bullet_train-api (= 1.7.21)
+  bullet_train-fields (= 1.7.21)
+  bullet_train-has_uuid (= 1.7.21)
+  bullet_train-incoming_webhooks (= 1.7.21)
+  bullet_train-integrations (= 1.7.21)
+  bullet_train-integrations-stripe (= 1.7.21)
+  bullet_train-obfuscates_id (= 1.7.21)
+  bullet_train-outgoing_webhooks (= 1.7.21)
+  bullet_train-roles (= 1.7.21)
+  bullet_train-scope_questions (= 1.7.21)
+  bullet_train-scope_validator (= 1.7.21)
+  bullet_train-sortable (= 1.7.21)
+  bullet_train-super_load_and_authorize_resource (= 1.7.21)
+  bullet_train-super_scaffolding (= 1.7.21)
+  bullet_train-themes (= 1.7.21)
+  bullet_train-themes-light (= 1.7.21)
+  bullet_train-themes-tailwind_css (= 1.7.21)
   capybara (~> 3.39)
   capybara-email
   capybara-lockstep
@@ -741,6 +741,7 @@ DEPENDENCIES
   magic_test
   minitest-reporters
   minitest-retry
+  pagy (< 7)
   pg (>= 0.18, < 2.0)
   postmark-rails
   pry
@@ -767,7 +768,7 @@ DEPENDENCIES
   web-console
 
 RUBY VERSION
-   ruby 3.3.3p89
+   ruby 3.3.4p94
 
 BUNDLED WITH
    2.4.10
diff --git a/bin/configure-scripts/utils.rb b/bin/configure-scripts/utils.rb
@@ -3,6 +3,7 @@
 require "bundler/inline"
 
 gemfile do
+  source "https://rubygems.org"
   gem "colorize"
   gem "activesupport", require: "active_support"
 end
@@ -38,7 +39,10 @@ def replace_in_file(file, before, after, target_regexp = nil)
     target_file_content = ""
     File.open(file).each_line do |l|
       l.gsub!(before, after) if !!l.match(target_regexp)
+      # standard:disable Lint/Void
+      # TODO: Does this line even do anything for us?
       l if !!l.match(target_regexp)
+      # standard:enable Lint/Void
       target_file_content += l
     end
   else

diff --git a/package.json b/package.json
@@ -2,35 +2,35 @@
   "name": "app",
   "private": true,
   "dependencies": {
-    "@bullet-train/bullet-train": "1.7.16",
-    "@bullet-train/bullet-train-sortable": "1.7.16",
-    "@bullet-train/fields": "1.7.16",
+    "@bullet-train/bullet-train": "1.7.21",
+    "@bullet-train/bullet-train-sortable": "1.7.21",
+    "@bullet-train/fields": "1.7.21",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@fullhuman/postcss-purgecss": "6.0.0",
-    "@hotwired/turbo-rails": "^8.0.4",
+    "@hotwired/turbo-rails": "^8.0.5",
     "@icon/themify-icons": "^1.0.1-alpha.3",
     "@rails/actioncable": "^7.1.3",
-    "@rails/actiontext": "^7.1.3",
+    "@rails/actiontext": "^7.2.0",
     "@rails/activestorage": "^7.1.3",
     "@rails/request.js": "^0.0.9",
     "@rails/ujs": "^7.1.3",
     "@redocly/cli": "^1.0.0-beta.111",
     "@tailwindcss/forms": "^0.5.7",
-    "@tailwindcss/typography": "^0.5.13",
-    "autoprefixer": "^10.4.19",
+    "@tailwindcss/typography": "^0.5.14",
+    "autoprefixer": "^10.4.20",
     "cable_ready": "^5.0.5",
     "dragula": "^3.7.3",
-    "esbuild": "^0.23.0",
+    "esbuild": "^0.23.1",
     "glob": "^10.3.12",
     "jstz": "^2.1.1",
     "postcss": "^8.4.38",
     "postcss-css-variables": "^0.19.0",
     "postcss-extend-rule": "^4.0.0",
     "postcss-import": "^16.1.0",
-    "postcss-nested": "^6.0.1",
+    "postcss-nested": "^6.2.0",
     "stimulus-reveal": "^1.4.2",
     "stimulus-scroll-reveal": "^3.2.0",
-    "tailwindcss": "^3.4.4",
+    "tailwindcss": "^3.4.10",
     "yalc": "^1.0.0-pre.53"
   },
   "scripts": {