Merge tag 'v1.16.0'

# Conflicts: # Gemfile.lock
bullet-train-co · Feb 7, 2025 · c3687b7 · c3687b7
2 parents 92f6b3f + 5d6cce7
commit c3687b7
Show file tree

Hide file tree

Showing 9 changed files with 98 additions and 95 deletions.
diff --git a/.circleci/checkout-and-link-core-repo b/.circleci/checkout-and-link-core-repo
@@ -36,7 +36,6 @@ packages=(
   "bullet_train-obfuscates_id"
   "bullet_train-outgoing_webhooks"
   "bullet_train-roles"
-  "bullet_train-scope_questions"
   "bullet_train-scope_validator"
   "bullet_train-sortable"
   "bullet_train-super_load_and_authorize_resource"

diff --git a/Gemfile b/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.15.0"
+BULLET_TRAIN_VERSION = "1.16.0"
 
 # Core packages.
 gem "bullet_train", BULLET_TRAIN_VERSION
@@ -132,7 +132,6 @@ gem "bullet_train-integrations-stripe", BULLET_TRAIN_VERSION
 
 # Optional support packages.
 gem "bullet_train-sortable", BULLET_TRAIN_VERSION
-gem "bullet_train-scope_questions", BULLET_TRAIN_VERSION
 gem "bullet_train-obfuscates_id", BULLET_TRAIN_VERSION
 
 # Core gems that are dependencies of gems listed above. Technically they

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -123,7 +123,7 @@ GEM
     bootsnap (1.18.4)
       msgpack (~> 1.2)
     builder (3.3.0)
-    bullet_train (1.15.0)
+    bullet_train (1.16.0)
       awesome_print
       bullet_train-fields
       bullet_train-has_uuid
@@ -155,7 +155,7 @@ GEM
       unicode-emoji
       valid_email
       xxhash
-    bullet_train-api (1.15.0)
+    bullet_train-api (1.16.0)
       bullet_train
       bullet_train-super_scaffolding
       colorizer
@@ -166,59 +166,57 @@ GEM
       pagy_cursor
       rack-cors
       rails (>= 6.0.0)
-    bullet_train-fields (1.15.0)
+    bullet_train-fields (1.16.0)
       chronic
       cloudinary
       phonelib
       rails (>= 6.0.0)
-    bullet_train-has_uuid (1.15.0)
+    bullet_train-has_uuid (1.16.0)
       rails (>= 6.0.0)
-    bullet_train-incoming_webhooks (1.15.0)
+    bullet_train-incoming_webhooks (1.16.0)
       bullet_train
       bullet_train-api
       bullet_train-super_scaffolding
       rails (>= 6.0.0)
-    bullet_train-integrations (1.15.0)
+    bullet_train-integrations (1.16.0)
       rails (>= 6.0.0)
-    bullet_train-integrations-stripe (1.15.0)
+    bullet_train-integrations-stripe (1.16.0)
       omniauth (~> 2.0)
       omniauth-rails_csrf_protection (~> 1.0)
       omniauth-stripe-connect-v2
       rails (>= 6.0.0)
       stripe
-    bullet_train-obfuscates_id (1.15.0)
+    bullet_train-obfuscates_id (1.16.0)
       hashids
       rails (>= 6.0.0)
-    bullet_train-outgoing_webhooks (1.15.0)
+    bullet_train-outgoing_webhooks (1.16.0)
       public_suffix
       rails (>= 6.0.0)
-    bullet_train-roles (1.15.0)
-      active_hash
+    bullet_train-roles (1.16.0)
+      active_hash (>= 3.3.1)
       activesupport
       cancancan
-    bullet_train-scope_questions (1.15.0)
-      rails (>= 6.0.0)
-    bullet_train-scope_validator (1.15.0)
+    bullet_train-scope_validator (1.16.0)
       rails
-    bullet_train-sortable (1.15.0)
+    bullet_train-sortable (1.16.0)
       rails (>= 6.0.0)
-    bullet_train-super_load_and_authorize_resource (1.15.0)
+    bullet_train-super_load_and_authorize_resource (1.16.0)
       cancancan
       rails (>= 6.0.0)
-    bullet_train-super_scaffolding (1.15.0)
+    bullet_train-super_scaffolding (1.16.0)
       colorizer
       indefinite_article
       masamune-ast (~> 2.0.2)
       rails (>= 6.0.0)
-    bullet_train-themes (1.15.0)
+    bullet_train-themes (1.16.0)
       bullet_train-fields
       nice_partials (~> 0.9)
       rails (>= 6.0.0)
-    bullet_train-themes-light (1.15.0)
+    bullet_train-themes-light (1.16.0)
       bullet_train-themes-tailwind_css
       masamune-ast (~> 2.0.2)
       rails (>= 6.0.0)
-    bullet_train-themes-tailwind_css (1.15.0)
+    bullet_train-themes-tailwind_css (1.16.0)
       bullet_train-themes
       rails (>= 6.0.0)
     cable_ready (5.0.6)
@@ -705,24 +703,23 @@ DEPENDENCIES
   avo (>= 3.1.7)
   aws-sdk-s3
   bootsnap
-  bullet_train (= 1.15.0)
-  bullet_train-api (= 1.15.0)
-  bullet_train-fields (= 1.15.0)
-  bullet_train-has_uuid (= 1.15.0)
-  bullet_train-incoming_webhooks (= 1.15.0)
-  bullet_train-integrations (= 1.15.0)
-  bullet_train-integrations-stripe (= 1.15.0)
-  bullet_train-obfuscates_id (= 1.15.0)
-  bullet_train-outgoing_webhooks (= 1.15.0)
-  bullet_train-roles (= 1.15.0)
-  bullet_train-scope_questions (= 1.15.0)
-  bullet_train-scope_validator (= 1.15.0)
-  bullet_train-sortable (= 1.15.0)
-  bullet_train-super_load_and_authorize_resource (= 1.15.0)
-  bullet_train-super_scaffolding (= 1.15.0)
-  bullet_train-themes (= 1.15.0)
-  bullet_train-themes-light (= 1.15.0)
-  bullet_train-themes-tailwind_css (= 1.15.0)
+  bullet_train (= 1.16.0)
+  bullet_train-api (= 1.16.0)
+  bullet_train-fields (= 1.16.0)
+  bullet_train-has_uuid (= 1.16.0)
+  bullet_train-incoming_webhooks (= 1.16.0)
+  bullet_train-integrations (= 1.16.0)
+  bullet_train-integrations-stripe (= 1.16.0)
+  bullet_train-obfuscates_id (= 1.16.0)
+  bullet_train-outgoing_webhooks (= 1.16.0)
+  bullet_train-roles (= 1.16.0)
+  bullet_train-scope_validator (= 1.16.0)
+  bullet_train-sortable (= 1.16.0)
+  bullet_train-super_load_and_authorize_resource (= 1.16.0)
+  bullet_train-super_scaffolding (= 1.16.0)
+  bullet_train-themes (= 1.16.0)
+  bullet_train-themes-light (= 1.16.0)
+  bullet_train-themes-tailwind_css (= 1.16.0)
   capybara (~> 3.39)
   capybara-email
   capybara-lockstep

diff --git a/bin/bump-core b/bin/bump-core
@@ -80,7 +80,6 @@ class CoreBumpCLI < Thor
         bullet_train-obfuscates_id
         bullet_train-outgoing_webhooks
         bullet_train-roles
-        bullet_train-scope_questions
         bullet_train-scope_validator
         bullet_train-sortable
         bullet_train-super_load_and_authorize_resource

diff --git a/bin/configure-scripts/setup_github.rb b/bin/configure-scripts/setup_github.rb
@@ -14,7 +14,8 @@
 
 puts "SETUP_GITHUB = #{SETUP_GITHUB}"
 if SETUP_GITHUB
-  if `git remote | grep origin`.strip.length > 0
+  git_remote_url = `git remote get-url origin`.strip
+  if git_remote_url.length > 0
     puts "Repository already has a `origin` remote.".yellow
   else
     ask "Hit <Return> and we'll open a browser to GitHub where you can create a new repository. When you're done, copy the SSH path from the new repository and return here. We'll ask you to paste it to us in the next step."
@@ -33,11 +34,18 @@
     if ssh_path == "skip"
       puts "Bailing out of GitHub setup.".yellow
       return
-    else
-      # We use this variable in the `deploy_button_heroku.rb` and `deploy_button_render.rb` scripts.
-      HTTP_PATH = "https://github.com/#{ssh_path.gsub(/.*:/, "")}".delete_suffix(".git")
     end
+    git_remote_url = ssh_path
     puts "Setting repository's `origin` remote to `#{ssh_path}`.".green
     puts `git remote add origin #{ssh_path}`.chomp
   end
+
+  # We use this variable in the `deploy_button_heroku.rb` and `deploy_button_render.rb` scripts.
+  if git_remote_url.start_with?("git@github.com:")
+    HTTP_PATH = "https://github.com/#{git_remote_url.gsub(/.*:/, "")}".delete_suffix(".git")
+  elsif git_remote_url.start_with?("https://github.com/")
+    HTTP_PATH = git_remote_url.delete_suffix(".git")
+  else
+    raise "Unknown git remote url format: #{git_remote_url}"
+  end
 end
diff --git a/bin/render-build.sh b/bin/render-build.sh
@@ -2,11 +2,16 @@
 # exit on error
 set -o errexit
 
+corepack enable
+yarn
+
 bundle install
 bundle exec rake assets:precompile
 bundle exec rake assets:clean
 
-# These are not combined because we want to reload all models after the migrations take place.
-# TODO Any way to read these from the `Procfile` where we have the same thing defined for Heroku?
-bundle exec rails db:migrate 
-bundle exec rails db:seed
+if [[ -n "${RUN_MIGRATIONS+1}" ]]; then
+  # These are not combined because we want to reload all models after the migrations take place.
+  # TODO Any way to read these from the `Procfile` where we have the same thing defined for Heroku?
+  bundle exec rails db:migrate
+  bundle exec rails db:seed
+fi
diff --git a/package.json b/package.json
@@ -2,9 +2,9 @@
   "name": "app",
   "private": true,
   "dependencies": {
-    "@bullet-train/bullet-train": "1.15.0",
-    "@bullet-train/bullet-train-sortable": "1.15.0",
-    "@bullet-train/fields": "1.15.0",
+    "@bullet-train/bullet-train": "1.16.0",
+    "@bullet-train/bullet-train-sortable": "1.16.0",
+    "@bullet-train/fields": "1.16.0",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@fullhuman/postcss-purgecss": "7.0.2",
     "@hotwired/stimulus": "^3.2.2",

diff --git a/render.yaml b/render.yaml
@@ -2,7 +2,7 @@ databases:
   - name: database
     databaseName: database
     user: bullet_train
-    plan: starter
+    plan: basic-1gb
 
 services:
   - type: redis
@@ -13,8 +13,8 @@ services:
   - type: web
     name: web
     env: ruby
-    buildCommand: "./bin/render-build.sh"
-    startCommand: "bundle exec puma -C config/puma.rb"
+    buildCommand: "RUN_MIGRATIONS=1 ./bin/render-build.sh"
+    startCommand: "corepack enable && bundle exec puma -C config/puma.rb"
     envVars:
       - key: DATABASE_URL
         fromDatabase:
@@ -29,8 +29,8 @@ services:
   - type: worker
     name: worker
     env: ruby
-    buildCommand: "bundle install && bundle exec rake assets:precompile && bundle exec rake assets:clean"
-    startCommand: "bundle exec sidekiq -t 25"
+    buildCommand: "./bin/render-build.sh"
+    startCommand: "corepack enable && bundle exec sidekiq -t 25"
     envVars:
       - key: DATABASE_URL
         fromDatabase: