From 636d1c6a942982c9f2f94e48895936005cea31bd Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 14:59:22 +0200 Subject: [PATCH 01/42] =?UTF-8?q?[js]=20Update=20tailwindcss-stimulus-comp?= =?UTF-8?q?onents=203.0.3=20=E2=86=92=203.0.4=20(patch)=20(#2247)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1712234dd5..c5a3d8543d 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "stimulus-rails-nested-form": "^4.1.0", "stimulus-use": "^0.50.0", "tailwindcss": "^3.3.6", - "tailwindcss-stimulus-components": "^3.0.3", + "tailwindcss-stimulus-components": "^3.0.4", "tippy.js": "^6.3.7", "trix": "^2.0.8", "turbo_power": "^0.6.0", diff --git a/yarn.lock b/yarn.lock index c51932615b..3296b956ff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4258,10 +4258,10 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -tailwindcss-stimulus-components@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/tailwindcss-stimulus-components/-/tailwindcss-stimulus-components-3.0.3.tgz#7e9854b9ec20dd5688e8b00a099de5bb3d3812a5" - integrity sha512-+SVt9LYYv0P4fYhS8d+2R2R9rdlk8zyDZNETB+d6G9IPB9Htk6t5ccfEaSNnYKZnB0loBTvrskz8xnK/Z6jsRA== +tailwindcss-stimulus-components@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/tailwindcss-stimulus-components/-/tailwindcss-stimulus-components-3.0.4.tgz#598a880aed1a4966c2bf85fcc9c65fb63d02d2f0" + integrity sha512-kv4CHEcTvZSmthV6PseSdnW/QqKh237fZrvbNKNhWeYsTuEnOrKvdbR+3CmpuTok7L4XgEXk+XOFfo7AMhhtAA== dependencies: "@hotwired/stimulus" ">=3.0.0" From f4813ed11540445c37d1538bcb51c43093ffeda7 Mon Sep 17 00:00:00 2001 From: Brychu Date: Tue, 19 Dec 2023 13:59:40 +0100 Subject: [PATCH 02/42] Feature/better error for missing resource (#2062) Co-authored-by: Adrian Co-authored-by: Paul Bob --- app/controllers/avo/application_controller.rb | 2 + db/factories.rb | 19 +++ lib/avo.rb | 18 +++ lib/avo/fields/base_field.rb | 6 + lib/avo/fields/belongs_to_field.rb | 6 +- lib/avo/fields/has_base_field.rb | 6 +- spec/dummy/app/avo/resources/course.rb | 5 + spec/dummy/app/avo/resources/event.rb | 15 +++ spec/dummy/app/avo/resources/store.rb | 14 ++ spec/dummy/app/avo/resources/team.rb | 7 +- .../app/controllers/avo/events_controller.rb | 2 + .../app/controllers/avo/stores_controller.rb | 2 + spec/dummy/app/models/city.rb | 3 +- spec/dummy/app/models/course.rb | 2 + spec/dummy/app/models/event.rb | 14 +- spec/dummy/app/models/location.rb | 19 +++ spec/dummy/app/models/store.rb | 13 ++ spec/dummy/app/models/team.rb | 1 + spec/dummy/config/initializers/avo.rb | 2 + .../20231126035843_create_locations.rb | 12 ++ ...20231205153910_create_courses_locations.rb | 10 ++ .../20231206095919_add_location_to_events.rb | 5 + .../migrate/20231206112806_create_stores.rb | 10 ++ .../20231206113153_add_store_to_locations.rb | 5 + ...1204_make_team_id_nullable_on_locations.rb | 5 + spec/dummy/db/schema.rb | 124 +++++++++++------- spec/dummy/db/seeds.rb | 20 +++ .../avo/generators/resource_generator_spec.rb | 30 ++++- .../avo/model_missing_resource_spec.rb | 50 +++++++ 29 files changed, 362 insertions(+), 65 deletions(-) create mode 100644 spec/dummy/app/avo/resources/event.rb create mode 100644 spec/dummy/app/avo/resources/store.rb create mode 100644 spec/dummy/app/controllers/avo/events_controller.rb create mode 100644 spec/dummy/app/controllers/avo/stores_controller.rb create mode 100644 spec/dummy/app/models/location.rb create mode 100644 spec/dummy/app/models/store.rb create mode 100644 spec/dummy/db/migrate/20231126035843_create_locations.rb create mode 100644 spec/dummy/db/migrate/20231205153910_create_courses_locations.rb create mode 100644 spec/dummy/db/migrate/20231206095919_add_location_to_events.rb create mode 100644 spec/dummy/db/migrate/20231206112806_create_stores.rb create mode 100644 spec/dummy/db/migrate/20231206113153_add_store_to_locations.rb create mode 100644 spec/dummy/db/migrate/20231212231204_make_team_id_nullable_on_locations.rb create mode 100644 spec/features/avo/model_missing_resource_spec.rb diff --git a/app/controllers/avo/application_controller.rb b/app/controllers/avo/application_controller.rb index 29c3ed31b6..5f3247987f 100644 --- a/app/controllers/avo/application_controller.rb +++ b/app/controllers/avo/application_controller.rb @@ -125,6 +125,8 @@ def detect_fields end def set_related_resource + raise Avo::MissingResourceError.new(related_resource_name) if related_resource.nil? + @related_resource = related_resource.new(params: params, view: action_name.to_sym, user: _current_user, record: @related_record).detect_fields end diff --git a/db/factories.rb b/db/factories.rb index 6ca6dba6da..a9541adbd6 100644 --- a/db/factories.rb +++ b/db/factories.rb @@ -129,4 +129,23 @@ status { "status" } category { ::Product.categories.values.sample } end + + factory :location do + team { create :team } + name { Faker::Address.street_name } + address { Faker::Address.full_address } + size { ["small", "medium", "large"].sample } + end + + factory :event do + location { create :location } + name { Faker::Lorem.sentence } + event_time { DateTime.now } + body { Faker::Lorem.paragraphs(number: rand(1...3)).join("\n") } + end + + factory :store do + name { Faker::Company.name } + size { ["small", "medium", "large"].sample } + end end diff --git a/lib/avo.rb b/lib/avo.rb index 91d2435159..5daea8a624 100644 --- a/lib/avo.rb +++ b/lib/avo.rb @@ -31,6 +31,24 @@ class MissingGemError < StandardError; end class DeprecatedAPIError < StandardError; end + class MissingResourceError < StandardError + def initialize(resource_name) + super(missing_resource_message(resource_name)) + end + + private + + def missing_resource_message(resource_name) + name = resource_name.to_s.downcase + + "Failed to find a resource while rendering the :#{name} field.\n" \ + "You may generate a resource for it by running 'rails generate avo:resource #{name.singularize}'.\n" \ + "\n" \ + "Alternatively add the 'use_resource' option to the :#{name} field to specify a custom resource to be used.\n" \ + "More info on https://docs.avohq.io/#{Avo::VERSION[0]}.0/resources.html." + end + end + class << self attr_reader :logger attr_reader :cache_store diff --git a/lib/avo/fields/base_field.rb b/lib/avo/fields/base_field.rb index 43f80c91f5..1d19f77ac4 100644 --- a/lib/avo/fields/base_field.rb +++ b/lib/avo/fields/base_field.rb @@ -289,6 +289,12 @@ def on_create? def in_action? @action.present? end + + def get_resource_by_model_class(model_class) + resource = Avo.resource_manager.get_resource_by_model_class(model_class) + + resource || (raise Avo::MissingResourceError.new(model_class)) + end end end end diff --git a/lib/avo/fields/belongs_to_field.rb b/lib/avo/fields/belongs_to_field.rb index f364e66464..f76571d33c 100644 --- a/lib/avo/fields/belongs_to_field.rb +++ b/lib/avo/fields/belongs_to_field.rb @@ -234,7 +234,7 @@ def target_resource if is_polymorphic? if value.present? - return Avo.resource_manager.get_resource_by_model_class(value.class) + return get_resource_by_model_class(value.class) else return nil end @@ -243,9 +243,9 @@ def target_resource reflection_key = polymorphic_as || id if @record._reflections[reflection_key.to_s].klass.present? - Avo.resource_manager.get_resource_by_model_class @record._reflections[reflection_key.to_s].klass.to_s + get_resource_by_model_class(@record._reflections[reflection_key.to_s].klass.to_s) elsif @record._reflections[reflection_key.to_s].options[:class_name].present? - Avo.resource_manager.get_resource_by_model_class @record._reflections[reflection_key.to_s].options[:class_name] + get_resource_by_model_class(@record._reflections[reflection_key.to_s].options[:class_name]) else App.get_resource_by_name reflection_key.to_s end diff --git a/lib/avo/fields/has_base_field.rb b/lib/avo/fields/has_base_field.rb index 6940b90149..d61989f604 100644 --- a/lib/avo/fields/has_base_field.rb +++ b/lib/avo/fields/has_base_field.rb @@ -27,7 +27,7 @@ def initialize(id, **args, &block) end def field_resource - resource || Avo.resource_manager.get_resource_by_model_class(@record.class) + resource || get_resource_by_model_class(@record.class) end def turbo_frame @@ -57,9 +57,9 @@ def field_label def target_resource if @record._reflections[id.to_s].klass.present? - Avo.resource_manager.get_resource_by_model_class @record._reflections[id.to_s].klass.to_s + get_resource_by_model_class(@record._reflections[id.to_s].klass.to_s) elsif @record._reflections[id.to_s].options[:class_name].present? - Avo.resource_manager.get_resource_by_model_class @record._reflections[id.to_s].options[:class_name] + get_resource_by_model_class(@record._reflections[id.to_s].options[:class_name]) else Avo.resource_manager.get_resource_by_name id.to_s end diff --git a/spec/dummy/app/avo/resources/course.rb b/spec/dummy/app/avo/resources/course.rb index 19c5cd9b57..2b7f7d111a 100644 --- a/spec/dummy/app/avo/resources/course.rb +++ b/spec/dummy/app/avo/resources/course.rb @@ -73,6 +73,11 @@ def fields field :links, as: :has_many, searchable: true, placeholder: "Click to choose a link", discreet_pagination: true + + if params[:show_location_field] == '1' + # Example for error message when resource is missing + field :locations, as: :has_and_belongs_to_many + end end def filters diff --git a/spec/dummy/app/avo/resources/event.rb b/spec/dummy/app/avo/resources/event.rb new file mode 100644 index 0000000000..e8df73b9eb --- /dev/null +++ b/spec/dummy/app/avo/resources/event.rb @@ -0,0 +1,15 @@ +class Avo::Resources::Event < Avo::BaseResource + self.title = :name + self.description = "An event that happened at a certain time." + self.includes = [:location] + + def fields + field :name, as: :text, link_to_record: true, sortable: true, stacked: true + field :event_time, as: :datetime, sortable: true + + if params[:show_location_field] == '1' + # Example for error message when resource is missing + field :location, as: :belongs_to + end + end +end diff --git a/spec/dummy/app/avo/resources/store.rb b/spec/dummy/app/avo/resources/store.rb new file mode 100644 index 0000000000..239983dd0a --- /dev/null +++ b/spec/dummy/app/avo/resources/store.rb @@ -0,0 +1,14 @@ +class Avo::Resources::Store < Avo::BaseResource + self.includes = [:location] + + def fields + field :id, as: :id + field :name, as: :text + field :size, as: :text + + if params[:show_location_field] == '1' + # Example for error message when resource is missing + field :location, as: :has_one + end + end +end diff --git a/spec/dummy/app/avo/resources/team.rb b/spec/dummy/app/avo/resources/team.rb index cdfbcd531d..7fe5fb33ae 100644 --- a/spec/dummy/app/avo/resources/team.rb +++ b/spec/dummy/app/avo/resources/team.rb @@ -1,5 +1,5 @@ class Avo::Resources::Team < Avo::BaseResource - self.includes = [:admin, :team_members] + self.includes = [:admin, :team_members, :locations] self.search = { query: -> { query.ransack(id_eq: params[:q], name_cont: params[:q], m: "or").result(distinct: false) } } @@ -79,6 +79,11 @@ def fields field :admin, as: :has_one field :team_members, as: :has_many, through: :memberships, translation_key: "avo.resource_translations.team_members" field :reviews, as: :has_many + + if params[:show_location_field] == '1' + # Example for error message when resource is missing + field :locations, as: :has_many + end end def filters diff --git a/spec/dummy/app/controllers/avo/events_controller.rb b/spec/dummy/app/controllers/avo/events_controller.rb new file mode 100644 index 0000000000..36e35d6a33 --- /dev/null +++ b/spec/dummy/app/controllers/avo/events_controller.rb @@ -0,0 +1,2 @@ +class Avo::EventsController < Avo::ResourcesController +end diff --git a/spec/dummy/app/controllers/avo/stores_controller.rb b/spec/dummy/app/controllers/avo/stores_controller.rb new file mode 100644 index 0000000000..9e68a7ed28 --- /dev/null +++ b/spec/dummy/app/controllers/avo/stores_controller.rb @@ -0,0 +1,2 @@ +class Avo::StoresController < Avo::ResourcesController +end diff --git a/spec/dummy/app/models/city.rb b/spec/dummy/app/models/city.rb index 86aabf11e0..ce4077dd37 100644 --- a/spec/dummy/app/models/city.rb +++ b/spec/dummy/app/models/city.rb @@ -9,13 +9,12 @@ # features :json # metadata :json # image_url :string -# description :text # status :string # tiny_description :text # created_at :datetime not null # updated_at :datetime not null -# latitude :float # longitude :float +# latitude :float # city_center_area :json # class City < ApplicationRecord diff --git a/spec/dummy/app/models/course.rb b/spec/dummy/app/models/course.rb index 0751b95844..00f38305f2 100644 --- a/spec/dummy/app/models/course.rb +++ b/spec/dummy/app/models/course.rb @@ -16,6 +16,8 @@ class Course < ApplicationRecord has_many :links, -> { order(position: :asc) }, class_name: "Course::Link", inverse_of: :course + has_and_belongs_to_many :locations, inverse_of: :courses + validates :name, presence: true def has_skills diff --git a/spec/dummy/app/models/event.rb b/spec/dummy/app/models/event.rb index e37d8f7a54..39b6545c48 100644 --- a/spec/dummy/app/models/event.rb +++ b/spec/dummy/app/models/event.rb @@ -2,12 +2,16 @@ # # Table name: events # -# id :bigint not null, primary key -# name :string -# event_time :datetime -# created_at :datetime not null -# updated_at :datetime not null +# id :bigint not null, primary key +# name :string +# event_time :datetime +# created_at :datetime not null +# updated_at :datetime not null +# body :text +# location_id :bigint # class Event < ApplicationRecord has_rich_text :body + + belongs_to :location, optional: true end diff --git a/spec/dummy/app/models/location.rb b/spec/dummy/app/models/location.rb new file mode 100644 index 0000000000..4dbcdc5a39 --- /dev/null +++ b/spec/dummy/app/models/location.rb @@ -0,0 +1,19 @@ +# == Schema Information +# +# Table name: locations +# +# id :bigint not null, primary key +# team_id :bigint not null +# name :text +# address :string +# size :string +# created_at :datetime not null +# updated_at :datetime not null +# store_id :bigint +# +class Location < ApplicationRecord + belongs_to :store, optional: true + belongs_to :team, optional: true + + has_and_belongs_to_many :courses, inverse_of: :locations +end diff --git a/spec/dummy/app/models/store.rb b/spec/dummy/app/models/store.rb new file mode 100644 index 0000000000..cb3e045416 --- /dev/null +++ b/spec/dummy/app/models/store.rb @@ -0,0 +1,13 @@ +# == Schema Information +# +# Table name: stores +# +# id :bigint not null, primary key +# name :string +# size :string +# created_at :datetime not null +# updated_at :datetime not null +# +class Store < ApplicationRecord + has_one :location +end diff --git a/spec/dummy/app/models/team.rb b/spec/dummy/app/models/team.rb index 8e7cda9e3e..2d1e383ba4 100644 --- a/spec/dummy/app/models/team.rb +++ b/spec/dummy/app/models/team.rb @@ -15,6 +15,7 @@ class Team < ApplicationRecord has_many :memberships, class_name: "TeamMembership" has_many :team_members, through: :memberships, class_name: "User", source: :user, inverse_of: :teams + has_many :locations has_one :admin_membership, -> { where level: :admin }, class_name: "TeamMembership", dependent: :destroy has_one :admin, through: :admin_membership, source: :user, inverse_of: :teams diff --git a/spec/dummy/config/initializers/avo.rb b/spec/dummy/config/initializers/avo.rb index 5cefeb0d58..958cb79b44 100644 --- a/spec/dummy/config/initializers/avo.rb +++ b/spec/dummy/config/initializers/avo.rb @@ -98,10 +98,12 @@ section "Store", icon: "currency-dollar" do resource :products + resource :stores end group "Other", collapsable: true, collapsed: true do resource :fish, label: "Fishies" + resource :events end end diff --git a/spec/dummy/db/migrate/20231126035843_create_locations.rb b/spec/dummy/db/migrate/20231126035843_create_locations.rb new file mode 100644 index 0000000000..80753663e9 --- /dev/null +++ b/spec/dummy/db/migrate/20231126035843_create_locations.rb @@ -0,0 +1,12 @@ +class CreateLocations < ActiveRecord::Migration[6.1] + def change + create_table :locations do |t| + t.references :team, null: false, foreign_key: true + t.text :name + t.string :address + t.string :size + + t.timestamps + end + end +end diff --git a/spec/dummy/db/migrate/20231205153910_create_courses_locations.rb b/spec/dummy/db/migrate/20231205153910_create_courses_locations.rb new file mode 100644 index 0000000000..a4affb414b --- /dev/null +++ b/spec/dummy/db/migrate/20231205153910_create_courses_locations.rb @@ -0,0 +1,10 @@ +class CreateCoursesLocations < ActiveRecord::Migration[6.1] + def change + create_table :courses_locations do |t| + t.references :user, null: false, foreign_key: true + t.references :course, null: false, foreign_key: true + + t.timestamps + end + end +end diff --git a/spec/dummy/db/migrate/20231206095919_add_location_to_events.rb b/spec/dummy/db/migrate/20231206095919_add_location_to_events.rb new file mode 100644 index 0000000000..8db1f93439 --- /dev/null +++ b/spec/dummy/db/migrate/20231206095919_add_location_to_events.rb @@ -0,0 +1,5 @@ +class AddLocationToEvents < ActiveRecord::Migration[6.1] + def change + add_reference :events, :location, null: true, foreign_key: true + end +end diff --git a/spec/dummy/db/migrate/20231206112806_create_stores.rb b/spec/dummy/db/migrate/20231206112806_create_stores.rb new file mode 100644 index 0000000000..2ee5cd8b73 --- /dev/null +++ b/spec/dummy/db/migrate/20231206112806_create_stores.rb @@ -0,0 +1,10 @@ +class CreateStores < ActiveRecord::Migration[6.1] + def change + create_table :stores do |t| + t.string :name + t.string :size + + t.timestamps + end + end +end diff --git a/spec/dummy/db/migrate/20231206113153_add_store_to_locations.rb b/spec/dummy/db/migrate/20231206113153_add_store_to_locations.rb new file mode 100644 index 0000000000..f7f4b87ce4 --- /dev/null +++ b/spec/dummy/db/migrate/20231206113153_add_store_to_locations.rb @@ -0,0 +1,5 @@ +class AddStoreToLocations < ActiveRecord::Migration[6.1] + def change + add_reference :locations, :store, foreign_key: true + end +end diff --git a/spec/dummy/db/migrate/20231212231204_make_team_id_nullable_on_locations.rb b/spec/dummy/db/migrate/20231212231204_make_team_id_nullable_on_locations.rb new file mode 100644 index 0000000000..9ee62a1dd3 --- /dev/null +++ b/spec/dummy/db/migrate/20231212231204_make_team_id_nullable_on_locations.rb @@ -0,0 +1,5 @@ +class MakeTeamIdNullableOnLocations < ActiveRecord::Migration[6.1] + def change + change_column :locations, :team_id, :bigint, null: true + end +end diff --git a/spec/dummy/db/schema.rb b/spec/dummy/db/schema.rb index 5e258d3ae2..851b708722 100644 --- a/spec/dummy/db/schema.rb +++ b/spec/dummy/db/schema.rb @@ -10,8 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2023_06_22_120626) do - +ActiveRecord::Schema[7.1].define(version: 2023_12_12_231204) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -20,8 +19,8 @@ t.text "body" t.string "record_type", null: false t.bigint "record_id", null: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["record_type", "record_id", "name"], name: "index_action_text_rich_texts_uniqueness", unique: true end @@ -30,7 +29,7 @@ t.string "record_type", null: false t.bigint "record_id", null: false t.bigint "blob_id", null: false - t.datetime "created_at", null: false + t.datetime "created_at", precision: nil, null: false t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id" t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true end @@ -42,7 +41,7 @@ t.text "metadata" t.bigint "byte_size", null: false t.string "checksum", null: false - t.datetime "created_at", null: false + t.datetime "created_at", precision: nil, null: false t.string "service_name", null: false t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true end @@ -62,8 +61,8 @@ t.string "image_url" t.string "status" t.text "tiny_description" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.float "longitude" t.float "latitude" t.json "city_center_area" @@ -74,53 +73,76 @@ t.integer "commentable_id" t.text "body" t.bigint "user_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.datetime "posted_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.datetime "posted_at", precision: nil t.index ["user_id"], name: "index_comments_on_user_id" end create_table "course_links", force: :cascade do |t| t.string "link" t.bigint "course_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "position" t.index ["course_id"], name: "index_course_links_on_course_id" end create_table "courses", force: :cascade do |t| t.string "name" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.text "skills", default: [], array: true t.string "country" t.string "city" t.time "starting_at" end + create_table "courses_locations", force: :cascade do |t| + t.bigint "user_id", null: false + t.bigint "course_id", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["course_id"], name: "index_courses_locations_on_course_id" + t.index ["user_id"], name: "index_courses_locations_on_user_id" + end + create_table "events", force: :cascade do |t| t.string "name" - t.datetime "event_time" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "event_time", precision: nil + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.text "body" + t.bigint "location_id" + t.index ["location_id"], name: "index_events_on_location_id" end create_table "fish", force: :cascade do |t| t.string "name" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.string "type" t.bigint "user_id" t.index ["user_id"], name: "index_fish_on_user_id" end + create_table "locations", force: :cascade do |t| + t.bigint "team_id" + t.text "name" + t.string "address" + t.string "size" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.bigint "store_id" + t.index ["store_id"], name: "index_locations_on_store_id" + t.index ["team_id"], name: "index_locations_on_team_id" + end + create_table "people", force: :cascade do |t| t.string "name" t.string "type" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.bigint "user_id" t.bigint "person_id" t.index ["person_id"], name: "index_people_on_person_id" @@ -131,10 +153,10 @@ t.string "name" t.text "body" t.boolean "is_featured" - t.datetime "published_at" + t.datetime "published_at", precision: nil t.bigint "user_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "status", default: 0 t.string "slug" t.index ["slug"], name: "index_posts_on_slug", unique: true @@ -147,8 +169,8 @@ t.integer "price" t.string "status" t.string "category" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end create_table "projects", force: :cascade do |t| @@ -158,10 +180,10 @@ t.string "budget" t.string "country" t.integer "users_required" - t.datetime "started_at" + t.datetime "started_at", precision: nil t.json "meta" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.text "description" t.integer "progress" end @@ -169,8 +191,8 @@ create_table "projects_users", force: :cascade do |t| t.bigint "project_id" t.bigint "user_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["project_id"], name: "index_projects_users_on_project_id" t.index ["user_id"], name: "index_projects_users_on_user_id" end @@ -180,11 +202,18 @@ t.integer "reviewable_id" t.text "body" t.bigint "user_id" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["user_id"], name: "index_reviews_on_user_id" end + create_table "stores", force: :cascade do |t| + t.string "name" + t.string "size" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "taggings", force: :cascade do |t| t.bigint "tag_id" t.string "taggable_type" @@ -192,7 +221,7 @@ t.string "tagger_type" t.bigint "tagger_id" t.string "context", limit: 128 - t.datetime "created_at" + t.datetime "created_at", precision: nil t.string "tenant", limit: 128 t.index ["context"], name: "index_taggings_on_context" t.index ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true @@ -210,8 +239,8 @@ create_table "tags", force: :cascade do |t| t.string "name" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.integer "taggings_count", default: 0 t.index ["name"], name: "index_tags_on_name", unique: true end @@ -220,8 +249,8 @@ t.bigint "team_id", null: false t.bigint "user_id", null: false t.string "level" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.index ["team_id"], name: "index_team_memberships_on_team_id" t.index ["user_id"], name: "index_team_memberships_on_user_id" end @@ -229,8 +258,8 @@ create_table "teams", force: :cascade do |t| t.string "name" t.text "description" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.string "url" t.string "color" end @@ -245,10 +274,10 @@ t.bigint "team_id" t.string "encrypted_password", default: "", null: false t.string "reset_password_token" - t.datetime "reset_password_sent_at" - t.datetime "remember_created_at" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + t.datetime "reset_password_sent_at", precision: nil + t.datetime "remember_created_at", precision: nil + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.boolean "active", default: true t.string "slug" t.index ["email"], name: "index_users_on_email", unique: true @@ -260,7 +289,12 @@ add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id" add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id" add_foreign_key "comments", "users" + add_foreign_key "courses_locations", "courses" + add_foreign_key "courses_locations", "users" + add_foreign_key "events", "locations" add_foreign_key "fish", "users" + add_foreign_key "locations", "stores" + add_foreign_key "locations", "teams" add_foreign_key "people", "people" add_foreign_key "people", "users" add_foreign_key "reviews", "users" diff --git a/spec/dummy/db/seeds.rb b/spec/dummy/db/seeds.rb index 72e1e04712..ee04a4e55d 100644 --- a/spec/dummy/db/seeds.rb +++ b/spec/dummy/db/seeds.rb @@ -264,3 +264,23 @@ ].each do |city| City.create(**city) end + +store = Store.create( + name: "Apple Store Prime", + size: "large" +) + +location = Location.create( + team: Team.find_by(name: "Apple"), + store: store, + name: "Apple Park - Barbecue Area", + address: "1 Orchard Street, 12345 New York", + size: "medium" +) + +Event.create( + location: location, + name: "M3 release celebration", + event_time: DateTime.new(2023, 11, 11, 11, 11, 11), + body: "We're celebrating the release of the new M3 chip!" +) diff --git a/spec/features/avo/generators/resource_generator_spec.rb b/spec/features/avo/generators/resource_generator_spec.rb index 78b95d8cc4..cd9ae50300 100644 --- a/spec/features/avo/generators/resource_generator_spec.rb +++ b/spec/features/avo/generators/resource_generator_spec.rb @@ -20,11 +20,13 @@ Rails.root.join("app", "controllers", "avo", "events_controller.rb").to_s ] - Rails::Generators.invoke("avo:resource", ["event", "-q"], {destination_root: Rails.root}) + keeping_original_files(files) do + Rails::Generators.invoke("avo:resource", ["event", "-q"], {destination_root: Rails.root}) - expect(File.read(files[0])).to include("field :event_time, as: :date_time") + expect(File.read(files[0])).to include("field :event_time, as: :date_time") - check_files_and_clean_up files + check_files_and_clean_up files + end end end @@ -35,11 +37,27 @@ Rails.root.join("app", "controllers", "avo", "events_controller.rb").to_s ] - Rails::Generators.invoke("avo:resource", ["event", "-q"], {destination_root: Rails.root}) + keeping_original_files(files) do + Rails::Generators.invoke("avo:resource", ["event", "-q"], {destination_root: Rails.root}) - expect(File.read(files[0])).to include("field :body, as: :trix") + expect(File.read(files[0])).to include("field :body, as: :trix") - check_files_and_clean_up files + check_files_and_clean_up files + end end end end + +def keeping_original_files(files) + # Add _temp to the end of the files name in order to keep the original ones + files.each do |file_path| + FileUtils.mv(file_path, "#{file_path}_temp") + end + + yield + + # Remove the _temp from the end of the files name in order to restore the original ones + files.each do |file_path| + FileUtils.mv("#{file_path}_temp", file_path) + end +end diff --git a/spec/features/avo/model_missing_resource_spec.rb b/spec/features/avo/model_missing_resource_spec.rb new file mode 100644 index 0000000000..aea85dfcb4 --- /dev/null +++ b/spec/features/avo/model_missing_resource_spec.rb @@ -0,0 +1,50 @@ +require "rails_helper" + +RSpec.feature "MissingResourceError", type: :feature do + subject { visit url } + + context "when has_one field" do + let(:url) { "/admin/resources/stores/#{store.id}/location/#{location.id}?turbo_frame=has_one_field_show_location" } + let!(:store) { create :store } + let!(:location) { create :location, store: store } + + it "shows informative error with suggested solution for missing resource" do + expect { + subject + }.to raise_error(Avo::MissingResourceError).with_message "Failed to find a resource while rendering the :location field.\nYou may generate a resource for it by running 'rails generate avo:resource location'.\n\nAlternatively add the 'use_resource' option to the :location field to specify a custom resource to be used.\nMore info on https://docs.avohq.io/3.0/resources.html." + end + end + + context "when belongs_to field" do + let!(:event) { create :event } + let(:url) { "/admin/resources/events?show_location_field=1" } + + it "shows informative error with suggested solution for missing resource" do + expect { + subject + }.to raise_error.with_message "Failed to find a resource while rendering the :location field.\nYou may generate a resource for it by running 'rails generate avo:resource location'.\n\nAlternatively add the 'use_resource' option to the :location field to specify a custom resource to be used.\nMore info on https://docs.avohq.io/3.0/resources.html." + end + end + + context "when has_many field" do + let!(:team) { create :team } + let(:url) { "/admin/resources/teams/#{team.id}/locations?turbo_frame=has_many_field_show_locations" } + + it "shows informative error with suggested solution for missing resource" do + expect { + subject + }.to raise_error(Avo::MissingResourceError).with_message "Failed to find a resource while rendering the :locations field.\nYou may generate a resource for it by running 'rails generate avo:resource location'.\n\nAlternatively add the 'use_resource' option to the :locations field to specify a custom resource to be used.\nMore info on https://docs.avohq.io/3.0/resources.html." + end + end + + context "when has_and_belongs_to_many field" do + let!(:course) { create :course } + let(:url) { "/admin/resources/courses/#{course.id}/locations?turbo_frame=has_and_belongs_to_many_field_show_locations" } + + it "shows informative error with suggested solution for missing resource" do + expect { + subject + }.to raise_error(Avo::MissingResourceError).with_message "Failed to find a resource while rendering the :locations field.\nYou may generate a resource for it by running 'rails generate avo:resource location'.\n\nAlternatively add the 'use_resource' option to the :locations field to specify a custom resource to be used.\nMore info on https://docs.avohq.io/3.0/resources.html." + end + end +end From e46173a22e35514ac2e7b605acc713ebcdc85e2e Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 15:04:12 +0200 Subject: [PATCH 03/42] =?UTF-8?q?[js]=20Update=20chart.js=203.7.0=20?= =?UTF-8?q?=E2=86=92=203.9.1=20(minor)=20(#2250)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c5a3d8543d..3d85953649 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@yaireo/tagify": "^4.17.9", "autoprefixer": "^10.4.16", "axios": "^1.6.0", - "chart.js": "^3.7.0", + "chart.js": "^3.9.1", "chartkick": "^4.1.1", "codemirror": "5.59.1", "core-js": "^3.34.0", diff --git a/yarn.lock b/yarn.lock index 3296b956ff..b2f8c678a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1821,11 +1821,16 @@ chalk@^4.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chart.js@>=3.0.2, chart.js@^3.7.0: +chart.js@>=3.0.2: version "3.7.0" resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.7.0.tgz#7a19c93035341df801d613993c2170a1fcf1d882" integrity sha512-31gVuqqKp3lDIFmzpKIrBeum4OpZsQjSIAqlOpgjosHDJZlULtvwLEZKtEhIAZc7JMPaHlYMys40Qy9Mf+1AAg== +chart.js@^3.9.1: + version "3.9.1" + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.9.1.tgz#3abf2c775169c4c71217a107163ac708515924b8" + integrity sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w== + chartjs-adapter-date-fns@>=2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/chartjs-adapter-date-fns/-/chartjs-adapter-date-fns-2.0.0.tgz#5e53b2f660b993698f936f509c86dddf9ed44c6b" From 29939fb05fd712179d2411739b3fe58ff92061ed Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 15:04:18 +0200 Subject: [PATCH 04/42] =?UTF-8?q?[js]=20Update=20@rails/activestorage=206.?= =?UTF-8?q?0.3=20=E2=86=92=206.1.7=20(minor)=20(#2249)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3d85953649..e4b0fbe30f 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@babel/plugin-proposal-class-properties": "^7.12.1", "@hotwired/stimulus": "^3.2.2", "@hotwired/turbo-rails": "^8.0.0-beta.1", - "@rails/activestorage": "^6.0.2-1", + "@rails/activestorage": "^6.1.7", "@rails/ujs": "^6.1.0", "@tailwindcss/forms": "^0.5.7", "@tailwindcss/typography": "^0.5.10", diff --git a/yarn.lock b/yarn.lock index b2f8c678a8..fdc7f37c8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1457,10 +1457,10 @@ resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.4.tgz#70a3ca56809f7aaabb80af2f9c01ae51e1a8ed41" integrity sha512-tz4oM+Zn9CYsvtyicsa/AwzKZKL+ITHWkhiu7x+xF77clh2b4Rm+s6xnOgY/sGDWoFWZmtKsE95hxBPkgQQNnQ== -"@rails/activestorage@^6.0.2-1": - version "6.0.3" - resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-6.0.3.tgz#401d2a28ecb7167cdb5e830ffddaa17c308c31aa" - integrity sha512-YdNwyfryHlcKj7Ruix89wZ2aiN3KTYULdW1Y/hNlHJlrY2/PXjT2YBTzZiVd+dcjrwHBsXV2rExdy+Z/lsrlEg== +"@rails/activestorage@^6.1.7": + version "6.1.7" + resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-6.1.7.tgz#5aaae9f4d10800fdb4fd6fe26fd8b4218579c6e3" + integrity sha512-h++k8LBLns4O8AqzdaFp1TsCLP9VSc2hgWI37bjzJ+4D995X7Rd8kdkRmXRaNAUlHDJgy6RpnbhBJ5oiIgWTDw== dependencies: spark-md5 "^3.0.0" From 62411c757456b41487eecb017ee6424aca55cad8 Mon Sep 17 00:00:00 2001 From: Paul Bob Date: Tue, 19 Dec 2023 15:17:04 +0200 Subject: [PATCH 05/42] Bumped avo to 3.2.0 --- Gemfile.lock | 2 +- lib/avo/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b3f74f300c..fc9fbfe525 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - avo (3.1.7) + avo (3.2.0) actionview (>= 6.1) active_link_to activerecord (>= 6.1) diff --git a/lib/avo/version.rb b/lib/avo/version.rb index 1a4a063b47..57b440d657 100644 --- a/lib/avo/version.rb +++ b/lib/avo/version.rb @@ -1,3 +1,3 @@ module Avo - VERSION = "3.1.7" unless const_defined?(:VERSION) + VERSION = "3.2.0" unless const_defined?(:VERSION) end From 553efe60f4cd5c7d9cf3332d629c5a3d943b4e58 Mon Sep 17 00:00:00 2001 From: Adrian Marin Date: Tue, 19 Dec 2023 15:31:31 +0200 Subject: [PATCH 06/42] chore: revert bad turbo 8 merge (#2259) --- Gemfile.lock | 4 ++-- app/javascript/js/application.js | 1 - app/javascript/js/custom-stream-actions.js | 5 ---- .../avo/associations/create.turbo_stream.erb | 2 -- app/views/layouts/avo/application.html.erb | 2 -- avo.gemspec | 2 +- gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock | 20 ++++++++++------ gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock | 22 +++++++++++------ gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock | 20 ++++++++++------ gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock | 22 +++++++++++------ gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock | 19 +++++++++------ gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock | 21 ++++++++++------ gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock | 21 ++++++++++------ gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock | 21 ++++++++++------ lib/avo/engine.rb | 2 -- package.json | 2 +- yarn.lock | 24 +++++++------------ 17 files changed, 123 insertions(+), 87 deletions(-) delete mode 100644 app/views/avo/associations/create.turbo_stream.erb diff --git a/Gemfile.lock b/Gemfile.lock index fc9fbfe525..384e9bc97a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,7 +13,7 @@ PATH inline_svg meta-tags pagy - turbo-rails (~> 2.0.0.pre.beta.1) + turbo-rails turbo_power (>= 0.6.0) view_component (>= 3.7.0) zeitwerk (>= 2.6.12) @@ -498,7 +498,7 @@ GEM thor (1.3.0) tilt (2.3.0) timeout (0.4.1) - turbo-rails (2.0.0.pre.beta.1) + turbo-rails (1.4.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) diff --git a/app/javascript/js/application.js b/app/javascript/js/application.js index 8202cb4767..7d0e360541 100644 --- a/app/javascript/js/application.js +++ b/app/javascript/js/application.js @@ -2,7 +2,6 @@ import 'mapkick/bundle' import { Alert, Popover } from 'tailwindcss-stimulus-components' import { Application } from '@hotwired/stimulus' -import { Turbo } from '@hotwired/turbo-rails' import TurboPower from 'turbo_power' TurboPower.initialize(Turbo.StreamActions) diff --git a/app/javascript/js/custom-stream-actions.js b/app/javascript/js/custom-stream-actions.js index 4e0e65fdac..b2605aa359 100644 --- a/app/javascript/js/custom-stream-actions.js +++ b/app/javascript/js/custom-stream-actions.js @@ -1,11 +1,6 @@ /* eslint-disable camelcase */ import { StreamActions } from '@hotwired/turbo' -StreamActions.close_modal = () => { - document.querySelector('turbo_frame#actions_show').innerHTML = '' - document.querySelector('turbo_frame#attach_modal').innerHTML = '' -} - // TODO: move these to the avo_filters gem StreamActions.close_filters_dropdown = () => { diff --git a/app/views/avo/associations/create.turbo_stream.erb b/app/views/avo/associations/create.turbo_stream.erb deleted file mode 100644 index 4f2806eb83..0000000000 --- a/app/views/avo/associations/create.turbo_stream.erb +++ /dev/null @@ -1,2 +0,0 @@ -<%= turbo_stream.turbo_frame_reload(:has_many_field_show_photo_comments) %> -<%= turbo_stream.close_modal %> diff --git a/app/views/layouts/avo/application.html.erb b/app/views/layouts/avo/application.html.erb index d49c0cdf81..0a492ac6bd 100644 --- a/app/views/layouts/avo/application.html.erb +++ b/app/views/layouts/avo/application.html.erb @@ -21,8 +21,6 @@ <% end %> <%= render Avo::AssetManager::JavascriptComponent.new asset_manager: Avo.asset_manager %> <%= render partial: 'avo/partials/head' %> - <%= turbo_refreshes_with method: :morph, scroll: :preserve %> - <%= content_for :head %>
diff --git a/avo.gemspec b/avo.gemspec index 1cf60fba66..ea5d8f0c3b 100644 --- a/avo.gemspec +++ b/avo.gemspec @@ -41,7 +41,7 @@ Gem::Specification.new do |spec| spec.add_dependency "httparty" spec.add_dependency "active_link_to" spec.add_dependency "view_component", ">= 3.7.0" - spec.add_dependency "turbo-rails", "~> 2.0.0.pre.beta.1" + spec.add_dependency "turbo-rails" spec.add_dependency "turbo_power", ">= 0.6.0" spec.add_dependency "addressable" spec.add_dependency "meta-tags" diff --git a/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock b/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock index 3f630d7288..f0d49d2826 100644 --- a/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock @@ -150,6 +150,7 @@ GEM xpath (~> 3.2) chartkick (4.2.1) concurrent-ruby (1.2.2) + connection_pool (2.4.1) countries (5.3.0) unaccent (~> 0.3) crack (0.4.5) @@ -189,7 +190,7 @@ GEM faker (3.1.0) i18n (>= 1.8.11, < 2) ffi (1.15.5) - friendly_id (5.4.2) + friendly_id (5.5.1) activerecord (>= 4.0.0) fuubar (2.5.1) rspec-core (~> 3.0) @@ -204,9 +205,10 @@ GEM highline (2.1.0) hightop (0.3.0) activesupport (>= 5.2) - hotwire-livereload (1.2.3) + hotwire-livereload (1.3.0) + actioncable (>= 6.0.0) listen (>= 3.0.0) - rails (>= 6.0.0) + railties (>= 6.0.0) htmlbeautifier (1.4.2) httparty (0.21.0) mini_mime (>= 1.0.0) @@ -343,7 +345,10 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - redis (4.8.1) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool regexp_parser (2.8.1) responders (3.1.0) actionpack (>= 5.2) @@ -489,6 +494,7 @@ GEM PLATFORMS arm64-darwin-21 arm64-darwin-22 + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -518,12 +524,12 @@ DEPENDENCIES erb-formatter factory_bot_rails faker - friendly_id (~> 5.4.0) + friendly_id (~> 5.5.1) fuubar gem-release groupdate hightop - hotwire-livereload (~> 1.2.3) + hotwire-livereload (~> 1.3.0) htmlbeautifier httparty i18n-tasks (~> 1.0.12) @@ -543,7 +549,7 @@ DEPENDENCIES rails (~> 6.0) rails-controller-testing ransack (~> 4.1, >= 4.1.1) - redis (~> 4.0) + redis (~> 5.0) ripper-tags rspec-rails (~> 6.0, >= 6.0.3) rubocop diff --git a/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock b/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock index e0ed6ea5d3..2076b0748a 100644 --- a/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock @@ -150,6 +150,7 @@ GEM xpath (~> 3.2) chartkick (5.0.1) concurrent-ruby (1.2.2) + connection_pool (2.4.1) countries (5.4.0) unaccent (~> 0.3) crack (0.4.5) @@ -189,7 +190,7 @@ GEM faker (3.2.0) i18n (>= 1.8.11, < 2) ffi (1.15.5) - friendly_id (5.4.2) + friendly_id (5.5.1) activerecord (>= 4.0.0) fuubar (2.5.1) rspec-core (~> 3.0) @@ -204,9 +205,10 @@ GEM highline (2.1.0) hightop (0.3.0) activesupport (>= 5.2) - hotwire-livereload (1.2.3) + hotwire-livereload (1.3.0) + actioncable (>= 6.0.0) listen (>= 3.0.0) - rails (>= 6.0.0) + railties (>= 6.0.0) htmlbeautifier (1.4.2) httparty (0.21.0) mini_mime (>= 1.0.0) @@ -277,6 +279,8 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.9) + nokogiri (1.15.5-arm64-darwin) + racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) @@ -343,7 +347,10 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rbs (2.8.4) - redis (4.8.1) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool regexp_parser (2.8.1) responders (3.1.0) actionpack (>= 5.2) @@ -493,6 +500,7 @@ GEM zeitwerk (2.6.12) PLATFORMS + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -522,12 +530,12 @@ DEPENDENCIES erb-formatter factory_bot_rails faker - friendly_id (~> 5.4.0) + friendly_id (~> 5.5.1) fuubar gem-release groupdate hightop - hotwire-livereload (~> 1.2.3) + hotwire-livereload (~> 1.3.0) htmlbeautifier httparty i18n-tasks (~> 1.0.12) @@ -547,7 +555,7 @@ DEPENDENCIES rails (~> 6.0) rails-controller-testing ransack (~> 4.1, >= 4.1.1) - redis (~> 4.0) + redis (~> 5.0) ripper-tags rspec-rails (~> 6.0, >= 6.0.3) rubocop diff --git a/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock b/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock index 1dad4bba01..e5a37d3bc2 100644 --- a/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock @@ -150,6 +150,7 @@ GEM xpath (~> 3.2) chartkick (4.2.1) concurrent-ruby (1.2.2) + connection_pool (2.4.1) countries (5.3.0) unaccent (~> 0.3) crack (0.4.5) @@ -189,7 +190,7 @@ GEM faker (3.1.0) i18n (>= 1.8.11, < 2) ffi (1.15.5) - friendly_id (5.4.2) + friendly_id (5.5.1) activerecord (>= 4.0.0) fuubar (2.5.1) rspec-core (~> 3.0) @@ -204,9 +205,10 @@ GEM highline (2.1.0) hightop (0.3.0) activesupport (>= 5.2) - hotwire-livereload (1.2.3) + hotwire-livereload (1.3.0) + actioncable (>= 6.0.0) listen (>= 3.0.0) - rails (>= 6.0.0) + railties (>= 6.0.0) htmlbeautifier (1.4.2) httparty (0.21.0) mini_mime (>= 1.0.0) @@ -343,7 +345,10 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - redis (4.8.1) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool regexp_parser (2.8.1) responders (3.1.0) actionpack (>= 5.2) @@ -489,6 +494,7 @@ GEM PLATFORMS arm64-darwin-21 arm64-darwin-22 + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -518,12 +524,12 @@ DEPENDENCIES erb-formatter factory_bot_rails faker - friendly_id (~> 5.4.0) + friendly_id (~> 5.5.1) fuubar gem-release groupdate hightop - hotwire-livereload (~> 1.2.3) + hotwire-livereload (~> 1.3.0) htmlbeautifier httparty i18n-tasks (~> 1.0.12) @@ -543,7 +549,7 @@ DEPENDENCIES rails (~> 6.1) rails-controller-testing ransack (~> 4.1, >= 4.1.1) - redis (~> 4.0) + redis (~> 5.0) ripper-tags rspec-rails (~> 6.0, >= 6.0.3) rubocop diff --git a/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock b/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock index 7f0d04c7ca..a68551b3a6 100644 --- a/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock @@ -150,6 +150,7 @@ GEM xpath (~> 3.2) chartkick (5.0.1) concurrent-ruby (1.2.2) + connection_pool (2.4.1) countries (5.4.0) unaccent (~> 0.3) crack (0.4.5) @@ -189,7 +190,7 @@ GEM faker (3.2.0) i18n (>= 1.8.11, < 2) ffi (1.15.5) - friendly_id (5.4.2) + friendly_id (5.5.1) activerecord (>= 4.0.0) fuubar (2.5.1) rspec-core (~> 3.0) @@ -204,9 +205,10 @@ GEM highline (2.1.0) hightop (0.3.0) activesupport (>= 5.2) - hotwire-livereload (1.2.3) + hotwire-livereload (1.3.0) + actioncable (>= 6.0.0) listen (>= 3.0.0) - rails (>= 6.0.0) + railties (>= 6.0.0) htmlbeautifier (1.4.2) httparty (0.21.0) mini_mime (>= 1.0.0) @@ -277,6 +279,8 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.9) + nokogiri (1.15.5-arm64-darwin) + racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) @@ -343,7 +347,10 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rbs (2.8.4) - redis (4.8.1) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool regexp_parser (2.8.1) responders (3.1.0) actionpack (>= 5.2) @@ -493,6 +500,7 @@ GEM zeitwerk (2.6.12) PLATFORMS + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -522,12 +530,12 @@ DEPENDENCIES erb-formatter factory_bot_rails faker - friendly_id (~> 5.4.0) + friendly_id (~> 5.5.1) fuubar gem-release groupdate hightop - hotwire-livereload (~> 1.2.3) + hotwire-livereload (~> 1.3.0) htmlbeautifier httparty i18n-tasks (~> 1.0.12) @@ -547,7 +555,7 @@ DEPENDENCIES rails (~> 6.1) rails-controller-testing ransack (~> 4.1, >= 4.1.1) - redis (~> 4.0) + redis (~> 5.0) ripper-tags rspec-rails (~> 6.0, >= 6.0.3) rubocop diff --git a/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock b/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock index a572846496..c138c53749 100644 --- a/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock @@ -209,7 +209,7 @@ GEM faker (3.1.0) i18n (>= 1.8.11, < 2) ffi (1.15.5) - friendly_id (5.4.2) + friendly_id (5.5.1) activerecord (>= 4.0.0) fuubar (2.5.1) rspec-core (~> 3.0) @@ -224,9 +224,10 @@ GEM highline (2.1.0) hightop (0.3.0) activesupport (>= 5.2) - hotwire-livereload (1.2.3) + hotwire-livereload (1.3.0) + actioncable (>= 6.0.0) listen (>= 3.0.0) - rails (>= 6.0.0) + railties (>= 6.0.0) htmlbeautifier (1.4.2) httparty (0.21.0) mini_mime (>= 1.0.0) @@ -375,7 +376,10 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rdoc (6.3.3) - redis (4.8.1) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool regexp_parser (2.8.1) reline (0.4.1) io-console (~> 0.5) @@ -524,6 +528,7 @@ GEM PLATFORMS arm64-darwin-21 arm64-darwin-22 + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -553,12 +558,12 @@ DEPENDENCIES erb-formatter factory_bot_rails faker - friendly_id (~> 5.4.0) + friendly_id (~> 5.5.1) fuubar gem-release groupdate hightop - hotwire-livereload (~> 1.2.3) + hotwire-livereload (~> 1.3.0) htmlbeautifier httparty i18n-tasks (~> 1.0.12) @@ -578,7 +583,7 @@ DEPENDENCIES rails (~> 7.0) rails-controller-testing ransack (~> 4.1, >= 4.1.1) - redis (~> 4.0) + redis (~> 5.0) ripper-tags rspec-rails (~> 6.0, >= 6.0.3) rubocop diff --git a/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock b/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock index c25555e20d..8e3046f05a 100644 --- a/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock @@ -209,7 +209,7 @@ GEM faker (3.2.0) i18n (>= 1.8.11, < 2) ffi (1.15.5) - friendly_id (5.4.2) + friendly_id (5.5.1) activerecord (>= 4.0.0) fuubar (2.5.1) rspec-core (~> 3.0) @@ -224,9 +224,10 @@ GEM highline (2.1.0) hightop (0.3.0) activesupport (>= 5.2) - hotwire-livereload (1.2.3) + hotwire-livereload (1.3.0) + actioncable (>= 6.0.0) listen (>= 3.0.0) - rails (>= 6.0.0) + railties (>= 6.0.0) htmlbeautifier (1.4.2) httparty (0.21.0) mini_mime (>= 1.0.0) @@ -302,6 +303,8 @@ GEM net-smtp (0.4.0) net-protocol nio4r (2.7.0) + nokogiri (1.15.5-arm64-darwin) + racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) @@ -375,7 +378,10 @@ GEM ffi (~> 1.0) rbs (2.8.4) rdoc (6.3.3) - redis (4.8.1) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool regexp_parser (2.8.1) reline (0.4.1) io-console (~> 0.5) @@ -529,6 +535,7 @@ GEM zeitwerk (2.6.12) PLATFORMS + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -558,12 +565,12 @@ DEPENDENCIES erb-formatter factory_bot_rails faker - friendly_id (~> 5.4.0) + friendly_id (~> 5.5.1) fuubar gem-release groupdate hightop - hotwire-livereload (~> 1.2.3) + hotwire-livereload (~> 1.3.0) htmlbeautifier httparty i18n-tasks (~> 1.0.12) @@ -583,7 +590,7 @@ DEPENDENCIES rails (~> 7.0) rails-controller-testing ransack (~> 4.1, >= 4.1.1) - redis (~> 4.0) + redis (~> 5.0) ripper-tags rspec-rails (~> 6.0, >= 6.0.3) rubocop diff --git a/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock b/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock index d98eaf5110..28a30381df 100644 --- a/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock @@ -209,7 +209,7 @@ GEM faker (3.2.2) i18n (>= 1.8.11, < 2) ffi (1.16.3) - friendly_id (5.4.2) + friendly_id (5.5.1) activerecord (>= 4.0.0) fuubar (2.5.1) rspec-core (~> 3.0) @@ -224,9 +224,10 @@ GEM highline (2.1.0) hightop (0.4.0) activesupport (>= 6.1) - hotwire-livereload (1.2.3) + hotwire-livereload (1.3.0) + actioncable (>= 6.0.0) listen (>= 3.0.0) - rails (>= 6.0.0) + railties (>= 6.0.0) htmlbeautifier (1.4.2) httparty (0.21.0) mini_mime (>= 1.0.0) @@ -302,6 +303,8 @@ GEM net-smtp (0.4.0) net-protocol nio4r (2.7.0) + nokogiri (1.15.5-arm64-darwin) + racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) @@ -375,7 +378,10 @@ GEM ffi (~> 1.0) rbs (2.8.4) rdoc (6.3.3) - redis (4.8.1) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool regexp_parser (2.8.2) reline (0.4.1) io-console (~> 0.5) @@ -531,6 +537,7 @@ GEM zeitwerk (2.6.12) PLATFORMS + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -560,12 +567,12 @@ DEPENDENCIES erb-formatter factory_bot_rails faker - friendly_id (~> 5.4.0) + friendly_id (~> 5.5.1) fuubar gem-release groupdate hightop - hotwire-livereload (~> 1.2.3) + hotwire-livereload (~> 1.3.0) htmlbeautifier httparty i18n-tasks (~> 1.0.12) @@ -585,7 +592,7 @@ DEPENDENCIES rails (~> 7.1) rails-controller-testing ransack (~> 4.1, >= 4.1.1) - redis (~> 4.0) + redis (~> 5.0) ripper-tags rspec-rails (~> 6.0, >= 6.0.3) rubocop diff --git a/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock b/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock index d98eaf5110..28a30381df 100644 --- a/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock @@ -209,7 +209,7 @@ GEM faker (3.2.2) i18n (>= 1.8.11, < 2) ffi (1.16.3) - friendly_id (5.4.2) + friendly_id (5.5.1) activerecord (>= 4.0.0) fuubar (2.5.1) rspec-core (~> 3.0) @@ -224,9 +224,10 @@ GEM highline (2.1.0) hightop (0.4.0) activesupport (>= 6.1) - hotwire-livereload (1.2.3) + hotwire-livereload (1.3.0) + actioncable (>= 6.0.0) listen (>= 3.0.0) - rails (>= 6.0.0) + railties (>= 6.0.0) htmlbeautifier (1.4.2) httparty (0.21.0) mini_mime (>= 1.0.0) @@ -302,6 +303,8 @@ GEM net-smtp (0.4.0) net-protocol nio4r (2.7.0) + nokogiri (1.15.5-arm64-darwin) + racc (~> 1.4) nokogiri (1.15.5-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) @@ -375,7 +378,10 @@ GEM ffi (~> 1.0) rbs (2.8.4) rdoc (6.3.3) - redis (4.8.1) + redis (5.0.8) + redis-client (>= 0.17.0) + redis-client (0.19.0) + connection_pool regexp_parser (2.8.2) reline (0.4.1) io-console (~> 0.5) @@ -531,6 +537,7 @@ GEM zeitwerk (2.6.12) PLATFORMS + arm64-darwin-23 x86_64-linux DEPENDENCIES @@ -560,12 +567,12 @@ DEPENDENCIES erb-formatter factory_bot_rails faker - friendly_id (~> 5.4.0) + friendly_id (~> 5.5.1) fuubar gem-release groupdate hightop - hotwire-livereload (~> 1.2.3) + hotwire-livereload (~> 1.3.0) htmlbeautifier httparty i18n-tasks (~> 1.0.12) @@ -585,7 +592,7 @@ DEPENDENCIES rails (~> 7.1) rails-controller-testing ransack (~> 4.1, >= 4.1.1) - redis (~> 4.0) + redis (~> 5.0) ripper-tags rspec-rails (~> 6.0, >= 6.0.3) rubocop diff --git a/lib/avo/engine.rb b/lib/avo/engine.rb index cc8ab58853..fc84374db7 100644 --- a/lib/avo/engine.rb +++ b/lib/avo/engine.rb @@ -1,5 +1,3 @@ -require "active_support/core_ext/module/attribute_accessors_per_thread" - # requires all dependencies Gem.loaded_specs["avo"].dependencies.each do |d| case d.name diff --git a/package.json b/package.json index e4b0fbe30f..e117aee551 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@algolia/autocomplete-theme-classic": "^1.0.0-alpha.46", "@babel/plugin-proposal-class-properties": "^7.12.1", "@hotwired/stimulus": "^3.2.2", - "@hotwired/turbo-rails": "^8.0.0-beta.1", + "@hotwired/turbo-rails": "^7.3.0", "@rails/activestorage": "^6.1.7", "@rails/ujs": "^6.1.0", "@tailwindcss/forms": "^0.5.7", diff --git a/yarn.lock b/yarn.lock index fdc7f37c8a..312524ce41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1346,20 +1346,18 @@ resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.2.2.tgz#071aab59c600fed95b97939e605ff261a4251608" integrity sha512-eGeIqNOQpXoPAIP7tC1+1Yc1yl1xnwYqg+3mzqxyrbE5pg5YFBZcA6YoTiByJB6DKAEsiWtl6tjTJS4IYtbB7A== -"@hotwired/turbo-rails@^8.0.0-beta.1": - version "8.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-8.0.0-beta.1.tgz#7d5bd2843caa5d8d224eb36f22078311163128bd" - integrity sha512-x9G95vehf5LR4yYGvhD4z6wBMbmAVi0V87FTfenrmXPru4SfOVDsCwdEINBWsLqOvCgRPQD9eY2nGyDfZlsukg== +"@hotwired/turbo-rails@^7.3.0": + version "7.3.0" + resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-7.3.0.tgz#422c21752509f3edcd6c7b2725bbe9e157815f51" + integrity sha512-fvhO64vp/a2UVQ3jue9WTc2JisMv9XilIC7ViZmXAREVwiQ2S4UC7Go8f9A1j4Xu7DBI6SbFdqILk5ImqVoqyA== dependencies: - "@hotwired/turbo" "^8.0.0-beta.1" + "@hotwired/turbo" "^7.3.0" "@rails/actioncable" "^7.0" -"@hotwired/turbo@^8.0.0-beta.1": - version "8.0.0-beta.1" - resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-8.0.0-beta.1.tgz#35a7086c4c959445db059ea4a9b9af85cdafa616" - integrity sha512-g66YmO/Oa+EThB3KkNDhrM9mFnNyRn6tqgwGiBHh4Vf+d3XjCznuWSG2o2e2cO/RlddVRtCwvBSMuG6sYQWX+g== - dependencies: - idiomorph "https://github.com/basecamp/idiomorph#rollout-build" +"@hotwired/turbo@^7.3.0": + version "7.3.0" + resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.3.0.tgz#2226000fff1aabda9fd9587474565c9929dbf15d" + integrity sha512-Dcu+NaSvHLT7EjrDrkEmH4qET2ZJZ5IcCWmNXxNQTBwlnE5tBZfN6WxZ842n5cHV52DH/AKNirbPBtcEXDLW4g== "@humanwhocodes/config-array@^0.11.13": version "0.11.13" @@ -2883,10 +2881,6 @@ icss-utils@^5.0.0, icss-utils@^5.1.0: resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== -"idiomorph@https://github.com/basecamp/idiomorph#rollout-build": - version "0.0.8" - resolved "https://github.com/basecamp/idiomorph#e906820368e4c9c52489a3336b8c3826b1bf6de5" - ignore@^5.2.0: version "5.2.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" From e28f77d57b82edc36aac561a6ad7f95f5f122af6 Mon Sep 17 00:00:00 2001 From: Paul Bob <69730720+Paul-Bob@users.noreply.github.com> Date: Tue, 19 Dec 2023 16:01:24 +0200 Subject: [PATCH 07/42] fix: stimulus attributes crashing on grid view (#2260) --- lib/avo/fields/concerns/has_html_attributes.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/avo/fields/concerns/has_html_attributes.rb b/lib/avo/fields/concerns/has_html_attributes.rb index 6065e49ffc..285a16ebb2 100644 --- a/lib/avo/fields/concerns/has_html_attributes.rb +++ b/lib/avo/fields/concerns/has_html_attributes.rb @@ -54,12 +54,16 @@ def default_attribute_value(name) end def add_action_data_attributes(attributes, name, element) + return unless respond_to? :action + if can_add_stimulus_attributes_for?(action, attributes, name, element) attributes.merge!(stimulus_attributes_for(action)) end end def add_resource_data_attributes(attributes, name, element, view) + return unless respond_to? :resource + if can_add_stimulus_attributes_for?(resource, attributes, name, element) && view.in?([:edit, :new]) resource_stimulus_attributes = stimulus_attributes_for(resource) From 21bab2500cc164d2e3b00a812964d94f42b99fcf Mon Sep 17 00:00:00 2001 From: Paul Bob Date: Tue, 19 Dec 2023 16:08:48 +0200 Subject: [PATCH 08/42] Bumped avo to 3.2.1 --- Gemfile.lock | 2 +- lib/avo/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 384e9bc97a..71b0e85aba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - avo (3.2.0) + avo (3.2.1) actionview (>= 6.1) active_link_to activerecord (>= 6.1) diff --git a/lib/avo/version.rb b/lib/avo/version.rb index 57b440d657..02cc8c1452 100644 --- a/lib/avo/version.rb +++ b/lib/avo/version.rb @@ -1,3 +1,3 @@ module Avo - VERSION = "3.2.0" unless const_defined?(:VERSION) + VERSION = "3.2.1" unless const_defined?(:VERSION) end From bedd6b8917def58e5acdcc2e4dae44adafe3f41a Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 17:40:30 +0200 Subject: [PATCH 09/42] =?UTF-8?q?[js]=20Update=20chartkick=204.1.1=20?= =?UTF-8?q?=E2=86=92=204.2.0=20(minor)=20(#2255)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e117aee551..d1dac12e36 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "autoprefixer": "^10.4.16", "axios": "^1.6.0", "chart.js": "^3.9.1", - "chartkick": "^4.1.1", + "chartkick": "^4.2.0", "codemirror": "5.59.1", "core-js": "^3.34.0", "css-loader": "^6.7.3", diff --git a/yarn.lock b/yarn.lock index 312524ce41..da9794f8f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1834,10 +1834,10 @@ chartjs-adapter-date-fns@>=2.0.0: resolved "https://registry.yarnpkg.com/chartjs-adapter-date-fns/-/chartjs-adapter-date-fns-2.0.0.tgz#5e53b2f660b993698f936f509c86dddf9ed44c6b" integrity sha512-rmZINGLe+9IiiEB0kb57vH3UugAtYw33anRiw5kS2Tu87agpetDDoouquycWc9pRsKtQo5j+vLsYHyr8etAvFw== -chartkick@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/chartkick/-/chartkick-4.1.1.tgz#60d6e13a090c5334bd80ad8fb7da02aaf38fb936" - integrity sha512-+3+dIKZo8MzOiQFc4FZDZiRjDnrgVxgjk3tKXVclMcDF8yIJAEqSr5/l4pqpB2Rxye1s2Dg3j6bVA9eIeDbnCQ== +chartkick@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/chartkick/-/chartkick-4.2.0.tgz#106fc5ff7eef5343a9e6977f259a8a8a1ea57bf9" + integrity sha512-7yYZyxeFhOh/LA7gc1VwDFgc6t4ZM9RrbBjgb4dJoFukk2+94QkK0yulYI2OUH1cjcfrf1qmj04FkjZx7kZDeg== optionalDependencies: chart.js ">=3.0.2" chartjs-adapter-date-fns ">=2.0.0" From 119a5332bfcbc4cfc0a0320b43c6098ada39f83a Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 17:40:48 +0200 Subject: [PATCH 10/42] =?UTF-8?q?[js]=20Update=20postcss-preset-env=208.3.?= =?UTF-8?q?2=20=E2=86=92=208.5.1=20(minor)=20(#2258)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 315 ++++++++++++++++++++++++++++----------------------- 2 files changed, 177 insertions(+), 140 deletions(-) diff --git a/package.json b/package.json index d1dac12e36..2be16db88d 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "postcss-loader": "^7.3.3", "postcss-nested": "^6.0.1", "postcss-nested-ancestors": "^3.0.0", - "postcss-preset-env": "^8.3.2", + "postcss-preset-env": "^8.5.1", "regenerator-runtime": "^0.13.9", "stimulus-rails-nested-form": "^4.1.0", "stimulus-use": "^0.50.0", diff --git a/yarn.lock b/yarn.lock index da9794f8f9..0955ff4fc2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1089,38 +1089,63 @@ resolved "https://registry.yarnpkg.com/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-1.0.2.tgz#35253f57c6c83d684fe396672486c644e6a84127" integrity sha512-xm7Mgwej/wBfLoK0K5LfntmPJzoULayl1XZY9JYgQgT29JiqNw++sLnx95u5y9zCihblzkyaRYJrsRMhIBzRdg== -"@csstools/color-helpers@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-2.0.0.tgz#4ac578cb00b4e853b94f2250267d85ba957c4fc9" - integrity sha512-VcPjEnp07RNgz/D+oI2uIALg+IPCSl6mj0XhA3pl3F2bM2B95vgzatExmmzSg/X0zkh+R2v+jFY/J2pV/bnwpw== +"@csstools/cascade-layer-name-parser@^1.0.6": + version "1.0.6" + resolved "https://registry.yarnpkg.com/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-1.0.6.tgz#ea6a8fc7805c3384d914e9235d31d77dd0ccb2b8" + integrity sha512-HkxRNs6ZIV0VjLFw6k5G8K35vd9r+O8B1Vr+QVD8M5Y44eQxyHtc42BdF74FQatXACPnitOR1+sRx2oWdnKTQw== + +"@csstools/color-helpers@^2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-2.1.0.tgz#b27d8376e9e8a947878f10967481c22bf046976a" + integrity sha512-OWkqBa7PDzZuJ3Ha7T5bxdSVfSCfTq6K1mbAhbO1MD+GSULGjrp45i5RudyJOedstSarN/3mdwu9upJE7gDXfw== + +"@csstools/color-helpers@^4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-4.0.0.tgz#a1d6ffcefe5c1d389cbcca15f46da3cdaf241443" + integrity sha512-wjyXB22/h2OvxAr3jldPB7R7kjTUEzopvjitS8jWtyd8fN6xJ8vy1HnHu0ZNfEkqpBJgQ76Q+sBDshWcMvTa/w== "@csstools/css-calc@^1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-1.1.1.tgz#c622728b7f0c9aae70952623c2b0d3d114752987" integrity sha512-Nh+iLCtjlooTzuR0lpmB8I6hPX/VupcGQ3Z1U2+wgJJ4fa8+cWkub+lCsbZcYPzBGsZLEL8fQAg+Na5dwEFJxg== -"@csstools/css-color-parser@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-1.1.2.tgz#e5956c0fe9c30d9f228b0e37173ff61f0dd89dad" - integrity sha512-MjW/VspbFSkvbuou7tUUu2+FAlAR7VJ/PA69M9EGKltThbONC8nyW33wHRzNvLzRLGstZLEO5X5oR7IMhMDi0A== +"@csstools/css-calc@^1.1.5": + version "1.1.5" + resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-1.1.5.tgz#cf5ac0b51a0533bd69be258b15ae243a7a47e3e1" + integrity sha512-UhI5oSRAUtTHY3MyGahqn0ZzQOHVoPpfvUcOmYipAZ1rILAvCBoyiLSsa/clv1Xxct0SMKIq93KO5Bfl1cb6tQ== + +"@csstools/css-color-parser@^1.2.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-1.5.0.tgz#545fe1586d4927cc2614d62278325d37d8539b35" + integrity sha512-PUhSg1MgU2sjYhA6moOmxYesqVqYTJwcVw12boTNbDX7Af+VK02MkgvmBBY2Z2qU6UN5HOQ+wrF0qQJGsTFY7w== dependencies: - "@csstools/color-helpers" "^2.0.0" - "@csstools/css-calc" "^1.1.1" + "@csstools/color-helpers" "^4.0.0" + "@csstools/css-calc" "^1.1.5" "@csstools/css-parser-algorithms@^2.1.1": version "2.1.1" resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.1.1.tgz#7b62e6412a468a2d1096ed267edd1e4a7fd4a119" integrity sha512-viRnRh02AgO4mwIQb2xQNJju0i+Fh9roNgmbR5xEuG7J3TGgxjnE95HnBLgsFJOJOksvcfxOUCgODcft6Y07cA== +"@csstools/css-parser-algorithms@^2.2.0", "@csstools/css-parser-algorithms@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.4.0.tgz#88c7b62b8e00c391b24c585f9db5a0b62ed665b0" + integrity sha512-/PPLr2g5PAUCKAPEbfyk6/baZA+WJHQtUhPkoCQMpyRE8I0lXrG1QFRN8e5s3ZYxM8d/g5BZc6lH3s8Op7/VEg== + "@csstools/css-tokenizer@^2.1.1": version "2.1.1" resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.1.1.tgz#07ae11a0a06365d7ec686549db7b729bc036528e" integrity sha512-GbrTj2Z8MCTUv+52GE0RbFGM527xuXZ0Xa5g0Z+YN573uveS4G0qi6WNOMyz3yrFM/jaILTTwJ0+umx81EzqfA== -"@csstools/media-query-list-parser@^2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.0.4.tgz#466bd254041530dfd1e88bcb1921e8ca4af75b6a" - integrity sha512-GyYot6jHgcSDZZ+tLSnrzkR7aJhF2ZW6d+CXH66mjy5WpAQhZD4HDke2OQ36SivGRWlZJpAz7TzbW6OKlEpxAA== +"@csstools/css-tokenizer@^2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.2.2.tgz#bcd85cef4468c356833b21e96d38b940c9760605" + integrity sha512-wCDUe/MAw7npAHFLyW3QjSyLA66S5QFaV1jIXlNQvdJ8RzXDSgALa49eWcUO6P55ARQaz0TsDdAgdRgkXFYY8g== + +"@csstools/media-query-list-parser@^2.1.1", "@csstools/media-query-list-parser@^2.1.6": + version "2.1.6" + resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.6.tgz#e4e9a8a35be7a066836389b03ec19e584bc61af3" + integrity sha512-R6AKl9vaU0It7D7TR2lQn0pre5aQfdeqHRePlaRCY8rHL3l9eVlNRpsEVDKFi/zAjzv68CxH2M5kqbhPFPKjvw== "@csstools/postcss-cascade-layers@^3.0.1": version "3.0.1" @@ -1130,25 +1155,25 @@ "@csstools/selector-specificity" "^2.0.2" postcss-selector-parser "^6.0.10" -"@csstools/postcss-color-function@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-2.2.1.tgz#fa28cc742c29ae63dbe0812dd9a03998a67dd318" - integrity sha512-T52iiqmzyKk09B9iNTQbuWa9Tn83SztXY7o6r2+j+o1BS/7+CiCjTgN2HgzybDmx8cr6XYhQ1BzqgV9tJzhrmw== +"@csstools/postcss-color-function@^2.2.3": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-2.2.3.tgz#c15546c3cc6041293024cdaa7d7998a340f88c39" + integrity sha512-b1ptNkr1UWP96EEHqKBWWaV5m/0hgYGctgA/RVZhONeP1L3T/8hwoqDm9bB23yVCfOgE9U93KI9j06+pEkJTvw== dependencies: - "@csstools/css-color-parser" "^1.1.2" + "@csstools/css-color-parser" "^1.2.0" "@csstools/css-parser-algorithms" "^2.1.1" "@csstools/css-tokenizer" "^2.1.1" - "@csstools/postcss-progressive-custom-properties" "^2.0.0" + "@csstools/postcss-progressive-custom-properties" "^2.3.0" -"@csstools/postcss-color-mix-function@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-1.0.1.tgz#587f7df69d40f84c7bb4e9d7f178266cb7f6851b" - integrity sha512-NSVrzjVcI4TMzDfh6GKZXvEuelT81xpXzruuTNJrwKMTZXEBHY9G2gvmr0eC0wwmL8EF1TblXyPPfBbZobvfXg== +"@csstools/postcss-color-mix-function@^1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-1.0.3.tgz#3755894bd8a04f82739327717700497a3f2f6f73" + integrity sha512-QGXjGugTluqFZWzVf+S3wCiRiI0ukXlYqCi7OnpDotP/zaVTyl/aqZujLFzTOXy24BoWnu89frGMc79ohY5eog== dependencies: - "@csstools/css-color-parser" "^1.1.2" + "@csstools/css-color-parser" "^1.2.0" "@csstools/css-parser-algorithms" "^2.1.1" "@csstools/css-tokenizer" "^2.1.1" - "@csstools/postcss-progressive-custom-properties" "^2.0.0" + "@csstools/postcss-progressive-custom-properties" "^2.3.0" "@csstools/postcss-font-format-keywords@^2.0.2": version "2.0.2" @@ -1157,37 +1182,37 @@ dependencies: postcss-value-parser "^4.2.0" -"@csstools/postcss-gradients-interpolation-method@^3.0.4": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-3.0.4.tgz#c03402087c41feee0115f714cc87696e6424ba92" - integrity sha512-GgKoY7OlvL65UPigEdlrvMAUCR5kOQCjtue2/36TPrBNoRS6KM2KOqmjIVsxEwYYwK+L28pdnM8r10m03hhZxA== +"@csstools/postcss-gradients-interpolation-method@^3.0.6": + version "3.0.6" + resolved "https://registry.yarnpkg.com/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-3.0.6.tgz#9296958c28cc9940920ab22f7c86fbe3fd9a04f0" + integrity sha512-rBOBTat/YMmB0G8VHwKqDEx+RZ4KCU9j42K8LwS0IpZnyThalZZF7BCSsZ6TFlZhcRZKlZy3LLFI2pLqjNVGGA== dependencies: - "@csstools/css-color-parser" "^1.1.2" + "@csstools/css-color-parser" "^1.2.0" "@csstools/css-parser-algorithms" "^2.1.1" "@csstools/css-tokenizer" "^2.1.1" - "@csstools/postcss-progressive-custom-properties" "^2.0.0" + "@csstools/postcss-progressive-custom-properties" "^2.3.0" -"@csstools/postcss-hwb-function@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-2.2.1.tgz#ab50918104e4ef500c42e55e4ccdd27fc33d52b9" - integrity sha512-eiqB4DIs+xqProAly7KwIgE04oze1YHb0QSCw/Y7062d9gpw+Cdif3Y0Z+Te+U7JROYdO0/0j91A6Qy8fo/Rlw== +"@csstools/postcss-hwb-function@^2.2.2": + version "2.2.2" + resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-2.2.2.tgz#c36a450bc98038df00bbbebcef20f04aac6e0b08" + integrity sha512-W5Y5oaJ382HSlbdGfPf60d7dAK6Hqf10+Be1yZbd/TNNrQ/3dDdV1c07YwOXPQ3PZ6dvFMhxbIbn8EC3ki3nEg== dependencies: - "@csstools/css-color-parser" "^1.1.2" + "@csstools/css-color-parser" "^1.2.0" "@csstools/css-parser-algorithms" "^2.1.1" "@csstools/css-tokenizer" "^2.1.1" -"@csstools/postcss-ic-unit@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-2.0.2.tgz#5a5e481c53977deec3d63793788eec924d4c5f7d" - integrity sha512-N84qGTJkfLTPj2qOG5P4CIqGjpZBbjOEMKMn+UjO5wlb9lcBTfBsxCF0lQsFdWJUzBHYFOz19dL66v71WF3Pig== +"@csstools/postcss-ic-unit@^2.0.4": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-2.0.4.tgz#e533ebaae61121bfdba3c2a8c9762c117b9a4047" + integrity sha512-9W2ZbV7whWnr1Gt4qYgxMWzbevZMOvclUczT5vk4yR6vS53W/njiiUhtm/jh/BKYwQ1W3PECZjgAd2dH4ebJig== dependencies: - "@csstools/postcss-progressive-custom-properties" "^2.0.0" + "@csstools/postcss-progressive-custom-properties" "^2.3.0" postcss-value-parser "^4.2.0" -"@csstools/postcss-is-pseudo-class@^3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-3.2.0.tgz#1277cc187bdb075013341dab42b4140d1cafae27" - integrity sha512-uooelBL99jMg8ZD6xy0Pj1hSalchWmplcin00eI+JHpv1jW2iwbi1cn2UnVsToM4JLwJSZFzTSWCgSpmlyhe3A== +"@csstools/postcss-is-pseudo-class@^3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-3.2.1.tgz#610f451b9293307d83d484c84af332a05e48b661" + integrity sha512-AtANdV34kJl04Al62is3eQRk/BfOfyAvEmRJvbt+nx5REqImLC+2XhuE6skgkcPli1l8ONS67wS+l1sBzySc3Q== dependencies: "@csstools/selector-specificity" "^2.0.0" postcss-selector-parser "^6.0.10" @@ -1211,24 +1236,24 @@ dependencies: "@csstools/css-tokenizer" "^2.1.1" -"@csstools/postcss-media-minmax@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-media-minmax/-/postcss-media-minmax-1.0.2.tgz#77efc4fdd96c7ff97f0d714c940187d25fd87619" - integrity sha512-DsEykSINZTqlBefi1uSQBym1Rj0NQOj92dLRd5jUQpSy8yBVaXXmkiUgBUbb+gQh8imAdqPpz2v4sAUnw8yXXA== +"@csstools/postcss-media-minmax@^1.0.4": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@csstools/postcss-media-minmax/-/postcss-media-minmax-1.1.1.tgz#b98619dfff964e2c4e020f21934162d7c2d4dec5" + integrity sha512-mBY46/Hr+A8cDjoX0OoPRBOVrkANym9540dSB9rN3dllPZdM1E112i/tVxWsrR1s1yE9gfF0pk+7lf9l+qSeHA== dependencies: - "@csstools/css-calc" "^1.1.1" - "@csstools/css-parser-algorithms" "^2.1.1" - "@csstools/css-tokenizer" "^2.1.1" - "@csstools/media-query-list-parser" "^2.0.4" + "@csstools/css-calc" "^1.1.5" + "@csstools/css-parser-algorithms" "^2.4.0" + "@csstools/css-tokenizer" "^2.2.2" + "@csstools/media-query-list-parser" "^2.1.6" -"@csstools/postcss-media-queries-aspect-ratio-number-values@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-1.0.2.tgz#23ca3c3decc79d9089c2028ded20a97a2c784eee" - integrity sha512-rOSR5p+5m0joXUoitYgCyMqNCu97yfLsLG3cnNaM8VeJRCWHGEu5hE9Gv0M7n9A4wo2pYF8QqaxkTlWbSJY9Fg== +"@csstools/postcss-media-queries-aspect-ratio-number-values@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-1.0.4.tgz#5d0d69a3176d9c7ca131388cef38c80437956e2f" + integrity sha512-IwyTbyR8E2y3kh6Fhrs251KjKBJeUPV5GlnUKnpU70PRFEN2DolWbf2V4+o/B9+Oj77P/DullLTulWEQ8uFtAA== dependencies: - "@csstools/css-parser-algorithms" "^2.1.1" + "@csstools/css-parser-algorithms" "^2.2.0" "@csstools/css-tokenizer" "^2.1.1" - "@csstools/media-query-list-parser" "^2.0.4" + "@csstools/media-query-list-parser" "^2.1.1" "@csstools/postcss-nested-calc@^2.0.2": version "2.0.2" @@ -1244,23 +1269,33 @@ dependencies: postcss-value-parser "^4.2.0" -"@csstools/postcss-oklab-function@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-2.2.1.tgz#4f8f4d8d69e6e479e094b5d327c7b259352e8b81" - integrity sha512-g4wrVopp6xXr1KetUK4Lj36P+PFPwvUUtd2gaqo7X/0xgJHmMtKMPhD9p77H9bmIpPtkIYQ8b7+7cdmrWNEVAw== +"@csstools/postcss-oklab-function@^2.2.3": + version "2.2.3" + resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-2.2.3.tgz#5770b67fc495533081f3ca82984268f0f2c834ac" + integrity sha512-AgJ2rWMnLCDcbSMTHSqBYn66DNLBym6JpBpCaqmwZ9huGdljjDRuH3DzOYzkgQ7Pm2K92IYIq54IvFHloUOdvA== dependencies: - "@csstools/css-color-parser" "^1.1.2" + "@csstools/css-color-parser" "^1.2.0" "@csstools/css-parser-algorithms" "^2.1.1" "@csstools/css-tokenizer" "^2.1.1" - "@csstools/postcss-progressive-custom-properties" "^2.0.0" + "@csstools/postcss-progressive-custom-properties" "^2.3.0" -"@csstools/postcss-progressive-custom-properties@^2.0.0", "@csstools/postcss-progressive-custom-properties@^2.1.0": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-2.1.1.tgz#82df9314451db63bf7f4975a4d32f148e85db490" - integrity sha512-6p8eO5+j+9hn4h2Klr9dbmya0GIb9SRrnPaCxqR1muVlV1waAZq6YkmlApEwXrox9qxggSwGZD5TnLRIY9f7WA== +"@csstools/postcss-progressive-custom-properties@^2.3.0": + version "2.3.0" + resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-2.3.0.tgz#c16ad5fd9893136efc844e867e80f4becdb223d9" + integrity sha512-Zd8ojyMlsL919TBExQ1I0CTpBDdyCpH/yOdqatZpuC3sd22K4SwC7+Yez3Q/vmXMWSAl+shjNeFZ7JMyxMjK+Q== dependencies: postcss-value-parser "^4.2.0" +"@csstools/postcss-relative-color-syntax@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-1.0.2.tgz#9321765da2b372f3056ebdbfa219bfddf9285519" + integrity sha512-juCoVInkgH2TZPfOhyx6tIal7jW37L/0Tt+Vcl1LoxqQA9sxcg3JWYZ98pl1BonDnki6s/M7nXzFQHWsWMeHgw== + dependencies: + "@csstools/css-color-parser" "^1.2.0" + "@csstools/css-parser-algorithms" "^2.1.1" + "@csstools/css-tokenizer" "^2.1.1" + "@csstools/postcss-progressive-custom-properties" "^2.3.0" + "@csstools/postcss-scope-pseudo-class@^2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@csstools/postcss-scope-pseudo-class/-/postcss-scope-pseudo-class-2.0.2.tgz#6325e1e3b321093c59b008ec670bb772e17f06fe" @@ -1277,12 +1312,12 @@ "@csstools/css-parser-algorithms" "^2.1.1" "@csstools/css-tokenizer" "^2.1.1" -"@csstools/postcss-text-decoration-shorthand@^2.2.3": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-2.2.3.tgz#e634a488aa5ba252907deb787ad6cc24b8c2bb0a" - integrity sha512-PADJidg/tdhDk120aWlGuDxsp5ZTc9Nx7GhJ8t0qBCk5fOgLK6V3DsB9X6sOAhDokIihXKzjtUu15puac5McWw== +"@csstools/postcss-text-decoration-shorthand@^2.2.4": + version "2.2.4" + resolved "https://registry.yarnpkg.com/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-2.2.4.tgz#184af1d68f4d97c381fad2ca58ae7f3f2a5dd7c3" + integrity sha512-zPN56sQkS/7YTCVZhOBVCWf7AiNge8fXDl7JVaHLz2RyT4pnyK2gFjckWRLpO0A2xkm1lCgZ0bepYZTwAVd/5A== dependencies: - "@csstools/color-helpers" "^2.0.0" + "@csstools/color-helpers" "^2.1.0" postcss-value-parser "^4.2.0" "@csstools/postcss-trigonometric-functions@^2.1.1": @@ -2001,10 +2036,10 @@ css-prefers-color-scheme@^8.0.2: resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-8.0.2.tgz#a0671f54eb19ed0d30b952574c0af11ec355fb6d" integrity sha512-OvFghizHJ45x7nsJJUSYLyQNTzsCU8yWjxAc/nhPQg1pbs18LMoET8N3kOweFDPy0JV0OSXN2iqRFhPBHYOeMA== -cssdb@^7.5.3: - version "7.5.4" - resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-7.5.4.tgz#e34dafee5184d67634604e345e389ca79ac179ea" - integrity sha512-fGD+J6Jlq+aurfE1VDXlLS4Pt0VtNlu2+YgfGOdMxRyl/HQ9bDiHTwSck1Yz8A97Dt/82izSK6Bp/4nVqacOsg== +cssdb@^7.6.0: + version "7.9.1" + resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-7.9.1.tgz#d76e06509dc1e11050836c3d556988fdbffa749e" + integrity sha512-fqy6ZnNfpb8qAvTT0qijWyTsUmYThsDX2F2ctMG4ceI7mI4DtsMILSiMBiuuDnVIYTyWvCctdp9Nb08p/6m2SQ== cssesc@^3.0.0: version "3.0.0" @@ -3519,11 +3554,12 @@ postcss-clamp@^4.1.0: dependencies: postcss-value-parser "^4.2.0" -postcss-color-functional-notation@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-5.0.2.tgz#6d03c928aa3a13487703af86c301bdcd501e7430" - integrity sha512-M6ygxWOyd6eWf3sd1Lv8xi4SeF4iBPfJvkfMU4ITh8ExJc1qhbvh/U8Cv/uOvBgUVOMDdScvCdlg8+hREQzs7w== +postcss-color-functional-notation@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-5.1.0.tgz#4d284ddf3dfac8bb68f781cd46bbfecfc8e8a09c" + integrity sha512-w2R4py6zrVE1U7FwNaAc76tNQlG9GLkrBbcFw+VhUjyDDiV28vfZG+l4LyPmpoQpeSJVtu8VgNjE8Jv5SpC7dQ== dependencies: + "@csstools/postcss-progressive-custom-properties" "^2.3.0" postcss-value-parser "^4.2.0" postcss-color-hex-alpha@^9.0.2: @@ -3540,24 +3576,24 @@ postcss-color-rebeccapurple@^8.0.2: dependencies: postcss-value-parser "^4.2.0" -postcss-custom-media@^9.1.3: - version "9.1.3" - resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-9.1.3.tgz#68bb2ae377bb07c19f03f252930cc380af894dce" - integrity sha512-W1C4Fu6KAZ7sKYQCuGMr8gyaE4BtjTQGPLVS4m0WCaWM6l7PgVbvmDeb4ClBc5R/7kdwESYf0hdxGtEPhi9CLA== +postcss-custom-media@^9.1.5: + version "9.1.5" + resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-9.1.5.tgz#20c5822dd15155d768f8dd84e07a6ffd5d01b054" + integrity sha512-GStyWMz7Qbo/Gtw1xVspzVSX8eipgNg4lpsO3CAeY4/A1mzok+RV6MCv3fg62trWijh/lYEj6vps4o8JcBBpDA== dependencies: "@csstools/cascade-layer-name-parser" "^1.0.2" - "@csstools/css-parser-algorithms" "^2.1.1" + "@csstools/css-parser-algorithms" "^2.2.0" "@csstools/css-tokenizer" "^2.1.1" - "@csstools/media-query-list-parser" "^2.0.4" + "@csstools/media-query-list-parser" "^2.1.1" -postcss-custom-properties@^13.1.5: - version "13.1.5" - resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-13.1.5.tgz#75567e3b4a664f820bcc3ba8b6ae3c8d27db05d1" - integrity sha512-98DXk81zTGqMVkGANysMHbGIg3voH383DYo3/+c+Abzay3nao+vM/f4Jgzsakk9S7BDsEw5DiW7sFy5G4W2wLA== +postcss-custom-properties@^13.2.0: + version "13.3.3" + resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-13.3.3.tgz#c6be6c1746e0415f9e42a3055129aa20a19803e6" + integrity sha512-xLmILb2R83aG4X++iVFg8TWadOlc45xiyFHRZD6Yhhu2igrTHXL6C75AEWqx6k9lxrr9sK5rcfUI9JvTCxBTvA== dependencies: - "@csstools/cascade-layer-name-parser" "^1.0.2" - "@csstools/css-parser-algorithms" "^2.1.1" - "@csstools/css-tokenizer" "^2.1.1" + "@csstools/cascade-layer-name-parser" "^1.0.6" + "@csstools/css-parser-algorithms" "^2.4.0" + "@csstools/css-tokenizer" "^2.2.2" postcss-value-parser "^4.2.0" postcss-custom-selectors@^7.1.3: @@ -3577,12 +3613,12 @@ postcss-dir-pseudo-class@^7.0.2: dependencies: postcss-selector-parser "^6.0.10" -postcss-double-position-gradients@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-4.0.2.tgz#855a23201f26be447210504e9b668429cbf4640c" - integrity sha512-GXL1RmFREDK4Q9aYvI2RhVrA6a6qqSMQQ5ke8gSH1xgV6exsqbcJpIumC7AOgooH6/WIG3/K/T8xxAiVHy/tJg== +postcss-double-position-gradients@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-4.0.4.tgz#57850aceb94a05778e7fdf31767a5b2a78f2be62" + integrity sha512-nUAbUXURemLXIrl4Xoia2tiu5z/n8sY+BVDZApoeT9BlpByyrp02P/lFCRrRvZ/zrGRE+MOGLhk8o7VcMCtPtQ== dependencies: - "@csstools/postcss-progressive-custom-properties" "^2.0.0" + "@csstools/postcss-progressive-custom-properties" "^2.3.0" postcss-value-parser "^4.2.0" postcss-flexbugs-fixes@^5.0.2: @@ -3642,15 +3678,15 @@ postcss-js@^4.0.1: dependencies: camelcase-css "^2.0.1" -postcss-lab-function@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-5.2.1.tgz#a1f324fa5c098bddf36de221abcc32070c77b5db" - integrity sha512-u71Adr4nWi+4EmSZq5EV/fg9d1dYO6W26RNtT9LISEyjhH1q23vJIUkSqRwHgD6v7xxsxLOY5cSdVyaNE6rqzw== +postcss-lab-function@^5.2.3: + version "5.2.3" + resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-5.2.3.tgz#52ae2b90738c3aa2934519242cfc0a4d44ace29f" + integrity sha512-fi32AYKzji5/rvgxo5zXHFvAYBw0u0OzELbeCNjEZVLUir18Oj+9RmNphtM8QdLUaUnrfx8zy8vVYLmFLkdmrQ== dependencies: - "@csstools/css-color-parser" "^1.1.2" + "@csstools/css-color-parser" "^1.2.0" "@csstools/css-parser-algorithms" "^2.1.1" "@csstools/css-tokenizer" "^2.1.1" - "@csstools/postcss-progressive-custom-properties" "^2.0.0" + "@csstools/postcss-progressive-custom-properties" "^2.3.0" postcss-load-config@^4.0.1: version "4.0.1" @@ -3669,10 +3705,10 @@ postcss-loader@^7.3.3: jiti "^1.18.2" semver "^7.3.8" -postcss-logical@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-6.1.0.tgz#c33ae75d3edaea7eb821e76dc4e6d0ecedc3200d" - integrity sha512-qb1+LpClhYjxac8SfOcWotnY3unKZesDqIOm+jnGt8rTl7xaIWpE2bPGZHxflOip1E/4ETo79qlJyRL3yrHn1g== +postcss-logical@^6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-6.2.0.tgz#85e49cfee3ffda839d4befcab9f70c70a7bb337a" + integrity sha512-aqlfKGaY0nnbgI9jwUikp4gJKBqcH5noU/EdnIVceghaaDPYhZuyJVxlvWNy55tlTG5tunRKCTAX9yljLiFgmw== dependencies: postcss-value-parser "^4.2.0" @@ -3719,10 +3755,10 @@ postcss-nested@^6.0.1: dependencies: postcss-selector-parser "^6.0.11" -postcss-nesting@^11.2.1: - version "11.2.2" - resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-11.2.2.tgz#ddedfea5a1fdcd8d753298d82297ad15d5640c0f" - integrity sha512-aOTiUniAB1bcPE6GGiynWRa6PZFPhOTAm5q3q5cem6QeSijIHHkWr6gs65ukCZMXeak8yXeZVbBJET3VM+HlhA== +postcss-nesting@^11.3.0: + version "11.3.0" + resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-11.3.0.tgz#f0a16ecd55555770d41974236c90918447355a5f" + integrity sha512-JlS10AQm/RzyrUGgl5irVkAlZYTJ99mNueUl+Qab+TcHhVedLiylWVkKBhRale+rS9yWIJK48JVzQlq3LcSdeA== dependencies: "@csstools/selector-specificity" "^2.0.0" postcss-selector-parser "^6.0.10" @@ -3751,58 +3787,59 @@ postcss-place@^8.0.1: dependencies: postcss-value-parser "^4.2.0" -postcss-preset-env@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-8.3.2.tgz#9ec368e0f0df9c693d52b69d525d366fe4b1833a" - integrity sha512-VSAOsfxTXzO/gX5QljC8x8hN3ABbD9iqqLgqHqohBdNI5FhJptwpl96kpu+kYvvzK7BWwaHYou0IeYrp+NqmcQ== +postcss-preset-env@^8.5.1: + version "8.5.1" + resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-8.5.1.tgz#f4f10fb5374514b80cc68b8937deb310a4f07415" + integrity sha512-qhWnJJjP6ArLUINWJ38t6Aftxnv9NW6cXK0NuwcLCcRilbuw72dSFLkCVUJeCfHGgJiKzX+pnhkGiki0PEynWg== dependencies: "@csstools/postcss-cascade-layers" "^3.0.1" - "@csstools/postcss-color-function" "^2.2.1" - "@csstools/postcss-color-mix-function" "^1.0.1" + "@csstools/postcss-color-function" "^2.2.3" + "@csstools/postcss-color-mix-function" "^1.0.3" "@csstools/postcss-font-format-keywords" "^2.0.2" - "@csstools/postcss-gradients-interpolation-method" "^3.0.4" - "@csstools/postcss-hwb-function" "^2.2.1" - "@csstools/postcss-ic-unit" "^2.0.2" - "@csstools/postcss-is-pseudo-class" "^3.2.0" + "@csstools/postcss-gradients-interpolation-method" "^3.0.6" + "@csstools/postcss-hwb-function" "^2.2.2" + "@csstools/postcss-ic-unit" "^2.0.4" + "@csstools/postcss-is-pseudo-class" "^3.2.1" "@csstools/postcss-logical-float-and-clear" "^1.0.1" "@csstools/postcss-logical-resize" "^1.0.1" "@csstools/postcss-logical-viewport-units" "^1.0.3" - "@csstools/postcss-media-minmax" "^1.0.2" - "@csstools/postcss-media-queries-aspect-ratio-number-values" "^1.0.2" + "@csstools/postcss-media-minmax" "^1.0.4" + "@csstools/postcss-media-queries-aspect-ratio-number-values" "^1.0.4" "@csstools/postcss-nested-calc" "^2.0.2" "@csstools/postcss-normalize-display-values" "^2.0.1" - "@csstools/postcss-oklab-function" "^2.2.1" - "@csstools/postcss-progressive-custom-properties" "^2.1.0" + "@csstools/postcss-oklab-function" "^2.2.3" + "@csstools/postcss-progressive-custom-properties" "^2.3.0" + "@csstools/postcss-relative-color-syntax" "^1.0.2" "@csstools/postcss-scope-pseudo-class" "^2.0.2" "@csstools/postcss-stepped-value-functions" "^2.1.1" - "@csstools/postcss-text-decoration-shorthand" "^2.2.3" + "@csstools/postcss-text-decoration-shorthand" "^2.2.4" "@csstools/postcss-trigonometric-functions" "^2.1.1" "@csstools/postcss-unset-value" "^2.0.1" autoprefixer "^10.4.14" - browserslist "^4.21.5" + browserslist "^4.21.9" css-blank-pseudo "^5.0.2" css-has-pseudo "^5.0.2" css-prefers-color-scheme "^8.0.2" - cssdb "^7.5.3" + cssdb "^7.6.0" postcss-attribute-case-insensitive "^6.0.2" postcss-clamp "^4.1.0" - postcss-color-functional-notation "^5.0.2" + postcss-color-functional-notation "^5.1.0" postcss-color-hex-alpha "^9.0.2" postcss-color-rebeccapurple "^8.0.2" - postcss-custom-media "^9.1.3" - postcss-custom-properties "^13.1.5" + postcss-custom-media "^9.1.5" + postcss-custom-properties "^13.2.0" postcss-custom-selectors "^7.1.3" postcss-dir-pseudo-class "^7.0.2" - postcss-double-position-gradients "^4.0.2" + postcss-double-position-gradients "^4.0.4" postcss-focus-visible "^8.0.2" postcss-focus-within "^7.0.2" postcss-font-variant "^5.0.0" postcss-gap-properties "^4.0.1" postcss-image-set-function "^5.0.2" postcss-initial "^4.0.1" - postcss-lab-function "^5.2.1" - postcss-logical "^6.1.0" - postcss-nesting "^11.2.1" + postcss-lab-function "^5.2.3" + postcss-logical "^6.2.0" + postcss-nesting "^11.3.0" postcss-opacity-percentage "^2.0.0" postcss-overflow-shorthand "^4.0.1" postcss-page-break "^3.0.4" From 7c41f288196cb631d402e2e46b85b6f795173057 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 17:40:57 +0200 Subject: [PATCH 11/42] =?UTF-8?q?[js]=20Update=20esbuild=200.14.25=20?= =?UTF-8?q?=E2=86=92=200.14.54=20(minor)=20(#2257)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 252 ++++++++++++++++++++++++++------------------------- 2 files changed, 130 insertions(+), 124 deletions(-) diff --git a/package.json b/package.json index 2be16db88d..dcdea8c960 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "css-loader": "^6.7.3", "easymde": "^2.18.0", "el-transition": "^0.0.7", - "esbuild": "^0.14.25", + "esbuild": "^0.14.54", "eslint-config-airbnb": "^19.0.4", "eslint-import-resolver-alias": "^1.1.2", "eslint-plugin-sort-imports-es6-autofix": "^0.6.0", diff --git a/yarn.lock b/yarn.lock index 0955ff4fc2..edd8a78fd8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1339,6 +1339,11 @@ resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz#2cbcf822bf3764c9658c4d2e568bd0c0cb748016" integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw== +"@esbuild/linux-loong64@0.14.54": + version "0.14.54" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028" + integrity sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw== + "@eslint-community/eslint-utils@^4.2.0": version "4.4.0" resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" @@ -2264,90 +2269,90 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -esbuild-android-64@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.25.tgz#d532d38cb5fe0ae45167ce35f4bbc784c636be40" - integrity sha512-L5vCUk7TzFbBnoESNoXjU3x9+/+7TDIE/1mTfy/erAfvZAqC+S3sp/Qa9wkypFMcFvN9FzvESkTlpeQDolREtQ== - -esbuild-android-arm64@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.25.tgz#9c5bb3366aabfd14a1c726d36978b79441dfcb6e" - integrity sha512-4jv5xPjM/qNm27T5j3ZEck0PvjgQtoMHnz4FzwF5zNP56PvY2CT0WStcAIl6jNlsuDdN63rk2HRBIsO6xFbcFw== - -esbuild-darwin-64@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.25.tgz#05dcdb6d884f427039ffee5e92ff97527e56c26d" - integrity sha512-TGp8tuudIxOyWd1+8aYPxQmC1ZQyvij/AfNBa35RubixD0zJ1vkKHVAzo0Zao1zcG6pNqiSyzfPto8vmg0s7oA== - -esbuild-darwin-arm64@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.25.tgz#28e080da4ea0cfe9498071e7f8060498caee1a95" - integrity sha512-oTcDgdm0MDVEmw2DWu8BV68pYuImpFgvWREPErBZmNA4MYKGuBRaCiJqq6jZmBR1x+3y1DWCjez+5uLtuAm6mw== - -esbuild-freebsd-64@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.25.tgz#200d3664a3b945bc9fdcba73614b49a11ebd1cfa" - integrity sha512-ueAqbnMZ8arnuLH8tHwTCQYeptnHOUV7vA6px6j4zjjQwDx7TdP7kACPf3TLZLdJQ3CAD1XCvQ2sPhX+8tacvQ== - -esbuild-freebsd-arm64@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.25.tgz#624b08c5da6013bdc312aaa23c4ff409580f5c3c" - integrity sha512-+ZVWud2HKh+Ob6k/qiJWjBtUg4KmJGGmbvEXXW1SNKS7hW7HU+Zq2ZCcE1akFxOPkVB+EhOty/sSek30tkCYug== - -esbuild-linux-32@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.25.tgz#0238e597eb0b60aa06c7e98fccbbfd6bb9a0d6c5" - integrity sha512-3OP/lwV3kCzEz45tobH9nj+uE4ubhGsfx+tn0L26WAGtUbmmcRpqy7XRG/qK7h1mClZ+eguIANcQntYMdYklfw== - -esbuild-linux-64@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.25.tgz#8a8b8cf47dfce127c858e71229d9a385a82c62e8" - integrity sha512-+aKHdHZmX9qwVlQmu5xYXh7GsBFf4TWrePgeJTalhXHOG7NNuUwoHmketGiZEoNsWyyqwH9rE5BC+iwcLY30Ug== - -esbuild-linux-arm64@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.25.tgz#7ac94371418a2640ba413bc1700aaedeb2794e52" - integrity sha512-UxfenPx/wSZx55gScCImPtXekvZQLI2GW3qe5dtlmU7luiqhp5GWPzGeQEbD3yN3xg/pHc671m5bma5Ns7lBHw== - -esbuild-linux-arm@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.25.tgz#034bd18e9310b9f010c89f90ef7f05706689600b" - integrity sha512-aTLcE2VBoLydL943REcAcgnDi3bHtmULSXWLbjtBdtykRatJVSxKMjK9YlBXUZC4/YcNQfH7AxwVeQr9fNxPhw== - -esbuild-linux-mips64le@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.25.tgz#05f98a8cf6b578eab6b4e6b0ab094f37530934f4" - integrity sha512-wLWYyqVfYx9Ur6eU5RT92yJVsaBGi5RdkoWqRHOqcJ38Kn60QMlcghsKeWfe9jcYut8LangYZ98xO1LxIoSXrQ== - -esbuild-linux-ppc64le@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.25.tgz#46fd0add8d8535678439d7a9c2876ad20042d952" - integrity sha512-0dR6Csl6Zas3g4p9ULckEl8Mo8IInJh33VCJ3eaV1hj9+MHGdmDOakYMN8MZP9/5nl+NU/0ygpd14cWgy8uqRw== - -esbuild-linux-riscv64@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.25.tgz#ea2e986f0f3e5df73c635135dd778051734fc605" - integrity sha512-J4d20HDmTrgvhR0bdkDhvvJGaikH3LzXQnNaseo8rcw9Yqby9A90gKUmWpfwqLVNRILvNnAmKLfBjCKU9ajg8w== - -esbuild-linux-s390x@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.25.tgz#efe89486e9a1b1508925048076e3f3a6698aa6a3" - integrity sha512-YI2d5V6nTE73ZnhEKQD7MtsPs1EtUZJ3obS21oxQxGbbRw1G+PtJKjNyur+3t6nzHP9oTg6GHQ3S3hOLLmbDIQ== - -esbuild-netbsd-64@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.25.tgz#439fe27d8ee3b5887501ee63988e85f920107db6" - integrity sha512-TKIVgNWLUOkr+Exrye70XTEE1lJjdQXdM4tAXRzfHE9iBA7LXWcNtVIuSnphTqpanPzTDFarF0yqq4kpbC6miA== - -esbuild-openbsd-64@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.25.tgz#31ebf616aadf6e60674469f2b92cec92280d9930" - integrity sha512-QgFJ37A15D7NIXBTYEqz29+uw3nNBOIyog+3kFidANn6kjw0GHZ0lEYQn+cwjyzu94WobR+fes7cTl/ZYlHb1A== - -esbuild-sunos-64@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.25.tgz#815e4f936d74970292a63ccfd5791fe5e3569f5f" - integrity sha512-rmWfjUItYIVlqr5EnTH1+GCxXiBOC42WBZ3w++qh7n2cS9Xo0lO5pGSG2N+huOU2fX5L+6YUuJ78/vOYvefeFw== +esbuild-android-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz#505f41832884313bbaffb27704b8bcaa2d8616be" + integrity sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ== + +esbuild-android-arm64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz#8ce69d7caba49646e009968fe5754a21a9871771" + integrity sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg== + +esbuild-darwin-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz#24ba67b9a8cb890a3c08d9018f887cc221cdda25" + integrity sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug== + +esbuild-darwin-arm64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz#3f7cdb78888ee05e488d250a2bdaab1fa671bf73" + integrity sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw== + +esbuild-freebsd-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz#09250f997a56ed4650f3e1979c905ffc40bbe94d" + integrity sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg== + +esbuild-freebsd-arm64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz#bafb46ed04fc5f97cbdb016d86947a79579f8e48" + integrity sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q== + +esbuild-linux-32@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz#e2a8c4a8efdc355405325033fcebeb941f781fe5" + integrity sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw== + +esbuild-linux-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz#de5fdba1c95666cf72369f52b40b03be71226652" + integrity sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg== + +esbuild-linux-arm64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz#dae4cd42ae9787468b6a5c158da4c84e83b0ce8b" + integrity sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig== + +esbuild-linux-arm@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz#a2c1dff6d0f21dbe8fc6998a122675533ddfcd59" + integrity sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw== + +esbuild-linux-mips64le@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz#d9918e9e4cb972f8d6dae8e8655bf9ee131eda34" + integrity sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw== + +esbuild-linux-ppc64le@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz#3f9a0f6d41073fb1a640680845c7de52995f137e" + integrity sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ== + +esbuild-linux-riscv64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz#618853c028178a61837bc799d2013d4695e451c8" + integrity sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg== + +esbuild-linux-s390x@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz#d1885c4c5a76bbb5a0fe182e2c8c60eb9e29f2a6" + integrity sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA== + +esbuild-netbsd-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz#69ae917a2ff241b7df1dbf22baf04bd330349e81" + integrity sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w== + +esbuild-openbsd-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz#db4c8495287a350a6790de22edea247a57c5d47b" + integrity sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw== + +esbuild-sunos-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz#54287ee3da73d3844b721c21bc80c1dc7e1bf7da" + integrity sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw== esbuild-visualizer@^0.3.1: version "0.3.1" @@ -2358,46 +2363,47 @@ esbuild-visualizer@^0.3.1: open "^7.4.2" yargs "^16.2.0" -esbuild-windows-32@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.25.tgz#189e14df2478f2c193c86968ab1fb54e1ceaafd2" - integrity sha512-HGAxVUofl3iUIz9W10Y9XKtD0bNsK9fBXv1D55N/ljNvkrAYcGB8YCm0v7DjlwtyS6ws3dkdQyXadbxkbzaKOA== - -esbuild-windows-64@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.25.tgz#3d5fbfdc3856850bb47439299e3b60dd18be111f" - integrity sha512-TirEohRkfWU9hXLgoDxzhMQD1g8I2mOqvdQF2RS9E/wbkORTAqJHyh7wqGRCQAwNzdNXdg3JAyhQ9/177AadWA== - -esbuild-windows-arm64@0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.25.tgz#8b243cbbad8a86cf98697da9ccb88c05df2ef458" - integrity sha512-4ype9ERiI45rSh+R8qUoBtaj6kJvUOI7oVLhKqPEpcF4Pa5PpT3hm/mXAyotJHREkHpM87PAJcA442mLnbtlNA== - -esbuild@^0.14.25: - version "0.14.25" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.25.tgz#ddb9d47b91ca76abb7d850ce3dfed0bc3dc88d16" - integrity sha512-4JHEIOMNFvK09ziiL+iVmldIhLbn49V4NAVo888tcGFKedEZY/Y8YapfStJ6zSE23tzYPKxqKwQBnQoIO0BI/Q== +esbuild-windows-32@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz#f8aaf9a5667630b40f0fb3aa37bf01bbd340ce31" + integrity sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w== + +esbuild-windows-64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz#bf54b51bd3e9b0f1886ffdb224a4176031ea0af4" + integrity sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ== + +esbuild-windows-arm64@0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz#937d15675a15e4b0e4fafdbaa3a01a776a2be982" + integrity sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg== + +esbuild@^0.14.54: + version "0.14.54" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.54.tgz#8b44dcf2b0f1a66fc22459943dccf477535e9aa2" + integrity sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA== optionalDependencies: - esbuild-android-64 "0.14.25" - esbuild-android-arm64 "0.14.25" - esbuild-darwin-64 "0.14.25" - esbuild-darwin-arm64 "0.14.25" - esbuild-freebsd-64 "0.14.25" - esbuild-freebsd-arm64 "0.14.25" - esbuild-linux-32 "0.14.25" - esbuild-linux-64 "0.14.25" - esbuild-linux-arm "0.14.25" - esbuild-linux-arm64 "0.14.25" - esbuild-linux-mips64le "0.14.25" - esbuild-linux-ppc64le "0.14.25" - esbuild-linux-riscv64 "0.14.25" - esbuild-linux-s390x "0.14.25" - esbuild-netbsd-64 "0.14.25" - esbuild-openbsd-64 "0.14.25" - esbuild-sunos-64 "0.14.25" - esbuild-windows-32 "0.14.25" - esbuild-windows-64 "0.14.25" - esbuild-windows-arm64 "0.14.25" + "@esbuild/linux-loong64" "0.14.54" + esbuild-android-64 "0.14.54" + esbuild-android-arm64 "0.14.54" + esbuild-darwin-64 "0.14.54" + esbuild-darwin-arm64 "0.14.54" + esbuild-freebsd-64 "0.14.54" + esbuild-freebsd-arm64 "0.14.54" + esbuild-linux-32 "0.14.54" + esbuild-linux-64 "0.14.54" + esbuild-linux-arm "0.14.54" + esbuild-linux-arm64 "0.14.54" + esbuild-linux-mips64le "0.14.54" + esbuild-linux-ppc64le "0.14.54" + esbuild-linux-riscv64 "0.14.54" + esbuild-linux-s390x "0.14.54" + esbuild-netbsd-64 "0.14.54" + esbuild-openbsd-64 "0.14.54" + esbuild-sunos-64 "0.14.54" + esbuild-windows-32 "0.14.54" + esbuild-windows-64 "0.14.54" + esbuild-windows-arm64 "0.14.54" escalade@^3.1.1: version "3.1.1" From f9c17d2ee83140c69da9c3266bb7ee3416e85d82 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 20:10:54 +0200 Subject: [PATCH 12/42] =?UTF-8?q?[js]=20Update=20regenerator-runtime=200.1?= =?UTF-8?q?3.9=20=E2=86=92=200.13.11=20(minor)=20(#2264)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index dcdea8c960..3f3faa9558 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "postcss-nested": "^6.0.1", "postcss-nested-ancestors": "^3.0.0", "postcss-preset-env": "^8.5.1", - "regenerator-runtime": "^0.13.9", + "regenerator-runtime": "^0.13.11", "stimulus-rails-nested-form": "^4.1.0", "stimulus-use": "^0.50.0", "tailwindcss": "^3.3.6", diff --git a/yarn.lock b/yarn.lock index edd8a78fd8..86c52819db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3994,10 +3994,10 @@ regenerate@^1.4.2: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== -regenerator-runtime@^0.13.9: - version "0.13.9" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" - integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== +regenerator-runtime@^0.13.11: + version "0.13.11" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" + integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== regenerator-runtime@^0.14.0: version "0.14.0" From a58caf2d12a9b72883261cf80592ce7a69bea519 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 19 Dec 2023 20:10:59 +0200 Subject: [PATCH 13/42] =?UTF-8?q?[js]=20Update=20prettier=202.5.1=20?= =?UTF-8?q?=E2=86=92=202.8.8=20(minor)=20(#2263)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3f3faa9558..ef8580d3a3 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "eslint": "^8.56.0", "eslint-config-airbnb-base": "^15.0.0", "eslint-plugin-import": "^2.29.1", - "prettier": "^2.5.1", + "prettier": "^2.8.8", "prettier-plugin-erb": "^0.4.0" }, "browserslist": [ diff --git a/yarn.lock b/yarn.lock index 86c52819db..622aa94841 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3948,11 +3948,16 @@ prettier-plugin-erb@^0.4.0: dependencies: prettier-html-templates "^0.1.0" -prettier@>=2.3.0, prettier@^2.5.1: +prettier@>=2.3.0: version "2.5.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a" integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg== +prettier@^2.8.8: + version "2.8.8" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" + integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== + proxy-from-env@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" From 486409c076b3f723385976f81d52c946edc1077f Mon Sep 17 00:00:00 2001 From: Paul Bob <69730720+Paul-Bob@users.noreply.github.com> Date: Tue, 19 Dec 2023 21:58:50 +0200 Subject: [PATCH 14/42] chore: remove ujs (#2256) --- app/components/avo/resource_component.rb | 5 +++-- .../avo/sidebar_profile_component.html.erb | 5 +++-- app/javascript/avo.base.js | 2 -- package.json | 1 - spec/system/avo/belongs_to_polymorphic_spec.rb | 1 + spec/system/avo/sign_out_dropdown_spec.rb | 17 ++++++++--------- yarn.lock | 5 ----- 7 files changed, 15 insertions(+), 21 deletions(-) diff --git a/app/components/avo/resource_component.rb b/app/components/avo/resource_component.rb index 3b7c53861c..0bdbc90c7e 100644 --- a/app/components/avo/resource_component.rb +++ b/app/components/avo/resource_component.rb @@ -240,13 +240,14 @@ def render_edit_button(control) def render_detach_button(control) return unless is_a_related_resource? && can_detach? - a_button url: detach_path, + a_link detach_path, icon: "detach", method: :delete, form_class: "flex flex-col sm:flex-row sm:inline-flex", style: :text, data: { - confirm: "Are you sure you want to detach this #{title}." + turbo_method: :delete, + turbo_confirm: "Are you sure you want to detach this #{title}." } do control.label || t("avo.detach_item", item: title).humanize end diff --git a/app/components/avo/sidebar_profile_component.html.erb b/app/components/avo/sidebar_profile_component.html.erb index 2ac83bcfb1..6e74648b54 100644 --- a/app/components/avo/sidebar_profile_component.html.erb +++ b/app/components/avo/sidebar_profile_component.html.erb @@ -41,11 +41,12 @@ <% end %> <%= render "avo/partials/profile_menu_extra" %> <% if can_destroy_user? %> - <%= button_to helpers.main_app.send(destroy_user_session_path), + <%= link_to helpers.main_app.send(destroy_user_session_path), form: { "data-turbo" => "false" }, method: :delete, data: { - confirm: t('avo.are_you_sure') + turbo_method: :delete, + turbo_confirm: t('avo.are_you_sure') }, class: "flex-1 flex items-center justify-center bg-white text-left cursor-pointer text-red-600 font-semibold hover:bg-red-100 block px-4 py-1 w-full py-3 text-center rounded w-full", form_class: 'flex-1' do %> diff --git a/app/javascript/avo.base.js b/app/javascript/avo.base.js index d53b465c73..28e612ff07 100644 --- a/app/javascript/avo.base.js +++ b/app/javascript/avo.base.js @@ -5,7 +5,6 @@ import 'regenerator-runtime/runtime' import * as ActiveStorage from '@rails/activestorage' import * as Mousetrap from 'mousetrap' import { Turbo } from '@hotwired/turbo-rails' -import Rails from '@rails/ujs' import tippy from 'tippy.js' import { LocalStorageService } from './js/local-storage-service' @@ -18,7 +17,6 @@ import './js/active-storage' import './js/controllers' import './js/custom-stream-actions' -Rails.start() window.Turbolinks = Turbo diff --git a/package.json b/package.json index ef8580d3a3..44c589b693 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "@hotwired/stimulus": "^3.2.2", "@hotwired/turbo-rails": "^7.3.0", "@rails/activestorage": "^6.1.7", - "@rails/ujs": "^6.1.0", "@tailwindcss/forms": "^0.5.7", "@tailwindcss/typography": "^0.5.10", "@yaireo/tagify": "^4.17.9", diff --git a/spec/system/avo/belongs_to_polymorphic_spec.rb b/spec/system/avo/belongs_to_polymorphic_spec.rb index 8741b55416..5b44190fd7 100644 --- a/spec/system/avo/belongs_to_polymorphic_spec.rb +++ b/spec/system/avo/belongs_to_polymorphic_spec.rb @@ -230,6 +230,7 @@ click_on "Save" wait_for_loaded + sleep 0.5 expect(current_path).to eq "/admin/resources/projects/#{project.id}" diff --git a/spec/system/avo/sign_out_dropdown_spec.rb b/spec/system/avo/sign_out_dropdown_spec.rb index be9057e5bf..5f9d3bb552 100644 --- a/spec/system/avo/sign_out_dropdown_spec.rb +++ b/spec/system/avo/sign_out_dropdown_spec.rb @@ -6,21 +6,20 @@ visit "/admin/resources/posts" expect(page.body).to have_text admin.name - expect(page.body).to have_button "Sign out", visible: false + expect(page.body).to have_link "Sign out", visible: false - dots_button = find("[data-control='profile-dots']") + dots_link = find("[data-control='profile-dots']") - dots_button.click + dots_link.click - expect(page.body).to have_button "Sign out", visible: true + expect(page.body).to have_link "Sign out", visible: true # Test click away - # FIXME: Selenium::WebDriver::Error::ElementNotInteractableError: element not interactable - # page.find("body").click - # expect(page.body).to have_button "Sign out", visible: false + page.find("body").click + expect(page.body).to have_link "Sign out", visible: false - # dots_button.click - click_button "Sign out" + dots_link.click + click_link "Sign out" accept_alert wait_for_loaded diff --git a/yarn.lock b/yarn.lock index 622aa94841..ef71d084c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1502,11 +1502,6 @@ dependencies: spark-md5 "^3.0.0" -"@rails/ujs@^6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-6.1.0.tgz#9a48df6511cb2b472c9f596c1f37dc0af022e751" - integrity sha512-kQNKyM4ePAc4u9eR1c4OqrbAHH+3SJXt++8izIjeaZeg+P7yBtgoF/dogMD/JPPowNC74ACFpM/4op0Ggp/fPw== - "@tailwindcss/forms@^0.5.7": version "0.5.7" resolved "https://registry.yarnpkg.com/@tailwindcss/forms/-/forms-0.5.7.tgz#db5421f062a757b5f828bc9286ba626c6685e821" From 865649e3e0f9fabd868d4560e4233c324341c490 Mon Sep 17 00:00:00 2001 From: Adrian Marin Date: Wed, 20 Dec 2023 11:38:44 +0200 Subject: [PATCH 15/42] refactor: equal width columns in rows (#2267) --- .../avo/field_wrapper_component.html.erb | 17 +++++++++++++---- app/components/avo/row_component.html.erb | 4 ++-- spec/system/avo/app_spec.rb | 10 +++++----- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/app/components/avo/field_wrapper_component.html.erb b/app/components/avo/field_wrapper_component.html.erb index 4c970c1d95..e93c94b6ee 100644 --- a/app/components/avo/field_wrapper_component.html.erb +++ b/app/components/avo/field_wrapper_component.html.erb @@ -2,15 +2,24 @@ class: classes, style: style, data: data do %> -
+ <%= content_tag :div, class: class_names("pt-4 flex self-start items-center flex-shrink-0 w-48 px-6 uppercase font-semibold text-gray-500 text-sm", @field.get_html(:classes, view: view, element: :label), { + "md:pt-4 md:w-full": stacked?, + "h-full md:pt-0": !stacked?, + "md:h-10 ": !stacked? && short?, + "md:h-14 ": !stacked? && !short?, + "md:w-48 xl:w-64": compact?, + "md:w-64": !compact?, + }), data: {slot: "label"} do %> <% if form.present? %> <%= form.label field.id, label %> <% else %> <%= field.name %> <% end %> <% if on_edit? && field.is_required? %> * <% end %> -
-
+ <% end %> + <%= content_tag :div, class: class_names("flex-1 flex flex-row md:min-h-inherit py-2 px-6", @field.get_html(:classes, view: view, element: :content), { + "pb-4": stacked?, + }), data: {slot: "value"} do %>
<% if on_show? %> <% if field.value.blank? and dash_if_blank %> @@ -28,7 +37,7 @@ <% end %> <% end %>
-
+ <% end %> <% if params[:avo_debug].present? %> diff --git a/app/components/avo/row_component.html.erb b/app/components/avo/row_component.html.erb index bc1979f368..33a444c778 100644 --- a/app/components/avo/row_component.html.erb +++ b/app/components/avo/row_component.html.erb @@ -1,3 +1,3 @@ -
+<%= content_tag :div, class: "relative grid auto-cols-fr grid-flow-col min-h-14", data: {component: self.class.to_s} do %> <%= body %> -
+<% end %> diff --git a/spec/system/avo/app_spec.rb b/spec/system/avo/app_spec.rb index d425e66d94..8f8418a93d 100644 --- a/spec/system/avo/app_spec.rb +++ b/spec/system/avo/app_spec.rb @@ -24,15 +24,15 @@ expect(find_field("comment_body").value).to eql "hey there" - fill_in 'comment_body', with: 'yes' - click_on 'Save' + fill_in "comment_body", with: "yes" + click_on "Save" wait_for_loaded - comment.reload - expect(comment.body).to eq 'yes' - expect(current_path).to eq "/admin/resources/projects/#{project.id}" expect(page).to have_text("Comment was successfully updated.").once + + comment.reload + expect(comment.body).to eq "yes" end it "only displays one alert on record destroy from has_many" do From feab8e724a57a6e4956f6a662813f966f80b19a1 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 11:43:57 +0200 Subject: [PATCH 16/42] =?UTF-8?q?[ruby]=20Update=20erb-formatter=200.3.0?= =?UTF-8?q?=20=E2=86=92=200.6.0=20(major)=20(#2223)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Co-authored-by: Adrian Marin --- Gemfile.lock | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 71b0e85aba..38431a8360 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -198,7 +198,8 @@ GEM ruby2_keywords dry-initializer (3.1.1) e2mmap (0.1.0) - erb-formatter (0.3.0) + erb-formatter (0.6.0) + syntax_tree (~> 6.0) erubi (1.12.0) factory_bot (6.4.2) activesupport (>= 5.0.0) @@ -318,6 +319,7 @@ GEM prefixed_ids (1.6.1) hashids (>= 1.0.0, < 2.0.0) rails (>= 6.0.0) + prettier_print (1.2.1) psych (5.1.2) stringio public_suffix (5.0.4) @@ -492,6 +494,8 @@ GEM lint_roller (~> 1.1) rubocop-performance (~> 1.19.1) stringio (3.1.0) + syntax_tree (6.2.0) + prettier_print (>= 1.2.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) test-prof (1.3.1) From b74d54212ebcd4107bbebe069cc7a8ee4dd69172 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 23:07:44 +0200 Subject: [PATCH 17/42] =?UTF-8?q?[js]=20Update=20heroicons=202.0.18=20?= =?UTF-8?q?=E2=86=92=202.1.1=20(minor)=20(#2266)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Co-authored-by: Adrian Marin --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 44c589b693..9363b1c0fa 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "eslint-import-resolver-alias": "^1.1.2", "eslint-plugin-sort-imports-es6-autofix": "^0.6.0", "flatpickr": "^4.6.13", - "heroicons": "^2.0.18", + "heroicons": "^2.1.1", "js-cookie": "^3.0.5", "lodash": "^4.17.21", "luxon": "^3.4.4", diff --git a/yarn.lock b/yarn.lock index ef71d084c7..0460e53815 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2897,10 +2897,10 @@ hasown@^2.0.0: dependencies: function-bind "^1.1.2" -heroicons@^2.0.18: - version "2.0.18" - resolved "https://registry.yarnpkg.com/heroicons/-/heroicons-2.0.18.tgz#e4a5d7d0884fb1859f7171d2e41a7d89181c768e" - integrity sha512-3iaqznaz5GJ8Mox/eDfKHo7tYKuPiZV4vbg6pB6wjJhBa7ZKQlXT1KuUnsjkEiPy/ezyiqppOX6wUqYguMIq8w== +heroicons@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/heroicons/-/heroicons-2.1.1.tgz#b574c2d87bc504bf7f4fefacc20960c5672b0202" + integrity sha512-54kHbrxsTyAJJU7z07XN1OrVBX8ogN/tbclP8Doxk0X4IQmR6LEhLzJBkFK9Yc814NoXG6ZJBh9Bi/qvauzjfA== hotkeys-js@>=3: version "3.8.7" From 98f691a1f151bcfd0461746a7284f931611d977f Mon Sep 17 00:00:00 2001 From: Paul Bob <69730720+Paul-Bob@users.noreply.github.com> Date: Thu, 21 Dec 2023 19:20:48 +0200 Subject: [PATCH 18/42] fix: custom_streams_actions.js (#2281) --- app/javascript/js/custom-stream-actions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/js/custom-stream-actions.js b/app/javascript/js/custom-stream-actions.js index b2605aa359..c451163177 100644 --- a/app/javascript/js/custom-stream-actions.js +++ b/app/javascript/js/custom-stream-actions.js @@ -3,11 +3,11 @@ import { StreamActions } from '@hotwired/turbo' // TODO: move these to the avo_filters gem -StreamActions.close_filters_dropdown = () => { +StreamActions.close_filters_dropdown = function () { document.querySelector('.filters-dropdown-selector').classList.add('hidden') } -StreamActions.open_filter = () => { +StreamActions.open_filter = function () { const id = this.getAttribute('unique-id') setTimeout(() => { document.querySelector(`[data-filter-id="${id}"] .pill`).click() From 9be84b6e112222bcbc74b6b904b597a92f376106 Mon Sep 17 00:00:00 2001 From: Paul Bob Date: Thu, 21 Dec 2023 19:41:03 +0200 Subject: [PATCH 19/42] Bumped avo to 3.2.2 --- Gemfile.lock | 2 +- lib/avo/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 38431a8360..ba1634284a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - avo (3.2.1) + avo (3.2.2) actionview (>= 6.1) active_link_to activerecord (>= 6.1) diff --git a/lib/avo/version.rb b/lib/avo/version.rb index 02cc8c1452..8cb36ece99 100644 --- a/lib/avo/version.rb +++ b/lib/avo/version.rb @@ -1,3 +1,3 @@ module Avo - VERSION = "3.2.1" unless const_defined?(:VERSION) + VERSION = "3.2.2" unless const_defined?(:VERSION) end From 54f559c22a3590f0c6dc585ca6943859e68bd4af Mon Sep 17 00:00:00 2001 From: kakeruAoyama <64327383+kakeruAoyama@users.noreply.github.com> Date: Sat, 23 Dec 2023 06:30:23 +0900 Subject: [PATCH 20/42] create ja locale (#2286) --- config/initializers/pagy.rb | 1 + .../avo/templates/locales/avo.ja.yml | 126 ++++++++++++++++++ .../avo/generators/locales_generator_spec.rb | 2 +- 3 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 lib/generators/avo/templates/locales/avo.ja.yml diff --git a/config/initializers/pagy.rb b/config/initializers/pagy.rb index 85cf452c35..6d3e8b0893 100644 --- a/config/initializers/pagy.rb +++ b/config/initializers/pagy.rb @@ -10,6 +10,7 @@ def pagy_locale_path(file_name) {locale: "en"}, {locale: "es"}, {locale: "fr"}, + {locale: "ja"}, {locale: "nb"}, {locale: "pt-BR"}, {locale: "pt"}, diff --git a/lib/generators/avo/templates/locales/avo.ja.yml b/lib/generators/avo/templates/locales/avo.ja.yml new file mode 100644 index 0000000000..ffaa2e4c2e --- /dev/null +++ b/lib/generators/avo/templates/locales/avo.ja.yml @@ -0,0 +1,126 @@ +ja: + avo: + action_ran_successfully: アクションは正常に実行されました！ + actions: アクション + and_x_other_resources: その他%{count}件のリソース + are_you_sure: 本当によろしいですか？ + are_you_sure_detach_item: この%{item}をデタッチしてもよろしいですか？ + are_you_sure_you_want_to_run_this_option: このアクションを実行してもよろしいですか？ + attach: 添付 + attach_and_attach_another: アタッチして別のものをアタッチ + attach_item: "%{item}をアタッチ" + attachment_class_attached: "%{attachment_class}をアタッチしました。" + attachment_class_detached: "%{attachment_class}をデタッチしました。" + attachment_destroyed: アタッチは削除されました + cancel: キャンセル + choose_a_country: 国を選択 + choose_an_option: オプションを選択 + choose_item: "%{item}を選択" + clear_value: 値をクリア + click_to_reveal_filters: フィルターを表示するにはクリック + confirm: 確認 + create_new_item: 新しい%{item}を作成 + dashboard: ダッシュボード + dashboards: ダッシュボード + default_scope: 全て + delete: 削除 + delete_file: ファイルを削除 + delete_item: "%{item}を削除" + detach_item: "%{item}を切り離す" + details: 詳細 + download: ダウンロード + download_file: ファイルをダウンロード + download_item: "%{item}をダウンロード" + edit: 編集 + edit_item: "%{item}を編集" + empty_dashboard_message: このダッシュボードにカードを追加 + failed: 失敗 + failed_to_find_attachment: アタッチメントを見つけるのに失敗 + failed_to_load: 読み込みに失敗 + field_translations: + file: + one: ファイル + other: ファイル + zero: ファイル + people: + one: 人 + other: 人々 + zero: 人々 + filter_by: フィルター条件 + filters: フィルター + go_back: 戻る + grid_view: グリッドビュー + hide_content: 内容を非表示 + home: ホーム + key_value_field: + add_row: 行を追加 + delete_row: 行を削除 + key: キー + value: 値 + list_is_empty: リストは空です + loading: 読み込み中 + more: もっと + new: 新規 + next_page: 次のページ + no_cards_present: カードがありません + no_item_found: レコードが見つかりませんでした + no_options_available: 利用可能なオプションがありません + no_related_item_found: 関連するレコードが見つかりませんでした + not_authorized: このアクションを実行する権限がありません。 + number_of_items: + one: 一つの%{item} + other: "%{count}の%{item}" + zero: "%{item}がありません" + oops_nothing_found: おっと！ 何も見つかりませんでした... + order: + higher: レコードを上に移動 + lower: レコードを下に移動 + reorder_record: レコードを並べ替える + to_bottom: レコードを一番下に移動 + to_top: レコードを一番上に移動 + per_page: ページあたり + prev_page: 前のページ + records_selected_from_all_pages_html: 全ページから選択された全レコード + remove_selection: 選択を解除 + reset_filters: フィルターをリセット + resource_created: レコードが作成されました + resource_destroyed: レコードが破棄されました + resource_translations: + team_members: + one: チームメンバー + other: チームメンバー + zero: チームメンバー + user: + one: ユーザー + other: ユーザー + zero: ユーザー + resource_updated: レコードが更新されました + resources: リソース + run: 実行 + save: 保存 + search: + cancel_button: キャンセル + placeholder: 検索 + select_all: すべて選択 + select_all_matching: 一致するすべてを選択 + select_item: アイテムを選択 + show_content: 内容を表示 + sign_out: サインアウト + switch_to_view: "%{view_type}ビューに切り替える" + table_view: テーブルビュー + tools: ツール + type_to_search: 検索する内容を入力してください。 + unauthorized: 許可されていません + undo: 元に戻す + view: ビュー + view_item: "%{item}を表示" + was_successfully_created: は正常に作成されました + was_successfully_updated: は正常に更新されました + x_items_more: + one: もう一つのアイテム + other: "%{count}個のその他のアイテム" + zero: その他のアイテムはありません + x_records_selected_from_a_total_of_x_html: このページの%{count}個中、%{selected}個のレコードが選択されました + x_records_selected_from_all_pages_html: すべてのページから%{count}個のレコードが選択されました + x_records_selected_from_page_html: このページから%{selected}個のレコードが選択されました + you_missed_something_check_form: 何か見落としているかもしれません。フォームを確認してください。 diff --git a/spec/features/avo/generators/locales_generator_spec.rb b/spec/features/avo/generators/locales_generator_spec.rb index 6764382dbd..53efa2c73c 100644 --- a/spec/features/avo/generators/locales_generator_spec.rb +++ b/spec/features/avo/generators/locales_generator_spec.rb @@ -3,7 +3,7 @@ RSpec.feature "locales generator", type: :feature do it "generates the files" do - locales = %w[en fr nn nb pt-BR pt ro tr ar] + locales = %w[en fr nn nb pt-BR pt ro tr ar ja] files = locales.map do |locale| Rails.root.join("config", "locales", "avo.#{locale}.yml").to_s From f1eff8ae127d3c62c2e4c15e5dc58da4149c9957 Mon Sep 17 00:00:00 2001 From: Adrian Marin Date: Sun, 24 Dec 2023 11:26:00 +0200 Subject: [PATCH 21/42] chore: expose query to scopes (#2288) --- app/components/avo/views/resource_index_component.rb | 3 ++- lib/generators/avo/templates/scope.tt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/components/avo/views/resource_index_component.rb b/app/components/avo/views/resource_index_component.rb index 398221de10..d0dc1ef8b2 100644 --- a/app/components/avo/views/resource_index_component.rb +++ b/app/components/avo/views/resource_index_component.rb @@ -163,7 +163,8 @@ def scopes_list scopes: scopes, resource: resource, turbo_frame: turbo_frame, - parent_record: parent_record + parent_record: parent_record, + query: query ) end diff --git a/lib/generators/avo/templates/scope.tt b/lib/generators/avo/templates/scope.tt index 8d22460423..08e9083bc5 100644 --- a/lib/generators/avo/templates/scope.tt +++ b/lib/generators/avo/templates/scope.tt @@ -1,6 +1,6 @@ class Avo::Scopes::<%= class_name.camelize %> < Avo::Pro::Scopes::BaseScope self.name = "<%= name.underscore.humanize %>" - self.description = "<%= name.underscore.humanize %>" + # self.description = "<%= name.underscore.humanize %> description." self.scope = -> { query.all } self.visible = -> { true } end From 2692d972ded7d5abee796a1a3b0fa6650d546e06 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Sun, 24 Dec 2023 11:34:57 +0200 Subject: [PATCH 22/42] =?UTF-8?q?[js]=20Update=20tailwindcss=203.3.6=20?= =?UTF-8?q?=E2=86=92=203.4.0=20(minor)=20(#2272)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9363b1c0fa..e74f2cdec5 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "regenerator-runtime": "^0.13.11", "stimulus-rails-nested-form": "^4.1.0", "stimulus-use": "^0.50.0", - "tailwindcss": "^3.3.6", + "tailwindcss": "^3.4.0", "tailwindcss-stimulus-components": "^3.0.4", "tippy.js": "^6.3.7", "trix": "^2.0.8", diff --git a/yarn.lock b/yarn.lock index 0460e53815..ef04754eac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4307,10 +4307,10 @@ tailwindcss-stimulus-components@^3.0.4: dependencies: "@hotwired/stimulus" ">=3.0.0" -tailwindcss@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.6.tgz#4dd7986bf4902ad385d90d45fd4b2fa5fab26d5f" - integrity sha512-AKjF7qbbLvLaPieoKeTjG1+FyNZT6KaJMJPFeQyLfIp7l82ggH1fbHJSsYIvnbTFQOlkh+gBYpyby5GT1LIdLw== +tailwindcss@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.4.0.tgz#045a9c474e6885ebd0436354e611a76af1c76839" + integrity sha512-VigzymniH77knD1dryXbyxR+ePHihHociZbXnLZHUyzf2MMs2ZVqlUrZ3FvpXP8pno9JzmILt1sZPD19M3IxtA== dependencies: "@alloc/quick-lru" "^5.2.0" arg "^5.0.2" From e2182d370a817d8d1f8b4ca177dd539229df27ae Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Sun, 24 Dec 2023 11:35:50 +0200 Subject: [PATCH 23/42] =?UTF-8?q?[ruby]=20Update=20turbo-rails=201.4.0=20?= =?UTF-8?q?=E2=86=92=201.5.0=20(minor)=20(#2271)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock | 8 ++++---- gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock | 8 ++++---- gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock | 8 ++++---- gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock | 8 ++++---- gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock | 8 ++++---- gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock | 8 ++++---- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ba1634284a..a460a28645 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -252,7 +252,7 @@ GEM activesupport (>= 3.0) nokogiri (>= 1.6) io-console (0.7.1) - irb (1.10.1) + irb (1.11.0) rdoc reline (>= 0.3.8) iso (0.4.0) @@ -502,7 +502,7 @@ GEM thor (1.3.0) tilt (2.3.0) timeout (0.4.1) - turbo-rails (1.4.0) + turbo-rails (1.5.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) diff --git a/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock b/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock index f0d49d2826..2196af5e00 100644 --- a/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.1.7) + avo (3.2.1) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -196,8 +196,8 @@ GEM rspec-core (~> 3.0) ruby-progressbar (~> 1.4) gem-release (2.2.2) - globalid (1.1.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) groupdate (6.2.0) activesupport (>= 5.2) hashdiff (1.0.1) @@ -451,7 +451,7 @@ GEM thor (1.3.0) tilt (2.0.11) timeout (0.3.2) - turbo-rails (1.3.3) + turbo-rails (1.5.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) diff --git a/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock b/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock index 2076b0748a..1a08ef2c73 100644 --- a/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.1.7) + avo (3.2.1) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -196,8 +196,8 @@ GEM rspec-core (~> 3.0) ruby-progressbar (~> 1.4) gem-release (2.2.2) - globalid (1.1.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) groupdate (6.2.1) activesupport (>= 5.2) hashdiff (1.0.1) @@ -461,7 +461,7 @@ GEM thor (1.3.0) tilt (2.1.0) timeout (0.3.2) - turbo-rails (1.4.0) + turbo-rails (1.5.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) diff --git a/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock b/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock index e5a37d3bc2..37d47f7155 100644 --- a/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.1.7) + avo (3.2.1) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -196,8 +196,8 @@ GEM rspec-core (~> 3.0) ruby-progressbar (~> 1.4) gem-release (2.2.2) - globalid (1.1.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) groupdate (6.2.0) activesupport (>= 5.2) hashdiff (1.0.1) @@ -451,7 +451,7 @@ GEM thor (1.3.0) tilt (2.0.11) timeout (0.3.2) - turbo-rails (1.3.3) + turbo-rails (1.5.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) diff --git a/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock b/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock index a68551b3a6..88c9cf74f5 100644 --- a/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.1.7) + avo (3.2.1) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -196,8 +196,8 @@ GEM rspec-core (~> 3.0) ruby-progressbar (~> 1.4) gem-release (2.2.2) - globalid (1.1.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) groupdate (6.2.1) activesupport (>= 5.2) hashdiff (1.0.1) @@ -461,7 +461,7 @@ GEM thor (1.3.0) tilt (2.1.0) timeout (0.3.2) - turbo-rails (1.4.0) + turbo-rails (1.5.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) diff --git a/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock b/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock index c138c53749..67d0909cd2 100644 --- a/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.1.7) + avo (3.2.1) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -251,8 +251,8 @@ GEM inline_svg (1.8.0) activesupport (>= 3.0) nokogiri (>= 1.6) - io-console (0.7.0) - irb (1.10.1) + io-console (0.7.1) + irb (1.11.0) rdoc reline (>= 0.3.8) iso (0.4.0) @@ -485,7 +485,7 @@ GEM thor (1.3.0) tilt (2.0.11) timeout (0.4.1) - turbo-rails (1.3.3) + turbo-rails (1.5.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) diff --git a/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock b/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock index 8e3046f05a..a49c2d9999 100644 --- a/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.1.7) + avo (3.2.1) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -251,8 +251,8 @@ GEM inline_svg (1.9.0) activesupport (>= 3.0) nokogiri (>= 1.6) - io-console (0.7.0) - irb (1.10.1) + io-console (0.7.1) + irb (1.11.0) rdoc reline (>= 0.3.8) iso (0.4.0) @@ -495,7 +495,7 @@ GEM thor (1.3.0) tilt (2.1.0) timeout (0.4.1) - turbo-rails (1.4.0) + turbo-rails (1.5.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) From c40e94ce2ea6881e53c29473afc00f54451c6ed6 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Sun, 24 Dec 2023 22:19:00 +0200 Subject: [PATCH 24/42] =?UTF-8?q?[ruby]=20Update=20aws-sdk-s3=201.141.0=20?= =?UTF-8?q?=E2=86=92=201.142.0=20(minor)=20(#2287)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- Gemfile.lock | 6 +++--- gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock | 24 +++++++++++----------- gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock | 24 +++++++++++----------- gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock | 24 +++++++++++----------- gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock | 24 +++++++++++----------- gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock | 24 +++++++++++----------- gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock | 24 +++++++++++----------- gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock | 24 +++++++++++----------- gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock | 24 +++++++++++----------- 9 files changed, 99 insertions(+), 99 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a460a28645..3c8214425d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -121,8 +121,8 @@ GEM ast (2.4.2) awesome_print (1.9.2) aws-eventstream (1.3.0) - aws-partitions (1.869.0) - aws-sdk-core (3.190.0) + aws-partitions (1.873.0) + aws-sdk-core (3.190.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -130,7 +130,7 @@ GEM aws-sdk-kms (1.75.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.141.0) + aws-sdk-s3 (1.142.0) aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) diff --git a/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock b/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock index 2196af5e00..54aef10f69 100644 --- a/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.2.1) + avo (3.2.2) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -105,21 +105,21 @@ GEM thor (>= 0.14.0) ast (2.4.2) awesome_print (1.9.2) - aws-eventstream (1.2.0) - aws-partitions (1.689.0) - aws-sdk-core (3.168.4) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.873.0) + aws-sdk-core (3.190.1) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.61.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (1.75.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.117.2) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-s3 (1.142.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.2) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) backport (1.2.0) bcrypt (3.1.18) diff --git a/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock b/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock index 1a08ef2c73..7c808dd8da 100644 --- a/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.2.1) + avo (3.2.2) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -105,21 +105,21 @@ GEM thor (>= 0.14.0) ast (2.4.2) awesome_print (1.9.2) - aws-eventstream (1.2.0) - aws-partitions (1.752.0) - aws-sdk-core (3.171.0) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.873.0) + aws-sdk-core (3.190.1) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.63.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (1.75.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.121.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-s3 (1.142.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.2) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) backport (1.2.0) bcrypt (3.1.18) diff --git a/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock b/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock index 37d47f7155..d753f4716a 100644 --- a/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.2.1) + avo (3.2.2) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -105,21 +105,21 @@ GEM thor (>= 0.14.0) ast (2.4.2) awesome_print (1.9.2) - aws-eventstream (1.2.0) - aws-partitions (1.689.0) - aws-sdk-core (3.168.4) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.873.0) + aws-sdk-core (3.190.1) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.61.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (1.75.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.117.2) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-s3 (1.142.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.2) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) backport (1.2.0) bcrypt (3.1.18) diff --git a/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock b/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock index 88c9cf74f5..68411ae46e 100644 --- a/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.2.1) + avo (3.2.2) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -105,21 +105,21 @@ GEM thor (>= 0.14.0) ast (2.4.2) awesome_print (1.9.2) - aws-eventstream (1.2.0) - aws-partitions (1.752.0) - aws-sdk-core (3.171.0) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.873.0) + aws-sdk-core (3.190.1) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.63.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (1.75.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.121.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-s3 (1.142.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.2) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) backport (1.2.0) bcrypt (3.1.18) diff --git a/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock b/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock index 67d0909cd2..4c5abc8206 100644 --- a/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.2.1) + avo (3.2.2) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -120,21 +120,21 @@ GEM thor (>= 0.14.0) ast (2.4.2) awesome_print (1.9.2) - aws-eventstream (1.2.0) - aws-partitions (1.689.0) - aws-sdk-core (3.168.4) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.873.0) + aws-sdk-core (3.190.1) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.61.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (1.75.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.117.2) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-s3 (1.142.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.2) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) backport (1.2.0) base64 (0.2.0) diff --git a/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock b/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock index a49c2d9999..92dc4ad6fa 100644 --- a/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.2.1) + avo (3.2.2) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -120,21 +120,21 @@ GEM thor (>= 0.14.0) ast (2.4.2) awesome_print (1.9.2) - aws-eventstream (1.2.0) - aws-partitions (1.752.0) - aws-sdk-core (3.171.0) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.873.0) + aws-sdk-core (3.190.1) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.63.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (1.75.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.121.0) - aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-s3 (1.142.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.2) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) backport (1.2.0) base64 (0.2.0) diff --git a/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock b/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock index 28a30381df..33d4d059c1 100644 --- a/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.1.7) + avo (3.2.2) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -120,21 +120,21 @@ GEM thor (>= 0.14.0) ast (2.4.2) awesome_print (1.9.2) - aws-eventstream (1.2.0) - aws-partitions (1.848.0) - aws-sdk-core (3.186.0) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.873.0) + aws-sdk-core (3.190.1) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.72.0) - aws-sdk-core (~> 3, >= 3.184.0) + aws-sdk-kms (1.75.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.136.0) - aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-s3 (1.142.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.1) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) backport (1.2.0) base64 (0.2.0) diff --git a/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock b/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock index 28a30381df..33d4d059c1 100644 --- a/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.1.7) + avo (3.2.2) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -120,21 +120,21 @@ GEM thor (>= 0.14.0) ast (2.4.2) awesome_print (1.9.2) - aws-eventstream (1.2.0) - aws-partitions (1.848.0) - aws-sdk-core (3.186.0) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.873.0) + aws-sdk-core (3.190.1) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.72.0) - aws-sdk-core (~> 3, >= 3.184.0) + aws-sdk-kms (1.75.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.136.0) - aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-s3 (1.142.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.1) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) backport (1.2.0) base64 (0.2.0) From 77da4df8c2ba322254b3835e71a28edf181583e0 Mon Sep 17 00:00:00 2001 From: Adrian Marin Date: Mon, 25 Dec 2023 14:05:16 +0200 Subject: [PATCH 25/42] chore: remove brakeman (#2290) --- Gemfile | 2 -- Gemfile.lock | 2 -- gemfiles/rails_6.0_ruby_3.0.3.gemfile | 1 - gemfiles/rails_6.0_ruby_3.2.2.gemfile | 1 - gemfiles/rails_6.1_ruby_3.0.3.gemfile | 1 - gemfiles/rails_6.1_ruby_3.2.2.gemfile | 1 - gemfiles/rails_7.0_ruby_3.0.3.gemfile | 1 - gemfiles/rails_7.0_ruby_3.2.2.gemfile | 1 - gemfiles/rails_7.1_ruby_3.0.3.gemfile | 1 - gemfiles/rails_7.1_ruby_3.2.2.gemfile | 1 - 10 files changed, 12 deletions(-) diff --git a/Gemfile b/Gemfile index d8fa9d0ee7..263e549216 100644 --- a/Gemfile +++ b/Gemfile @@ -74,8 +74,6 @@ group :development do gem "hotwire-livereload", "~> 1.3.0" - gem "brakeman" - gem "rubocop" gem "ripper-tags" gem "rubocop-shopify", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 3c8214425d..06542c4055 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -151,7 +151,6 @@ GEM bindex (0.8.1) bootsnap (1.17.0) msgpack (~> 1.2) - brakeman (6.1.0) builder (3.2.4) bump (0.10.0) bundler-integrity (1.0.9) @@ -558,7 +557,6 @@ DEPENDENCIES awesome_print aws-sdk-s3 bootsnap (>= 1.4.2) - brakeman bump bundler-integrity (~> 1.0) byebug diff --git a/gemfiles/rails_6.0_ruby_3.0.3.gemfile b/gemfiles/rails_6.0_ruby_3.0.3.gemfile index 99659fd530..8c7f7ef519 100644 --- a/gemfiles/rails_6.0_ruby_3.0.3.gemfile +++ b/gemfiles/rails_6.0_ruby_3.0.3.gemfile @@ -51,7 +51,6 @@ group :development do gem "annotate" gem "htmlbeautifier" gem "hotwire-livereload", "~> 1.3.0" - gem "brakeman" gem "rubocop" gem "ripper-tags" gem "rubocop-shopify", require: false diff --git a/gemfiles/rails_6.0_ruby_3.2.2.gemfile b/gemfiles/rails_6.0_ruby_3.2.2.gemfile index 99659fd530..8c7f7ef519 100644 --- a/gemfiles/rails_6.0_ruby_3.2.2.gemfile +++ b/gemfiles/rails_6.0_ruby_3.2.2.gemfile @@ -51,7 +51,6 @@ group :development do gem "annotate" gem "htmlbeautifier" gem "hotwire-livereload", "~> 1.3.0" - gem "brakeman" gem "rubocop" gem "ripper-tags" gem "rubocop-shopify", require: false diff --git a/gemfiles/rails_6.1_ruby_3.0.3.gemfile b/gemfiles/rails_6.1_ruby_3.0.3.gemfile index 55d532a1ca..478929bb35 100644 --- a/gemfiles/rails_6.1_ruby_3.0.3.gemfile +++ b/gemfiles/rails_6.1_ruby_3.0.3.gemfile @@ -51,7 +51,6 @@ group :development do gem "annotate" gem "htmlbeautifier" gem "hotwire-livereload", "~> 1.3.0" - gem "brakeman" gem "rubocop" gem "ripper-tags" gem "rubocop-shopify", require: false diff --git a/gemfiles/rails_6.1_ruby_3.2.2.gemfile b/gemfiles/rails_6.1_ruby_3.2.2.gemfile index 55d532a1ca..478929bb35 100644 --- a/gemfiles/rails_6.1_ruby_3.2.2.gemfile +++ b/gemfiles/rails_6.1_ruby_3.2.2.gemfile @@ -51,7 +51,6 @@ group :development do gem "annotate" gem "htmlbeautifier" gem "hotwire-livereload", "~> 1.3.0" - gem "brakeman" gem "rubocop" gem "ripper-tags" gem "rubocop-shopify", require: false diff --git a/gemfiles/rails_7.0_ruby_3.0.3.gemfile b/gemfiles/rails_7.0_ruby_3.0.3.gemfile index c9e0045437..386da5660c 100644 --- a/gemfiles/rails_7.0_ruby_3.0.3.gemfile +++ b/gemfiles/rails_7.0_ruby_3.0.3.gemfile @@ -51,7 +51,6 @@ group :development do gem "annotate" gem "htmlbeautifier" gem "hotwire-livereload", "~> 1.3.0" - gem "brakeman" gem "rubocop" gem "ripper-tags" gem "rubocop-shopify", require: false diff --git a/gemfiles/rails_7.0_ruby_3.2.2.gemfile b/gemfiles/rails_7.0_ruby_3.2.2.gemfile index c9e0045437..386da5660c 100644 --- a/gemfiles/rails_7.0_ruby_3.2.2.gemfile +++ b/gemfiles/rails_7.0_ruby_3.2.2.gemfile @@ -51,7 +51,6 @@ group :development do gem "annotate" gem "htmlbeautifier" gem "hotwire-livereload", "~> 1.3.0" - gem "brakeman" gem "rubocop" gem "ripper-tags" gem "rubocop-shopify", require: false diff --git a/gemfiles/rails_7.1_ruby_3.0.3.gemfile b/gemfiles/rails_7.1_ruby_3.0.3.gemfile index 771d6ba2ab..16b93d141c 100644 --- a/gemfiles/rails_7.1_ruby_3.0.3.gemfile +++ b/gemfiles/rails_7.1_ruby_3.0.3.gemfile @@ -51,7 +51,6 @@ group :development do gem "annotate" gem "htmlbeautifier" gem "hotwire-livereload", "~> 1.3.0" - gem "brakeman" gem "rubocop" gem "ripper-tags" gem "rubocop-shopify", require: false diff --git a/gemfiles/rails_7.1_ruby_3.2.2.gemfile b/gemfiles/rails_7.1_ruby_3.2.2.gemfile index 771d6ba2ab..16b93d141c 100644 --- a/gemfiles/rails_7.1_ruby_3.2.2.gemfile +++ b/gemfiles/rails_7.1_ruby_3.2.2.gemfile @@ -51,7 +51,6 @@ group :development do gem "annotate" gem "htmlbeautifier" gem "hotwire-livereload", "~> 1.3.0" - gem "brakeman" gem "rubocop" gem "ripper-tags" gem "rubocop-shopify", require: false From a9b87fe6ec1fcb19bdfa8858e70a8ea2bcd051b0 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 27 Dec 2023 22:14:39 +0200 Subject: [PATCH 26/42] Update standard to version 1.33.0 (#2293) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- Gemfile.lock | 20 +++++----- gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock | 46 +++++++++++++--------- gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock | 40 +++++++++---------- gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock | 46 +++++++++++++--------- gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock | 40 +++++++++---------- gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock | 46 +++++++++++++--------- gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock | 40 +++++++++---------- gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock | 28 ++++++------- gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock | 28 ++++++------- 9 files changed, 177 insertions(+), 157 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 06542c4055..4384e602f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -412,7 +412,7 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.1) - rubocop (1.57.2) + rubocop (1.59.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -420,14 +420,14 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-shopify (2.14.0) rubocop (~> 1.51) ruby-debug-ide (0.7.3) @@ -480,18 +480,18 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - standard (1.32.1) + standard (1.33.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.57.2) + rubocop (~> 1.59.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.2) + standard-performance (~> 1.3) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.2.1) + standard-performance (1.3.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.19.1) + rubocop-performance (~> 1.20.1) stringio (3.1.0) syntax_tree (6.2.0) prettier_print (>= 1.2.0) diff --git a/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock b/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock index 54aef10f69..1bfbcfccb8 100644 --- a/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock @@ -134,7 +134,6 @@ GEM bindex (0.8.1) bootsnap (1.16.0) msgpack (~> 1.2) - brakeman (5.4.0) builder (3.2.4) bump (0.10.0) bundler-integrity (1.0.9) @@ -238,14 +237,15 @@ GEM jmespath (1.6.2) jsbundling-rails (1.1.1) railties (>= 6.0.0) - json (2.6.3) + json (2.7.1) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - language_server-protocol (3.17.0.2) + language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) + lint_roller (1.1.0) listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -284,7 +284,7 @@ GEM racc (~> 1.4) orm_adapter (0.5.0) pagy (6.0.2) - parallel (1.22.1) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -349,7 +349,7 @@ GEM redis-client (>= 0.17.0) redis-client (0.19.0) connection_pool - regexp_parser (2.8.1) + regexp_parser (2.8.3) responders (3.1.0) actionpack (>= 5.2) railties (>= 5.2) @@ -374,26 +374,27 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.0) - rubocop (1.42.0) + rubocop (1.59.0) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.24.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.24.1) - parser (>= 3.1.1.0) - rubocop-performance (1.15.2) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.30.0) + parser (>= 3.2.1.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-shopify (2.11.1) rubocop (~> 1.42) ruby-debug-ide (0.7.3) rake (>= 0.8.1) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby-vips (2.1.4) ffi (~> 1.12) rubyzip (2.3.2) @@ -439,10 +440,18 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - standard (1.21.1) + standard (1.33.0) language_server-protocol (~> 3.17.0.2) - rubocop (= 1.42.0) - rubocop-performance (= 1.15.2) + lint_roller (~> 1.0) + rubocop (~> 1.59.0) + standard-custom (~> 1.0.0) + standard-performance (~> 1.3) + standard-custom (1.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.3.0) + lint_roller (~> 1.1) + rubocop-performance (~> 1.20.1) syntax_tree (5.2.0) prettier_print (>= 1.2.0) terminal-table (3.0.2) @@ -510,7 +519,6 @@ DEPENDENCIES awesome_print aws-sdk-s3 bootsnap (>= 1.4.2) - brakeman bump bundler-integrity (~> 1.0) byebug diff --git a/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock b/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock index 7c808dd8da..c7fd67d8c5 100644 --- a/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock @@ -134,7 +134,6 @@ GEM bindex (0.8.1) bootsnap (1.16.0) msgpack (~> 1.2) - brakeman (5.4.1) builder (3.2.4) bump (0.10.0) bundler-integrity (1.0.9) @@ -238,7 +237,7 @@ GEM jmespath (1.6.2) jsbundling-rails (1.1.1) railties (>= 6.0.0) - json (2.6.3) + json (2.7.1) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) @@ -246,7 +245,7 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) - lint_roller (1.0.0) + lint_roller (1.1.0) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -285,7 +284,7 @@ GEM racc (~> 1.4) orm_adapter (0.5.0) pagy (6.0.3) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -351,7 +350,7 @@ GEM redis-client (>= 0.17.0) redis-client (0.19.0) connection_pool - regexp_parser (2.8.1) + regexp_parser (2.8.3) responders (3.1.0) actionpack (>= 5.2) railties (>= 5.2) @@ -376,21 +375,22 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.0) - rubocop (1.50.2) + rubocop (1.59.0) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.0.0) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.28.0) + rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-performance (1.16.0) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-shopify (2.13.0) rubocop (~> 1.50) ruby-debug-ide (0.7.3) @@ -442,17 +442,18 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - standard (1.28.0) + standard (1.33.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.50.2) + rubocop (~> 1.59.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.0.1) - standard-custom (1.0.0) + standard-performance (~> 1.3) + standard-custom (1.0.2) lint_roller (~> 1.0) - standard-performance (1.0.1) - lint_roller (~> 1.0) - rubocop-performance (~> 1.16.0) + rubocop (~> 1.50) + standard-performance (1.3.0) + lint_roller (~> 1.1) + rubocop-performance (~> 1.20.1) syntax_tree (6.1.1) prettier_print (>= 1.2.0) terminal-table (3.0.2) @@ -516,7 +517,6 @@ DEPENDENCIES awesome_print aws-sdk-s3 bootsnap (>= 1.4.2) - brakeman bump bundler-integrity (~> 1.0) byebug diff --git a/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock b/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock index d753f4716a..00f042ba18 100644 --- a/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock @@ -134,7 +134,6 @@ GEM bindex (0.8.1) bootsnap (1.16.0) msgpack (~> 1.2) - brakeman (5.4.0) builder (3.2.4) bump (0.10.0) bundler-integrity (1.0.9) @@ -238,14 +237,15 @@ GEM jmespath (1.6.2) jsbundling-rails (1.1.1) railties (>= 6.0.0) - json (2.6.3) + json (2.7.1) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - language_server-protocol (3.17.0.2) + language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) + lint_roller (1.1.0) listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -284,7 +284,7 @@ GEM racc (~> 1.4) orm_adapter (0.5.0) pagy (6.0.2) - parallel (1.22.1) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -349,7 +349,7 @@ GEM redis-client (>= 0.17.0) redis-client (0.19.0) connection_pool - regexp_parser (2.8.1) + regexp_parser (2.8.3) responders (3.1.0) actionpack (>= 5.2) railties (>= 5.2) @@ -374,26 +374,27 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.0) - rubocop (1.42.0) + rubocop (1.59.0) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.24.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.24.1) - parser (>= 3.1.1.0) - rubocop-performance (1.15.2) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.30.0) + parser (>= 3.2.1.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-shopify (2.11.1) rubocop (~> 1.42) ruby-debug-ide (0.7.3) rake (>= 0.8.1) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby-vips (2.1.4) ffi (~> 1.12) rubyzip (2.3.2) @@ -439,10 +440,18 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - standard (1.21.1) + standard (1.33.0) language_server-protocol (~> 3.17.0.2) - rubocop (= 1.42.0) - rubocop-performance (= 1.15.2) + lint_roller (~> 1.0) + rubocop (~> 1.59.0) + standard-custom (~> 1.0.0) + standard-performance (~> 1.3) + standard-custom (1.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.3.0) + lint_roller (~> 1.1) + rubocop-performance (~> 1.20.1) syntax_tree (5.2.0) prettier_print (>= 1.2.0) terminal-table (3.0.2) @@ -510,7 +519,6 @@ DEPENDENCIES awesome_print aws-sdk-s3 bootsnap (>= 1.4.2) - brakeman bump bundler-integrity (~> 1.0) byebug diff --git a/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock b/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock index 68411ae46e..0a187e73d7 100644 --- a/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock @@ -134,7 +134,6 @@ GEM bindex (0.8.1) bootsnap (1.16.0) msgpack (~> 1.2) - brakeman (5.4.1) builder (3.2.4) bump (0.10.0) bundler-integrity (1.0.9) @@ -238,7 +237,7 @@ GEM jmespath (1.6.2) jsbundling-rails (1.1.1) railties (>= 6.0.0) - json (2.6.3) + json (2.7.1) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) @@ -246,7 +245,7 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) - lint_roller (1.0.0) + lint_roller (1.1.0) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -285,7 +284,7 @@ GEM racc (~> 1.4) orm_adapter (0.5.0) pagy (6.0.3) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -351,7 +350,7 @@ GEM redis-client (>= 0.17.0) redis-client (0.19.0) connection_pool - regexp_parser (2.8.1) + regexp_parser (2.8.3) responders (3.1.0) actionpack (>= 5.2) railties (>= 5.2) @@ -376,21 +375,22 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.0) - rubocop (1.50.2) + rubocop (1.59.0) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.0.0) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.28.0) + rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-performance (1.16.0) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-shopify (2.13.0) rubocop (~> 1.50) ruby-debug-ide (0.7.3) @@ -442,17 +442,18 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - standard (1.28.0) + standard (1.33.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.50.2) + rubocop (~> 1.59.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.0.1) - standard-custom (1.0.0) + standard-performance (~> 1.3) + standard-custom (1.0.2) lint_roller (~> 1.0) - standard-performance (1.0.1) - lint_roller (~> 1.0) - rubocop-performance (~> 1.16.0) + rubocop (~> 1.50) + standard-performance (1.3.0) + lint_roller (~> 1.1) + rubocop-performance (~> 1.20.1) syntax_tree (6.1.1) prettier_print (>= 1.2.0) terminal-table (3.0.2) @@ -516,7 +517,6 @@ DEPENDENCIES awesome_print aws-sdk-s3 bootsnap (>= 1.4.2) - brakeman bump bundler-integrity (~> 1.0) byebug diff --git a/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock b/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock index 4c5abc8206..f5e027f11d 100644 --- a/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock @@ -151,7 +151,6 @@ GEM bindex (0.8.1) bootsnap (1.16.0) msgpack (~> 1.2) - brakeman (5.4.0) builder (3.2.4) bump (0.10.0) bundler-integrity (1.0.9) @@ -261,14 +260,15 @@ GEM jmespath (1.6.2) jsbundling-rails (1.1.1) railties (>= 6.0.0) - json (2.6.3) + json (2.7.1) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - language_server-protocol (3.17.0.2) + language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) + lint_roller (1.1.0) listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -308,7 +308,7 @@ GEM racc (~> 1.4) orm_adapter (0.5.0) pagy (6.0.2) - parallel (1.22.1) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -380,7 +380,7 @@ GEM redis-client (>= 0.17.0) redis-client (0.19.0) connection_pool - regexp_parser (2.8.1) + regexp_parser (2.8.3) reline (0.4.1) io-console (~> 0.5) responders (3.1.0) @@ -407,26 +407,27 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.0) - rubocop (1.42.0) + rubocop (1.59.0) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.1.2.1) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.24.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.24.1) - parser (>= 3.1.1.0) - rubocop-performance (1.15.2) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) + unicode-display_width (>= 2.4.0, < 3.0) + rubocop-ast (1.30.0) + parser (>= 3.2.1.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-shopify (2.11.1) rubocop (~> 1.42) ruby-debug-ide (0.7.3) rake (>= 0.8.1) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby-vips (2.1.4) ffi (~> 1.12) ruby2_keywords (0.0.5) @@ -473,10 +474,18 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - standard (1.21.1) + standard (1.33.0) language_server-protocol (~> 3.17.0.2) - rubocop (= 1.42.0) - rubocop-performance (= 1.15.2) + lint_roller (~> 1.0) + rubocop (~> 1.59.0) + standard-custom (~> 1.0.0) + standard-performance (~> 1.3) + standard-custom (1.0.2) + lint_roller (~> 1.0) + rubocop (~> 1.50) + standard-performance (1.3.0) + lint_roller (~> 1.1) + rubocop-performance (~> 1.20.1) syntax_tree (5.2.0) prettier_print (>= 1.2.0) terminal-table (3.0.2) @@ -544,7 +553,6 @@ DEPENDENCIES awesome_print aws-sdk-s3 bootsnap (>= 1.4.2) - brakeman bump bundler-integrity (~> 1.0) byebug diff --git a/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock b/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock index 92dc4ad6fa..ac7b493e1d 100644 --- a/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock @@ -151,7 +151,6 @@ GEM bindex (0.8.1) bootsnap (1.16.0) msgpack (~> 1.2) - brakeman (5.4.1) builder (3.2.4) bump (0.10.0) bundler-integrity (1.0.9) @@ -261,7 +260,7 @@ GEM jmespath (1.6.2) jsbundling-rails (1.1.1) railties (>= 6.0.0) - json (2.6.3) + json (2.7.1) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) @@ -269,7 +268,7 @@ GEM language_server-protocol (3.17.0.3) launchy (2.5.2) addressable (~> 2.8) - lint_roller (1.0.0) + lint_roller (1.1.0) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -309,7 +308,7 @@ GEM racc (~> 1.4) orm_adapter (0.5.0) pagy (6.0.3) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -382,7 +381,7 @@ GEM redis-client (>= 0.17.0) redis-client (0.19.0) connection_pool - regexp_parser (2.8.1) + regexp_parser (2.8.3) reline (0.4.1) io-console (~> 0.5) responders (3.1.0) @@ -409,21 +408,22 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.0) - rubocop (1.50.2) + rubocop (1.59.0) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.0.0) + parser (>= 3.2.2.4) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.0, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.28.0) + rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-performance (1.16.0) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-shopify (2.13.0) rubocop (~> 1.50) ruby-debug-ide (0.7.3) @@ -476,17 +476,18 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - standard (1.28.0) + standard (1.33.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.50.2) + rubocop (~> 1.59.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.0.1) - standard-custom (1.0.0) + standard-performance (~> 1.3) + standard-custom (1.0.2) lint_roller (~> 1.0) - standard-performance (1.0.1) - lint_roller (~> 1.0) - rubocop-performance (~> 1.16.0) + rubocop (~> 1.50) + standard-performance (1.3.0) + lint_roller (~> 1.1) + rubocop-performance (~> 1.20.1) syntax_tree (6.1.1) prettier_print (>= 1.2.0) terminal-table (3.0.2) @@ -551,7 +552,6 @@ DEPENDENCIES awesome_print aws-sdk-s3 bootsnap (>= 1.4.2) - brakeman bump bundler-integrity (~> 1.0) byebug diff --git a/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock b/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock index 33d4d059c1..9cfd6ec541 100644 --- a/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock @@ -151,7 +151,6 @@ GEM bindex (0.8.1) bootsnap (1.17.0) msgpack (~> 1.2) - brakeman (6.0.1) builder (3.2.4) bump (0.10.0) bundler-integrity (1.0.9) @@ -261,7 +260,7 @@ GEM jmespath (1.6.2) jsbundling-rails (1.2.1) railties (>= 6.0.0) - json (2.6.3) + json (2.7.1) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) @@ -309,7 +308,7 @@ GEM racc (~> 1.4) orm_adapter (0.5.0) pagy (6.1.0) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -382,7 +381,7 @@ GEM redis-client (>= 0.17.0) redis-client (0.19.0) connection_pool - regexp_parser (2.8.2) + regexp_parser (2.8.3) reline (0.4.1) io-console (~> 0.5) responders (3.1.1) @@ -409,7 +408,7 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.1) - rubocop (1.57.2) + rubocop (1.59.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -417,14 +416,14 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-shopify (2.14.0) rubocop (~> 1.51) ruby-debug-ide (0.7.3) @@ -477,18 +476,18 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - standard (1.32.0) + standard (1.33.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.57.2) + rubocop (~> 1.59.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.2) + standard-performance (~> 1.3) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.2.1) + standard-performance (1.3.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.19.1) + rubocop-performance (~> 1.20.1) syntax_tree (6.2.0) prettier_print (>= 1.2.0) terminal-table (3.0.2) @@ -553,7 +552,6 @@ DEPENDENCIES awesome_print aws-sdk-s3 bootsnap (>= 1.4.2) - brakeman bump bundler-integrity (~> 1.0) byebug diff --git a/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock b/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock index 33d4d059c1..9cfd6ec541 100644 --- a/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock @@ -151,7 +151,6 @@ GEM bindex (0.8.1) bootsnap (1.17.0) msgpack (~> 1.2) - brakeman (6.0.1) builder (3.2.4) bump (0.10.0) bundler-integrity (1.0.9) @@ -261,7 +260,7 @@ GEM jmespath (1.6.2) jsbundling-rails (1.2.1) railties (>= 6.0.0) - json (2.6.3) + json (2.7.1) kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) @@ -309,7 +308,7 @@ GEM racc (~> 1.4) orm_adapter (0.5.0) pagy (6.1.0) - parallel (1.23.0) + parallel (1.24.0) parser (3.2.2.4) ast (~> 2.4.1) racc @@ -382,7 +381,7 @@ GEM redis-client (>= 0.17.0) redis-client (0.19.0) connection_pool - regexp_parser (2.8.2) + regexp_parser (2.8.3) reline (0.4.1) io-console (~> 0.5) responders (3.1.1) @@ -409,7 +408,7 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.1) - rubocop (1.57.2) + rubocop (1.59.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -417,14 +416,14 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.28.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-performance (1.19.1) - rubocop (>= 1.7.0, < 2.0) - rubocop-ast (>= 0.4.0) + rubocop-performance (1.20.1) + rubocop (>= 1.48.1, < 2.0) + rubocop-ast (>= 1.30.0, < 2.0) rubocop-shopify (2.14.0) rubocop (~> 1.51) ruby-debug-ide (0.7.3) @@ -477,18 +476,18 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - standard (1.32.0) + standard (1.33.0) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.57.2) + rubocop (~> 1.59.0) standard-custom (~> 1.0.0) - standard-performance (~> 1.2) + standard-performance (~> 1.3) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.2.1) + standard-performance (1.3.0) lint_roller (~> 1.1) - rubocop-performance (~> 1.19.1) + rubocop-performance (~> 1.20.1) syntax_tree (6.2.0) prettier_print (>= 1.2.0) terminal-table (3.0.2) @@ -553,7 +552,6 @@ DEPENDENCIES awesome_print aws-sdk-s3 bootsnap (>= 1.4.2) - brakeman bump bundler-integrity (~> 1.0) byebug From 3b205735608786b6879c1b9af60efab5ac81ac9b Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Wed, 27 Dec 2023 22:15:27 +0200 Subject: [PATCH 27/42] Update @algolia/autocomplete-js to version 1.13.0 (#2291) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- yarn.lock | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/yarn.lock b/yarn.lock index ef04754eac..2e9d7d3405 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,43 +7,43 @@ resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== -"@algolia/autocomplete-core@1.12.2": - version "1.12.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.12.2.tgz#f36c8276c57a93b70cd5da6dcdb8817dfd9949ab" - integrity sha512-9H11byD/LotKdsAQW8LKfJRwTKde33nxieKgBRbG8jhPErnREsiAmdF82910mv2zimu66T4f9BL9zT1kGEF74g== +"@algolia/autocomplete-core@1.13.0": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.13.0.tgz#0654f26584efaf83365ab808360e0e2ce858e0f3" + integrity sha512-0v3mHfkvJBVx0aO1U290EHaLPp9pkUL8zkgbVY0JlitItrbXfYYHQHtNs1TxpA63mQAD0K0LyLzO2x+uWiBbGQ== dependencies: - "@algolia/autocomplete-plugin-algolia-insights" "1.12.2" - "@algolia/autocomplete-shared" "1.12.2" + "@algolia/autocomplete-plugin-algolia-insights" "1.13.0" + "@algolia/autocomplete-shared" "1.13.0" "@algolia/autocomplete-js@^1.0.0-alpha.46": - version "1.12.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-js/-/autocomplete-js-1.12.2.tgz#53e6564cc8a806121d2da59bc6ad869045e37e74" - integrity sha512-urCborbT4qJHZJ8atCe1YNicWQ0rJPRK6KWoufmukqZV0ktxXcRlJCstRV9j/8CqxOheB/eDWo/Rm3v9nXSJLg== + version "1.13.0" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-js/-/autocomplete-js-1.13.0.tgz#7332c1a59c876f1f993880feee1371611dbed468" + integrity sha512-gw2jbkIzSH+xljX3yoOg+5nfJwMh7jqw5T/jy/WPwgmPhn5Mv6PmosCM0huGwH2E88nwxNlY2AhbkDrS4qceAw== dependencies: - "@algolia/autocomplete-core" "1.12.2" - "@algolia/autocomplete-preset-algolia" "1.12.2" - "@algolia/autocomplete-shared" "1.12.2" + "@algolia/autocomplete-core" "1.13.0" + "@algolia/autocomplete-preset-algolia" "1.13.0" + "@algolia/autocomplete-shared" "1.13.0" htm "^3.1.1" preact "^10.13.2" -"@algolia/autocomplete-plugin-algolia-insights@1.12.2": - version "1.12.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.12.2.tgz#8d1d85f9c3f26de30fc6ece20713be849602eadf" - integrity sha512-jPlBXFZs3ukUl5bn27kF3D6JHsWwK9g2bcjIeFBld2UaZnH6ec8tcldVeYbUy6QzDevmFyTohzhb1j6MtSZBrQ== +"@algolia/autocomplete-plugin-algolia-insights@1.13.0": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.13.0.tgz#b86accfd95e899f8d1fe27d05a21df24b56ec96b" + integrity sha512-Q0rRUZ72x7piqvJKi1//SBZvoImnYdJLRC7Yaa0rwKtkIVQFl6MmZw/p4AEDSWIu5HY3Ki3bzgYxeDyhm//P/w== dependencies: - "@algolia/autocomplete-shared" "1.12.2" + "@algolia/autocomplete-shared" "1.13.0" -"@algolia/autocomplete-preset-algolia@1.12.2": - version "1.12.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.12.2.tgz#0f4c37735f369a3fbe0604c0e7dd720db1ff5c26" - integrity sha512-eIKg14xSr5nHp4Qc9ddl59iVTGmJzOTN8KSZMR/cp76Wa78VvYG5SWSU3Qi+visFrlPWH6I0aM8RrevsnhprtQ== +"@algolia/autocomplete-preset-algolia@1.13.0": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.13.0.tgz#7157ffaf892bc0703e325fb52d1ba5074bd3c675" + integrity sha512-IlanOCLT2EvfygX5cGFR5iKgfhQB0MqCv163ldctq8l0QCVdEOM1VLIQhl0tB3ViJc5XKUB8QZ7V+DcSVtZAuQ== dependencies: - "@algolia/autocomplete-shared" "1.12.2" + "@algolia/autocomplete-shared" "1.13.0" -"@algolia/autocomplete-shared@1.12.2": - version "1.12.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.12.2.tgz#b42e193a439b8affdc54dc43ccb1d67f0740eebb" - integrity sha512-XOaJ0LeXh8jgLKgR1FF2l3aF/8pw4gdjNWucaZh2NfwU1EfXmgjsvUHS7GglJgvxUcSHDoQglr2I5zUo3piSbA== +"@algolia/autocomplete-shared@1.13.0": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.13.0.tgz#99c71b17e7ae7ef5c73d8488ee1ab4e0170f1589" + integrity sha512-YB7JlPl1coHai3Xd4OdNIMavAMbgx8eHPH9nlEgcrCqCx57njh0qReruTMRxaThBaWIkkl47jZlUnKvb8MjGGQ== "@algolia/autocomplete-theme-classic@^1.0.0-alpha.46": version "1.12.2" From f7c3e73811f7636930b0c0a6ceff26338e0b6ee5 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 28 Dec 2023 17:26:52 +0200 Subject: [PATCH 28/42] Update axios to version 1.6.3 (#2295) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index e74f2cdec5..16741dc51f 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@tailwindcss/typography": "^0.5.10", "@yaireo/tagify": "^4.17.9", "autoprefixer": "^10.4.16", - "axios": "^1.6.0", + "axios": "^1.6.3", "chart.js": "^3.9.1", "chartkick": "^4.2.0", "codemirror": "5.59.1", diff --git a/yarn.lock b/yarn.lock index 2e9d7d3405..f7370fbed6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1717,10 +1717,10 @@ available-typed-arrays@^1.0.5: resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -axios@^1.6.0: - version "1.6.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.2.tgz#de67d42c755b571d3e698df1b6504cde9b0ee9f2" - integrity sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A== +axios@^1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.3.tgz#7f50f23b3aa246eff43c54834272346c396613f4" + integrity sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww== dependencies: follow-redirects "^1.15.0" form-data "^4.0.0" From 5589b5f75754277320cd742e609539551acfcbc5 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 28 Dec 2023 18:59:17 +0200 Subject: [PATCH 29/42] Update meta-tags to version 2.20.0 (#2294) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- Gemfile.lock | 4 ++-- gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock | 4 ++-- gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock | 4 ++-- gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock | 4 ++-- gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock | 4 ++-- gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock | 4 ++-- gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock | 4 ++-- gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock | 4 ++-- gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4384e602f2..bab3e9ba5c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -283,8 +283,8 @@ GEM mapkick-rb (0.1.5) marcel (1.0.2) matrix (0.4.2) - meta-tags (2.19.0) - actionpack (>= 3.2.0, < 7.2) + meta-tags (2.20.0) + actionpack (>= 6.0.0, < 7.2) method_source (1.0.0) mini_magick (4.11.0) mini_mime (1.1.5) diff --git a/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock b/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock index 1bfbcfccb8..b16ed2d9fa 100644 --- a/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock @@ -260,8 +260,8 @@ GEM mapkick-rb (0.1.5) marcel (1.0.2) matrix (0.4.2) - meta-tags (2.18.0) - actionpack (>= 3.2.0, < 7.1) + meta-tags (2.20.0) + actionpack (>= 6.0.0, < 7.2) method_source (1.0.0) mini_magick (4.12.0) mini_mime (1.1.5) diff --git a/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock b/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock index c7fd67d8c5..c3218d7ecc 100644 --- a/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock @@ -260,8 +260,8 @@ GEM mapkick-rb (0.1.5) marcel (1.0.2) matrix (0.4.2) - meta-tags (2.18.0) - actionpack (>= 3.2.0, < 7.1) + meta-tags (2.20.0) + actionpack (>= 6.0.0, < 7.2) method_source (1.0.0) mini_magick (4.12.0) mini_mime (1.1.5) diff --git a/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock b/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock index 00f042ba18..c03ef6bc2d 100644 --- a/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock @@ -260,8 +260,8 @@ GEM mapkick-rb (0.1.5) marcel (1.0.2) matrix (0.4.2) - meta-tags (2.18.0) - actionpack (>= 3.2.0, < 7.1) + meta-tags (2.20.0) + actionpack (>= 6.0.0, < 7.2) method_source (1.0.0) mini_magick (4.12.0) mini_mime (1.1.5) diff --git a/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock b/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock index 0a187e73d7..3bbbf94cea 100644 --- a/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock @@ -260,8 +260,8 @@ GEM mapkick-rb (0.1.5) marcel (1.0.2) matrix (0.4.2) - meta-tags (2.18.0) - actionpack (>= 3.2.0, < 7.1) + meta-tags (2.20.0) + actionpack (>= 6.0.0, < 7.2) method_source (1.0.0) mini_magick (4.12.0) mini_mime (1.1.5) diff --git a/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock b/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock index f5e027f11d..4780774525 100644 --- a/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock @@ -283,8 +283,8 @@ GEM mapkick-rb (0.1.5) marcel (1.0.2) matrix (0.4.2) - meta-tags (2.19.0) - actionpack (>= 3.2.0, < 7.2) + meta-tags (2.20.0) + actionpack (>= 6.0.0, < 7.2) method_source (1.0.0) mini_magick (4.12.0) mini_mime (1.1.5) diff --git a/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock b/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock index ac7b493e1d..99ba07938c 100644 --- a/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock @@ -283,8 +283,8 @@ GEM mapkick-rb (0.1.5) marcel (1.0.2) matrix (0.4.2) - meta-tags (2.19.0) - actionpack (>= 3.2.0, < 7.2) + meta-tags (2.20.0) + actionpack (>= 6.0.0, < 7.2) method_source (1.0.0) mini_magick (4.12.0) mini_mime (1.1.5) diff --git a/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock b/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock index 9cfd6ec541..b34c5fbbf2 100644 --- a/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock @@ -283,8 +283,8 @@ GEM mapkick-rb (0.1.5) marcel (1.0.2) matrix (0.4.2) - meta-tags (2.19.0) - actionpack (>= 3.2.0, < 7.2) + meta-tags (2.20.0) + actionpack (>= 6.0.0, < 7.2) method_source (1.0.0) mini_magick (4.12.0) mini_mime (1.1.5) diff --git a/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock b/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock index 9cfd6ec541..b34c5fbbf2 100644 --- a/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock @@ -283,8 +283,8 @@ GEM mapkick-rb (0.1.5) marcel (1.0.2) matrix (0.4.2) - meta-tags (2.19.0) - actionpack (>= 3.2.0, < 7.2) + meta-tags (2.20.0) + actionpack (>= 6.0.0, < 7.2) method_source (1.0.0) mini_magick (4.12.0) mini_mime (1.1.5) From 248b6b4dea030eb518158e58ecfa6d0d80ae239c Mon Sep 17 00:00:00 2001 From: Paul Bob Date: Thu, 28 Dec 2023 20:15:56 +0200 Subject: [PATCH 30/42] Bumped avo to 3.2.3 --- Gemfile.lock | 2 +- lib/avo/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index bab3e9ba5c..dd5c359334 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - avo (3.2.2) + avo (3.2.3) actionview (>= 6.1) active_link_to activerecord (>= 6.1) diff --git a/lib/avo/version.rb b/lib/avo/version.rb index 8cb36ece99..351be9c918 100644 --- a/lib/avo/version.rb +++ b/lib/avo/version.rb @@ -1,3 +1,3 @@ module Avo - VERSION = "3.2.2" unless const_defined?(:VERSION) + VERSION = "3.2.3" unless const_defined?(:VERSION) end From d3e8d8a9084fc3767b1f4642f80a2bd2966c0094 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 28 Dec 2023 21:08:36 +0200 Subject: [PATCH 31/42] =?UTF-8?q?[js]=20Update=20postcss-loader=207.3.3=20?= =?UTF-8?q?=E2=86=92=207.3.4=20(patch)=20(#2298)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 16741dc51f..51bea788ba 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "postcss": "^8.4.32", "postcss-flexbugs-fixes": "^5.0.2", "postcss-import": "^15.1.0", - "postcss-loader": "^7.3.3", + "postcss-loader": "^7.3.4", "postcss-nested": "^6.0.1", "postcss-nested-ancestors": "^3.0.0", "postcss-preset-env": "^8.5.1", diff --git a/yarn.lock b/yarn.lock index f7370fbed6..d4dd51f084 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1982,7 +1982,7 @@ core-js@^3.34.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.34.0.tgz#5705e6ad5982678612e96987d05b27c6c7c274a5" integrity sha512-aDdvlDder8QmY91H88GzNi9EtQi2TjvQhpCX6B1v/dAZHU1AuLgHvRh54RiOerpEhEW46Tkf+vgAViB/CWC0ag== -cosmiconfig@^8.2.0: +cosmiconfig@^8.3.5: version "8.3.6" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.6.tgz#060a2b871d66dba6c8538ea1118ba1ac16f5fae3" integrity sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA== @@ -3127,7 +3127,7 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -jiti@^1.18.2, jiti@^1.19.1: +jiti@^1.19.1, jiti@^1.20.0: version "1.21.0" resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.21.0.tgz#7c97f8fe045724e136a397f7340475244156105d" integrity sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q== @@ -3697,14 +3697,14 @@ postcss-load-config@^4.0.1: lilconfig "^2.0.5" yaml "^2.1.1" -postcss-loader@^7.3.3: - version "7.3.3" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.3.3.tgz#6da03e71a918ef49df1bb4be4c80401df8e249dd" - integrity sha512-YgO/yhtevGO/vJePCQmTxiaEwER94LABZN0ZMT4A0vsak9TpO+RvKRs7EmJ8peIlB9xfXCsS7M8LjqncsUZ5HA== +postcss-loader@^7.3.4: + version "7.3.4" + resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.3.4.tgz#aed9b79ce4ed7e9e89e56199d25ad1ec8f606209" + integrity sha512-iW5WTTBSC5BfsBJ9daFMPVrLT36MrNiC6fqOZTTaHjBNX6Pfd5p+hSBqe/fEeNd7pc13QiAyGt7VdGMw4eRC4A== dependencies: - cosmiconfig "^8.2.0" - jiti "^1.18.2" - semver "^7.3.8" + cosmiconfig "^8.3.5" + jiti "^1.20.0" + semver "^7.5.4" postcss-logical@^6.2.0: version "6.2.0" @@ -4119,7 +4119,7 @@ semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.3.8: +semver@^7.3.8, semver@^7.5.4: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== From 5589e5fce48ec9a10a06862bf5baab69dbdd0cc6 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 14:59:06 +0200 Subject: [PATCH 32/42] =?UTF-8?q?[js]=20Update=20@algolia/autocomplete-the?= =?UTF-8?q?me-classic=201.12.2=20=E2=86=92=201.13.0=20(minor)=20(#2292)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Co-authored-by: Paul Bob <69730720+Paul-Bob@users.noreply.github.com> Co-authored-by: Adrian Marin --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index d4dd51f084..0750fe96cc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -46,9 +46,9 @@ integrity sha512-YB7JlPl1coHai3Xd4OdNIMavAMbgx8eHPH9nlEgcrCqCx57njh0qReruTMRxaThBaWIkkl47jZlUnKvb8MjGGQ== "@algolia/autocomplete-theme-classic@^1.0.0-alpha.46": - version "1.12.2" - resolved "https://registry.yarnpkg.com/@algolia/autocomplete-theme-classic/-/autocomplete-theme-classic-1.12.2.tgz#f845ddec82ed87d4d0397007d817c4dd56ada117" - integrity sha512-0AZzaX4jiN9fc/uO00PTZ4GUYMS/W5BIjCVMF6Rry21VhH5RYBnhH1VLNw3WUH++K2xwcyIoDIBV+tCInF0lOg== + version "1.13.0" + resolved "https://registry.yarnpkg.com/@algolia/autocomplete-theme-classic/-/autocomplete-theme-classic-1.13.0.tgz#dda4e7635d6d27e5aa0ac5cad4465934564baa75" + integrity sha512-YAyfcpi+VJ0h5PUTThDmc/V2OB47RNlvIBQgffzrjAw5vDkoBcAj5bsReJW8/QtLnRGB85XhrmWoYFtP4W3HgQ== "@alloc/quick-lru@^5.2.0": version "5.2.0" From 5fe3bc935abd20b0e51d316cca6a812d59b77425 Mon Sep 17 00:00:00 2001 From: Paul Bob <69730720+Paul-Bob@users.noreply.github.com> Date: Fri, 29 Dec 2023 15:28:41 +0200 Subject: [PATCH 33/42] fix: tabs persistence when tab name has spaces (#2278) --- app/components/avo/tab_group_component.rb | 6 ++---- app/components/avo/tab_switcher_component.rb | 5 +---- lib/avo/resources/items/tab_group.rb | 4 ++++ spec/system/avo/tabs_spec.rb | 22 ++++++++++++++++++++ 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/app/components/avo/tab_group_component.rb b/app/components/avo/tab_group_component.rb index 8ed26662fc..6aaaebdec2 100644 --- a/app/components/avo/tab_group_component.rb +++ b/app/components/avo/tab_group_component.rb @@ -7,6 +7,8 @@ class Avo::TabGroupComponent < Avo::BaseComponent attr_reader :form attr_reader :resource + delegate :group_param, to: :@group + def initialize(resource:, group:, index:, form:, params:, view:) @resource = resource @group = group @@ -26,10 +28,6 @@ def tabs_have_content? visible_tabs.present? end - def group_param - group.id - end - def active_tab_name CGI.unescape(params[group_param] || group.visible_items&.first&.name) end diff --git a/app/components/avo/tab_switcher_component.rb b/app/components/avo/tab_switcher_component.rb index f8030099a7..b23aa11cab 100644 --- a/app/components/avo/tab_switcher_component.rb +++ b/app/components/avo/tab_switcher_component.rb @@ -12,6 +12,7 @@ class Avo::TabSwitcherComponent < Avo::BaseComponent attr_reader :resource delegate :white_panel_classes, to: :helpers + delegate :group_param, to: :@group def initialize(resource:, group:, current_tab:, active_tab_name:, view:) @active_tab_name = active_tab_name @@ -48,10 +49,6 @@ def current_one?(tab) private - def group_param - "tab-group_#{group.id}" - end - def tab_param_missing? params[group_param].blank? end diff --git a/lib/avo/resources/items/tab_group.rb b/lib/avo/resources/items/tab_group.rb index 08d43093b6..8c140c00bc 100644 --- a/lib/avo/resources/items/tab_group.rb +++ b/lib/avo/resources/items/tab_group.rb @@ -37,6 +37,10 @@ def turbo_frame_id "#{Avo::Resources::Items::TabGroup.to_s.parameterize} #{index}".parameterize end + def group_param + "tab-group_#{id}" + end + class Builder include Avo::Concerns::BorrowItemsHolder diff --git a/spec/system/avo/tabs_spec.rb b/spec/system/avo/tabs_spec.rb index dc77c63b41..c4de9ce7f3 100644 --- a/spec/system/avo/tabs_spec.rb +++ b/spec/system/avo/tabs_spec.rb @@ -140,4 +140,26 @@ find('a[data-selected="true"][data-tabs-tab-name-param="Posts"]') end end + + describe "tabs with names that have spaces" do + it "keeps tab on reload" do + visit avo.resources_user_path user + + find('a[data-selected="true"][data-tabs-tab-name-param="Fish"]') + find('a[data-selected="false"][data-tabs-tab-name-param="Projects"]').click + find('a[data-selected="false"][data-tabs-tab-name-param="Team memberships"]') + + refresh + + find('a[data-selected="false"][data-tabs-tab-name-param="Fish"]') + find('a[data-selected="true"][data-tabs-tab-name-param="Projects"]') + find('a[data-selected="false"][data-tabs-tab-name-param="Team memberships"]').click + + refresh + + find('a[data-selected="false"][data-tabs-tab-name-param="Fish"]') + find('a[data-selected="false"][data-tabs-tab-name-param="Projects"]') + find('a[data-selected="true"][data-tabs-tab-name-param="Team memberships"]') + end + end end From a310fbb174b6f95d044157bdfc4cd1a05732724f Mon Sep 17 00:00:00 2001 From: Paul Bob <69730720+Paul-Bob@users.noreply.github.com> Date: Fri, 29 Dec 2023 16:01:03 +0200 Subject: [PATCH 34/42] fix: secret key base warning (#2297) --- lib/avo/services/encryption_service.rb | 23 ++++++++++++++++++----- spec/dummy/config/boot.rb | 2 ++ spec/rails_helper.rb | 1 - 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/lib/avo/services/encryption_service.rb b/lib/avo/services/encryption_service.rb index 4be609501d..716a5822a1 100644 --- a/lib/avo/services/encryption_service.rb +++ b/lib/avo/services/encryption_service.rb @@ -29,14 +29,27 @@ def decrypt def encryption_key secret_key_base[0..31] - rescue - # This will fail the decryption process. - # It's here only to keep Avo from crashing - SecureRandom.random_bytes(32) end def secret_key_base - ENV["SECRET_KEY_BASE"] || Rails.application.credentials.secret_key_base || Rails.application.secrets.secret_key_base + # Try to fetch the secret key base from ENV or the credentials file + key = ENV["SECRET_KEY_BASE"] || Rails.application.credentials.secret_key_base + + # If key is blank and Rails version is less than 7.2.0 + # Try to fetch the secret key base from the secrets file + # Rails 7.2.0 made secret_key_base from secrets obsolete + if key.blank? && (Rails.gem_version < Gem::Version.new('7.2.0')) + key = Rails.application.secrets.secret_key_base + end + + return key if key.present? + + # Avoid breaking in production + # All features relying on encryption will not work properly without a configured secret key base + return SecureRandom.random_bytes(32) if Rails.env.production? + + raise "Unable to fetch secret key base. Please set it in your credentials or environment variables\n" \ + "For more information check https://docs.avohq.io/3.0/encryption-service.html#secret-key-base" end end end diff --git a/spec/dummy/config/boot.rb b/spec/dummy/config/boot.rb index 60f41bd7d0..c347ce71d9 100644 --- a/spec/dummy/config/boot.rb +++ b/spec/dummy/config/boot.rb @@ -3,6 +3,8 @@ ENV["AVO_IN_DEVELOPMENT"] = "1" +ENV["SECRET_KEY_BASE"] = "130b8d0a74b5b73bfb2d0505c3de8250" + require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"]) require "bootsnap/setup" unless ENV["CI"] # Speed up boot time by caching expensive operations. $LOAD_PATH.unshift File.expand_path("../../../lib", __dir__) diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 3e773eded5..acda2dc8c5 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -3,7 +3,6 @@ require "fileutils" ENV["RAILS_ENV"] = "test" -ENV["SECRET_KEY_BASE"] = "secret_key_base_to_avoid DEPRECATION WARNING: `Rails.application.secrets` is deprecated in favor of `Rails.application.credentials` and will be removed in Rails 7.2." require_relative "dummy/config/environment" # Prevent database truncation if the environment is production From 335fced5ac015c5ed9f07c6daf9bcc745f9f7eeb Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Sun, 31 Dec 2023 15:50:46 +0200 Subject: [PATCH 35/42] =?UTF-8?q?[ruby]=20Update=20erb-formatter=200.6.0?= =?UTF-8?q?=20=E2=86=92=200.7.0=20(major)=20(#2304)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock | 10 +++++----- gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock | 6 +++--- gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock | 10 +++++----- gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock | 6 +++--- gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock | 10 +++++----- gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock | 6 +++--- gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock | 4 ++-- gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock | 4 ++-- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index dd5c359334..fb0bd649bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -197,7 +197,7 @@ GEM ruby2_keywords dry-initializer (3.1.1) e2mmap (0.1.0) - erb-formatter (0.6.0) + erb-formatter (0.7.0) syntax_tree (~> 6.0) erubi (1.12.0) factory_bot (6.4.2) diff --git a/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock b/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock index b16ed2d9fa..64e3ecbad7 100644 --- a/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.2.2) + avo (3.2.3) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -178,8 +178,8 @@ GEM railties (>= 3.2) dry-initializer (3.1.1) e2mmap (0.1.0) - erb-formatter (0.4.1) - syntax_tree (~> 5.0) + erb-formatter (0.7.0) + syntax_tree (~> 6.0) erubi (1.12.0) factory_bot (6.2.1) activesupport (>= 5.0.0) @@ -292,7 +292,7 @@ GEM prefixed_ids (1.4.0) hashids (>= 1.0.0, < 2.0.0) rails (>= 6.0.0) - prettier_print (1.2.0) + prettier_print (1.2.1) psych (3.3.4) public_suffix (5.0.4) puma (6.4.0) @@ -452,7 +452,7 @@ GEM standard-performance (1.3.0) lint_roller (~> 1.1) rubocop-performance (~> 1.20.1) - syntax_tree (5.2.0) + syntax_tree (6.2.0) prettier_print (>= 1.2.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) diff --git a/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock b/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock index c3218d7ecc..6d5458079a 100644 --- a/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.2.2) + avo (3.2.3) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -178,7 +178,7 @@ GEM railties (>= 3.2) dry-initializer (3.1.1) e2mmap (0.1.0) - erb-formatter (0.4.3) + erb-formatter (0.7.0) syntax_tree (~> 6.0) erubi (1.12.0) factory_bot (6.2.1) @@ -454,7 +454,7 @@ GEM standard-performance (1.3.0) lint_roller (~> 1.1) rubocop-performance (~> 1.20.1) - syntax_tree (6.1.1) + syntax_tree (6.2.0) prettier_print (>= 1.2.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) diff --git a/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock b/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock index c03ef6bc2d..123dd829c7 100644 --- a/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.2.2) + avo (3.2.3) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -178,8 +178,8 @@ GEM railties (>= 3.2) dry-initializer (3.1.1) e2mmap (0.1.0) - erb-formatter (0.4.1) - syntax_tree (~> 5.0) + erb-formatter (0.7.0) + syntax_tree (~> 6.0) erubi (1.12.0) factory_bot (6.2.1) activesupport (>= 5.0.0) @@ -292,7 +292,7 @@ GEM prefixed_ids (1.4.0) hashids (>= 1.0.0, < 2.0.0) rails (>= 6.0.0) - prettier_print (1.2.0) + prettier_print (1.2.1) psych (3.3.4) public_suffix (5.0.4) puma (6.4.0) @@ -452,7 +452,7 @@ GEM standard-performance (1.3.0) lint_roller (~> 1.1) rubocop-performance (~> 1.20.1) - syntax_tree (5.2.0) + syntax_tree (6.2.0) prettier_print (>= 1.2.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) diff --git a/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock b/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock index 3bbbf94cea..26895c2c56 100644 --- a/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.2.2) + avo (3.2.3) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -178,7 +178,7 @@ GEM railties (>= 3.2) dry-initializer (3.1.1) e2mmap (0.1.0) - erb-formatter (0.4.3) + erb-formatter (0.7.0) syntax_tree (~> 6.0) erubi (1.12.0) factory_bot (6.2.1) @@ -454,7 +454,7 @@ GEM standard-performance (1.3.0) lint_roller (~> 1.1) rubocop-performance (~> 1.20.1) - syntax_tree (6.1.1) + syntax_tree (6.2.0) prettier_print (>= 1.2.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) diff --git a/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock b/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock index 4780774525..d529a01c29 100644 --- a/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.2.2) + avo (3.2.3) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -197,8 +197,8 @@ GEM ruby2_keywords dry-initializer (3.1.1) e2mmap (0.1.0) - erb-formatter (0.4.1) - syntax_tree (~> 5.0) + erb-formatter (0.7.0) + syntax_tree (~> 6.0) erubi (1.12.0) factory_bot (6.2.1) activesupport (>= 5.0.0) @@ -316,7 +316,7 @@ GEM prefixed_ids (1.4.0) hashids (>= 1.0.0, < 2.0.0) rails (>= 6.0.0) - prettier_print (1.2.0) + prettier_print (1.2.1) psych (3.3.4) public_suffix (5.0.4) puma (6.4.0) @@ -486,7 +486,7 @@ GEM standard-performance (1.3.0) lint_roller (~> 1.1) rubocop-performance (~> 1.20.1) - syntax_tree (5.2.0) + syntax_tree (6.2.0) prettier_print (>= 1.2.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) diff --git a/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock b/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock index 99ba07938c..1a9f3e1b46 100644 --- a/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.2.2) + avo (3.2.3) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -197,7 +197,7 @@ GEM ruby2_keywords dry-initializer (3.1.1) e2mmap (0.1.0) - erb-formatter (0.4.3) + erb-formatter (0.7.0) syntax_tree (~> 6.0) erubi (1.12.0) factory_bot (6.2.1) @@ -488,7 +488,7 @@ GEM standard-performance (1.3.0) lint_roller (~> 1.1) rubocop-performance (~> 1.20.1) - syntax_tree (6.1.1) + syntax_tree (6.2.0) prettier_print (>= 1.2.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) diff --git a/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock b/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock index b34c5fbbf2..10570f1df7 100644 --- a/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.2.2) + avo (3.2.3) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -197,7 +197,7 @@ GEM ruby2_keywords dry-initializer (3.1.1) e2mmap (0.1.0) - erb-formatter (0.4.3) + erb-formatter (0.7.0) syntax_tree (~> 6.0) erubi (1.12.0) factory_bot (6.2.1) diff --git a/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock b/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock index b34c5fbbf2..10570f1df7 100644 --- a/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock @@ -6,7 +6,7 @@ PATH PATH remote: .. specs: - avo (3.2.2) + avo (3.2.3) actionview (>= 6.1) active_link_to activerecord (>= 6.1) @@ -197,7 +197,7 @@ GEM ruby2_keywords dry-initializer (3.1.1) e2mmap (0.1.0) - erb-formatter (0.4.3) + erb-formatter (0.7.0) syntax_tree (~> 6.0) erubi (1.12.0) factory_bot (6.2.1) From 95ed7fdfd431c9db943846fd8d6ded058e76ac93 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Sun, 31 Dec 2023 15:50:53 +0200 Subject: [PATCH 36/42] =?UTF-8?q?[js]=20Update=20all=20of=20babel7=207.23.?= =?UTF-8?q?6=20=E2=86=92=207.23.7=20(patch)=20(#2306)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> --- package.json | 4 +- yarn.lock | 102 +++++++++++++++++++++++++-------------------------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index 51bea788ba..49f94ec86b 100644 --- a/package.json +++ b/package.json @@ -66,9 +66,9 @@ "urijs": "^1.19.11" }, "devDependencies": { - "@babel/core": "^7.23.6", + "@babel/core": "^7.23.7", "@babel/eslint-parser": "^7.23.3", - "@babel/preset-env": "^7.23.6", + "@babel/preset-env": "^7.23.7", "@prettier/plugin-ruby": "^2.1.0", "esbuild-visualizer": "^0.3.1", "eslint": "^8.56.0", diff --git a/yarn.lock b/yarn.lock index 0750fe96cc..79db8cbbd1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -84,20 +84,20 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== -"@babel/core@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.6.tgz#8be77cd77c55baadcc1eae1c33df90ab6d2151d4" - integrity sha512-FxpRyGjrMJXh7X3wGLGhNDCRiwpWEF74sKjTLDJSG5Kyvow3QZaG0Adbqzi9ZrVjTWpsX+2cxWXD71NMg93kdw== +"@babel/core@^7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.7.tgz#4d8016e06a14b5f92530a13ed0561730b5c6483f" + integrity sha512-+UpDgowcmqe36d4NwqvKsyPMlOLNGMsfMmQ5WGCu+siCe3t3dfe9njrzGfdN4qq+bcNUt0+Vw6haRxBOycs4dw== dependencies: "@ampproject/remapping" "^2.2.0" "@babel/code-frame" "^7.23.5" "@babel/generator" "^7.23.6" "@babel/helper-compilation-targets" "^7.23.6" "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.23.6" + "@babel/helpers" "^7.23.7" "@babel/parser" "^7.23.6" "@babel/template" "^7.22.15" - "@babel/traverse" "^7.23.6" + "@babel/traverse" "^7.23.7" "@babel/types" "^7.23.6" convert-source-map "^2.0.0" debug "^4.1.0" @@ -199,10 +199,10 @@ regexpu-core "^5.3.1" semver "^6.3.1" -"@babel/helper-define-polyfill-provider@^0.4.3": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz#a71c10f7146d809f4a256c373f462d9bba8cf6ba" - integrity sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug== +"@babel/helper-define-polyfill-provider@^0.4.4": + version "0.4.4" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.4.tgz#64df615451cb30e94b59a9696022cffac9a10088" + integrity sha512-QcJMILQCu2jm5TFPGA3lCpJJTeEP+mqeXooG/NZbg/h5FTFi6V0+99ahlRsW8/kRLyb24LZVCCiclDedhLKcBA== dependencies: "@babel/helper-compilation-targets" "^7.22.6" "@babel/helper-plugin-utils" "^7.22.5" @@ -335,13 +335,13 @@ "@babel/template" "^7.22.15" "@babel/types" "^7.22.19" -"@babel/helpers@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.6.tgz#d03af2ee5fb34691eec0cda90f5ecbb4d4da145a" - integrity sha512-wCfsbN4nBidDRhpDhvcKlzHWCTlgJYUUdSJfzXb2NuBssDSIjc3xcb+znA7l+zYsFljAcGM0aFkN40cR3lXiGA== +"@babel/helpers@^7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.7.tgz#eb543c36f81da2873e47b76ee032343ac83bba60" + integrity sha512-6AMnjCoC8wjqBzDHkuqpa7jAKwvMo4dC+lr/TFBz+ucfulO1XMpDnwWPGBNwClOKZ8h6xn5N81W/R5OrcKtCbQ== dependencies: "@babel/template" "^7.22.15" - "@babel/traverse" "^7.23.6" + "@babel/traverse" "^7.23.7" "@babel/types" "^7.23.6" "@babel/highlight@^7.22.13": @@ -388,10 +388,10 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5" "@babel/plugin-transform-optional-chaining" "^7.23.3" -"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz#20c60d4639d18f7da8602548512e9d3a4c8d7098" - integrity sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w== +"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@^7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz#516462a95d10a9618f197d39ad291a9b47ae1d7b" + integrity sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw== dependencies: "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-plugin-utils" "^7.22.5" @@ -543,10 +543,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.22.5" -"@babel/plugin-transform-async-generator-functions@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.4.tgz#93ac8e3531f347fba519b4703f9ff2a75c6ae27a" - integrity sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw== +"@babel/plugin-transform-async-generator-functions@^7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.7.tgz#3aa0b4f2fa3788b5226ef9346cf6d16ec61f99cd" + integrity sha512-PdxEpL71bJp1byMG0va5gwQcXHxuEYC/BgI/e88mGTtohbZN28O5Yit0Plkkm/dBzCF/BxmbNcses1RH1T+urA== dependencies: "@babel/helper-environment-visitor" "^7.22.20" "@babel/helper-plugin-utils" "^7.22.5" @@ -925,10 +925,10 @@ "@babel/helper-create-regexp-features-plugin" "^7.22.15" "@babel/helper-plugin-utils" "^7.22.5" -"@babel/preset-env@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.6.tgz#ad0ea799d5a3c07db5b9a172819bbd444092187a" - integrity sha512-2XPn/BqKkZCpzYhUUNZ1ssXw7DcXfKQEjv/uXZUXgaebCMYmkEsfZ2yY+vv+xtXv50WmL5SGhyB6/xsWxIvvOQ== +"@babel/preset-env@^7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.23.7.tgz#e5d69b9f14db8a13bae4d8e5ce7f360973626241" + integrity sha512-SY27X/GtTz/L4UryMNJ6p4fH4nsgWbz84y9FE0bQeWJP6O5BhgVCt53CotQKHCOeXJel8VyhlhujhlltKms/CA== dependencies: "@babel/compat-data" "^7.23.5" "@babel/helper-compilation-targets" "^7.23.6" @@ -936,7 +936,7 @@ "@babel/helper-validator-option" "^7.23.5" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.23.3" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.23.3" - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.3" + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly" "^7.23.7" "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" @@ -957,7 +957,7 @@ "@babel/plugin-syntax-top-level-await" "^7.14.5" "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6" "@babel/plugin-transform-arrow-functions" "^7.23.3" - "@babel/plugin-transform-async-generator-functions" "^7.23.4" + "@babel/plugin-transform-async-generator-functions" "^7.23.7" "@babel/plugin-transform-async-to-generator" "^7.23.3" "@babel/plugin-transform-block-scoped-functions" "^7.23.3" "@babel/plugin-transform-block-scoping" "^7.23.4" @@ -1005,9 +1005,9 @@ "@babel/plugin-transform-unicode-regex" "^7.23.3" "@babel/plugin-transform-unicode-sets-regex" "^7.23.3" "@babel/preset-modules" "0.1.6-no-external-plugins" - babel-plugin-polyfill-corejs2 "^0.4.6" - babel-plugin-polyfill-corejs3 "^0.8.5" - babel-plugin-polyfill-regenerator "^0.5.3" + babel-plugin-polyfill-corejs2 "^0.4.7" + babel-plugin-polyfill-corejs3 "^0.8.7" + babel-plugin-polyfill-regenerator "^0.5.4" core-js-compat "^3.31.0" semver "^6.3.1" @@ -1041,10 +1041,10 @@ "@babel/parser" "^7.22.15" "@babel/types" "^7.22.15" -"@babel/traverse@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.6.tgz#b53526a2367a0dd6edc423637f3d2d0f2521abc5" - integrity sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ== +"@babel/traverse@^7.23.7": + version "7.23.7" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.7.tgz#9a7bf285c928cb99b5ead19c3b1ce5b310c9c305" + integrity sha512-tY3mM8rH9jM0YHFGyfC0/xf+SB5eKUu7HPj7/k3fpi9dAlsMc5YbQvDi0Sh2QTPXqMhyaAtzAr807TIyfQrmyg== dependencies: "@babel/code-frame" "^7.23.5" "@babel/generator" "^7.23.6" @@ -1726,29 +1726,29 @@ axios@^1.6.3: form-data "^4.0.0" proxy-from-env "^1.1.0" -babel-plugin-polyfill-corejs2@^0.4.6: - version "0.4.6" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz#b2df0251d8e99f229a8e60fc4efa9a68b41c8313" - integrity sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q== +babel-plugin-polyfill-corejs2@^0.4.7: + version "0.4.7" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.7.tgz#679d1b94bf3360f7682e11f2cb2708828a24fe8c" + integrity sha512-LidDk/tEGDfuHW2DWh/Hgo4rmnw3cduK6ZkOI1NPFceSK3n/yAGeOsNT7FLnSGHkXj3RHGSEVkN3FsCTY6w2CQ== dependencies: "@babel/compat-data" "^7.22.6" - "@babel/helper-define-polyfill-provider" "^0.4.3" + "@babel/helper-define-polyfill-provider" "^0.4.4" semver "^6.3.1" -babel-plugin-polyfill-corejs3@^0.8.5: - version "0.8.6" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.6.tgz#25c2d20002da91fe328ff89095c85a391d6856cf" - integrity sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ== +babel-plugin-polyfill-corejs3@^0.8.7: + version "0.8.7" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.7.tgz#941855aa7fdaac06ed24c730a93450d2b2b76d04" + integrity sha512-KyDvZYxAzkC0Aj2dAPyDzi2Ym15e5JKZSK+maI7NAwSqofvuFglbSsxE7wUOvTg9oFVnHMzVzBKcqEb4PJgtOA== dependencies: - "@babel/helper-define-polyfill-provider" "^0.4.3" + "@babel/helper-define-polyfill-provider" "^0.4.4" core-js-compat "^3.33.1" -babel-plugin-polyfill-regenerator@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz#d4c49e4b44614607c13fb769bcd85c72bb26a4a5" - integrity sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw== +babel-plugin-polyfill-regenerator@^0.5.4: + version "0.5.4" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.4.tgz#c6fc8eab610d3a11eb475391e52584bacfc020f4" + integrity sha512-S/x2iOCvDaCASLYsOOgWOq4bCfKYVqvO/uxjkaYyZ3rVsVE3CeAI/c84NpyuBBymEgNvHgjEot3a9/Z/kXvqsg== dependencies: - "@babel/helper-define-polyfill-provider" "^0.4.3" + "@babel/helper-define-polyfill-provider" "^0.4.4" balanced-match@^1.0.0: version "1.0.2" From 4e2a3ac1bc9b9c7c50b59e3a7aca1d95534a7aa8 Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:35:56 +0200 Subject: [PATCH 37/42] =?UTF-8?q?[ruby]=20Update=20factory=5Fbot=5Frails?= =?UTF-8?q?=206.4.2=20=E2=86=92=206.4.3=20(patch)=20(#2307)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Co-authored-by: Adrian Marin --- Gemfile.lock | 8 ++++---- gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock | 10 +++++----- gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock | 10 +++++----- gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock | 10 +++++----- gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock | 10 +++++----- gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock | 10 +++++----- gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock | 10 +++++----- gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock | 14 +++++++------- gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock | 14 +++++++------- 9 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fb0bd649bd..d4c875266c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -200,9 +200,9 @@ GEM erb-formatter (0.7.0) syntax_tree (~> 6.0) erubi (1.12.0) - factory_bot (6.4.2) + factory_bot (6.4.5) activesupport (>= 5.0.0) - factory_bot_rails (6.4.2) + factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) faker (3.2.2) @@ -303,10 +303,10 @@ GEM net-smtp (0.4.0) net-protocol nio4r (2.7.0) - nokogiri (1.15.5) + nokogiri (1.16.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) pagy (6.2.0) diff --git a/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock b/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock index 64e3ecbad7..3c31e80b5d 100644 --- a/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_6.0_ruby_3.0.3.gemfile.lock @@ -181,10 +181,10 @@ GEM erb-formatter (0.7.0) syntax_tree (~> 6.0) erubi (1.12.0) - factory_bot (6.2.1) + factory_bot (6.4.5) activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) + factory_bot_rails (6.4.3) + factory_bot (~> 6.4) railties (>= 5.0.0) faker (3.1.0) i18n (>= 1.8.11, < 2) @@ -278,9 +278,9 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.8) - nokogiri (1.15.5-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) pagy (6.0.2) diff --git a/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock b/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock index 6d5458079a..492523798d 100644 --- a/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_6.0_ruby_3.2.2.gemfile.lock @@ -181,10 +181,10 @@ GEM erb-formatter (0.7.0) syntax_tree (~> 6.0) erubi (1.12.0) - factory_bot (6.2.1) + factory_bot (6.4.5) activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) + factory_bot_rails (6.4.3) + factory_bot (~> 6.4) railties (>= 5.0.0) faker (3.2.0) i18n (>= 1.8.11, < 2) @@ -278,9 +278,9 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.9) - nokogiri (1.15.5-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) pagy (6.0.3) diff --git a/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock b/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock index 123dd829c7..cde0fd9b1c 100644 --- a/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.0.3.gemfile.lock @@ -181,10 +181,10 @@ GEM erb-formatter (0.7.0) syntax_tree (~> 6.0) erubi (1.12.0) - factory_bot (6.2.1) + factory_bot (6.4.5) activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) + factory_bot_rails (6.4.3) + factory_bot (~> 6.4) railties (>= 5.0.0) faker (3.1.0) i18n (>= 1.8.11, < 2) @@ -278,9 +278,9 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.8) - nokogiri (1.15.5-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) pagy (6.0.2) diff --git a/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock b/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock index 26895c2c56..09721f5f97 100644 --- a/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_6.1_ruby_3.2.2.gemfile.lock @@ -181,10 +181,10 @@ GEM erb-formatter (0.7.0) syntax_tree (~> 6.0) erubi (1.12.0) - factory_bot (6.2.1) + factory_bot (6.4.5) activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) + factory_bot_rails (6.4.3) + factory_bot (~> 6.4) railties (>= 5.0.0) faker (3.2.0) i18n (>= 1.8.11, < 2) @@ -278,9 +278,9 @@ GEM net-smtp (0.3.3) net-protocol nio4r (2.5.9) - nokogiri (1.15.5-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) pagy (6.0.3) diff --git a/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock b/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock index d529a01c29..4946f76123 100644 --- a/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_7.0_ruby_3.0.3.gemfile.lock @@ -200,10 +200,10 @@ GEM erb-formatter (0.7.0) syntax_tree (~> 6.0) erubi (1.12.0) - factory_bot (6.2.1) + factory_bot (6.4.5) activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) + factory_bot_rails (6.4.3) + factory_bot (~> 6.4) railties (>= 5.0.0) faker (3.1.0) i18n (>= 1.8.11, < 2) @@ -302,9 +302,9 @@ GEM net-smtp (0.4.0) net-protocol nio4r (2.7.0) - nokogiri (1.15.5-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) pagy (6.0.2) diff --git a/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock b/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock index 1a9f3e1b46..4cae1d76b0 100644 --- a/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_7.0_ruby_3.2.2.gemfile.lock @@ -200,10 +200,10 @@ GEM erb-formatter (0.7.0) syntax_tree (~> 6.0) erubi (1.12.0) - factory_bot (6.2.1) + factory_bot (6.4.5) activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) + factory_bot_rails (6.4.3) + factory_bot (~> 6.4) railties (>= 5.0.0) faker (3.2.0) i18n (>= 1.8.11, < 2) @@ -302,9 +302,9 @@ GEM net-smtp (0.4.0) net-protocol nio4r (2.7.0) - nokogiri (1.15.5-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) pagy (6.0.3) diff --git a/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock b/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock index 10570f1df7..fdd460e121 100644 --- a/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock +++ b/gemfiles/rails_7.1_ruby_3.0.3.gemfile.lock @@ -200,10 +200,10 @@ GEM erb-formatter (0.7.0) syntax_tree (~> 6.0) erubi (1.12.0) - factory_bot (6.2.1) + factory_bot (6.4.5) activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) + factory_bot_rails (6.4.3) + factory_bot (~> 6.4) railties (>= 5.0.0) faker (3.2.2) i18n (>= 1.8.11, < 2) @@ -250,8 +250,8 @@ GEM inline_svg (1.9.0) activesupport (>= 3.0) nokogiri (>= 1.6) - io-console (0.7.0) - irb (1.10.1) + io-console (0.7.1) + irb (1.11.0) rdoc reline (>= 0.3.8) iso (0.4.0) @@ -302,9 +302,9 @@ GEM net-smtp (0.4.0) net-protocol nio4r (2.7.0) - nokogiri (1.15.5-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) pagy (6.1.0) diff --git a/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock b/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock index 10570f1df7..fdd460e121 100644 --- a/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock +++ b/gemfiles/rails_7.1_ruby_3.2.2.gemfile.lock @@ -200,10 +200,10 @@ GEM erb-formatter (0.7.0) syntax_tree (~> 6.0) erubi (1.12.0) - factory_bot (6.2.1) + factory_bot (6.4.5) activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) + factory_bot_rails (6.4.3) + factory_bot (~> 6.4) railties (>= 5.0.0) faker (3.2.2) i18n (>= 1.8.11, < 2) @@ -250,8 +250,8 @@ GEM inline_svg (1.9.0) activesupport (>= 3.0) nokogiri (>= 1.6) - io-console (0.7.0) - irb (1.10.1) + io-console (0.7.1) + irb (1.11.0) rdoc reline (>= 0.3.8) iso (0.4.0) @@ -302,9 +302,9 @@ GEM net-smtp (0.4.0) net-protocol nio4r (2.7.0) - nokogiri (1.15.5-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) pagy (6.1.0) From 2eb1cc5690824563ed642ae5364881920461dacb Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 17:36:08 +0200 Subject: [PATCH 38/42] =?UTF-8?q?[js]=20Update=20core-js=203.34.0=20?= =?UTF-8?q?=E2=86=92=203.35.0=20(minor)=20(#2303)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Co-authored-by: Adrian Marin --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 49f94ec86b..90fab081cd 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "chart.js": "^3.9.1", "chartkick": "^4.2.0", "codemirror": "5.59.1", - "core-js": "^3.34.0", + "core-js": "^3.35.0", "css-loader": "^6.7.3", "easymde": "^2.18.0", "el-transition": "^0.0.7", diff --git a/yarn.lock b/yarn.lock index 79db8cbbd1..ba7e8e5eca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1977,10 +1977,10 @@ core-js-compat@^3.31.0, core-js-compat@^3.33.1: dependencies: browserslist "^4.22.2" -core-js@^3.34.0: - version "3.34.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.34.0.tgz#5705e6ad5982678612e96987d05b27c6c7c274a5" - integrity sha512-aDdvlDder8QmY91H88GzNi9EtQi2TjvQhpCX6B1v/dAZHU1AuLgHvRh54RiOerpEhEW46Tkf+vgAViB/CWC0ag== +core-js@^3.35.0: + version "3.35.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.35.0.tgz#58e651688484f83c34196ca13f099574ee53d6b4" + integrity sha512-ntakECeqg81KqMueeGJ79Q5ZgQNR+6eaE8sxGCx62zMbAIj65q+uYvatToew3m6eAGdU4gNZwpZ34NMe4GYswg== cosmiconfig@^8.3.5: version "8.3.6" From 6bf7fef77b214a453b2e8143c62f327b2963af2a Mon Sep 17 00:00:00 2001 From: Adrian Marin Date: Wed, 3 Jan 2024 21:30:28 +0200 Subject: [PATCH 39/42] fix: remove status field defaults and fix the neutral state (#2316) --- app/controllers/avo/application_controller.rb | 8 -------- lib/avo/fields/status_field.rb | 6 +++--- tailwind.preset.js | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app/controllers/avo/application_controller.rb b/app/controllers/avo/application_controller.rb index 5f3247987f..08e508ae66 100644 --- a/app/controllers/avo/application_controller.rb +++ b/app/controllers/avo/application_controller.rb @@ -45,14 +45,6 @@ def exception_logger(exception) end end - def _current_user - instance_eval(&Avo.configuration.current_user) - end - - def context - instance_eval(&Avo.configuration.context) - end - # This is coming from Turbo::Frames::FrameRequest module. # Exposing it as public method def turbo_frame_request? diff --git a/lib/avo/fields/status_field.rb b/lib/avo/fields/status_field.rb index e0d1236ca8..c53335af8d 100644 --- a/lib/avo/fields/status_field.rb +++ b/lib/avo/fields/status_field.rb @@ -4,10 +4,10 @@ class StatusField < BaseField def initialize(id, **args, &block) super(id, **args, &block) - @loading_when = args[:loading_when].present? ? [args[:loading_when]].flatten.map(&:to_sym) : [:waiting, :running] - @failed_when = args[:failed_when].present? ? [args[:failed_when]].flatten.map(&:to_sym) : [:failed] + @loading_when = args[:loading_when].present? ? [args[:loading_when]].flatten.map(&:to_sym) : [] + @failed_when = args[:failed_when].present? ? [args[:failed_when]].flatten.map(&:to_sym) : [] @success_when = args[:success_when].present? ? [args[:success_when]].flatten.map(&:to_sym) : [] - @neutral_when = args[:neutral_when].present? ? [args[:neutral_when]].flatten.map(&:to_sym) : nil + @neutral_when = args[:neutral_when].present? ? [args[:neutral_when]].flatten.map(&:to_sym) : [] end def status diff --git a/tailwind.preset.js b/tailwind.preset.js index 4cac1d8265..4944ef676d 100644 --- a/tailwind.preset.js +++ b/tailwind.preset.js @@ -10,7 +10,7 @@ function contentPaths(basePath) { `${basePath}/safelist.txt`, `${basePath}/lib/avo/**/*.rb`, `${basePath}/app/helpers/**/*.rb`, - `${basePath}/app/views/**/*.erb`, + `${basePath}/app/views/**/*.{html.erb,rb}`, `${basePath}/app/javascript/**/*.js`, `${basePath}/app/components/**/*.{html.erb,rb}`, `${basePath}/app/controllers/**/*.rb`, From 06390c5040f8b58465d6349a80fce540c66518ed Mon Sep 17 00:00:00 2001 From: Paul Bob <69730720+Paul-Bob@users.noreply.github.com> Date: Thu, 4 Jan 2024 12:39:12 +0200 Subject: [PATCH 40/42] feature: delegate missing to view_context (#2314) --- lib/avo/execution_context.rb | 2 ++ spec/dummy/app/avo/resources/product.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/avo/execution_context.rb b/lib/avo/execution_context.rb index ff452f160e..d3b8657c84 100644 --- a/lib/avo/execution_context.rb +++ b/lib/avo/execution_context.rb @@ -4,6 +4,8 @@ class ExecutionContext attr_accessor :target, :context, :params, :view_context, :current_user, :request, :include, :main_app, :avo, :locale + delegate_missing_to :@view_context + def initialize(**args) # Extend the class with custom modules if required. if args[:include].present? diff --git a/spec/dummy/app/avo/resources/product.rb b/spec/dummy/app/avo/resources/product.rb index f4a115925f..a46550e28f 100644 --- a/spec/dummy/app/avo/resources/product.rb +++ b/spec/dummy/app/avo/resources/product.rb @@ -7,7 +7,7 @@ class Avo::Resources::Product < Avo::BaseResource { cover_url: record.image.attached? ? main_app.url_for(record.image.variant(resize: "300x300")) : nil, title: record.title, - body: view_context.simple_format(record.description) + body: simple_format(record.description) } end, html: -> do From 93b6e7b2c3c79910e6b4fd6b3e710198348c2376 Mon Sep 17 00:00:00 2001 From: Paul Bob <69730720+Paul-Bob@users.noreply.github.com> Date: Thu, 4 Jan 2024 13:57:48 +0200 Subject: [PATCH 41/42] chore: move scopes from pro to advanced (#2319) --- app/components/avo/views/resource_index_component.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/avo/views/resource_index_component.rb b/app/components/avo/views/resource_index_component.rb index d0dc1ef8b2..1261a71e38 100644 --- a/app/components/avo/views/resource_index_component.rb +++ b/app/components/avo/views/resource_index_component.rb @@ -159,7 +159,7 @@ def render_dynamic_filters_button end def scopes_list - Avo::Pro::Scopes::ListComponent.new( + Avo::Advanced::Scopes::ListComponent.new( scopes: scopes, resource: resource, turbo_frame: turbo_frame, @@ -169,7 +169,7 @@ def scopes_list end def can_render_scopes? - defined?(Avo::Pro) + defined?(Avo::Advanced) end private From 94f6e77e61ed7ad48dce766830f2e338380cbc4c Mon Sep 17 00:00:00 2001 From: Paul Bob <69730720+Paul-Bob@users.noreply.github.com> Date: Thu, 4 Jan 2024 14:00:20 +0200 Subject: [PATCH 42/42] fix: invalid date_time (#2279) * fix: invalid date_time * Update lib/avo/fields/concerns/frame_loading.rb * rm wrong include * revert frames helper include * add use case * change use case * spec * fix unrelated spec * JS fix * Rename loading variable * apply rename loading on `app/components/avo/fields/has_many_field/show_component.html.erb` --------- Co-authored-by: Adrian Marin --- .../fields/has_many_field/show_component.html.erb | 2 +- .../avo/fields/has_many_field/show_component.rb | 7 +------ .../fields/has_one_field/show_component.html.erb | 2 +- .../avo/fields/has_one_field/show_component.rb | 1 + .../js/controllers/fields/date_field_controller.js | 2 +- lib/avo/fields/concerns/frame_loading.rb | 14 ++++++++++++++ spec/dummy/app/avo/resources/post.rb | 1 + spec/dummy/app/avo/resources/user.rb | 6 ++++++ spec/dummy/app/models/user.rb | 1 + spec/system/avo/tabs_spec.rb | 14 ++++++++++++-- spec/system/avo/test_helpers_spec.rb | 2 +- 11 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 lib/avo/fields/concerns/frame_loading.rb diff --git a/app/components/avo/fields/has_many_field/show_component.html.erb b/app/components/avo/fields/has_many_field/show_component.html.erb index aa10c54efd..1dd1c054f0 100644 --- a/app/components/avo/fields/has_many_field/show_component.html.erb +++ b/app/components/avo/fields/has_many_field/show_component.html.erb @@ -1,3 +1,3 @@ -<%= turbo_frame_tag @field.turbo_frame, src: @field.frame_url, loading: loading, target: :_top, class: "block" do %> +<%= turbo_frame_tag @field.turbo_frame, src: @field.frame_url, loading: turbo_frame_loading, target: :_top, class: "block" do %> <%= render(Avo::LoadingComponent.new(title: @field.plural_name)) %> <% end %> diff --git a/app/components/avo/fields/has_many_field/show_component.rb b/app/components/avo/fields/has_many_field/show_component.rb index 2f2d45246d..116308bb71 100644 --- a/app/components/avo/fields/has_many_field/show_component.rb +++ b/app/components/avo/fields/has_many_field/show_component.rb @@ -2,10 +2,5 @@ class Avo::Fields::HasManyField::ShowComponent < Avo::Fields::ShowComponent include Turbo::FramesHelper - - def turbo_frame_loading = kwargs[:turbo_frame_loading] - - def loading - turbo_frame_loading || params[:turbo_frame_loading] || "eager" - end + include Avo::Fields::Concerns::FrameLoading end diff --git a/app/components/avo/fields/has_one_field/show_component.html.erb b/app/components/avo/fields/has_one_field/show_component.html.erb index 98a36626f6..45b7f42377 100644 --- a/app/components/avo/fields/has_one_field/show_component.html.erb +++ b/app/components/avo/fields/has_one_field/show_component.html.erb @@ -1,5 +1,5 @@ <% if @field.value %> - + target="_top" class="block"> <%= render(Avo::LoadingComponent.new(title: @field.name)) %> <% else %> diff --git a/app/components/avo/fields/has_one_field/show_component.rb b/app/components/avo/fields/has_one_field/show_component.rb index e7127bb5ad..15bb9fbdcc 100644 --- a/app/components/avo/fields/has_one_field/show_component.rb +++ b/app/components/avo/fields/has_one_field/show_component.rb @@ -2,6 +2,7 @@ class Avo::Fields::HasOneField::ShowComponent < Avo::Fields::ShowComponent include Avo::ApplicationHelper + include Avo::Fields::Concerns::FrameLoading def can_attach? policy_result = true diff --git a/app/javascript/js/controllers/fields/date_field_controller.js b/app/javascript/js/controllers/fields/date_field_controller.js index 6a204b0dff..182144c54a 100644 --- a/app/javascript/js/controllers/fields/date_field_controller.js +++ b/app/javascript/js/controllers/fields/date_field_controller.js @@ -78,7 +78,7 @@ export default class extends Controller { // Parse the time as if it were UTC get parsedValue() { - return DateTime.fromISO(this.initialValue, { zone: 'UTC' }) + return DateTime.fromISO(this.initialValue.trim(), { zone: 'UTC' }) } get displayTimezone() { diff --git a/lib/avo/fields/concerns/frame_loading.rb b/lib/avo/fields/concerns/frame_loading.rb new file mode 100644 index 0000000000..dcbbc1242c --- /dev/null +++ b/lib/avo/fields/concerns/frame_loading.rb @@ -0,0 +1,14 @@ +module Avo + module Fields + module Concerns + module FrameLoading + extend ActiveSupport::Concern + + def turbo_frame_loading + kwargs[:turbo_frame_loading] || params[:turbo_frame_loading] || "eager" + end + end + end + end +end + diff --git a/spec/dummy/app/avo/resources/post.rb b/spec/dummy/app/avo/resources/post.rb index 3eb5db4642..f5d07853d1 100644 --- a/spec/dummy/app/avo/resources/post.rb +++ b/spec/dummy/app/avo/resources/post.rb @@ -25,6 +25,7 @@ class Avo::Resources::Post < Avo::BaseResource def fields field :id, as: :id field :name, required: true, sortable: true + field :created_at, as: :date_time field :body, as: :trix, placeholder: "Enter text", diff --git a/spec/dummy/app/avo/resources/user.rb b/spec/dummy/app/avo/resources/user.rb index 3b0a792192..0876dc6211 100644 --- a/spec/dummy/app/avo/resources/user.rb +++ b/spec/dummy/app/avo/resources/user.rb @@ -222,6 +222,11 @@ def first_tabs_group test_tab test_field("Inside tabs") first_tabs_group_fields + tab "Created at" do + panel do + field :created_at, as: :date_time + end + end end end @@ -240,6 +245,7 @@ def second_tabs_group # show_on: :edit, scope: -> { query.starts_with parent.first_name[0].downcase }, description: "The comments listed in the attach modal all start with the name of the parent user." + field :comment, as: :has_one, name: "Main comment" end end diff --git a/spec/dummy/app/models/user.rb b/spec/dummy/app/models/user.rb index 59b78331a3..cec09cc7fe 100644 --- a/spec/dummy/app/models/user.rb +++ b/spec/dummy/app/models/user.rb @@ -30,6 +30,7 @@ class User < ApplicationRecord validates :last_name, presence: true has_one :post + has_one :comment has_one :fish has_many :posts, inverse_of: :user has_many :people diff --git a/spec/system/avo/tabs_spec.rb b/spec/system/avo/tabs_spec.rb index c4de9ce7f3..914012bdb5 100644 --- a/spec/system/avo/tabs_spec.rb +++ b/spec/system/avo/tabs_spec.rb @@ -48,7 +48,7 @@ visit avo.resources_user_path user within first_tab_group do - expect(find('[data-tabs-target="tabSwitcher"]').text).to eq "Fish\nTeams\nPeople\nSpouses\nProjects\nTeam memberships" + expect(find('[data-tabs-target="tabSwitcher"]').text).to eq "Fish\nTeams\nPeople\nSpouses\nProjects\nTeam memberships\nCreated at" end end end @@ -101,7 +101,7 @@ scroll_to first_tab_group within first_tab_group do - expect(find('[data-tabs-target="tabSwitcher"]')).to have_text "Fish\nTeams\nPeople\nSpouses\nProjects\nTeam memberships", exact: true + expect(find('[data-tabs-target="tabSwitcher"]')).to have_text "Fish\nTeams\nPeople\nSpouses\nProjects\nTeam memberships\nCreated at", exact: true end end end @@ -162,4 +162,14 @@ find('a[data-selected="true"][data-tabs-tab-name-param="Team memberships"]') end end + + it "date_time field works on tabs" do + visit avo.resources_user_path user + + find('a[data-selected="false"][data-tabs-tab-name-param="Main comment"]').click + expect(page).not_to have_text 'Invalid DateTime' + + find('a[data-selected="false"][data-tabs-tab-name-param="Created at"]').click + expect(page).not_to have_text 'Invalid DateTime' + end end diff --git a/spec/system/avo/test_helpers_spec.rb b/spec/system/avo/test_helpers_spec.rb index 8d37dc5dc0..4c82c86ecf 100644 --- a/spec/system/avo/test_helpers_spec.rb +++ b/spec/system/avo/test_helpers_spec.rb @@ -73,7 +73,7 @@ it "finds the wrapper" do users.each do |user| visit "admin/resources/users/#{user.id}" - has_one_post = has_one_field_wrapper(id: :post) + scroll_to(has_one_post = has_one_field_wrapper(id: :post)) name_wrapper = within(has_one_post) { show_field_wrapper(id: "name", type: "text") } name_wrapper_without_type = within(has_one_post) { show_field_wrapper(id: "name") }