From bbf3578c567908e28150e81498fe4943b8351b2f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 16:07:42 -0500 Subject: [PATCH 01/20] BT-Core version bump: - 1.3.21 (#951) Co-authored-by: jagthedrummer --- Gemfile.lock | 36 ++++++++++++++++++------------------ yarn.lock | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 41a722c0..7f03d564 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,7 +97,7 @@ GEM bootsnap (1.16.0) msgpack (~> 1.2) builder (3.2.4) - bullet_train (1.3.20) + bullet_train (1.3.21) awesome_print bullet_train-fields bullet_train-has_uuid @@ -129,7 +129,7 @@ GEM unicode-emoji valid_email xxhash - bullet_train-api (1.3.20) + bullet_train-api (1.3.21) bullet_train doorkeeper factory_bot @@ -138,53 +138,53 @@ GEM pagy_cursor rack-cors rails (>= 6.0.0) - bullet_train-fields (1.3.20) + bullet_train-fields (1.3.21) chronic cloudinary phonelib rails (>= 6.0.0) - bullet_train-has_uuid (1.3.20) + bullet_train-has_uuid (1.3.21) rails (>= 6.0.0) - bullet_train-incoming_webhooks (1.3.20) + bullet_train-incoming_webhooks (1.3.21) bullet_train-super_scaffolding rails (>= 6.0.0) - bullet_train-integrations (1.3.20) + bullet_train-integrations (1.3.21) rails (>= 6.0.0) - bullet_train-integrations-stripe (1.3.20) + bullet_train-integrations-stripe (1.3.21) omniauth omniauth-rails_csrf_protection omniauth-stripe-connect rails (>= 6.0.0) stripe - bullet_train-obfuscates_id (1.3.20) + bullet_train-obfuscates_id (1.3.21) hashids rails (>= 6.0.0) - bullet_train-outgoing_webhooks (1.3.20) + bullet_train-outgoing_webhooks (1.3.21) public_suffix rails (>= 6.0.0) - bullet_train-roles (1.3.20) + bullet_train-roles (1.3.21) active_hash activesupport cancancan bullet_train-routes (1.0.0) rails (>= 6.0.0) - bullet_train-scope_questions (1.3.20) + bullet_train-scope_questions (1.3.21) rails (>= 6.0.0) - bullet_train-scope_validator (1.3.20) - bullet_train-sortable (1.3.20) + bullet_train-scope_validator (1.3.21) + bullet_train-sortable (1.3.21) rails (>= 6.0.0) - bullet_train-super_load_and_authorize_resource (1.3.20) + bullet_train-super_load_and_authorize_resource (1.3.21) rails (>= 6.0.0) - bullet_train-super_scaffolding (1.3.20) + bullet_train-super_scaffolding (1.3.21) bullet_train indefinite_article rails (>= 6.0.0) - bullet_train-themes (1.3.20) + bullet_train-themes (1.3.21) rails (>= 6.0.0) - bullet_train-themes-light (1.3.20) + bullet_train-themes-light (1.3.21) bullet_train-themes-tailwind_css rails (>= 6.0.0) - bullet_train-themes-tailwind_css (1.3.20) + bullet_train-themes-tailwind_css (1.3.21) bullet_train bullet_train-themes rails (>= 6.0.0) diff --git a/yarn.lock b/yarn.lock index 278483c3..c1ef871c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -144,25 +144,25 @@ to-fast-properties "^2.0.0" "@bullet-train/bullet-train-sortable@^1.3.0": - version "1.3.20" - resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train-sortable/-/bullet-train-sortable-1.3.20.tgz#f955f01745b5d5f715bcbe014b3a1e1b550a1ba2" - integrity sha512-M0oW7a3RrYSgFMvF3Lgwgd9EQOHc5uB1bdz7f2gsiVulO525o9wbAHwSnPIhKuDYbo2WOJ4v9XGI9I3XyG/9BQ== + version "1.3.21" + resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train-sortable/-/bullet-train-sortable-1.3.21.tgz#6772f15c56eadaad4ae715935e6d6ae254fd18af" + integrity sha512-FuPD/ucTFwc3OA9TO7mgqm5xoeiFTiWBdSTQSo3EX3RPpmwbNQbTOIoEAq321eqrB0MJiUtBmwZ6Xgx/w8TfMA== dependencies: "@hotwired/stimulus" "^3.0.1" "@rails/request.js" "^0.0.6" dragula "^3.7.3" "@bullet-train/bullet-train@^1.3.0": - version "1.3.20" - resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train/-/bullet-train-1.3.20.tgz#f391599bba30cbcc9d77829efc2012ac2a377ba3" - integrity sha512-ZJe26ZkqLmtPXuqOlNeFJ69NxUr7YlwBO6+cj27CwbN/+2lDZ04KY2xsCLhsHPftGB3bhp5PPId+Sz4bpC8WNQ== + version "1.3.21" + resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train/-/bullet-train-1.3.21.tgz#dd3f6e512717d86b2097d89a43ff25ed0f5a0d38" + integrity sha512-Ox+aUE7R11Q8hW+qLFsyG8kpikfjJzCCYcMYa1ljEd83iA+C6GF+WmKdFjxmffzKx7p6Oh+IMG/YEYcOThVUNw== dependencies: "@hotwired/stimulus" "^3.0.1" "@bullet-train/fields@^1.3.0": - version "1.3.20" - resolved "https://registry.yarnpkg.com/@bullet-train/fields/-/fields-1.3.20.tgz#a4189f6ad07ce12af3c5e33d7b1a0a9c66cafb8e" - integrity sha512-nA0FkvGv4WDShwzBjKHaMjsbRQev6PYNpz0GJHHW9VtKr4JojGJWClqGC12aLIKg3JAlpd+SUhHlFWPFGaLMjQ== + version "1.3.21" + resolved "https://registry.yarnpkg.com/@bullet-train/fields/-/fields-1.3.21.tgz#c8962c610e5a4b2609bfe6bef6b658cdd71dcd85" + integrity sha512-Pgd3SOWx+WBxlEqQt54/As9PbaZCqb777XUq0PWtcM0mYVFLl1zy0+G7n5Xcl7sNKTRJLVX24aYENhoE8iWpEA== dependencies: "@hotwired/stimulus" "^3.0.1" "@simonwep/pickr" "^1.8.1" From 22ef89092edefcc5607038c93de0b6604597ec94 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 1 Sep 2023 06:16:11 +0000 Subject: [PATCH 02/20] Update all Yarn dependencies (2023-09-01) (#956) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a18c4b4d..9d8e4826 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "cable_ready": "^5.0.0", "dragula": "^3.7.3", "esbuild": "^0.19.2", - "glob": "^10.2.2", + "glob": "^10.3.4", "jquery": "^3.7.0", "jstz": "^2.1.1", "postcss": "^8.4.29", diff --git a/yarn.lock b/yarn.lock index c1ef871c..9fd34d3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1104,10 +1104,10 @@ glob@7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^10.2.2: - version "10.3.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.3.tgz#8360a4ffdd6ed90df84aa8d52f21f452e86a123b" - integrity sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw== +glob@^10.3.4: + version "10.3.4" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.4.tgz#c85c9c7ab98669102b6defda76d35c5b1ef9766f" + integrity sha512-6LFElP3A+i/Q8XQKEvZjkEWEOTgAIALR9AO2rwT8bgPhDd1anmqDJDZ6lLddI4ehxxxR1S5RIqKe1uapMQfYaQ== dependencies: foreground-child "^3.1.0" jackspeak "^2.0.3" From 500c1dbc74f136e937f4d227b2220b0ff93fc3eb Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 1 Sep 2023 06:19:05 +0000 Subject: [PATCH 03/20] Update all Bundler dependencies (2023-09-01) (#957) --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7f03d564..7354462b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM ast (2.4.2) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.814.0) + aws-partitions (1.815.0) aws-sdk-core (3.181.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) @@ -221,7 +221,7 @@ GEM concurrent-ruby (1.2.2) connection_pool (2.4.1) crass (1.0.6) - css_parser (1.15.0) + css_parser (1.16.0) addressable cssbundling-rails (1.2.0) railties (>= 6.0.0) @@ -355,7 +355,7 @@ GEM net-smtp (0.3.3) net-protocol netrc (0.11.0) - nice_partials (0.9.3) + nice_partials (0.10.0) actionview (>= 4.2.6) nio4r (2.5.9) nokogiri (1.15.4) @@ -517,7 +517,7 @@ GEM ffi (~> 1.12) ruby2_keywords (0.0.5) rubyzip (2.3.2) - selenium-webdriver (4.11.0) + selenium-webdriver (4.12.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -570,7 +570,7 @@ GEM stimulus-rails (1.2.2) railties (>= 6.0.0) stringio (3.0.8) - stripe (9.0.0) + stripe (9.1.0) thor (1.2.2) thread-local (1.1.0) timeout (0.4.0) From 29768d59372db8c20bca514984da8a12ff2b1e52 Mon Sep 17 00:00:00 2001 From: Pascal Laliberte Date: Fri, 1 Sep 2023 10:15:43 -0400 Subject: [PATCH 04/20] Add Address model, Factory, Addresses::Country and Addresses::Region (#635) * add Addresses::Country and Addresses::Region * add Address model, factory * add snail gem * tangible_thing_test: check address fields refresh on country change * remove snail gem * add Addresses::Continent and Addresses::Subcontinent * tests: fix find_stimulus_controller_for_label to permit multiple controllers * fix a merge conflict that snuck through * make the linter happy --------- Co-authored-by: Jeremy Green --- app/models/address.rb | 24 +++++++++++++++++++ app/models/addresses/continent.rb | 22 +++++++++++++++++ app/models/addresses/country.rb | 22 +++++++++++++++++ app/models/addresses/region.rb | 22 +++++++++++++++++ app/models/addresses/subcontinent.rb | 22 +++++++++++++++++ db/migrate/20230123162616_create_addresses.rb | 16 +++++++++++++ db/schema.rb | 17 ++++++++++++- test/application_system_test_case.rb | 4 ++-- test/factories/addresses.rb | 12 ++++++++++ test/system/tangible_thing_test.rb | 5 ++++ 10 files changed, 163 insertions(+), 3 deletions(-) create mode 100644 app/models/address.rb create mode 100644 app/models/addresses/continent.rb create mode 100644 app/models/addresses/country.rb create mode 100644 app/models/addresses/region.rb create mode 100644 app/models/addresses/subcontinent.rb create mode 100644 db/migrate/20230123162616_create_addresses.rb create mode 100644 test/factories/addresses.rb diff --git a/app/models/address.rb b/app/models/address.rb new file mode 100644 index 00000000..a52c02df --- /dev/null +++ b/app/models/address.rb @@ -0,0 +1,24 @@ +class Address < ApplicationRecord + extend ActiveHash::Associations::ActiveRecordExtensions + + include Addresses::Base + # 🚅 add concerns above. + + # 🚅 add belongs_to associations above. + + # 🚅 add has_many associations above. + + # 🚅 add oauth providers above. + + # 🚅 add has_one associations above. + + # 🚅 add scopes above. + + # 🚅 add validations above. + + # 🚅 add callbacks above. + + # 🚅 add delegations above. + + # 🚅 add methods above. +end diff --git a/app/models/addresses/continent.rb b/app/models/addresses/continent.rb new file mode 100644 index 00000000..aaaa0068 --- /dev/null +++ b/app/models/addresses/continent.rb @@ -0,0 +1,22 @@ +class Addresses::Continent < ApplicationHash + include Addresses::Continents::Base + # 🚅 add concerns above. + + # 🚅 add belongs_to associations above. + + # 🚅 add has_many associations above. + + # 🚅 add oauth providers above. + + # 🚅 add has_one associations above. + + # 🚅 add scopes above. + + # 🚅 add validations above. + + # 🚅 add callbacks above. + + # 🚅 add delegations above. + + # 🚅 add methods above. +end diff --git a/app/models/addresses/country.rb b/app/models/addresses/country.rb new file mode 100644 index 00000000..9402dcce --- /dev/null +++ b/app/models/addresses/country.rb @@ -0,0 +1,22 @@ +class Addresses::Country < ApplicationHash + include Addresses::Countries::Base + # 🚅 add concerns above. + + # 🚅 add belongs_to associations above. + + # 🚅 add has_many associations above. + + # 🚅 add oauth providers above. + + # 🚅 add has_one associations above. + + # 🚅 add scopes above. + + # 🚅 add validations above. + + # 🚅 add callbacks above. + + # 🚅 add delegations above. + + # 🚅 add methods above. +end diff --git a/app/models/addresses/region.rb b/app/models/addresses/region.rb new file mode 100644 index 00000000..d753d4ff --- /dev/null +++ b/app/models/addresses/region.rb @@ -0,0 +1,22 @@ +class Addresses::Region < ApplicationHash + include Addresses::Regions::Base + # 🚅 add concerns above. + + # 🚅 add belongs_to associations above. + + # 🚅 add has_many associations above. + + # 🚅 add oauth providers above. + + # 🚅 add has_one associations above. + + # 🚅 add scopes above. + + # 🚅 add validations above. + + # 🚅 add callbacks above. + + # 🚅 add delegations above. + + # 🚅 add methods above. +end diff --git a/app/models/addresses/subcontinent.rb b/app/models/addresses/subcontinent.rb new file mode 100644 index 00000000..22cc6446 --- /dev/null +++ b/app/models/addresses/subcontinent.rb @@ -0,0 +1,22 @@ +class Addresses::Subcontinent < ApplicationHash + include Addresses::Subcontinents::Base + # 🚅 add concerns above. + + # 🚅 add belongs_to associations above. + + # 🚅 add has_many associations above. + + # 🚅 add oauth providers above. + + # 🚅 add has_one associations above. + + # 🚅 add scopes above. + + # 🚅 add validations above. + + # 🚅 add callbacks above. + + # 🚅 add delegations above. + + # 🚅 add methods above. +end diff --git a/db/migrate/20230123162616_create_addresses.rb b/db/migrate/20230123162616_create_addresses.rb new file mode 100644 index 00000000..8deaf2e6 --- /dev/null +++ b/db/migrate/20230123162616_create_addresses.rb @@ -0,0 +1,16 @@ +class CreateAddresses < ActiveRecord::Migration[7.0] + def change + create_table :addresses do |t| + t.references :addressable, polymorphic: true, null: false + t.string :address_one + t.string :address_two + t.string :city + t.integer :region_id + t.string :region_name + t.integer :country_id + t.string :postal_code + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index f52d0bb3..ab239c3d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2022_12_31_003438) do +ActiveRecord::Schema[7.0].define(version: 2023_01_23_162616) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -61,6 +61,21 @@ t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true end + create_table "addresses", force: :cascade do |t| + t.string "addressable_type", null: false + t.bigint "addressable_id", null: false + t.string "address_one" + t.string "address_two" + t.string "city" + t.integer "region_id" + t.string "region_name" + t.integer "country_id" + t.string "postal_code" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["addressable_type", "addressable_id"], name: "index_addresses_on_addressable" + end + create_table "integrations_stripe_installations", force: :cascade do |t| t.bigint "team_id", null: false t.bigint "oauth_stripe_account_id", null: false diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb index 14b2c6dd..d60cb483 100644 --- a/test/application_system_test_case.rb +++ b/test/application_system_test_case.rb @@ -259,9 +259,9 @@ def assert_no_js_errors &block def find_stimulus_controller_for_label(label, stimulus_controller, wrapper = false) if wrapper wrapper_el = find("label", text: /\A#{label}\z/).first(:xpath, ".//..//..") - wrapper_el if wrapper_el["data-controller"] == stimulus_controller + wrapper_el if wrapper_el["data-controller"].split(" ").include?(stimulus_controller) else - find("label", text: /\A#{label}\z/).first(:xpath, ".//..").first('[data-controller="' + stimulus_controller + '"]') + find("label", text: /\A#{label}\z/).first(:xpath, ".//..").first('[data-controller~="' + stimulus_controller + '"]') end end diff --git a/test/factories/addresses.rb b/test/factories/addresses.rb new file mode 100644 index 00000000..8b1b29a3 --- /dev/null +++ b/test/factories/addresses.rb @@ -0,0 +1,12 @@ +FactoryBot.define do + factory :address do + addressable { nil } + address_one { "1000 Vin Scully Avenue" } + address_two { nil } + city { "Los Angeles" } + region_id { 1416 } + region_name { "California" } + country_id { 233 } + postal_code { "90090" } + end +end diff --git a/test/system/tangible_thing_test.rb b/test/system/tangible_thing_test.rb index b3484ec0..a172cebc 100644 --- a/test/system/tangible_thing_test.rb +++ b/test/system/tangible_thing_test.rb @@ -54,6 +54,11 @@ class TangibleThingTest < ApplicationSystemTestCase fill_in "Email Field Value", with: "me@acme.com" fill_in "Password Field Value", with: "secure-password" fill_in "Phone Field Value", with: "(201) 551-8321" + + assert page.has_content? "State / Province" + select "Japan", from: "Country" + assert page.has_content? "Prefecture" + select "One", from: "Super Select Value" select2_select "Multiple Super Select Values", ["Five", "Six"] fill_in "Text Area Value", with: "Long text for this text area field" From 122f6953f9eb5df3d670923cda38511a45d4772a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 1 Sep 2023 09:49:32 -0500 Subject: [PATCH 05/20] BT-Core version bump: - 1.3.22 (#958) Co-authored-by: jagthedrummer --- Gemfile.lock | 36 ++++++++++++++++++------------------ yarn.lock | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7354462b..481985fe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,7 +97,7 @@ GEM bootsnap (1.16.0) msgpack (~> 1.2) builder (3.2.4) - bullet_train (1.3.21) + bullet_train (1.3.22) awesome_print bullet_train-fields bullet_train-has_uuid @@ -129,7 +129,7 @@ GEM unicode-emoji valid_email xxhash - bullet_train-api (1.3.21) + bullet_train-api (1.3.22) bullet_train doorkeeper factory_bot @@ -138,53 +138,53 @@ GEM pagy_cursor rack-cors rails (>= 6.0.0) - bullet_train-fields (1.3.21) + bullet_train-fields (1.3.22) chronic cloudinary phonelib rails (>= 6.0.0) - bullet_train-has_uuid (1.3.21) + bullet_train-has_uuid (1.3.22) rails (>= 6.0.0) - bullet_train-incoming_webhooks (1.3.21) + bullet_train-incoming_webhooks (1.3.22) bullet_train-super_scaffolding rails (>= 6.0.0) - bullet_train-integrations (1.3.21) + bullet_train-integrations (1.3.22) rails (>= 6.0.0) - bullet_train-integrations-stripe (1.3.21) + bullet_train-integrations-stripe (1.3.22) omniauth omniauth-rails_csrf_protection omniauth-stripe-connect rails (>= 6.0.0) stripe - bullet_train-obfuscates_id (1.3.21) + bullet_train-obfuscates_id (1.3.22) hashids rails (>= 6.0.0) - bullet_train-outgoing_webhooks (1.3.21) + bullet_train-outgoing_webhooks (1.3.22) public_suffix rails (>= 6.0.0) - bullet_train-roles (1.3.21) + bullet_train-roles (1.3.22) active_hash activesupport cancancan bullet_train-routes (1.0.0) rails (>= 6.0.0) - bullet_train-scope_questions (1.3.21) + bullet_train-scope_questions (1.3.22) rails (>= 6.0.0) - bullet_train-scope_validator (1.3.21) - bullet_train-sortable (1.3.21) + bullet_train-scope_validator (1.3.22) + bullet_train-sortable (1.3.22) rails (>= 6.0.0) - bullet_train-super_load_and_authorize_resource (1.3.21) + bullet_train-super_load_and_authorize_resource (1.3.22) rails (>= 6.0.0) - bullet_train-super_scaffolding (1.3.21) + bullet_train-super_scaffolding (1.3.22) bullet_train indefinite_article rails (>= 6.0.0) - bullet_train-themes (1.3.21) + bullet_train-themes (1.3.22) rails (>= 6.0.0) - bullet_train-themes-light (1.3.21) + bullet_train-themes-light (1.3.22) bullet_train-themes-tailwind_css rails (>= 6.0.0) - bullet_train-themes-tailwind_css (1.3.21) + bullet_train-themes-tailwind_css (1.3.22) bullet_train bullet_train-themes rails (>= 6.0.0) diff --git a/yarn.lock b/yarn.lock index 9fd34d3b..684f8bf7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -144,25 +144,25 @@ to-fast-properties "^2.0.0" "@bullet-train/bullet-train-sortable@^1.3.0": - version "1.3.21" - resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train-sortable/-/bullet-train-sortable-1.3.21.tgz#6772f15c56eadaad4ae715935e6d6ae254fd18af" - integrity sha512-FuPD/ucTFwc3OA9TO7mgqm5xoeiFTiWBdSTQSo3EX3RPpmwbNQbTOIoEAq321eqrB0MJiUtBmwZ6Xgx/w8TfMA== + version "1.3.22" + resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train-sortable/-/bullet-train-sortable-1.3.22.tgz#dc2f30d969c2bbd631b3ec2283062846a6334917" + integrity sha512-d20N4ojiqZCG340yn2oANr0YY7W3IjOVMwVJQd/0fcq8NTmaelI8Axbn2HUANybnNKDHBJX707NbSbGOaIOHOQ== dependencies: "@hotwired/stimulus" "^3.0.1" "@rails/request.js" "^0.0.6" dragula "^3.7.3" "@bullet-train/bullet-train@^1.3.0": - version "1.3.21" - resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train/-/bullet-train-1.3.21.tgz#dd3f6e512717d86b2097d89a43ff25ed0f5a0d38" - integrity sha512-Ox+aUE7R11Q8hW+qLFsyG8kpikfjJzCCYcMYa1ljEd83iA+C6GF+WmKdFjxmffzKx7p6Oh+IMG/YEYcOThVUNw== + version "1.3.22" + resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train/-/bullet-train-1.3.22.tgz#8dcc9a39d204eba34e9e8ede2b0ea1c4b2be256e" + integrity sha512-vWWEZCqfQRbUaQO4oNO34DX0kgkcFsjSBW7COCYe0dz1i5SeupE9ulxn8J6GeS78VQnXgSc0EE9EZYHPl8LuNA== dependencies: "@hotwired/stimulus" "^3.0.1" "@bullet-train/fields@^1.3.0": - version "1.3.21" - resolved "https://registry.yarnpkg.com/@bullet-train/fields/-/fields-1.3.21.tgz#c8962c610e5a4b2609bfe6bef6b658cdd71dcd85" - integrity sha512-Pgd3SOWx+WBxlEqQt54/As9PbaZCqb777XUq0PWtcM0mYVFLl1zy0+G7n5Xcl7sNKTRJLVX24aYENhoE8iWpEA== + version "1.3.22" + resolved "https://registry.yarnpkg.com/@bullet-train/fields/-/fields-1.3.22.tgz#e8a1f6435ea770509b38caad81b640ccf5a6dc58" + integrity sha512-hr1UFF4gIKU0z8jtf7Pu/77PlrriLiIieW1GC3L9ERmOU2W8MgEXySfOmSnQSpmOawOT1wQTPZd6H8XIXxL3fw== dependencies: "@hotwired/stimulus" "^3.0.1" "@simonwep/pickr" "^1.8.1" From 9a3e8313be69bce6989ef334abb360cccb57cec1 Mon Sep 17 00:00:00 2001 From: Jeremy Green Date: Fri, 1 Sep 2023 13:40:04 -0700 Subject: [PATCH 06/20] Add `ruby-vips` in the `:development` group (#959) * Add `ruby-vips` in the `:development, :test` group This (mostly) fixes the problem reported in https://github.com/bullet-train-co/bullet_train-core/issues/464 However, due to https://github.com/bullet-train-co/bullet_train-core/issues/498 we don't currently try to show a user profile photo if we're using ActiveStorage instead of Cloudinary. Here's some context about why we need to add this directly to the `Gemfile`. https://github.com/libvips/ruby-vips/issues/155#issuecomment-1047370993 * Try it here --- Gemfile | 4 ++++ Gemfile.lock | 1 + 2 files changed, 5 insertions(+) diff --git a/Gemfile b/Gemfile index a677d6b9..f758f8dd 100644 --- a/Gemfile +++ b/Gemfile @@ -76,6 +76,10 @@ group :development do # Speed up commands on slow machines / big apps [https://github.com/rails/spring] # gem "spring" + + # Workaround to get image process to behave on a Mac in development + # https://github.com/libvips/ruby-vips/issues/155#issuecomment-1047370993 + gem "ruby-vips" end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 481985fe..0916f989 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -657,6 +657,7 @@ DEPENDENCIES rails_best_practices redis (~> 5.0.5) rqrcode + ruby-vips selenium-webdriver sentry-rails sentry-ruby From 76617c1931da08fa21eb6a4caae7873407f67c1d Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Sat, 2 Sep 2023 06:16:30 +0000 Subject: [PATCH 07/20] Update all Bundler dependencies (2023-09-02) (#960) --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0916f989..60944feb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM ast (2.4.2) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.815.0) + aws-partitions (1.816.0) aws-sdk-core (3.181.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) @@ -273,8 +273,8 @@ GEM figaro (1.2.0) thor (>= 0.14.0, < 2) foreman (0.87.2) - globalid (1.1.0) - activesupport (>= 5.0) + globalid (1.2.0) + activesupport (>= 6.1) hashids (1.0.6) hashie (5.0.0) hiredis (0.6.3) @@ -393,7 +393,7 @@ GEM parser (3.2.2.3) ast (~> 2.4.1) racc - pg (1.5.3) + pg (1.5.4) phonelib (0.8.3) possessive (1.0.1) postmark (1.24.0) From edf6a67a773315f95713ae8000296f3a3b071d33 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 14:41:34 -0500 Subject: [PATCH 08/20] BT-Core version bump: - 1.3.23 (#963) Co-authored-by: jagthedrummer --- Gemfile.lock | 36 ++++++++++++++++++------------------ yarn.lock | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 60944feb..e7f99ce8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,7 +97,7 @@ GEM bootsnap (1.16.0) msgpack (~> 1.2) builder (3.2.4) - bullet_train (1.3.22) + bullet_train (1.3.23) awesome_print bullet_train-fields bullet_train-has_uuid @@ -129,7 +129,7 @@ GEM unicode-emoji valid_email xxhash - bullet_train-api (1.3.22) + bullet_train-api (1.3.23) bullet_train doorkeeper factory_bot @@ -138,53 +138,53 @@ GEM pagy_cursor rack-cors rails (>= 6.0.0) - bullet_train-fields (1.3.22) + bullet_train-fields (1.3.23) chronic cloudinary phonelib rails (>= 6.0.0) - bullet_train-has_uuid (1.3.22) + bullet_train-has_uuid (1.3.23) rails (>= 6.0.0) - bullet_train-incoming_webhooks (1.3.22) + bullet_train-incoming_webhooks (1.3.23) bullet_train-super_scaffolding rails (>= 6.0.0) - bullet_train-integrations (1.3.22) + bullet_train-integrations (1.3.23) rails (>= 6.0.0) - bullet_train-integrations-stripe (1.3.22) + bullet_train-integrations-stripe (1.3.23) omniauth omniauth-rails_csrf_protection omniauth-stripe-connect rails (>= 6.0.0) stripe - bullet_train-obfuscates_id (1.3.22) + bullet_train-obfuscates_id (1.3.23) hashids rails (>= 6.0.0) - bullet_train-outgoing_webhooks (1.3.22) + bullet_train-outgoing_webhooks (1.3.23) public_suffix rails (>= 6.0.0) - bullet_train-roles (1.3.22) + bullet_train-roles (1.3.23) active_hash activesupport cancancan bullet_train-routes (1.0.0) rails (>= 6.0.0) - bullet_train-scope_questions (1.3.22) + bullet_train-scope_questions (1.3.23) rails (>= 6.0.0) - bullet_train-scope_validator (1.3.22) - bullet_train-sortable (1.3.22) + bullet_train-scope_validator (1.3.23) + bullet_train-sortable (1.3.23) rails (>= 6.0.0) - bullet_train-super_load_and_authorize_resource (1.3.22) + bullet_train-super_load_and_authorize_resource (1.3.23) rails (>= 6.0.0) - bullet_train-super_scaffolding (1.3.22) + bullet_train-super_scaffolding (1.3.23) bullet_train indefinite_article rails (>= 6.0.0) - bullet_train-themes (1.3.22) + bullet_train-themes (1.3.23) rails (>= 6.0.0) - bullet_train-themes-light (1.3.22) + bullet_train-themes-light (1.3.23) bullet_train-themes-tailwind_css rails (>= 6.0.0) - bullet_train-themes-tailwind_css (1.3.22) + bullet_train-themes-tailwind_css (1.3.23) bullet_train bullet_train-themes rails (>= 6.0.0) diff --git a/yarn.lock b/yarn.lock index 684f8bf7..2f8646be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -144,25 +144,25 @@ to-fast-properties "^2.0.0" "@bullet-train/bullet-train-sortable@^1.3.0": - version "1.3.22" - resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train-sortable/-/bullet-train-sortable-1.3.22.tgz#dc2f30d969c2bbd631b3ec2283062846a6334917" - integrity sha512-d20N4ojiqZCG340yn2oANr0YY7W3IjOVMwVJQd/0fcq8NTmaelI8Axbn2HUANybnNKDHBJX707NbSbGOaIOHOQ== + version "1.3.23" + resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train-sortable/-/bullet-train-sortable-1.3.23.tgz#36972d925fc4b33b7c4cf5a6c7321138e3a04d2f" + integrity sha512-OsOE1eJ1bDSfH6U5cd/CcKEnLX6ATOgowJN/vMNJ62SeRA3riX2/YnVUHC0kbiUTDEnPbCFDICxD5b+bai06PQ== dependencies: "@hotwired/stimulus" "^3.0.1" "@rails/request.js" "^0.0.6" dragula "^3.7.3" "@bullet-train/bullet-train@^1.3.0": - version "1.3.22" - resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train/-/bullet-train-1.3.22.tgz#8dcc9a39d204eba34e9e8ede2b0ea1c4b2be256e" - integrity sha512-vWWEZCqfQRbUaQO4oNO34DX0kgkcFsjSBW7COCYe0dz1i5SeupE9ulxn8J6GeS78VQnXgSc0EE9EZYHPl8LuNA== + version "1.3.23" + resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train/-/bullet-train-1.3.23.tgz#a35c53c1d3603c9d3eab7b00d9f30827a1096701" + integrity sha512-2X2JyqFEG7GYB3u7s07XhxUPPir8oUdI8gyDnM3nP25ArBQqTkACyuGwmdZgXlommhQ/STg1UtyD+W06RHzKRg== dependencies: "@hotwired/stimulus" "^3.0.1" "@bullet-train/fields@^1.3.0": - version "1.3.22" - resolved "https://registry.yarnpkg.com/@bullet-train/fields/-/fields-1.3.22.tgz#e8a1f6435ea770509b38caad81b640ccf5a6dc58" - integrity sha512-hr1UFF4gIKU0z8jtf7Pu/77PlrriLiIieW1GC3L9ERmOU2W8MgEXySfOmSnQSpmOawOT1wQTPZd6H8XIXxL3fw== + version "1.3.23" + resolved "https://registry.yarnpkg.com/@bullet-train/fields/-/fields-1.3.23.tgz#fac7b15f6f5a2af8a91d23cc585366bb0f8cf37c" + integrity sha512-9LRzSYUXMyTomMqeRssVX+Zqm7u06jzf461v14wSY/loIJqr+fF7Ul0MDVPgdBA4aWQ6TY7/FtKhoDcWIWawRA== dependencies: "@hotwired/stimulus" "^3.0.1" "@simonwep/pickr" "^1.8.1" From 54903a11a6f1de12ad0bf69bf5171e7603341a30 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 06:18:55 +0000 Subject: [PATCH 09/20] Update all Bundler dependencies (2023-09-06) (#966) --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e7f99ce8..e8a5b461 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM ast (2.4.2) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.816.0) + aws-partitions (1.817.0) aws-sdk-core (3.181.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) @@ -273,7 +273,7 @@ GEM figaro (1.2.0) thor (>= 0.14.0, < 2) foreman (0.87.2) - globalid (1.2.0) + globalid (1.2.1) activesupport (>= 6.1) hashids (1.0.6) hashie (5.0.0) @@ -292,9 +292,9 @@ GEM indefinite_article (0.2.5) activesupport io-console (0.6.0) - irb (1.8.0) - rdoc (~> 6.5) - reline (>= 0.3.6) + irb (1.8.1) + rdoc + reline (>= 0.3.8) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) @@ -548,7 +548,7 @@ GEM snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) - sprockets (4.2.0) + sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) @@ -594,7 +594,7 @@ GEM version_gem (1.1.3) warden (1.2.9) rack (>= 2.0.9) - web-console (4.2.0) + web-console (4.2.1) actionview (>= 6.0.0) activemodel (>= 6.0.0) bindex (>= 0.4.0) From 6c179fa1e70ef3392ff10b5c42104e061711cfe3 Mon Sep 17 00:00:00 2001 From: Lars Greiving Date: Wed, 6 Sep 2023 17:21:21 +0200 Subject: [PATCH 10/20] Fix typo in bump-core banner (#967) --- bin/bump-core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/bump-core b/bin/bump-core index e945c155..123c4756 100755 --- a/bin/bump-core +++ b/bin/bump-core @@ -9,7 +9,7 @@ class CoreBumpCLI < Thor if !github_output_file && !options[:allow_local] banner = <<~BANNER -------------------------------------------------------------------------------------------------------- - - It looks like you're running this scirpt locally. + - It looks like you're running this script locally. - This script was designed to run as part of a GitHub workflow. - The workflow will prepare a speically formatted PR that will kick off other workflows when merged. - We don't recommend using this script locally to make updates directly to the starter repo. From d821c26593b7f4c688e3351948653d7f946897af Mon Sep 17 00:00:00 2001 From: Yuri Sidorov <403994+newstler@users.noreply.github.com> Date: Wed, 6 Sep 2023 18:54:19 +0200 Subject: [PATCH 11/20] Eager load classes for OpenAPI test (#935) --- test/controllers/api/open_api_controller_test.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/controllers/api/open_api_controller_test.rb b/test/controllers/api/open_api_controller_test.rb index 9c683a11..eb112103 100644 --- a/test/controllers/api/open_api_controller_test.rb +++ b/test/controllers/api/open_api_controller_test.rb @@ -2,6 +2,10 @@ require "fileutils" class Api::OpenApiControllerTest < Api::Test + setup do + Rails.application.eager_load! + end + test "OpenAPI document is valid" do get api_path(version: "v1") From 8bd48b56b87e09085c4df4b14a253de1fa5f7697 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 13:00:46 -0500 Subject: [PATCH 12/20] BT-Core version bump: - 1.3.24 (#969) Co-authored-by: jagthedrummer --- Gemfile.lock | 39 +++++++++++++++++++++------------------ yarn.lock | 18 +++++++++--------- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e8a5b461..ff81a633 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,7 +97,7 @@ GEM bootsnap (1.16.0) msgpack (~> 1.2) builder (3.2.4) - bullet_train (1.3.23) + bullet_train (1.3.24) awesome_print bullet_train-fields bullet_train-has_uuid @@ -117,6 +117,7 @@ GEM hiredis http_accept_language image_processing + masamune-ast (>= 1.2.0) microscope nice_partials (~> 0.9) pagy @@ -129,7 +130,7 @@ GEM unicode-emoji valid_email xxhash - bullet_train-api (1.3.23) + bullet_train-api (1.3.24) bullet_train doorkeeper factory_bot @@ -138,53 +139,53 @@ GEM pagy_cursor rack-cors rails (>= 6.0.0) - bullet_train-fields (1.3.23) + bullet_train-fields (1.3.24) chronic cloudinary phonelib rails (>= 6.0.0) - bullet_train-has_uuid (1.3.23) + bullet_train-has_uuid (1.3.24) rails (>= 6.0.0) - bullet_train-incoming_webhooks (1.3.23) + bullet_train-incoming_webhooks (1.3.24) bullet_train-super_scaffolding rails (>= 6.0.0) - bullet_train-integrations (1.3.23) + bullet_train-integrations (1.3.24) rails (>= 6.0.0) - bullet_train-integrations-stripe (1.3.23) + bullet_train-integrations-stripe (1.3.24) omniauth omniauth-rails_csrf_protection omniauth-stripe-connect rails (>= 6.0.0) stripe - bullet_train-obfuscates_id (1.3.23) + bullet_train-obfuscates_id (1.3.24) hashids rails (>= 6.0.0) - bullet_train-outgoing_webhooks (1.3.23) + bullet_train-outgoing_webhooks (1.3.24) public_suffix rails (>= 6.0.0) - bullet_train-roles (1.3.23) + bullet_train-roles (1.3.24) active_hash activesupport cancancan bullet_train-routes (1.0.0) rails (>= 6.0.0) - bullet_train-scope_questions (1.3.23) + bullet_train-scope_questions (1.3.24) rails (>= 6.0.0) - bullet_train-scope_validator (1.3.23) - bullet_train-sortable (1.3.23) + bullet_train-scope_validator (1.3.24) + bullet_train-sortable (1.3.24) rails (>= 6.0.0) - bullet_train-super_load_and_authorize_resource (1.3.23) + bullet_train-super_load_and_authorize_resource (1.3.24) rails (>= 6.0.0) - bullet_train-super_scaffolding (1.3.23) + bullet_train-super_scaffolding (1.3.24) bullet_train indefinite_article rails (>= 6.0.0) - bullet_train-themes (1.3.23) + bullet_train-themes (1.3.24) rails (>= 6.0.0) - bullet_train-themes-light (1.3.23) + bullet_train-themes-light (1.3.24) bullet_train-themes-tailwind_css rails (>= 6.0.0) - bullet_train-themes-tailwind_css (1.3.23) + bullet_train-themes-tailwind_css (1.3.24) bullet_train bullet_train-themes rails (>= 6.0.0) @@ -328,6 +329,8 @@ GEM net-pop net-smtp marcel (1.0.2) + masamune-ast (1.2.0) + activesupport matrix (0.4.2) method_source (1.0.0) microscope (1.1.1) diff --git a/yarn.lock b/yarn.lock index 2f8646be..80983c1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -144,25 +144,25 @@ to-fast-properties "^2.0.0" "@bullet-train/bullet-train-sortable@^1.3.0": - version "1.3.23" - resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train-sortable/-/bullet-train-sortable-1.3.23.tgz#36972d925fc4b33b7c4cf5a6c7321138e3a04d2f" - integrity sha512-OsOE1eJ1bDSfH6U5cd/CcKEnLX6ATOgowJN/vMNJ62SeRA3riX2/YnVUHC0kbiUTDEnPbCFDICxD5b+bai06PQ== + version "1.3.24" + resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train-sortable/-/bullet-train-sortable-1.3.24.tgz#d3dda9c5dc23792a16a0e32da8281fe9254d57c9" + integrity sha512-i1UFYEuaGK8vVHC+P/TNOxGvqrRY2xgctGvMbSLSy/D01cJ/i2mU0vBh0PchgPYzqhehTW4jaZ8CqLgCMy2aLw== dependencies: "@hotwired/stimulus" "^3.0.1" "@rails/request.js" "^0.0.6" dragula "^3.7.3" "@bullet-train/bullet-train@^1.3.0": - version "1.3.23" - resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train/-/bullet-train-1.3.23.tgz#a35c53c1d3603c9d3eab7b00d9f30827a1096701" - integrity sha512-2X2JyqFEG7GYB3u7s07XhxUPPir8oUdI8gyDnM3nP25ArBQqTkACyuGwmdZgXlommhQ/STg1UtyD+W06RHzKRg== + version "1.3.24" + resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train/-/bullet-train-1.3.24.tgz#21ff2a474de8a1438801b5bb52eb971fd50d4445" + integrity sha512-VwvmtXsAJR6U0R6W40m26/0srP5tGpSPp1G5N3dpjwCA4HFU01LDOVyacM682BOgW0m5+cXcdOqld2q8VHnsEQ== dependencies: "@hotwired/stimulus" "^3.0.1" "@bullet-train/fields@^1.3.0": - version "1.3.23" - resolved "https://registry.yarnpkg.com/@bullet-train/fields/-/fields-1.3.23.tgz#fac7b15f6f5a2af8a91d23cc585366bb0f8cf37c" - integrity sha512-9LRzSYUXMyTomMqeRssVX+Zqm7u06jzf461v14wSY/loIJqr+fF7Ul0MDVPgdBA4aWQ6TY7/FtKhoDcWIWawRA== + version "1.3.24" + resolved "https://registry.yarnpkg.com/@bullet-train/fields/-/fields-1.3.24.tgz#71bbf4e5a13255f8a00197e1553a0b188ea46110" + integrity sha512-lmFTOv85j3KU5P2L6lgx6jYlunKC8bKJzduTqsP2Iks6f6Gye4f+wm6qiBTHufIHCkv5dkTHz/SuCrDsjo6Pww== dependencies: "@hotwired/stimulus" "^3.0.1" "@simonwep/pickr" "^1.8.1" From 918f4ca9fcfb75fffdee92ab5476b1266af64e5d Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 06:15:35 +0000 Subject: [PATCH 13/20] Update all Yarn dependencies (2023-09-07) (#972) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9d8e4826..88c5aacc 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@rails/ujs": "^7.0.0", "@redocly/cli": "^1.0.0-beta.111", "@tailwindcss/forms": "^0.5.6", - "@tailwindcss/typography": "^0.5.8", + "@tailwindcss/typography": "^0.5.10", "autoprefixer": "^10.4.15", "cable_ready": "^5.0.0", "dragula": "^3.7.3", diff --git a/yarn.lock b/yarn.lock index 80983c1c..6975655c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -512,10 +512,10 @@ dependencies: mini-svg-data-uri "^1.2.3" -"@tailwindcss/typography@^0.5.8": - version "0.5.9" - resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.9.tgz#027e4b0674929daaf7c921c900beee80dbad93e8" - integrity sha512-t8Sg3DyynFysV9f4JDOVISGsjazNb48AeIYQwcL+Bsq5uf4RYL75C1giZ43KISjeDGBaTN3Kxh7Xj/vRSMJUUg== +"@tailwindcss/typography@^0.5.10": + version "0.5.10" + resolved "https://registry.yarnpkg.com/@tailwindcss/typography/-/typography-0.5.10.tgz#2abde4c6d5c797ab49cf47610830a301de4c1e0a" + integrity sha512-Pe8BuPJQJd3FfRnm6H0ulKIGoMEQS+Vq01R6M5aCrFB/ccR/shT+0kXLjouGC1gFLm9hopTFN+DMP0pfwRWzPw== dependencies: lodash.castarray "^4.4.0" lodash.isplainobject "^4.0.6" From dcb97cb47be8510f31dc2a6200584f17f03c7011 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 06:19:26 +0000 Subject: [PATCH 14/20] Update all Bundler dependencies (2023-09-07) (#973) --- Gemfile.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ff81a633..b43151cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM ast (2.4.2) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.817.0) + aws-partitions (1.818.0) aws-sdk-core (3.181.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) @@ -342,7 +342,7 @@ GEM mini_magick (4.12.0) mini_mime (1.1.5) mini_portile2 (2.8.4) - minitest (5.19.0) + minitest (5.20.0) minitest-retry (0.2.2) minitest (>= 5.0) msgpack (1.7.2) @@ -475,7 +475,7 @@ GEM psych (>= 4.0.0) redis (5.0.7) redis-client (>= 0.9.0) - redis-client (0.16.0) + redis-client (0.17.0) connection_pool regexp_parser (2.8.1) reline (0.3.8) @@ -524,13 +524,13 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - sentry-rails (5.10.0) + sentry-rails (5.11.0) railties (>= 5.0) - sentry-ruby (~> 5.10.0) - sentry-ruby (5.10.0) + sentry-ruby (~> 5.11.0) + sentry-ruby (5.11.0) concurrent-ruby (~> 1.0, >= 1.0.2) - sentry-sidekiq (5.10.0) - sentry-ruby (~> 5.10.0) + sentry-sidekiq (5.11.0) + sentry-ruby (~> 5.11.0) sidekiq (>= 3.0) sexp_processor (4.17.0) showcase-rails (0.4.6) From 47b39ffde71b0a970299ba1a0776a52131ccd3c0 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 8 Sep 2023 06:25:55 +0000 Subject: [PATCH 15/20] Update all Bundler dependencies (2023-09-08) (#975) --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b43151cf..ac7dbe4d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM ast (2.4.2) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.818.0) + aws-partitions (1.819.0) aws-sdk-core (3.181.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) @@ -573,7 +573,7 @@ GEM stimulus-rails (1.2.2) railties (>= 6.0.0) stringio (3.0.8) - stripe (9.1.0) + stripe (9.2.0) thor (1.2.2) thread-local (1.1.0) timeout (0.4.0) From 0d31ce1e307b334b305ec825e287843ae5eee8e6 Mon Sep 17 00:00:00 2001 From: Jeremy Green Date: Fri, 8 Sep 2023 08:49:11 -0700 Subject: [PATCH 16/20] Decrease parallelism in CircleCI (#976) With parallelism set to 16 we spend about 75-80% of the time in any given job doing setup, and only 20-25% of the time running tests. Decreasing parallelism will give us a better ratio, and shouldn't increase testing time all that much. --- .circleci/config.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bb7b16f0..a514df5f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -93,7 +93,7 @@ jobs: - <<: *postgres_docker_image - image: cimg/redis:6.2.6 executor: ruby/default - parallelism: 16 + parallelism: 2 steps: - browser-tools/install-chrome: chrome-version: "116.0.5845.96" # TODO: remove -> https://github.com/CircleCI-Public/browser-tools-orb/issues/75 @@ -123,7 +123,7 @@ jobs: export RAILS_ENV=test bundle exec rails "knapsack_pro:queue:minitest[--verbose]" environment: - KNAPSACK_PRO_CI_NODE_TOTAL: 16 + KNAPSACK_PRO_CI_NODE_TOTAL: 2 # If you don't want to use Knapsack Pro, then use this configuration: # @@ -150,7 +150,7 @@ jobs: - <<: *postgres_docker_image - image: circleci/redis executor: ruby/default - parallelism: 16 + parallelism: 2 steps: - browser-tools/install-browser-tools: chrome-version: "116.0.5845.96" # TODO: remove -> https://github.com/CircleCI-Public/browser-tools-orb/issues/75 @@ -180,7 +180,7 @@ jobs: export RAILS_ENV=test bundle exec rails "knapsack_pro:queue:minitest[--verbose]" environment: - KNAPSACK_PRO_CI_NODE_TOTAL: 16 + KNAPSACK_PRO_CI_NODE_TOTAL: 2 HIDE_THINGS: true # If you don't want to use Knapsack Pro, then use this configuration: @@ -254,7 +254,7 @@ jobs: - <<: *postgres_docker_image - image: cimg/redis:6.2.6 executor: ruby/default - parallelism: 16 + parallelism: 2 steps: - browser-tools/install-chrome: chrome-version: "116.0.5845.96" # TODO: remove -> https://github.com/CircleCI-Public/browser-tools-orb/issues/75 @@ -295,7 +295,7 @@ jobs: fi environment: RAILS_ENV: test - KNAPSACK_PRO_CI_NODE_TOTAL: 16 + KNAPSACK_PRO_CI_NODE_TOTAL: 2 KNAPSACK_PRO_TEST_FILE_PATTERN: "test/system/**{,/*/**}/*_test.rb" # Uncomment the job at the bottom of this file to run these system tests. @@ -308,7 +308,7 @@ jobs: - <<: *postgres_docker_image - image: cimg/redis:6.2.6 executor: ruby/default - parallelism: 4 + parallelism: 2 steps: - browser-tools/install-chrome: From 78e1933401b7ed2dea139e11a49a83fae7f162a8 Mon Sep 17 00:00:00 2001 From: Gabriel Zayas Date: Sat, 9 Sep 2023 00:54:43 +0900 Subject: [PATCH 17/20] Remove bullet train webhooks routing (#947) --- config/routes.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 4c633b19..eaf68e06 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -21,7 +21,6 @@ namespace :webhooks do namespace :incoming do - resources :bullet_train_webhooks namespace :oauth do # 🚅 super scaffolding will insert new oauth provider webhooks above this line. end From 10ad4721a3f5b879040225ed541d13e081738fa3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 8 Sep 2023 11:34:26 -0500 Subject: [PATCH 18/20] BT-Core version bump: - 1.3.25 (#977) Co-authored-by: jagthedrummer --- Gemfile.lock | 36 ++++++++++++++++++------------------ yarn.lock | 24 ++++++++++++------------ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ac7dbe4d..589ac096 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,7 +97,7 @@ GEM bootsnap (1.16.0) msgpack (~> 1.2) builder (3.2.4) - bullet_train (1.3.24) + bullet_train (1.3.25) awesome_print bullet_train-fields bullet_train-has_uuid @@ -130,7 +130,7 @@ GEM unicode-emoji valid_email xxhash - bullet_train-api (1.3.24) + bullet_train-api (1.3.25) bullet_train doorkeeper factory_bot @@ -139,53 +139,53 @@ GEM pagy_cursor rack-cors rails (>= 6.0.0) - bullet_train-fields (1.3.24) + bullet_train-fields (1.3.25) chronic cloudinary phonelib rails (>= 6.0.0) - bullet_train-has_uuid (1.3.24) + bullet_train-has_uuid (1.3.25) rails (>= 6.0.0) - bullet_train-incoming_webhooks (1.3.24) + bullet_train-incoming_webhooks (1.3.25) bullet_train-super_scaffolding rails (>= 6.0.0) - bullet_train-integrations (1.3.24) + bullet_train-integrations (1.3.25) rails (>= 6.0.0) - bullet_train-integrations-stripe (1.3.24) + bullet_train-integrations-stripe (1.3.25) omniauth omniauth-rails_csrf_protection omniauth-stripe-connect rails (>= 6.0.0) stripe - bullet_train-obfuscates_id (1.3.24) + bullet_train-obfuscates_id (1.3.25) hashids rails (>= 6.0.0) - bullet_train-outgoing_webhooks (1.3.24) + bullet_train-outgoing_webhooks (1.3.25) public_suffix rails (>= 6.0.0) - bullet_train-roles (1.3.24) + bullet_train-roles (1.3.25) active_hash activesupport cancancan bullet_train-routes (1.0.0) rails (>= 6.0.0) - bullet_train-scope_questions (1.3.24) + bullet_train-scope_questions (1.3.25) rails (>= 6.0.0) - bullet_train-scope_validator (1.3.24) - bullet_train-sortable (1.3.24) + bullet_train-scope_validator (1.3.25) + bullet_train-sortable (1.3.25) rails (>= 6.0.0) - bullet_train-super_load_and_authorize_resource (1.3.24) + bullet_train-super_load_and_authorize_resource (1.3.25) rails (>= 6.0.0) - bullet_train-super_scaffolding (1.3.24) + bullet_train-super_scaffolding (1.3.25) bullet_train indefinite_article rails (>= 6.0.0) - bullet_train-themes (1.3.24) + bullet_train-themes (1.3.25) rails (>= 6.0.0) - bullet_train-themes-light (1.3.24) + bullet_train-themes-light (1.3.25) bullet_train-themes-tailwind_css rails (>= 6.0.0) - bullet_train-themes-tailwind_css (1.3.24) + bullet_train-themes-tailwind_css (1.3.25) bullet_train bullet_train-themes rails (>= 6.0.0) diff --git a/yarn.lock b/yarn.lock index 6975655c..7221cea2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -144,25 +144,25 @@ to-fast-properties "^2.0.0" "@bullet-train/bullet-train-sortable@^1.3.0": - version "1.3.24" - resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train-sortable/-/bullet-train-sortable-1.3.24.tgz#d3dda9c5dc23792a16a0e32da8281fe9254d57c9" - integrity sha512-i1UFYEuaGK8vVHC+P/TNOxGvqrRY2xgctGvMbSLSy/D01cJ/i2mU0vBh0PchgPYzqhehTW4jaZ8CqLgCMy2aLw== + version "1.3.25" + resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train-sortable/-/bullet-train-sortable-1.3.25.tgz#cba218e584cde2ce8518b4f84f2710839684bd09" + integrity sha512-lfnYLk7mi1OgSfQv4u0CkNVrCGczuag4Kz3sytXxtV27i7JAj2qxlpLbGQ87WvsgdSGgJCYsByzFIfMDvpkuiA== dependencies: "@hotwired/stimulus" "^3.0.1" "@rails/request.js" "^0.0.6" dragula "^3.7.3" "@bullet-train/bullet-train@^1.3.0": - version "1.3.24" - resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train/-/bullet-train-1.3.24.tgz#21ff2a474de8a1438801b5bb52eb971fd50d4445" - integrity sha512-VwvmtXsAJR6U0R6W40m26/0srP5tGpSPp1G5N3dpjwCA4HFU01LDOVyacM682BOgW0m5+cXcdOqld2q8VHnsEQ== + version "1.3.25" + resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train/-/bullet-train-1.3.25.tgz#d68b19b2c6da43018a273a1944136c70e0ee1b0c" + integrity sha512-2CMwaj4yJQixGha6nAxAX2xYagbIvXxkW7/byLBXXK8LZoev8l5aX7SnsE/x69Cosw45Fwy7diMC0K8nowq4mw== dependencies: "@hotwired/stimulus" "^3.0.1" "@bullet-train/fields@^1.3.0": - version "1.3.24" - resolved "https://registry.yarnpkg.com/@bullet-train/fields/-/fields-1.3.24.tgz#71bbf4e5a13255f8a00197e1553a0b188ea46110" - integrity sha512-lmFTOv85j3KU5P2L6lgx6jYlunKC8bKJzduTqsP2Iks6f6Gye4f+wm6qiBTHufIHCkv5dkTHz/SuCrDsjo6Pww== + version "1.3.25" + resolved "https://registry.yarnpkg.com/@bullet-train/fields/-/fields-1.3.25.tgz#e7a96c8d0e5d0ff94a6e86348eae720f1becf215" + integrity sha512-Dp3e/xBZzvZNDNt1U+hqEmVNS4p3flPRTo88Xv3WMPFIxGh+zJWb170kLneEMutt55TQbEUKbtg9+BsAHU7i0A== dependencies: "@hotwired/stimulus" "^3.0.1" "@simonwep/pickr" "^1.8.1" @@ -817,9 +817,9 @@ contra@1.9.4: ticky "1.0.1" core-js@^3.15.1: - version "3.32.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.32.1.tgz#a7d8736a3ed9dd05940c3c4ff32c591bb735be77" - integrity sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ== + version "3.32.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.32.2.tgz#172fb5949ef468f93b4be7841af6ab1f21992db7" + integrity sha512-pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ== cross-spawn@^7.0.0: version "7.0.3" From cf1456f11b9712836914829225020770f81353cc Mon Sep 17 00:00:00 2001 From: Jeremy Green Date: Fri, 8 Sep 2023 11:30:43 -0700 Subject: [PATCH 19/20] Explicitly set the expected verison of BulletTrain gems (#968) * Explicitly set the expected verison of BulletTrain gems * Add the unlisted core gems to the `Gemfile` * Explicitly set the verison in package.json * liner * 1.3.24 * Update bump-core to accept a version number and to explicitly use that value * Update the workflow action to accept a version number * a little clean up * Pass the version number down to bin/bump-core * Add Gemfile and package.json to the PR * 1.3.25 --- .github/workflows/version-bump.yml | 9 +++++-- Gemfile | 38 ++++++++++++++++++++---------- Gemfile.lock | 30 +++++++++++++---------- bin/bump-core | 28 +++++++++++++--------- package.json | 6 ++--- yarn.lock | 6 ++--- 6 files changed, 74 insertions(+), 43 deletions(-) diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index c2a07c5a..b753e2ad 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -2,6 +2,11 @@ name: "Create Version Bump PR For Core Gems & NPM Packages" on: workflow_dispatch: + inputs: + versionNumber: + description: 'Version Number' + required: true + type: string permissions: contents: write @@ -32,7 +37,7 @@ jobs: - name: "Bump core" id: bump-core - run: ./bin/bump-core + run: ./bin/bump-core ${{ inputs.versionNumber }} - name: "Create Pull Request" id: cpr @@ -44,7 +49,7 @@ jobs: branch: "core-version-bump/${{ steps.bump-core.outputs.NEW_VERSION_NUMBER }}" delete-branch: true title: "BT-Core version bump: ${{ inputs.versionBump }} - ${{ steps.bump-core.outputs.NEW_VERSION_NUMBER }}" - add-paths: "Gemfile.lock,yarn.lock" + add-paths: "Gemfile, Gemfile.lock, package.json, yarn.lock" body: | Version bump of the `core` ruby gems and npm packages to version `${{ steps.bump-core.outputs.NEW_VERSION_NUMBER }}` diff --git a/Gemfile b/Gemfile index f758f8dd..eff30cd4 100644 --- a/Gemfile +++ b/Gemfile @@ -100,21 +100,35 @@ end # BULLET TRAIN GEMS # This section is the list of Ruby gems included by default for Bullet Train. +# 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.3.25" + # Core packages. -gem "bullet_train" -gem "bullet_train-super_scaffolding" -gem "bullet_train-api" -gem "bullet_train-outgoing_webhooks" -gem "bullet_train-incoming_webhooks" -gem "bullet_train-themes" -gem "bullet_train-themes-light" -gem "bullet_train-integrations" -gem "bullet_train-integrations-stripe" +gem "bullet_train", BULLET_TRAIN_VERSION +gem "bullet_train-super_scaffolding", BULLET_TRAIN_VERSION +gem "bullet_train-api", BULLET_TRAIN_VERSION +gem "bullet_train-outgoing_webhooks", BULLET_TRAIN_VERSION +gem "bullet_train-incoming_webhooks", BULLET_TRAIN_VERSION +gem "bullet_train-themes", BULLET_TRAIN_VERSION +gem "bullet_train-themes-light", BULLET_TRAIN_VERSION +gem "bullet_train-integrations", BULLET_TRAIN_VERSION +gem "bullet_train-integrations-stripe", BULLET_TRAIN_VERSION # Optional support packages. -gem "bullet_train-sortable" -gem "bullet_train-scope_questions" -gem "bullet_train-obfuscates_id" +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 +# shouldn't need to be listed here, but we list them so that we can keep +# verion numbers in sync. +gem "bullet_train-fields", BULLET_TRAIN_VERSION +gem "bullet_train-has_uuid", BULLET_TRAIN_VERSION +gem "bullet_train-roles", BULLET_TRAIN_VERSION +gem "bullet_train-scope_validator", BULLET_TRAIN_VERSION +gem "bullet_train-super_load_and_authorize_resource", BULLET_TRAIN_VERSION +gem "bullet_train-themes-tailwind_css", BULLET_TRAIN_VERSION gem "devise" gem "devise-two-factor" diff --git a/Gemfile.lock b/Gemfile.lock index 589ac096..dbf03e7c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -621,18 +621,24 @@ DEPENDENCIES active_hash aws-sdk-s3 bootsnap - bullet_train - bullet_train-api - bullet_train-incoming_webhooks - bullet_train-integrations - bullet_train-integrations-stripe - bullet_train-obfuscates_id - bullet_train-outgoing_webhooks - bullet_train-scope_questions - bullet_train-sortable - bullet_train-super_scaffolding - bullet_train-themes - bullet_train-themes-light + bullet_train (= 1.3.25) + bullet_train-api (= 1.3.25) + bullet_train-fields (= 1.3.25) + bullet_train-has_uuid (= 1.3.25) + bullet_train-incoming_webhooks (= 1.3.25) + bullet_train-integrations (= 1.3.25) + bullet_train-integrations-stripe (= 1.3.25) + bullet_train-obfuscates_id (= 1.3.25) + bullet_train-outgoing_webhooks (= 1.3.25) + bullet_train-roles (= 1.3.25) + bullet_train-scope_questions (= 1.3.25) + bullet_train-scope_validator (= 1.3.25) + bullet_train-sortable (= 1.3.25) + bullet_train-super_load_and_authorize_resource (= 1.3.25) + bullet_train-super_scaffolding (= 1.3.25) + bullet_train-themes (= 1.3.25) + bullet_train-themes-light (= 1.3.25) + bullet_train-themes-tailwind_css (= 1.3.25) capybara (~> 3.39) capybara-email chronic diff --git a/bin/bump-core b/bin/bump-core index 123c4756..b0b45297 100755 --- a/bin/bump-core +++ b/bin/bump-core @@ -3,9 +3,9 @@ require 'thor' class CoreBumpCLI < Thor - desc "bump", "Bump the versions of bullet_train-core gems and npm packages" + desc "bump VERSION_NUMBER", "Set the versions of bullet_train-core gems and npm packages to VERSION_NUMBER" option :allow_local - def bump + def bump(version_number) if !github_output_file && !options[:allow_local] banner = <<~BANNER -------------------------------------------------------------------------------------------------------- @@ -28,9 +28,10 @@ class CoreBumpCLI < Thor return end + modify_gemfile(version_number) bundle_update - yarn_upgrade - write_to_github_output_file + yarn_upgrade(version_number) + write_to_github_output_file(version_number) end # This allows us to define helper methods that aren't attached to thor commands @@ -39,21 +40,26 @@ class CoreBumpCLI < Thor ENV['GITHUB_OUTPUT'] end + def modify_gemfile(version_number) + text = File.read("Gemfile") + content = text.gsub(/^BULLET_TRAIN_VERSION = ".*"$/, "BULLET_TRAIN_VERSION = \"#{version_number}\"") + File.open("Gemfile", "w") { |file| file << content } + end + def bundle_update puts `bundle update --conservative #{ruby_gems.join(" ")}` end - def yarn_upgrade - puts `yarn upgrade #{npm_packages.join(" ")}` + def yarn_upgrade(version_number) + yarn_package_string = npm_packages.map{|pkg| "#{pkg}@#{version_number}"}.join(" ") + puts `yarn upgrade #{yarn_package_string}` end - def write_to_github_output_file + def write_to_github_output_file(version_number) if github_output_file # This block allows us to pass the new bump version out to the workflow. - output = `bundle show bullet_train` # => /some/path/bullet_train-1.3.2 - version = output.split('-').last - puts "The new version to pass to the GitHub output file = #{version}" - IO.write(github_output_file, "NEW_VERSION_NUMBER=#{version}\n", mode: 'a') + puts "The new version to pass to the GitHub output file = #{version_number}" + IO.write(github_output_file, "NEW_VERSION_NUMBER=#{version_number}\n", mode: 'a') else say "We don't seem to be running in GitHub actions. Skipping the GitHub output file." end diff --git a/package.json b/package.json index 88c5aacc..98f349a5 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,9 @@ "name": "app", "private": true, "dependencies": { - "@bullet-train/bullet-train": "^1.3.0", - "@bullet-train/bullet-train-sortable": "^1.3.0", - "@bullet-train/fields": "^1.3.0", + "@bullet-train/bullet-train": "1.3.25", + "@bullet-train/bullet-train-sortable": "1.3.25", + "@bullet-train/fields": "1.3.25", "@esbuild-plugins/node-globals-polyfill": "^0.2.3", "@fullhuman/postcss-purgecss": "5.0.0", "@hotwired/turbo-rails": "^7.3.0", diff --git a/yarn.lock b/yarn.lock index 7221cea2..55dfb873 100644 --- a/yarn.lock +++ b/yarn.lock @@ -143,7 +143,7 @@ "@babel/helper-validator-identifier" "^7.22.5" to-fast-properties "^2.0.0" -"@bullet-train/bullet-train-sortable@^1.3.0": +"@bullet-train/bullet-train-sortable@1.3.25": version "1.3.25" resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train-sortable/-/bullet-train-sortable-1.3.25.tgz#cba218e584cde2ce8518b4f84f2710839684bd09" integrity sha512-lfnYLk7mi1OgSfQv4u0CkNVrCGczuag4Kz3sytXxtV27i7JAj2qxlpLbGQ87WvsgdSGgJCYsByzFIfMDvpkuiA== @@ -152,14 +152,14 @@ "@rails/request.js" "^0.0.6" dragula "^3.7.3" -"@bullet-train/bullet-train@^1.3.0": +"@bullet-train/bullet-train@1.3.25": version "1.3.25" resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train/-/bullet-train-1.3.25.tgz#d68b19b2c6da43018a273a1944136c70e0ee1b0c" integrity sha512-2CMwaj4yJQixGha6nAxAX2xYagbIvXxkW7/byLBXXK8LZoev8l5aX7SnsE/x69Cosw45Fwy7diMC0K8nowq4mw== dependencies: "@hotwired/stimulus" "^3.0.1" -"@bullet-train/fields@^1.3.0": +"@bullet-train/fields@1.3.25": version "1.3.25" resolved "https://registry.yarnpkg.com/@bullet-train/fields/-/fields-1.3.25.tgz#e7a96c8d0e5d0ff94a6e86348eae720f1becf215" integrity sha512-Dp3e/xBZzvZNDNt1U+hqEmVNS4p3flPRTo88Xv3WMPFIxGh+zJWb170kLneEMutt55TQbEUKbtg9+BsAHU7i0A== From 01cbee67d75287afec4507098227eb0bd19ca90a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 8 Sep 2023 13:47:30 -0500 Subject: [PATCH 20/20] BT-Core version bump: - 1.4.0 (#979) Co-authored-by: jagthedrummer --- Gemfile | 2 +- Gemfile.lock | 72 ++++++++++++++++++++++++++-------------------------- package.json | 6 ++--- yarn.lock | 24 +++++++++--------- 4 files changed, 52 insertions(+), 52 deletions(-) diff --git a/Gemfile b/Gemfile index eff30cd4..2a027ce1 100644 --- a/Gemfile +++ b/Gemfile @@ -102,7 +102,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.3.25" +BULLET_TRAIN_VERSION = "1.4.0" # Core packages. gem "bullet_train", BULLET_TRAIN_VERSION diff --git a/Gemfile.lock b/Gemfile.lock index dbf03e7c..05d07dde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -97,7 +97,7 @@ GEM bootsnap (1.16.0) msgpack (~> 1.2) builder (3.2.4) - bullet_train (1.3.25) + bullet_train (1.4.0) awesome_print bullet_train-fields bullet_train-has_uuid @@ -130,7 +130,7 @@ GEM unicode-emoji valid_email xxhash - bullet_train-api (1.3.25) + bullet_train-api (1.4.0) bullet_train doorkeeper factory_bot @@ -139,53 +139,53 @@ GEM pagy_cursor rack-cors rails (>= 6.0.0) - bullet_train-fields (1.3.25) + bullet_train-fields (1.4.0) chronic cloudinary phonelib rails (>= 6.0.0) - bullet_train-has_uuid (1.3.25) + bullet_train-has_uuid (1.4.0) rails (>= 6.0.0) - bullet_train-incoming_webhooks (1.3.25) + bullet_train-incoming_webhooks (1.4.0) bullet_train-super_scaffolding rails (>= 6.0.0) - bullet_train-integrations (1.3.25) + bullet_train-integrations (1.4.0) rails (>= 6.0.0) - bullet_train-integrations-stripe (1.3.25) + bullet_train-integrations-stripe (1.4.0) omniauth omniauth-rails_csrf_protection omniauth-stripe-connect rails (>= 6.0.0) stripe - bullet_train-obfuscates_id (1.3.25) + bullet_train-obfuscates_id (1.4.0) hashids rails (>= 6.0.0) - bullet_train-outgoing_webhooks (1.3.25) + bullet_train-outgoing_webhooks (1.4.0) public_suffix rails (>= 6.0.0) - bullet_train-roles (1.3.25) + bullet_train-roles (1.4.0) active_hash activesupport cancancan bullet_train-routes (1.0.0) rails (>= 6.0.0) - bullet_train-scope_questions (1.3.25) + bullet_train-scope_questions (1.4.0) rails (>= 6.0.0) - bullet_train-scope_validator (1.3.25) - bullet_train-sortable (1.3.25) + bullet_train-scope_validator (1.4.0) + bullet_train-sortable (1.4.0) rails (>= 6.0.0) - bullet_train-super_load_and_authorize_resource (1.3.25) + bullet_train-super_load_and_authorize_resource (1.4.0) rails (>= 6.0.0) - bullet_train-super_scaffolding (1.3.25) + bullet_train-super_scaffolding (1.4.0) bullet_train indefinite_article rails (>= 6.0.0) - bullet_train-themes (1.3.25) + bullet_train-themes (1.4.0) rails (>= 6.0.0) - bullet_train-themes-light (1.3.25) + bullet_train-themes-light (1.4.0) bullet_train-themes-tailwind_css rails (>= 6.0.0) - bullet_train-themes-tailwind_css (1.3.25) + bullet_train-themes-tailwind_css (1.4.0) bullet_train bullet_train-themes rails (>= 6.0.0) @@ -621,24 +621,24 @@ DEPENDENCIES active_hash aws-sdk-s3 bootsnap - bullet_train (= 1.3.25) - bullet_train-api (= 1.3.25) - bullet_train-fields (= 1.3.25) - bullet_train-has_uuid (= 1.3.25) - bullet_train-incoming_webhooks (= 1.3.25) - bullet_train-integrations (= 1.3.25) - bullet_train-integrations-stripe (= 1.3.25) - bullet_train-obfuscates_id (= 1.3.25) - bullet_train-outgoing_webhooks (= 1.3.25) - bullet_train-roles (= 1.3.25) - bullet_train-scope_questions (= 1.3.25) - bullet_train-scope_validator (= 1.3.25) - bullet_train-sortable (= 1.3.25) - bullet_train-super_load_and_authorize_resource (= 1.3.25) - bullet_train-super_scaffolding (= 1.3.25) - bullet_train-themes (= 1.3.25) - bullet_train-themes-light (= 1.3.25) - bullet_train-themes-tailwind_css (= 1.3.25) + bullet_train (= 1.4.0) + bullet_train-api (= 1.4.0) + bullet_train-fields (= 1.4.0) + bullet_train-has_uuid (= 1.4.0) + bullet_train-incoming_webhooks (= 1.4.0) + bullet_train-integrations (= 1.4.0) + bullet_train-integrations-stripe (= 1.4.0) + bullet_train-obfuscates_id (= 1.4.0) + bullet_train-outgoing_webhooks (= 1.4.0) + bullet_train-roles (= 1.4.0) + bullet_train-scope_questions (= 1.4.0) + bullet_train-scope_validator (= 1.4.0) + bullet_train-sortable (= 1.4.0) + bullet_train-super_load_and_authorize_resource (= 1.4.0) + bullet_train-super_scaffolding (= 1.4.0) + bullet_train-themes (= 1.4.0) + bullet_train-themes-light (= 1.4.0) + bullet_train-themes-tailwind_css (= 1.4.0) capybara (~> 3.39) capybara-email chronic diff --git a/package.json b/package.json index 98f349a5..1804dd8d 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,9 @@ "name": "app", "private": true, "dependencies": { - "@bullet-train/bullet-train": "1.3.25", - "@bullet-train/bullet-train-sortable": "1.3.25", - "@bullet-train/fields": "1.3.25", + "@bullet-train/bullet-train": "1.4.0", + "@bullet-train/bullet-train-sortable": "1.4.0", + "@bullet-train/fields": "1.4.0", "@esbuild-plugins/node-globals-polyfill": "^0.2.3", "@fullhuman/postcss-purgecss": "5.0.0", "@hotwired/turbo-rails": "^7.3.0", diff --git a/yarn.lock b/yarn.lock index 55dfb873..3db6cbcc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -143,26 +143,26 @@ "@babel/helper-validator-identifier" "^7.22.5" to-fast-properties "^2.0.0" -"@bullet-train/bullet-train-sortable@1.3.25": - version "1.3.25" - resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train-sortable/-/bullet-train-sortable-1.3.25.tgz#cba218e584cde2ce8518b4f84f2710839684bd09" - integrity sha512-lfnYLk7mi1OgSfQv4u0CkNVrCGczuag4Kz3sytXxtV27i7JAj2qxlpLbGQ87WvsgdSGgJCYsByzFIfMDvpkuiA== +"@bullet-train/bullet-train-sortable@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train-sortable/-/bullet-train-sortable-1.4.0.tgz#8b44f8343b7da42dbcadd83e5758c4a635ee6701" + integrity sha512-Kp2bDkJzhGItD5WLCp+3Bo4cPop1i2KGvMAAKreJVDyeg0VZols6PivbW8km9fFiz4y157Uc8qeXNRkftpqeEg== dependencies: "@hotwired/stimulus" "^3.0.1" "@rails/request.js" "^0.0.6" dragula "^3.7.3" -"@bullet-train/bullet-train@1.3.25": - version "1.3.25" - resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train/-/bullet-train-1.3.25.tgz#d68b19b2c6da43018a273a1944136c70e0ee1b0c" - integrity sha512-2CMwaj4yJQixGha6nAxAX2xYagbIvXxkW7/byLBXXK8LZoev8l5aX7SnsE/x69Cosw45Fwy7diMC0K8nowq4mw== +"@bullet-train/bullet-train@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@bullet-train/bullet-train/-/bullet-train-1.4.0.tgz#59260da5e7b94487092777e6f03f09dc5f5c6d34" + integrity sha512-zYIEBvqICNFLh4caa7b81jCbK12A7kbFNatn6slCF3yBvFJ4N+q70bQuU+Z0q/lI4cVc+0A7i0iJf0Cp9gunyQ== dependencies: "@hotwired/stimulus" "^3.0.1" -"@bullet-train/fields@1.3.25": - version "1.3.25" - resolved "https://registry.yarnpkg.com/@bullet-train/fields/-/fields-1.3.25.tgz#e7a96c8d0e5d0ff94a6e86348eae720f1becf215" - integrity sha512-Dp3e/xBZzvZNDNt1U+hqEmVNS4p3flPRTo88Xv3WMPFIxGh+zJWb170kLneEMutt55TQbEUKbtg9+BsAHU7i0A== +"@bullet-train/fields@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@bullet-train/fields/-/fields-1.4.0.tgz#bd7b4ce6ee2ad871791a03eccfbd07a1f2801ba8" + integrity sha512-nclfr2upZv96Ebb6FG1ZtKJ5cbbOrX/TJrMGppToUoTzLsVauHVQxYWtEEK6dZYYaFzJPuPS0A1fTOCUXy8lUA== dependencies: "@hotwired/stimulus" "^3.0.1" "@simonwep/pickr" "^1.8.1"