From 9b32bfc0e1f9c34bb0819452fd0f54991ba405fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 30 Sep 2023 18:00:11 +0000 Subject: [PATCH 01/60] Bump postcss from 8.4.30 to 8.4.31 (#1857) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ad2ee76d7..326c8669e 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "@webpack-cli/serve": "^2.0.5", "autoprefixer": "^10.4.16", "event-target-shim": "^6.0.2", - "postcss": "^8.4.30", + "postcss": "^8.4.31", "postcss-cli": "^10.1.0", "postcss-flexbugs-fixes": "^5.0.2", "postcss-import": "^15.1.0", diff --git a/yarn.lock b/yarn.lock index 246a9725e..320baf6c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3251,10 +3251,10 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^8.4.23, postcss@^8.4.30: - version "8.4.30" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.30.tgz#0e0648d551a606ef2192a26da4cabafcc09c1aa7" - integrity sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g== +postcss@^8.4.23, postcss@^8.4.31: + version "8.4.31" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d" + integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== dependencies: nanoid "^3.3.6" picocolors "^1.0.0" From 501cff3efe2dd4c91a440610d259a5450c73e15b Mon Sep 17 00:00:00 2001 From: Zee <50284+zspencer@users.noreply.github.com> Date: Mon, 2 Oct 2023 08:40:46 -0700 Subject: [PATCH 02/60] =?UTF-8?q?=E2=9C=A8=20`Marketplace`:=20Show=20`Deli?= =?UTF-8?q?veryFee`=20when=20`DeliveryArea`=20is=20selected=20(#1862)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `Marketplace`: Show delivery fee when Delivery Area is selected - https://github.com/zinc-collective/convene/issues/1325 I think this is leftover from when we collected both the address and the area at the same time. --- app/furniture/marketplace/carts/_total.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/furniture/marketplace/carts/_total.html.erb b/app/furniture/marketplace/carts/_total.html.erb index 646c676c2..123d6bc21 100644 --- a/app/furniture/marketplace/carts/_total.html.erb +++ b/app/furniture/marketplace/carts/_total.html.erb @@ -4,7 +4,7 @@ Taxes: <%= humanized_money_with_symbol(cart.tax_total) %> - <%- if cart.delivery_address.present? %> + <%- if cart.delivery_area.present? %> Delivery Fee: <%= humanized_money_with_symbol(cart.delivery_fee) %> <%- end %> From e330759e1162f128fcd7df375d714d50311dd064 Mon Sep 17 00:00:00 2001 From: Zee <50284+zspencer@users.noreply.github.com> Date: Mon, 2 Oct 2023 08:41:11 -0700 Subject: [PATCH 03/60] =?UTF-8?q?=F0=9F=A7=B9=20`Neighborhood`:=20Stop=20t?= =?UTF-8?q?elling=20Sentry=20about=20authorization=20errors=20(#1861)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `Neighborhood`: Stop telling Sentry about authorization errors https://github.com/zinc-collective/convene/issues/1844 I think we've reached the point where this is mostly just noise. It's possible we should doing more; but the 404 page asks them to make sure they are logged in; so I think it should be fine. Maybe one day we will add an "if you think you've reached this page in error" or something... --- app/controllers/application_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 6f45284fc..3fa37a88e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -159,7 +159,6 @@ def space_repository end def handle_unauthorized(exception) - Sentry.capture_exception(exception, level: :warn) render_not_found end From b6d079e958b77c8d254920d7b96f5b4f0c8cd6a8 Mon Sep 17 00:00:00 2001 From: Zee <50284+zspencer@users.noreply.github.com> Date: Mon, 2 Oct 2023 08:48:47 -0700 Subject: [PATCH 04/60] =?UTF-8?q?=F0=9F=8C=B8=20`Themes`:=20Make=20the=20p?= =?UTF-8?q?rimary=20theme=20Orange=20(#1858)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Eliminate the `primary` color scheme for now At some point, I would love it if we could swap out different CSS files and magically get the different colors! However, we haven't been doing that consistently enough; so I am going to tear it out for now so I can swap the Zinc Purple for Piikup Orange. * Consolidate Danger to Red for now * Consolidate Neutral to Gray * Orangeify me Cap'n! * piikup is a much brighter orange; so we'll lighten everything up a bit --- app/assets/stylesheets/components/button.scss | 20 +++++++++---------- app/assets/stylesheets/components/footer.scss | 2 +- app/assets/stylesheets/components/form.scss | 8 ++++---- app/assets/stylesheets/components/header.scss | 6 +++--- app/components/button_component.rb | 18 ++++++++--------- app/components/card_component.rb | 2 +- .../journal/entry_component.html.erb | 4 ++-- app/views/application/_radio_group.html.erb | 2 +- app/views/buttons/_minus.html.erb | 4 ++-- app/views/buttons/_plus.html.erb | 2 +- app/views/furnitures/_furniture.html.erb | 2 +- app/views/spaces/_room_card.html.erb | 6 +++--- spec/components/button_component_spec.rb | 2 +- tailwind.config.cjs | 9 --------- 14 files changed, 39 insertions(+), 48 deletions(-) diff --git a/app/assets/stylesheets/components/button.scss b/app/assets/stylesheets/components/button.scss index e5d4520fd..23e2cadc9 100644 --- a/app/assets/stylesheets/components/button.scss +++ b/app/assets/stylesheets/components/button.scss @@ -5,36 +5,36 @@ [type="submit"], button, .button { - @apply font-bold py-2 px-4 rounded bg-primary-500 text-white text-center transition ease-in-out duration-150; + @apply font-bold py-2 px-4 rounded bg-orange-500 text-white text-center transition ease-in-out duration-150; &:hover { - @apply bg-primary-700; + @apply bg-orange-400; } &:active { - @apply bg-primary-200; + @apply bg-orange-200; } &:focus { - @apply outline-none border-neutral-300 ring-gray-500; + @apply outline-none border-gray-300 ring-gray-500; } &.--danger { - @apply bg-danger-500; + @apply bg-red-500; &:hover { - @apply bg-danger-700; + @apply bg-red-700; } &:active { - @apply bg-danger-200; + @apply bg-red-200; } } &.--neutral { - @apply bg-neutral-500; + @apply bg-gray-500; &:hover { - @apply bg-neutral-700; + @apply bg-gray-700; } &:active { - @apply bg-neutral-200; + @apply bg-gray-200; } } } diff --git a/app/assets/stylesheets/components/footer.scss b/app/assets/stylesheets/components/footer.scss index 438ae4362..5e86d30ed 100644 --- a/app/assets/stylesheets/components/footer.scss +++ b/app/assets/stylesheets/components/footer.scss @@ -1,5 +1,5 @@ @layer components { body > footer { - @apply flex items-center justify-between px-2 py-2 bg-primary-900 text-white; + @apply flex items-center justify-between px-2 py-2 bg-orange-500 text-white; } } diff --git a/app/assets/stylesheets/components/form.scss b/app/assets/stylesheets/components/form.scss index 45df9d269..e46083c9d 100644 --- a/app/assets/stylesheets/components/form.scss +++ b/app/assets/stylesheets/components/form.scss @@ -3,7 +3,7 @@ @apply bg-white shadow rounded-lg p-2 mt-2; legend { - @apply text-lg leading-6 font-medium text-neutral-900; + @apply text-lg leading-6 font-medium text-gray-900; } } @@ -19,7 +19,7 @@ @apply block w-full; } label { - @apply font-medium text-sm leading-6 text-neutral-700 mb-1; + @apply font-medium text-sm leading-6 text-gray-700 mb-1; } input[type="email"], @@ -35,7 +35,7 @@ @apply py-2 px-4 rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset - focus:ring-primary-300; + focus:ring-orange-300; @screen sm { @apply leading-6 text-sm; @@ -71,7 +71,7 @@ select:disabled, textarea:disabled, input:disabled { - @apply bg-neutral-200; + @apply bg-gray-200; } .field_with_errors { @apply text-red-500; diff --git a/app/assets/stylesheets/components/header.scss b/app/assets/stylesheets/components/header.scss index 46992a693..809ebc90a 100644 --- a/app/assets/stylesheets/components/header.scss +++ b/app/assets/stylesheets/components/header.scss @@ -1,6 +1,6 @@ @layer components { body > header { - @apply flex justify-between px-2 py-2 bg-primary-900 text-white place-items-end; + @apply flex justify-between px-2 py-2 bg-orange-500 text-white place-items-end; .profile-menu { @apply flex flex-row relative; @@ -17,11 +17,11 @@ @apply px-4 py-4; &.--notice { - @apply bg-primary-100 text-primary-900; + @apply bg-orange-100 text-orange-500; } &.--alert { - @apply bg-danger-100 text-danger-900; + @apply bg-red-100 text-red-900; } } } diff --git a/app/components/button_component.rb b/app/components/button_component.rb index a51f8b1d8..c5771c8bc 100644 --- a/app/components/button_component.rb +++ b/app/components/button_component.rb @@ -69,34 +69,34 @@ def base_classes "focus-visible:outline", "focus-visible:outline-2", "focus-visible:outline-offset-2", - "focus-visible:outline-purple-600" + "focus-visible:outline-orange-400" ] end def secondary_classes [ "bg-white", - "text-purple-950", + "text-orange-950", "ring-gray-300", - "hover:bg-purple-100", - "hover:text-purple-700" + "hover:bg-orange-100", + "hover:text-orange-700" ] end def danger_classes [ - "bg-danger-500", - "hover:bg-danger-700", - "active:bg-danger-200", + "bg-red-500", + "hover:bg-red-700", + "active:bg-red-200", "text-white" ] end def primary_classes [ - "bg-purple-600", + "bg-orange-500", "text-white", - "hover:bg-purple-700", + "hover:bg-orange-400", "hover:text-white" ] end diff --git a/app/components/card_component.rb b/app/components/card_component.rb index 7b7b43c28..d49965636 100644 --- a/app/components/card_component.rb +++ b/app/components/card_component.rb @@ -20,7 +20,7 @@ def card_classes_wrapper def card_classes_footer [ - "bg-purple-50", + "bg-orange-50", "p-4", "sm:p-6", # content? is not always working as described, and is returning a proc in some cases rather than a boolean diff --git a/app/furniture/journal/entry_component.html.erb b/app/furniture/journal/entry_component.html.erb index 02dc3f235..0f5d38fc4 100644 --- a/app/furniture/journal/entry_component.html.erb +++ b/app/furniture/journal/entry_component.html.erb @@ -1,6 +1,6 @@
-
-

<%= entry.headline %>

+
+

<%= entry.headline %>

<%- if entry.published?%> Published on <%= link_to published_at, entry.location %> <%- else %> diff --git a/app/views/application/_radio_group.html.erb b/app/views/application/_radio_group.html.erb index bd24b3f71..1b0adba86 100644 --- a/app/views/application/_radio_group.html.erb +++ b/app/views/application/_radio_group.html.erb @@ -3,7 +3,7 @@ <%- options.each do |option| %>
<%= form.radio_button attribute, option, - class: "h-4 w-4 border-gray-300 text-purple-900 focus:ring-purple-600" %> + class: "h-4 w-4 border-gray-300 text-orange-500 focus:ring-orange-600" %> <%= form.label attribute, option, value: option, class: "ml-3 block text-sm leading-6 text-gray-900" %>
diff --git a/app/views/buttons/_minus.html.erb b/app/views/buttons/_minus.html.erb index a876ebe01..fa8cbac3e 100644 --- a/app/views/buttons/_minus.html.erb +++ b/app/views/buttons/_minus.html.erb @@ -9,7 +9,7 @@ <%- if !disabled %> <%= link_to label, href, title: title, method: method, data: data, - class: 'no-underline bg-transparent hover:bg-primary-100 button' %> + class: 'no-underline bg-transparent hover:bg-orange-100 button' %> <%- else %> - <%=label%> + <%=label%> <%- end %> diff --git a/app/views/buttons/_plus.html.erb b/app/views/buttons/_plus.html.erb index 23b93b8b9..8384d4f17 100644 --- a/app/views/buttons/_plus.html.erb +++ b/app/views/buttons/_plus.html.erb @@ -7,4 +7,4 @@ <%= link_to label, href, title: title, data: data, - class: 'no-underline bg-transparent hover:bg-primary-100 button' %> + class: 'no-underline bg-transparent hover:bg-orange-100 button' %> diff --git a/app/views/furnitures/_furniture.html.erb b/app/views/furnitures/_furniture.html.erb index 419172b98..56966b686 100644 --- a/app/views/furnitures/_furniture.html.erb +++ b/app/views/furnitures/_furniture.html.erb @@ -4,7 +4,7 @@
<%- if local_assigns[:editing] %> -
+

<%= furniture.title %>

<%- if edit_href.present? %> diff --git a/app/views/spaces/_room_card.html.erb b/app/views/spaces/_room_card.html.erb index 3fadb8f06..1eb57f5db 100644 --- a/app/views/spaces/_room_card.html.erb +++ b/app/views/spaces/_room_card.html.erb @@ -1,14 +1,14 @@ <%= link_to [room.space, room], class: "no-underline" do %> <%= render CardComponent.new( data: { access_level: room.access_level, slug: room.slug, model: "room", id: room.id }, - classes: "group self-stretch hover:bg-purple-100" + classes: "group self-stretch hover:bg-orange-50" ) do %>
-

+

<%= room.name %>

-
-
- 💾  - <%= link_to "Contribute", "https://github.com/zinc-collective/convene" %> - 💚  - <%= link_to "Sponsor", "https://opencollective.com/zinc-community" %> +
- <%- if current_space&.agreements&.present? %> -
- <%- current_space.agreements.each do |agreement| %> - <%- next unless agreement.persisted? %> - <%= link_to(agreement.name, agreement.location, class: "px-4 py-2") %> +
- <%- end %> + <%= link_to "Sign out", [current_space, :authenticated_session].compact, data: { turbo: true, turbo_method: :delete }, class: "sign-out px-4 py-1" %> + <%- else %> + <%= link_to "Sign in", [:new, current_space, :authenticated_session].compact, class: "px-4 py-1" %> + <%- end %> + + +
+ <%= link_to "💾 Contribute", "https://github.com/zinccollective/convene", class: "px-2 py-1" %> + <%= link_to "💚 Sponsor", "https://opencollective.com/zinccommunity", class: "px-2 py-1" %> + + <%- current_space&.agreements&.each do |agreement| %> + <%- next unless agreement.persisted? %> + <%= link_to(agreement.name, agreement.location, class: "px-2 py-1") %> + <%- end %> +
+
+ <%= render Neighborhood::LinkComponent.new %> +
diff --git a/features/harness/Page.js b/features/harness/Page.js index 84997d43a..681eb28a9 100644 --- a/features/harness/Page.js +++ b/features/harness/Page.js @@ -23,7 +23,10 @@ class Page { * @returns {PersonNavigationComponent} */ personNavigation() { - return this.component(".profile-menu", PersonNavigationComponent); + return this.component( + "*[aria-label='Profile Menu']", + PersonNavigationComponent, + ); } /** * Goes directly to the page, as defined in the path method. diff --git a/features/lib/Actor.js b/features/lib/Actor.js index 400fdb104..162f95600 100644 --- a/features/lib/Actor.js +++ b/features/lib/Actor.js @@ -65,7 +65,7 @@ class Actor { * @returns {Promise} */ isSignedIn(driver) { - return new PersonNavigationComponent(driver, ".profile-menu") + return new PersonNavigationComponent(driver, "*[aria-label='Profile Menu']") .signedInEmail() .then((email) => this.email == email); } From e41e780323dda24ef5e3e2024dcecc79150f5c1b Mon Sep 17 00:00:00 2001 From: Zee <50284+zspencer@users.noreply.github.com> Date: Wed, 4 Oct 2023 17:32:53 -0700 Subject: [PATCH 10/60] =?UTF-8?q?=F0=9F=8C=B8=20`Themes`:=20Violet=20begat?= =?UTF-8?q?s=20violets=20(#1868)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `Themes`: Violet begats violets - https://github.com/zinc-collective/convene/pull/1858#issuecomment-1743768286 - https://github.com/zinc-collective/convene/issues/621 Now they're orange! Just like everything else! ORANGE ORANGE ORANGE --- app/components/alert_component.rb | 8 ++++---- .../marketplace/cart/deliveries/_delivery.html.erb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/components/alert_component.rb b/app/components/alert_component.rb index b8eeb3ce8..ee72c45ba 100644 --- a/app/components/alert_component.rb +++ b/app/components/alert_component.rb @@ -25,7 +25,7 @@ def bg_class when :success "bg-green-50" else - "bg-violet-50" + "bg-orange-50" end end @@ -38,7 +38,7 @@ def icon_class when :success "text-green-400" else - "text-violet-400" + "text-orange-400" end end @@ -51,7 +51,7 @@ def title_text_class when :success "text-green-800" else - "text-violet-800" + "text-orange-800" end end @@ -64,7 +64,7 @@ def content_text_class when :success "text-green-700" else - "text-violet-700" + "text-orange-700" end end end diff --git a/app/furniture/marketplace/cart/deliveries/_delivery.html.erb b/app/furniture/marketplace/cart/deliveries/_delivery.html.erb index 97fa775dc..c957fe8cc 100644 --- a/app/furniture/marketplace/cart/deliveries/_delivery.html.erb +++ b/app/furniture/marketplace/cart/deliveries/_delivery.html.erb @@ -7,7 +7,7 @@ <%= turbo_frame_tag(delivery) do %> <% if delivery.details_filled_in? %>

Delivering to:

-
+

<%= delivery.contact_email %>
<%= number_to_phone(delivery.contact_phone_number) %>
From f1decf6d13a22976891141fe5212c5ba6bf0b926 Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Wed, 4 Oct 2023 17:30:24 -0700 Subject: [PATCH 11/60] =?UTF-8?q?=F0=9F=8C=B8=20`Marketplace`:=20Show=20`S?= =?UTF-8?q?hoppers`=20the=20`Room`=20and=20`Space`=20names?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - https://github.com/zinc-collective/convene/issues/1326 - https://github.com/zinc-collective/convene/issues/832 - https://github.com/zinc-collective/convene/issues/831 --- app/furniture/marketplace/marketplace_component.html.erb | 4 ++++ app/furniture/marketplace/marketplace_component.yml | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 app/furniture/marketplace/marketplace_component.yml diff --git a/app/furniture/marketplace/marketplace_component.html.erb b/app/furniture/marketplace/marketplace_component.html.erb index 600c582f6..a16bd615b 100644 --- a/app/furniture/marketplace/marketplace_component.html.erb +++ b/app/furniture/marketplace/marketplace_component.html.erb @@ -1,3 +1,7 @@ +

+ <%= t('.header', space: marketplace.space.name, room: marketplace.room.name) %> +

+ <%= render onboarding_component %> diff --git a/app/furniture/marketplace/marketplace_component.yml b/app/furniture/marketplace/marketplace_component.yml new file mode 100644 index 000000000..820516be5 --- /dev/null +++ b/app/furniture/marketplace/marketplace_component.yml @@ -0,0 +1,2 @@ +en: + header: Shop %{room} on %{space} From 0d8e36a507381b83b7dd1020446d9b9c26bae7fe Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Wed, 4 Oct 2023 18:00:23 -0700 Subject: [PATCH 12/60] `Section`: Remove `Listed` concept; since it's confusing - https://github.com/zinc-collective/convene/issues/1155 At some point, it would make sense for us to make a Gizmo for linking to different places (even ones outside of the Space!) and replacing the Section Navigation bar with that. But in the meantime, the `Listed` vs `Unlisted` dichotomy isn't really serving us, and is getting in the way a little bit. --- app/models/blueprint.rb | 18 ++------- app/models/room.rb | 10 +---- app/policies/room_policy.rb | 3 +- app/views/rooms/_form.html.erb | 1 - app/views/rooms/_room.html.erb | 2 +- features/rooms/discovering-rooms.feature | 38 +++---------------- features/rooms/entering-rooms.feature | 22 +++++------ .../support/parameter-types/publicityLevel.js | 12 ------ spec/factories/room.rb | 9 ----- spec/models/blueprint_spec.rb | 1 - spec/models/room_spec.rb | 36 +----------------- spec/policies/room_policy_spec.rb | 9 ----- 12 files changed, 26 insertions(+), 135 deletions(-) delete mode 100644 features/support/parameter-types/publicityLevel.js diff --git a/app/models/blueprint.rb b/app/models/blueprint.rb index 7d54c19e8..6398495e4 100644 --- a/app/models/blueprint.rb +++ b/app/models/blueprint.rb @@ -99,34 +99,24 @@ def space_attributes {email: "space-member@example.com"}], rooms: [ { - name: "Listed Room 1", - publicity_level: :listed, + name: "Room 1", access_level: :public, furnitures: { markdown_text_block: {content: "# Welcome!"} } }, { - name: "Listed Room 2", - publicity_level: :listed, + name: "Room 2", access_level: :public, furnitures: {} }, { - name: "Unlisted Room 1", - publicity_level: :unlisted, - access_level: :public, - furnitures: {} - }, - { - name: "Unlisted Room 2", - publicity_level: :unlisted, - access_level: :public, + name: "Internal Room 1", + access_level: :internal, furnitures: {} }, { name: "Entrance Hall", - publicity_level: :unlisted, furnitures: { markdown_text_block: {content: "# Wooo!"} } diff --git a/app/models/room.rb b/app/models/room.rb index 990932302..d54f06da7 100644 --- a/app/models/room.rb +++ b/app/models/room.rb @@ -1,5 +1,6 @@ # A Room in Convene acts as a gathering place. class Room < ApplicationRecord + self.ignored_columns += [:publicity_level] # The space whose settings govern the default publicity and access controls for the Room. belongs_to :space, inverse_of: :rooms location(parent: :space) @@ -25,15 +26,6 @@ class Room < ApplicationRecord alias_method :internal?, :internal_access? alias_method :public?, :public_access? - # A Room's Publicity Level indicates how visible the room is. - # `listed` - The room is discoverable by anyone in the space lobby. - # `unlisted` - The room is not listed. - enum publicity_level: { - listed: "listed", - unlisted: "unlisted" - } - validates :publicity_level, presence: true - has_many :gizmos, dependent: :destroy, inverse_of: :room, class_name: :Furniture accepts_nested_attributes_for :gizmos diff --git a/app/policies/room_policy.rb b/app/policies/room_policy.rb index 88a6b8cf3..f962ab14b 100644 --- a/app/policies/room_policy.rb +++ b/app/policies/room_policy.rb @@ -19,8 +19,7 @@ def create? alias_method :new?, :create? def permitted_attributes(params) - [:access_level, :name, :slug, :publicity_level, - gizmos_attributes: + [:access_level, :name, :slug, gizmos_attributes: policy(Furniture).permitted_attributes(params)] end diff --git a/app/views/rooms/_form.html.erb b/app/views/rooms/_form.html.erb index 0c5e97596..93e9a28eb 100644 --- a/app/views/rooms/_form.html.erb +++ b/app/views/rooms/_form.html.erb @@ -5,7 +5,6 @@

Privacy and Security

- <%= render "radio_group", attribute: :publicity_level, options: Room::publicity_levels.values, form: room_form %> <%= render "radio_group", attribute: :access_level, options: Room::access_levels.values, form: room_form %>
diff --git a/app/views/rooms/_room.html.erb b/app/views/rooms/_room.html.erb index 1177182b0..eb97b554d 100644 --- a/app/views/rooms/_room.html.erb +++ b/app/views/rooms/_room.html.erb @@ -6,7 +6,7 @@
- <% policy_scope(room.space.rooms.listed).each do |room| %> + <% policy_scope(room.space.rooms).each do |room| %> <%= render partial: 'spaces/room_card', locals: { room: room } %> <% end %>
diff --git a/features/rooms/discovering-rooms.feature b/features/rooms/discovering-rooms.feature index cfbccd7ae..5f4e5e8c6 100644 --- a/features/rooms/discovering-rooms.feature +++ b/features/rooms/discovering-rooms.feature @@ -3,45 +3,19 @@ Feature: Discovering Rooms I want to be able to explore the Space's rooms @built @unimplemented-steps - Scenario: Space Member may discover Listed Room - Given a Space with a Listed Room + Scenario: Space Member may discover Room + Given a Space with a Room When a Space Member is on the Space Dashboard Then they see the Room @built @unimplemented-steps - Scenario: Guest may discover Listed Room - Given a Space with a Listed Room + Scenario: Guest may discover Room + Given a Space with a Room When a Guest is on the Space Dashboard Then they see the Room @unstarted - Scenario: Guest may not discover Listed Internal Room - Given a Space with an Listed Internal Room + Scenario: Guest may not discover Internal Room + Given a Space with an Internal Room When a Guest is on the Space Dashboard Then they do not see the Room - - # Unlisted Rooms - @built - Scenario: Guest may not discover Unlisted Rooms - Given a "System Test" Space - When the Guest is on the "System Test" Space Dashboard - Then the Guest does not see the "Unlisted Room 1" Room's Door - - @built - Scenario: Space Member may not discover Unlisted Room - Given a "System Test" Space - When the Space Member is on the "System Test" Space Dashboard - Then the Space Member does not see the "Unlisted Room 1" Room's Door - - @unstarted @unimplemented-steps - Scenario: Room Creator may discover Unlisted Room - Given a Space with an Unlisted Room - When the Room Creator is on the Space Dashboard - Then they see the Room - - - @unstarted - Scenario: Room Previous Attendee may discover previously visited Unlisted Room - Given a Space with an Unlisted Room - When a Previous Attendee of that Room is on the Space Dashboard - Then they see the Room diff --git a/features/rooms/entering-rooms.feature b/features/rooms/entering-rooms.feature index 0369e52ad..bda3d561f 100644 --- a/features/rooms/entering-rooms.feature +++ b/features/rooms/entering-rooms.feature @@ -16,14 +16,14 @@ Feature: Entering Rooms @built Scenario: Entering Room via Room Picker from Space Dashboard Given the Space Member is on the "System Test" Space Dashboard - When the Space Member taps the "Listed Room 1" Room in the Room Picker - Then the Space Member is placed in the "Listed Room 1" Room + When the Space Member taps the "Room 1" Room in the Room Picker + Then the Space Member is placed in the "Room 1" Room @built Scenario: Entering Room via Room Picker from another Room - Given the Space Member is in the "System Test" Space and in the "Listed Room 1" Room - When the Space Member taps the "Listed Room 2" Room in the Room Picker - Then the Space Member is placed in the "Listed Room 2" Room + Given the Space Member is in the "System Test" Space and in the "Room 1" Room + When the Space Member taps the "Room 2" Room in the Room Picker + Then the Space Member is placed in the "Room 2" Room @built @unimplemented-steps Scenario: Entering Room via Slug on a Branded Domain @@ -33,13 +33,13 @@ Feature: Entering Rooms @built Scenario: Entering Room via Room full URL - When the Space Member visit the "System Test" Space, "Listed Room 1" Room full URL - Then the Space Member is placed in the "Listed Room 1" Room + When the Space Member visit the "System Test" Space, "Room 1" Room full URL + Then the Space Member is placed in the "Room 1" Room @built @unimplemented-steps Scenario: Entering Room via back button - Given the Space Member is in the "System Test" Space and in the "Listed Room 1" Room - When the Space Member taps the "Listed Room 2" Room in the Room Picker - And the Space Member is placed in the "Listed Room 2" Room + Given the Space Member is in the "System Test" Space and in the "Room 1" Room + When the Space Member taps the "Room 2" Room in the Room Picker + And the Space Member is placed in the "Room 2" Room And the Space Member hit the back button - Then the Space Member is placed in the "Listed Room 1" Room + Then the Space Member is placed in the "Room 1" Room diff --git a/features/support/parameter-types/publicityLevel.js b/features/support/parameter-types/publicityLevel.js deleted file mode 100644 index 8a044f09e..000000000 --- a/features/support/parameter-types/publicityLevel.js +++ /dev/null @@ -1,12 +0,0 @@ -import { defineParameterType } from "@cucumber/cucumber"; -// Defines whether a Room may be discovered or not. -// See: https://github.com/zinc-collective/convene/issues/39 -defineParameterType({ - name: "publicityLevel", - regexp: /(Unlisted|Listed)/, -}); -class PublicityLevel { - constructor(level) { - this.level = level; - } -} diff --git a/spec/factories/room.rb b/spec/factories/room.rb index 716d2d0e8..8836c6b31 100644 --- a/spec/factories/room.rb +++ b/spec/factories/room.rb @@ -2,7 +2,6 @@ factory :room do space name { Faker::Book.genre } - publicity_level { "listed" } trait :internal do access_level { :internal } @@ -12,14 +11,6 @@ access_level { :public } end - trait :listed do - publicity_level { :listed } - end - - trait :unlisted do - publicity_level { :unlisted } - end - trait :with_slug do slug { name.parameterize } end diff --git a/spec/models/blueprint_spec.rb b/spec/models/blueprint_spec.rb index 2f586ef70..234f94f69 100644 --- a/spec/models/blueprint_spec.rb +++ b/spec/models/blueprint_spec.rb @@ -8,7 +8,6 @@ members: [{email: "client-a@example.com"}], rooms: [{ name: "Room A", - publicity_level: :listed, furnitures: { markdown_text_block: {content: "Obi Swan Kenobi"} } diff --git a/spec/models/room_spec.rb b/spec/models/room_spec.rb index 377236523..1eb5419a9 100644 --- a/spec/models/room_spec.rb +++ b/spec/models/room_spec.rb @@ -10,43 +10,11 @@ it "creates unique slugs by space scope" do space_1 = Space.create(name: "space1") space_2 = Space.create(name: "space2") - space_1_room = space_1.rooms.create(name: "room1", publicity_level: :listed) - space_2_room = space_2.rooms.create(name: "room1", publicity_level: :listed) + space_1_room = space_1.rooms.create(name: "room1") + space_2_room = space_2.rooms.create(name: "room1") expect(space_1_room.slug).to eq "room1" expect(space_2_room.slug).to eq "room1" end end - - describe ".listed" do - it "does not include rooms whose publicity level is unlisted" do - space = Space.create(name: "space") - listed_room = space.rooms.create(publicity_level: :listed, name: "Listed Room") - unlisted_room = space.rooms.create(publicity_level: :unlisted, name: "Unlisted Room") - - aggregate_failures do - expect(described_class.listed).not_to include(unlisted_room) - expect(described_class.listed).to include(listed_room) - end - end - end - - describe "#publicity_level" do - it { is_expected.to validate_presence_of(:publicity_level) } - it { is_expected.to define_enum_for(:publicity_level).backed_by_column_of_type(:string) } - - context "when set to 'listed'" do - subject { described_class.new(publicity_level: "listed", space: space) } - - it { is_expected.not_to be_unlisted } - it { is_expected.to be_listed } - end - - context "when set to 'unlisted'" do - subject { described_class.new(publicity_level: "unlisted", space: space) } - - it { is_expected.to be_unlisted } - it { is_expected.not_to be_listed } - end - end end diff --git a/spec/policies/room_policy_spec.rb b/spec/policies/room_policy_spec.rb index 253f167f1..6818d177a 100644 --- a/spec/policies/room_policy_spec.rb +++ b/spec/policies/room_policy_spec.rb @@ -44,8 +44,6 @@ let(:space) { room.space } let!(:internal_room) { create(:room, :internal, space: space) } let!(:public_room) { create(:room, :public, space: space) } - let!(:listed_room) { create(:room, :listed, space: space) } - let!(:unlisted_room) { create(:room, :unlisted, space: space) } context "when person is an operator" do let(:person) { operator } @@ -53,8 +51,6 @@ it "returns all the rooms" do expect(results).to include(internal_room) expect(results).to include(public_room) - expect(results).to include(unlisted_room) - expect(results).to include(listed_room) end end @@ -64,8 +60,6 @@ it "returns all the rooms" do expect(results).to include(internal_room) expect(results).to include(public_room) - expect(results).to include(unlisted_room) - expect(results).to include(listed_room) end end @@ -74,9 +68,6 @@ it "returns only the public rooms" do expect(results).to include(public_room) - expect(results).to include(unlisted_room) - expect(results).to include(listed_room) - expect(results).not_to include(internal_room) end end From 0b60faf15838e7a9e6f3948ce88bcae64b4c87fd Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Wed, 4 Oct 2023 18:22:51 -0700 Subject: [PATCH 13/60] `Section`: Drop the `publicity_level` column, since it is dead - https://github.com/zinc-collective/convene/issues/1155 --- app/models/room.rb | 1 - .../20231005005905_drop_publicity_level_from_rooms.rb | 7 +++++++ db/schema.rb | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20231005005905_drop_publicity_level_from_rooms.rb diff --git a/app/models/room.rb b/app/models/room.rb index d54f06da7..973523fe3 100644 --- a/app/models/room.rb +++ b/app/models/room.rb @@ -1,6 +1,5 @@ # A Room in Convene acts as a gathering place. class Room < ApplicationRecord - self.ignored_columns += [:publicity_level] # The space whose settings govern the default publicity and access controls for the Room. belongs_to :space, inverse_of: :rooms location(parent: :space) diff --git a/db/migrate/20231005005905_drop_publicity_level_from_rooms.rb b/db/migrate/20231005005905_drop_publicity_level_from_rooms.rb new file mode 100644 index 000000000..856a85e58 --- /dev/null +++ b/db/migrate/20231005005905_drop_publicity_level_from_rooms.rb @@ -0,0 +1,7 @@ +class DropPublicityLevelFromRooms < ActiveRecord::Migration[7.0] + def change + safety_assured do + remove_column :rooms, :publicity_level, type: :string, default: :listed + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 1cba42bac..9c5b1bd8e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2023_08_14_180326) do +ActiveRecord::Schema[7.0].define(version: 2023_10_05_005905) do # These are extensions that must be enabled in order to support this database enable_extension "pgcrypto" enable_extension "plpgsql" @@ -252,7 +252,6 @@ t.string "name" t.string "slug" t.string "access_level", default: "public", null: false - t.string "publicity_level", default: "listed", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false t.uuid "space_id" From 4f704acceae09ebf474261a8d39dad2c598537c3 Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Wed, 4 Oct 2023 18:53:28 -0700 Subject: [PATCH 14/60] Remove `Convene` branding from Page titles Convene's branding isn't what's important, our client and community owners are! --- app/controllers/application_controller.rb | 2 +- app/controllers/rooms_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3fa37a88e..88b1bb113 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -29,7 +29,7 @@ class ApplicationController < ActionController::Base # @return [String] helper_method def page_title if current_space.present? - "Convene - #{current_space.name}" + current_space.name else "Convene" end diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb index 4279a53e9..adf5a983e 100644 --- a/app/controllers/rooms_controller.rb +++ b/app/controllers/rooms_controller.rb @@ -53,7 +53,7 @@ def room_params end helper_method def page_title - ["[Convene]", current_room&.name, current_space&.name].compact.join(" - ") + [current_room&.name, current_space&.name].compact.join(" - ") end helper_method def room From 224fb9273ad56cf1f65fe911188f949bb7244186 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 22:21:17 +0000 Subject: [PATCH 15/60] Bump gretel from 4.5.0 to 4.6.0 (#1875) --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 557778f7c..c99b5ba61 100644 --- a/Gemfile +++ b/Gemfile @@ -39,7 +39,7 @@ gem "rswag-ui" # Allows us to render .markdown.erb files gem "redcarpet", "~> 3.6" # Breadcrumbs! -gem "gretel", "~> 4.5" +gem "gretel", "~> 4.6" # Better UI components gem "lookbook", ">= 2.0.0.beta.4" gem "view_component", "~> 3.6" diff --git a/Gemfile.lock b/Gemfile.lock index a9305975f..1d960b645 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -192,9 +192,9 @@ GEM activerecord (>= 4.0.0) globalid (1.1.0) activesupport (>= 5.0) - gretel (4.5.0) - actionview (>= 5.1, < 7.1) - railties (>= 5.1, < 7.1) + gretel (4.6.0) + actionview (>= 5.1, < 7.2) + railties (>= 5.1, < 7.2) hashdiff (1.0.1) htmlbeautifier (1.4.2) htmlentities (4.3.4) @@ -510,7 +510,7 @@ DEPENDENCIES factory_bot_rails faker friendly_id (~> 5.5.0) - gretel (~> 4.5) + gretel (~> 4.6) image_processing jbuilder (~> 2.11) jsbundling-rails From e1ea788d3bd9f9ae7aa9d2d6f2656c6df2f0e94d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 22:23:38 +0000 Subject: [PATCH 16/60] Bump stripe from 9.3.0 to 9.4.0 (#1874) --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1d960b645..8be96a3d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -457,7 +457,7 @@ GEM railties (>= 6.0.0) strip_attributes (1.13.0) activemodel (>= 3.0, < 8.0) - stripe (9.3.0) + stripe (9.4.0) strong_migrations (1.6.3) activerecord (>= 5.2) thor (1.2.2) From 484dc19b78205e82223cb0cab874ee10277e50c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 22:28:08 +0000 Subject: [PATCH 17/60] Bump @rails/activestorage from 7.0.8 to 7.1.0 (#1873) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ac0507923..73d1debd2 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "@hotwired/stimulus-webpack-helpers": "^1.0.1", "@hotwired/turbo-rails": "^7.3.0", "@rails/actioncable": "^7.0.8", - "@rails/activestorage": "^7.0.8", + "@rails/activestorage": "^7.1.0", "@sentry/browser": "^7.73.0", "@tailwindcss/forms": "^0.5.6", "@tailwindcss/typography": "^0.5.10", diff --git a/yarn.lock b/yarn.lock index ddce5b1d7..36cd1fce6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -500,10 +500,10 @@ resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.8.tgz#f44e7517f2d1570f1eabeea457dbeb17ed3a2d12" integrity sha512-GjYQv89ZOOfbFw8VMNUOG33GXzyAA/TCVoD+742Ob4svm1XXUkd+w+ewqUXd+7VHQtV35y1/O78AGIPeJDTy/g== -"@rails/activestorage@^7.0.8": - version "7.0.8" - resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.0.8.tgz#7ea8a656b5621e0dc57f51e3ad2f06c3af30d3ea" - integrity sha512-CxPyCxTV0HIaZP8qqH11tkESNl8TrQsIAesAgeOXDOl0BkaN6nC0/Mq2/0ngezBu9CZbFzfHtP2g6Yl8BWkV8g== +"@rails/activestorage@^7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.1.0.tgz#6aeea30720f98ea25f790596862ac89251bcc05d" + integrity sha512-TYc3AkBaXgBlavODTHPgyaOMqt0MRkFlPCa7BiQJJyND17GYS7pP0lT0bgcDQgpuKMvsCdVxQaRwl6tzL5AW0g== dependencies: spark-md5 "^3.0.1" From d69b5fe9d0bba034de7973cb745c13efe025644b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 22:35:29 +0000 Subject: [PATCH 18/60] Bump @rails/actioncable from 7.0.8 to 7.1.0 (#1872) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 73d1debd2..198df544a 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@hotwired/stimulus": "^3.2.2", "@hotwired/stimulus-webpack-helpers": "^1.0.1", "@hotwired/turbo-rails": "^7.3.0", - "@rails/actioncable": "^7.0.8", + "@rails/actioncable": "^7.1.0", "@rails/activestorage": "^7.1.0", "@sentry/browser": "^7.73.0", "@tailwindcss/forms": "^0.5.6", diff --git a/yarn.lock b/yarn.lock index 36cd1fce6..80c2df05c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -495,10 +495,10 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@rails/actioncable@^7.0", "@rails/actioncable@^7.0.8": - version "7.0.8" - resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.8.tgz#f44e7517f2d1570f1eabeea457dbeb17ed3a2d12" - integrity sha512-GjYQv89ZOOfbFw8VMNUOG33GXzyAA/TCVoD+742Ob4svm1XXUkd+w+ewqUXd+7VHQtV35y1/O78AGIPeJDTy/g== +"@rails/actioncable@^7.0", "@rails/actioncable@^7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.1.0.tgz#9b1543b0abf5a0a7ef7088882ee3d6092b2745b3" + integrity sha512-MBGzAQHOk+sXblpCQsM0MPxQDzvTLFwaFu8jqYbfWDejpZPszo9xaAOF/3+iv7ab1o6PFiTpdbh+PR4osofIWw== "@rails/activestorage@^7.1.0": version "7.1.0" From 73594068628b69ce00086dc9cbb6261f37a52054 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 23:56:33 +0000 Subject: [PATCH 19/60] Bump postcss-preset-env from 9.1.4 to 9.2.0 (#1876) --- package.json | 2 +- yarn.lock | 451 ++++++++++++++++++++++++++------------------------- 2 files changed, 234 insertions(+), 219 deletions(-) diff --git a/package.json b/package.json index 198df544a..d9800ebda 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "postcss-cli": "^10.1.0", "postcss-flexbugs-fixes": "^5.0.2", "postcss-import": "^15.1.0", - "postcss-preset-env": "^9.1.4", + "postcss-preset-env": "^9.2.0", "tailwindcss": "^3.3.3", "webpack": "^5.76.0", "webpack-cli": "^5.1.4" diff --git a/yarn.lock b/yarn.lock index 80c2df05c..39323f8bd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,43 +12,43 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@csstools/cascade-layer-name-parser@^1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-1.0.4.tgz#3ff490b84660dc0592b4315029f22908f3de0577" - integrity sha512-zXMGsJetbLoXe+gjEES07MEGjL0Uy3hMxmnGtVBrRpVKr5KV9OgCB09zr/vLrsEtoVQTgJFewxaU8IYSAE4tjg== +"@csstools/cascade-layer-name-parser@^1.0.5": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-1.0.5.tgz#c4d276e32787651df0007af22c9fa70d9c9ca3c2" + integrity sha512-v/5ODKNBMfBl0us/WQjlfsvSlYxfZLhNMVIsuCPib2ulTwGKYbKJbwqw671+qH9Y4wvWVnu7LBChvml/wBKjFg== "@csstools/color-helpers@^3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-3.0.2.tgz#6571d289af8bfcc3a8d75357b35e6d17a8ba6848" integrity sha512-NMVs/l7Y9eIKL5XjbCHEgGcG8LOUT2qVcRjX6EzkCdlvftHVKr2tHIPzHavfrULRZ5Q2gxrJ9f44dAlj6fX97Q== -"@csstools/css-calc@^1.1.3": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-1.1.3.tgz#75e07eec075f1f3df0ce25575dab3d63da2bd680" - integrity sha512-7mJZ8gGRtSQfQKBQFi5N0Z+jzNC0q8bIkwojP1W0w+APzEqHu5wJoGVsvKxVnVklu9F8tW1PikbBRseYnAdv+g== +"@csstools/css-calc@^1.1.4": + version "1.1.4" + resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-1.1.4.tgz#70bf4c5b379cdc256d3936bf4a21e3a3454a3d68" + integrity sha512-ZV1TSmToiNcQL1P3hfzlzZzA02mmVkVmXGaUDUqpYUG84PmLhVSZpKX+KfxAuOcK7de04UXSQPBrAvaya6iiGg== -"@csstools/css-color-parser@^1.3.1": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-1.3.1.tgz#ab37d833e65595c8dae05c6ec44aeb87f210b76b" - integrity sha512-cehc/DQCyb4hL4fspvyL7WiY+uAy8Iuaz0yTyndC/AyBmxkNpgtSgCSsr0aR4vkaSFVZfNNVlKbjHFwOsPGB1Q== +"@csstools/css-color-parser@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-1.4.0.tgz#c8517457dcb6ad080848b1583aa029ab61221ce8" + integrity sha512-SlGd8E6ron24JYQPQAIzu5tvmWi1H4sDKTdA7UDnwF45oJv7AVESbOlOO1YjfBhrQFuvLWUgKiOY9DwGoAxwTA== dependencies: "@csstools/color-helpers" "^3.0.2" - "@csstools/css-calc" "^1.1.3" + "@csstools/css-calc" "^1.1.4" -"@csstools/css-parser-algorithms@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.1.tgz#ec4fc764ba45d2bb7ee2774667e056aa95003f3a" - integrity sha512-xrvsmVUtefWMWQsGgFffqWSK03pZ1vfDki4IVIIUxxDKnGBzqNgv0A7SB1oXtVNEkcVO8xi1ZrTL29HhSu5kGA== +"@csstools/css-parser-algorithms@2.3.2", "@csstools/css-parser-algorithms@^2.3.2": + version "2.3.2" + resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.2.tgz#1e0d581dbf4518cb3e939c3b863cb7180c8cedad" + integrity sha512-sLYGdAdEY2x7TSw9FtmdaTrh2wFtRJO5VMbBrA8tEqEod7GEggFmxTSK9XqExib3yMuYNcvcTdCZIP6ukdjAIA== -"@csstools/css-tokenizer@^2.2.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.2.0.tgz#9d70e6dcbe94e44c7400a2929928db35c4de32b5" - integrity sha512-wErmsWCbsmig8sQKkM6pFhr/oPha1bHfvxsUY5CYSQxwyhA9Ulrs8EqCgClhg4Tgg2XapVstGqSVcz0xOYizZA== +"@csstools/css-tokenizer@^2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.2.1.tgz#9dc431c9a5f61087af626e41ac2a79cce7bb253d" + integrity sha512-Zmsf2f/CaEPWEVgw29odOj+WEVoiJy9s9NOv5GgNY9mZ1CZ7394By6wONrONrTsnNDv6F9hR02nvFihrGVGHBg== -"@csstools/media-query-list-parser@^2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.4.tgz#0017f99945f6c16dd81a7aacf6821770933c3a5c" - integrity sha512-V/OUXYX91tAC1CDsiY+HotIcJR+vPtzrX8pCplCpT++i8ThZZsq5F5dzZh/bDM3WUOjrvC1ljed1oSJxMfjqhw== +"@csstools/media-query-list-parser@^2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.5.tgz#94bc8b3c3fd7112a40b7bf0b483e91eba0654a0f" + integrity sha512-IxVBdYzR8pYe89JiyXQuYk4aVVoCPhMJkz6ElRwlVysjwURTsTk/bmY/z4FfeRE+CRBMlykPwXEVUg8lThv7AQ== "@csstools/postcss-cascade-layers@^4.0.0": version "4.0.0" @@ -58,34 +58,34 @@ "@csstools/selector-specificity" "^3.0.0" postcss-selector-parser "^6.0.13" -"@csstools/postcss-color-function@^3.0.4": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-3.0.4.tgz#bfcdb2cb83de9893e7d47123d272da2676a82a3c" - integrity sha512-ZLi+nSb/u1Tt+zxB8MGE2rOkX7YhWGxM3pBQRz9nn8DIAKT84GkaeHGyVrxwCPBVdko/4nwqApC7YCeqgZxTAw== +"@csstools/postcss-color-function@^3.0.7": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-3.0.7.tgz#646b0c3e3805e4bb9c1e240bce807f1cc6ccdfea" + integrity sha512-/PIB20G1TPCXmQlaJLWIYzTZRZpj6csT4ijgnshIj/kcmniIRroAfDa0xSWnfuO1eNo0NptIaPU7jzUukWn55Q== dependencies: - "@csstools/css-color-parser" "^1.3.1" - "@csstools/css-parser-algorithms" "^2.3.1" - "@csstools/css-tokenizer" "^2.2.0" - "@csstools/postcss-progressive-custom-properties" "^3.0.1" + "@csstools/css-color-parser" "^1.4.0" + "@csstools/css-parser-algorithms" "^2.3.2" + "@csstools/css-tokenizer" "^2.2.1" + "@csstools/postcss-progressive-custom-properties" "^3.0.2" -"@csstools/postcss-color-mix-function@^2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-2.0.4.tgz#9a6b9bc4e0f4b4e0e3fb1abcd7b381886a0e189f" - integrity sha512-EiMi+BkzMLQAz7Z2gak7Gs3XjY1Z7QyJ8yjj1DdogpVc3FBqtxDQn/co4LluZdMda0894XcIpdikH6sCOpRd5w== +"@csstools/postcss-color-mix-function@^2.0.7": + version "2.0.7" + resolved "https://registry.yarnpkg.com/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-2.0.7.tgz#0fc9b638bd6b9578a52a50e3af66109ae52dc2b6" + integrity sha512-57/g8aGo5eKFjEeJMiRKh8Qq43K2rCyk5ZZTvJ34TNl4zUtYU5DvLkIkOnhCtL8/a4z9oMA42aOnFPddRrScUQ== dependencies: - "@csstools/css-color-parser" "^1.3.1" - "@csstools/css-parser-algorithms" "^2.3.1" - "@csstools/css-tokenizer" "^2.2.0" - "@csstools/postcss-progressive-custom-properties" "^3.0.1" + "@csstools/css-color-parser" "^1.4.0" + "@csstools/css-parser-algorithms" "^2.3.2" + "@csstools/css-tokenizer" "^2.2.1" + "@csstools/postcss-progressive-custom-properties" "^3.0.2" -"@csstools/postcss-exponential-functions@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-1.0.0.tgz#2e558ad2856e0c737d9cb98a5d91cfe8d785c9f6" - integrity sha512-FPndJ/7oGlML7/4EhLi902wGOukO0Nn37PjwOQGc0BhhjQPy3np3By4d3M8s9Cfmp9EHEKgUHRN2DQ5HLT/hTw== +"@csstools/postcss-exponential-functions@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-1.0.1.tgz#0d938f58ba5ac5c362e09ad22b5768b04ee82650" + integrity sha512-ZLK2iSK4DUxeypGce2PnQSdYugUqDTwxnhNiq1o6OyKMNYgYs4eKbvEhFG8JKr1sJWbeqBi5jRr0017l2EWVvg== dependencies: - "@csstools/css-calc" "^1.1.3" - "@csstools/css-parser-algorithms" "^2.3.1" - "@csstools/css-tokenizer" "^2.2.0" + "@csstools/css-calc" "^1.1.4" + "@csstools/css-parser-algorithms" "^2.3.2" + "@csstools/css-tokenizer" "^2.2.1" "@csstools/postcss-font-format-keywords@^3.0.0": version "3.0.0" @@ -94,31 +94,40 @@ dependencies: postcss-value-parser "^4.2.0" -"@csstools/postcss-gradients-interpolation-method@^4.0.4": - version "4.0.4" - resolved "https://registry.yarnpkg.com/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-4.0.4.tgz#6887e1d4831403fb2f600a2f4a8f307cc8b25783" - integrity sha512-JEQ+DqfltCLjzr/gAC9/DLxgjYXHrrDlgtiyhxqZOVpRQaLpJiCxNiKoEJFAPFXH5lbfwxvd4fwFDbCrAArIqA== +"@csstools/postcss-gamut-mapping@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@csstools/postcss-gamut-mapping/-/postcss-gamut-mapping-1.0.0.tgz#a23d2c4bd2bd89b2ed3c5d2e062c069ad18745e0" + integrity sha512-6UQyK8l9YaG5Ao5rBDcCnKHrLsHiQ1E0zeFQuqDJqEtinVzAPb/MwSw3TenZXL1Rnd7th3tb+4CBFHBXdW5tbQ== dependencies: - "@csstools/css-color-parser" "^1.3.1" - "@csstools/css-parser-algorithms" "^2.3.1" - "@csstools/css-tokenizer" "^2.2.0" - "@csstools/postcss-progressive-custom-properties" "^3.0.1" + "@csstools/css-color-parser" "^1.4.0" + "@csstools/css-parser-algorithms" "2.3.2" + "@csstools/css-tokenizer" "^2.2.1" -"@csstools/postcss-hwb-function@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-3.0.3.tgz#adbd5f8094cbe476ada2990ce7e4ad3e0fc0a303" - integrity sha512-2TqrRD8JzSwQCRKKNc9BFhSEmsz+mR3RtwSw5mQSGILC+LIYCVWeYwC33cI+saFWv0DGZ0NXLx5VSX2tdJyU6w== +"@csstools/postcss-gradients-interpolation-method@^4.0.7": + version "4.0.7" + resolved "https://registry.yarnpkg.com/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-4.0.7.tgz#e5c2628157fb9dea9aa8cd9c84fdcc2a842af91b" + integrity sha512-GT1CzE/Tyr/ei4j5BwKESkHAgg+Gzys/0mAY7W+UiR+XrcYk5hDbOrE/YJIx1rflfO/7La1bDoZtA0YnLl4qNA== dependencies: - "@csstools/css-color-parser" "^1.3.1" - "@csstools/css-parser-algorithms" "^2.3.1" - "@csstools/css-tokenizer" "^2.2.0" + "@csstools/css-color-parser" "^1.4.0" + "@csstools/css-parser-algorithms" "^2.3.2" + "@csstools/css-tokenizer" "^2.2.1" + "@csstools/postcss-progressive-custom-properties" "^3.0.2" -"@csstools/postcss-ic-unit@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-3.0.1.tgz#9d4964fe9da11f51463e0a141b3184ee3a23acb8" - integrity sha512-OkKZV0XZQixChA6r68O9UfGNFv06cPVcuT+MjpzfEuoCfbNWCj+b0dhsmdz776giQ+DymPmFDlTD+QJEFPI7rw== +"@csstools/postcss-hwb-function@^3.0.6": + version "3.0.6" + resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-3.0.6.tgz#7d56583c6c8607352718a802f87e51edf4f9365e" + integrity sha512-uQgWt2Ho2yy2S6qthWY7mD5v57NKxi6dD1NB8nAybU5bJSsm+hLXRGm3/zbOH4xNrqO3Cl60DFSNlSrUME3Xjg== + dependencies: + "@csstools/css-color-parser" "^1.4.0" + "@csstools/css-parser-algorithms" "^2.3.2" + "@csstools/css-tokenizer" "^2.2.1" + +"@csstools/postcss-ic-unit@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-3.0.2.tgz#08b62de51a3636ba40ba8e77cef4619a6e636aac" + integrity sha512-n28Er7W9qc48zNjJnvTKuVHY26/+6YlA9WzJRksIHiAWOMxSH5IksXkw7FpkIOd+jLi59BMrX/BWrZMgjkLBHg== dependencies: - "@csstools/postcss-progressive-custom-properties" "^3.0.1" + "@csstools/postcss-progressive-custom-properties" "^3.0.2" postcss-value-parser "^4.2.0" "@csstools/postcss-initial@^1.0.0": @@ -126,10 +135,10 @@ resolved "https://registry.yarnpkg.com/@csstools/postcss-initial/-/postcss-initial-1.0.0.tgz#e35ec12143a654b384fb81623970deeacedb0769" integrity sha512-1l7iHHjIl5qmVeGItugr4ZOlCREDP71mNKqoEyxlosIoiu3Os1nPWMHpuCvDLCLiWI/ONTOg3nzJh7gwHOrqUA== -"@csstools/postcss-is-pseudo-class@^4.0.2": - version "4.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-4.0.2.tgz#c896e25baf0a5249eb5c5e8cce78dfc0cc11380e" - integrity sha512-LeAJozyZTY3c1SaHMbwF4p8Ego/2HHprYusmmdmUH7wP6lRF1w3s7IO2iNwQ6fHBrSOfkPUFaUtRUGZLBE23Eg== +"@csstools/postcss-is-pseudo-class@^4.0.3": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-4.0.3.tgz#d8b04ff5eefb1a9bc8f1ab99b8f3b6b04b704480" + integrity sha512-/dt5M9Ty/x3Yiq0Nm/5PJJzwkVFchJgdjKVnryBPtoMCb9ohb/nDIJOwr/Wr3hK3FDs1EA1GE6PyRYsUmQPS8Q== dependencies: "@csstools/selector-specificity" "^3.0.0" postcss-selector-parser "^6.0.13" @@ -146,31 +155,31 @@ dependencies: postcss-value-parser "^4.2.0" -"@csstools/postcss-logical-viewport-units@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-2.0.2.tgz#4218a8965270006c6f76d67c48f702183fe16c36" - integrity sha512-g/QKzESt59SB+08kE3onn8obaqu56TtBg4K03hvsWLrNFoXbkuR6lhooaMyrRwH4f3KP08VnqsHqEtcm7ji87g== +"@csstools/postcss-logical-viewport-units@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-2.0.3.tgz#95e7195660bb8b05cd46f13d0495fe427e2db988" + integrity sha512-xeVxqND5rlQyqLGdH7rX34sIm/JbbQKxpKQP8oD1YQqUHHCLQR9NUS57WqJKajxKN6AcNAMWJhb5LUH5RfPcyA== dependencies: - "@csstools/css-tokenizer" "^2.2.0" + "@csstools/css-tokenizer" "^2.2.1" -"@csstools/postcss-media-minmax@^1.0.7": - version "1.0.7" - resolved "https://registry.yarnpkg.com/@csstools/postcss-media-minmax/-/postcss-media-minmax-1.0.7.tgz#6701cf1141d28b5240de9bfae083c8a0af0daa00" - integrity sha512-5LGLdu8cJgRPmvkjUNqOPKIKeHbyQmoGKooB5Rh0mp5mLaNI9bl+IjFZ2keY0cztZYsriJsGf6Lu8R5XetuwoQ== +"@csstools/postcss-media-minmax@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@csstools/postcss-media-minmax/-/postcss-media-minmax-1.1.0.tgz#8d46317b6686cd49e05870ae3c8993e49a54149c" + integrity sha512-t5Li/DPC5QmW/6VFLfUvsw/4dNYYseWR0tOXDeJg/9EKUodBgNawz5tuk5vYKtNvoj+Q08odMuXcpS5YJj0AFA== dependencies: - "@csstools/css-calc" "^1.1.3" - "@csstools/css-parser-algorithms" "^2.3.1" - "@csstools/css-tokenizer" "^2.2.0" - "@csstools/media-query-list-parser" "^2.1.4" + "@csstools/css-calc" "^1.1.4" + "@csstools/css-parser-algorithms" "^2.3.2" + "@csstools/css-tokenizer" "^2.2.1" + "@csstools/media-query-list-parser" "^2.1.5" -"@csstools/postcss-media-queries-aspect-ratio-number-values@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-2.0.2.tgz#8cb8865ad6311756b5de5179fb65b9c008406b69" - integrity sha512-kQJR6NvTRidsaRjCdHGjra2+fLoFiDQOm5B2aZrhmXqng/hweXjruboKzB326rxQO2L0m0T+gCKbZgyuncyhLg== +"@csstools/postcss-media-queries-aspect-ratio-number-values@^2.0.3": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-2.0.3.tgz#a74355c828a13ede8e8390bcf2701a34a60696b3" + integrity sha512-IPL8AvnwMYW+cWtp+j8cW3MFN0RyXNT4hLOvs6Rf2N+NcbvXhSyKxZuE3W9Cv4KjaNoNoGx1d0UhT6tktq6tUw== dependencies: - "@csstools/css-parser-algorithms" "^2.3.1" - "@csstools/css-tokenizer" "^2.2.0" - "@csstools/media-query-list-parser" "^2.1.4" + "@csstools/css-parser-algorithms" "^2.3.2" + "@csstools/css-tokenizer" "^2.2.1" + "@csstools/media-query-list-parser" "^2.1.5" "@csstools/postcss-nested-calc@^3.0.0": version "3.0.0" @@ -186,32 +195,32 @@ dependencies: postcss-value-parser "^4.2.0" -"@csstools/postcss-oklab-function@^3.0.4": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-3.0.4.tgz#480914682f3610db7ac53cc37d5affe5faa13494" - integrity sha512-uofu4uIhwExcFGVy1LckgWU4opiWWEEKYw528ejAXzQwYsyyPflOm7VaXc61SJlqqlqOl/go2Ty3IehW5sMC9Q== +"@csstools/postcss-oklab-function@^3.0.7": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-3.0.7.tgz#4daff9e85b7f68ea744f2898f73e81d6fe47c0d7" + integrity sha512-vBFTQD3CARB3u/XIGO44wWbcO7xG/4GsYqJlcPuUGRSK8mtxes6n4vvNFlIByyAZy2k4d4RY63nyvTbMpeNTaQ== dependencies: - "@csstools/css-color-parser" "^1.3.1" - "@csstools/css-parser-algorithms" "^2.3.1" - "@csstools/css-tokenizer" "^2.2.0" - "@csstools/postcss-progressive-custom-properties" "^3.0.1" + "@csstools/css-color-parser" "^1.4.0" + "@csstools/css-parser-algorithms" "^2.3.2" + "@csstools/css-tokenizer" "^2.2.1" + "@csstools/postcss-progressive-custom-properties" "^3.0.2" -"@csstools/postcss-progressive-custom-properties@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-3.0.1.tgz#15251d880d60850df42deeb7702aab6c50ab74e7" - integrity sha512-yfdEk8o3CWPTusoInmGpOVCcMg1FikcKZyYB5ApULg9mES4FTGNuHK3MESscmm64yladcLNkPlz26O7tk3LMbA== +"@csstools/postcss-progressive-custom-properties@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-3.0.2.tgz#0c18152160a425950cb69a12a9add55af4f688e7" + integrity sha512-YEvTozk1SxnV/PGL5DllBVDuLQ+jiQhyCSQiZJ6CwBMU5JQ9hFde3i1qqzZHuclZfptjrU0JjlX4ePsOhxNzHw== dependencies: postcss-value-parser "^4.2.0" -"@csstools/postcss-relative-color-syntax@^2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-2.0.4.tgz#2a9956f2a79301f308dc6b3dae4f5dac85028723" - integrity sha512-DxR30Tzpm0RzFlvG6R1jDDPnK6VMDJDatfHtaN+HcFV0L/wI0+jCSmaDQxFYrdTHa91zKVc36JgVg9C8hbJ2CQ== +"@csstools/postcss-relative-color-syntax@^2.0.7": + version "2.0.7" + resolved "https://registry.yarnpkg.com/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-2.0.7.tgz#1d017aa25e3cda513cf00401a91899e9d3b83659" + integrity sha512-2AiFbJSVF4EyymLxme4JzSrbXykHolx8DdZECHjYKMhoulhKLltx5ccYgtrK3BmXGd3v3nJrWFCc8JM8bjuiOg== dependencies: - "@csstools/css-color-parser" "^1.3.1" - "@csstools/css-parser-algorithms" "^2.3.1" - "@csstools/css-tokenizer" "^2.2.0" - "@csstools/postcss-progressive-custom-properties" "^3.0.1" + "@csstools/css-color-parser" "^1.4.0" + "@csstools/css-parser-algorithms" "^2.3.2" + "@csstools/css-tokenizer" "^2.2.1" + "@csstools/postcss-progressive-custom-properties" "^3.0.2" "@csstools/postcss-scope-pseudo-class@^3.0.0": version "3.0.0" @@ -220,14 +229,14 @@ dependencies: postcss-selector-parser "^6.0.13" -"@csstools/postcss-stepped-value-functions@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-3.0.1.tgz#c337a8ae09bec13cdf6c95f63a58b407f6965557" - integrity sha512-y1sykToXorFE+5cjtp//xAMWEAEple0kcZn2QhzEFIZDDNvGOCp5JvvmmPGsC3eDlj6yQp70l9uXZNLnimEYfA== +"@csstools/postcss-stepped-value-functions@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-3.0.2.tgz#a902395efbf9c5c30a6d902a7c65549fb3f49309" + integrity sha512-I3wX44MZVv+tDuWfrd3BTvRB/YRIM2F5v1MBtTI89sxpFn47mNpTwpPYUOGPVCgKlRDfZSlxIUYhUQmqRQZZFQ== dependencies: - "@csstools/css-calc" "^1.1.3" - "@csstools/css-parser-algorithms" "^2.3.1" - "@csstools/css-tokenizer" "^2.2.0" + "@csstools/css-calc" "^1.1.4" + "@csstools/css-parser-algorithms" "^2.3.2" + "@csstools/css-tokenizer" "^2.2.1" "@csstools/postcss-text-decoration-shorthand@^3.0.3": version "3.0.3" @@ -237,14 +246,14 @@ "@csstools/color-helpers" "^3.0.2" postcss-value-parser "^4.2.0" -"@csstools/postcss-trigonometric-functions@^3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-3.0.1.tgz#06148aa8624b69a6573adb40ed27d3d019875caa" - integrity sha512-hW+JPv0MPQfWC1KARgvJI6bisEUFAZWSvUNq/khGCupYV/h6Z9R2ZFz0Xc633LXBst0ezbXpy7NpnPurSx5Klw== +"@csstools/postcss-trigonometric-functions@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-3.0.2.tgz#b03d045015fc6e16d81e36e5783c545b5590a2f2" + integrity sha512-AwzNhF4QOKaLOKvMljwwFkeYXwufhRO15G+kKohHkyoNOL75xWkN+W2Y9ik9tSeAyDv+cYNlYaF+o/a79WjVjg== dependencies: - "@csstools/css-calc" "^1.1.3" - "@csstools/css-parser-algorithms" "^2.3.1" - "@csstools/css-tokenizer" "^2.2.0" + "@csstools/css-calc" "^1.1.4" + "@csstools/css-parser-algorithms" "^2.3.2" + "@csstools/css-tokenizer" "^2.2.1" "@csstools/postcss-unset-value@^3.0.0": version "3.0.0" @@ -1045,7 +1054,7 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= -autoprefixer@^10.4.15, autoprefixer@^10.4.16: +autoprefixer@^10.4.16: version "10.4.16" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.16.tgz#fad1411024d8670880bdece3970aa72e3572feb8" integrity sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ== @@ -1155,15 +1164,15 @@ braces@^3.0.2, braces@~3.0.2: dependencies: fill-range "^7.0.1" -browserslist@^4.14.5, browserslist@^4.21.10: - version "4.21.10" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0" - integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ== +browserslist@^4.14.5, browserslist@^4.21.10, browserslist@^4.22.1: + version "4.22.1" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.1.tgz#ba91958d1a59b87dab6fed8dfbcb3da5e2e9c619" + integrity sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ== dependencies: - caniuse-lite "^1.0.30001517" - electron-to-chromium "^1.4.477" + caniuse-lite "^1.0.30001541" + electron-to-chromium "^1.4.535" node-releases "^2.0.13" - update-browserslist-db "^1.0.11" + update-browserslist-db "^1.0.13" buffer-from@^1.0.0: version "1.1.2" @@ -1203,11 +1212,16 @@ camelcase-css@^2.0.1: resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== -caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001538: +caniuse-lite@^1.0.30001538: version "1.0.30001538" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz#9dbc6b9af1ff06b5eb12350c2012b3af56744f3f" integrity sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw== +caniuse-lite@^1.0.30001541: + version "1.0.30001546" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001546.tgz#10fdad03436cfe3cc632d3af7a99a0fb497407f0" + integrity sha512-zvtSJwuQFpewSyRrI3AsftF6rM0X80mZkChIt1spBGEvRglCrjTniXvinc8JKRoqTwXAgvqTImaN9igfSMtUBw== + capital-case@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669" @@ -1442,10 +1456,10 @@ css-prefers-color-scheme@^9.0.0: resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-9.0.0.tgz#7e9b74062655ea15490e359cb456a3b9f4c93327" integrity sha512-03QGAk/FXIRseDdLb7XAiu6gidQ0Nd8945xuM7VFVPpc6goJsG9uIO8xQjTxwbPdPIIV4o4AJoOJyt8gwDl67g== -cssdb@^7.7.2: - version "7.7.2" - resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-7.7.2.tgz#fbebd90edfc6af129fda4fd986f9dd604a209094" - integrity sha512-pQPYP7/kch4QlkTcLuUNiNL2v/E+O+VIdotT+ug62/+2B2/jkzs5fMM6RHCzGCZ9C82pODEMSIzRRUzJOrl78g== +cssdb@^7.8.0: + version "7.8.0" + resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-7.8.0.tgz#ac41fa025371b74eb2ccfe3d41f5c4dbd444fbe3" + integrity sha512-SkeezZOQr5AHt9MgJgSFNyiuJwg1p8AwoVln6JwaQJsyxduRW9QJ+HP/gAQzbsz8SIqINtYvpJKjxTRI67zxLg== cssesc@^3.0.0: version "3.0.0" @@ -1572,10 +1586,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.4.477: - version "1.4.487" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.487.tgz#e2ef8b15f2791bf68fa6f38f2656f1a551d360ae" - integrity sha512-XbCRs/34l31np/p33m+5tdBrdXu9jJkZxSbNxj5I0H1KtV2ZMSB+i/HYqDiRzHaFx2T5EdytjoBRe8QRJE2vQg== +electron-to-chromium@^1.4.535: + version "1.4.546" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.546.tgz#673ff64862859b1593cebfbacc5fb6aebef7c457" + integrity sha512-cz9bBM26ZqoEmGHkdHXU3LP7OofVyEzRoMqfALQ9Au9WlB4rogAHzqj/NkNvw2JJjy4xuxS1me+pP2lbCD5Mfw== emoji-regex@^8.0.0: version "8.0.0" @@ -2915,12 +2929,12 @@ postcss-cli@^10.1.0: slash "^5.0.0" yargs "^17.0.0" -postcss-color-functional-notation@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-6.0.1.tgz#b67d7c71fa1c82b09c130e02a37f0b6ceacbef63" - integrity sha512-IouVx77fASIjOChWxkvOjYGnYNKq286cSiKFJwWNICV9NP2xZWVOS9WOriR/8uIB2zt/44bzQyw4GteCLpP2SA== +postcss-color-functional-notation@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-6.0.2.tgz#5fa38d36cd0e2ea9db7fd6f2f2a1ffb2c0796a8d" + integrity sha512-FsjSmlSufuiFBsIqQ++VxFmvX7zKndZpBkHmfXr4wqhvzM92FTEkAh703iqWTl1U3faTgqioIqCbfqdWiFVwtw== dependencies: - "@csstools/postcss-progressive-custom-properties" "^3.0.1" + "@csstools/postcss-progressive-custom-properties" "^3.0.2" postcss-value-parser "^4.2.0" postcss-color-hex-alpha@^9.0.2: @@ -2937,34 +2951,34 @@ postcss-color-rebeccapurple@^9.0.1: dependencies: postcss-value-parser "^4.2.0" -postcss-custom-media@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-10.0.1.tgz#48a4597451a69b1098e6eb11eb1166202171f9ed" - integrity sha512-fil7cosvzlIAYmZJPtNFcTH0Er7a3GveEK4q5Y/L24eWQHmiw8Fv/E5DMkVpdbNjkGzJxrvowOSt/Il9HZ06VQ== - dependencies: - "@csstools/cascade-layer-name-parser" "^1.0.4" - "@csstools/css-parser-algorithms" "^2.3.1" - "@csstools/css-tokenizer" "^2.2.0" - "@csstools/media-query-list-parser" "^2.1.4" - -postcss-custom-properties@^13.3.1: - version "13.3.1" - resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-13.3.1.tgz#d3058f0d773b8fdcb9a7b6d2b8dd1c28ff441b86" - integrity sha512-TAWyOLz95GGMqDK3KJfi+IvY0MDCR72yBtJBAwxSw2iJ8WbBvIo42p7Luie1yRht3ctQlMBG+wDcFqSBtSpGWw== - dependencies: - "@csstools/cascade-layer-name-parser" "^1.0.4" - "@csstools/css-parser-algorithms" "^2.3.1" - "@csstools/css-tokenizer" "^2.2.0" +postcss-custom-media@^10.0.2: + version "10.0.2" + resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-10.0.2.tgz#70a244bbc59fc953ab6573e4e2c9624639aef08a" + integrity sha512-zcEFNRmDm2fZvTPdI1pIW3W//UruMcLosmMiCdpQnrCsTRzWlKQPYMa1ud9auL0BmrryKK1+JjIGn19K0UjO/w== + dependencies: + "@csstools/cascade-layer-name-parser" "^1.0.5" + "@csstools/css-parser-algorithms" "^2.3.2" + "@csstools/css-tokenizer" "^2.2.1" + "@csstools/media-query-list-parser" "^2.1.5" + +postcss-custom-properties@^13.3.2: + version "13.3.2" + resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-13.3.2.tgz#88952f883003d897ade5c836e1e005b09a12f02b" + integrity sha512-2Coszybpo8lpLY24vy2CYv9AasiZ39/bs8Imv0pWMq55Gl8NWzfc24OAo3zIX7rc6uUJAqESnVOMZ6V6lpMjJA== + dependencies: + "@csstools/cascade-layer-name-parser" "^1.0.5" + "@csstools/css-parser-algorithms" "^2.3.2" + "@csstools/css-tokenizer" "^2.2.1" postcss-value-parser "^4.2.0" -postcss-custom-selectors@^7.1.5: - version "7.1.5" - resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-7.1.5.tgz#74e99ef5d7a3f84aaab246ba086975e8279b686e" - integrity sha512-0UYtz7GG10bZrRiUdZ/2Flt+hp5p/WP0T7JgAPZ/Xhgb0wFjW/p7QOjE+M58S9Z3x11P9YaNPcrsoOGewWYkcw== +postcss-custom-selectors@^7.1.6: + version "7.1.6" + resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-7.1.6.tgz#6d28812998dcd48f61a6a538141fc16cf2c42123" + integrity sha512-svsjWRaxqL3vAzv71dV0/65P24/FB8TbPX+lWyyf9SZ7aZm4S4NhCn7N3Bg+Z5sZunG3FS8xQ80LrCU9hb37cw== dependencies: - "@csstools/cascade-layer-name-parser" "^1.0.4" - "@csstools/css-parser-algorithms" "^2.3.1" - "@csstools/css-tokenizer" "^2.2.0" + "@csstools/cascade-layer-name-parser" "^1.0.5" + "@csstools/css-parser-algorithms" "^2.3.2" + "@csstools/css-tokenizer" "^2.2.1" postcss-selector-parser "^6.0.13" postcss-dir-pseudo-class@^8.0.0: @@ -2974,12 +2988,12 @@ postcss-dir-pseudo-class@^8.0.0: dependencies: postcss-selector-parser "^6.0.13" -postcss-double-position-gradients@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-5.0.1.tgz#5f28489f5b33ce5e1e97bf1ea6b62cd7a5f9c0c2" - integrity sha512-ogcHzfC5q4nfySyZyNF7crvK3/MRDTh+akzE+l7bgJUjVkhgfahBuI+ZAm/5EeaVSVKnCOgqtC6wTyUFgLVLTw== +postcss-double-position-gradients@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-5.0.2.tgz#a55ed4d6a395f324aa5535ea8c42c74e8ace2651" + integrity sha512-KTbvdOOy8z8zb0BTkEg4/1vqlRlApdvjw8/pFoehgQl0WVO+fezDGlvo0B8xRA+XccA7ohkQCULKNsiNOx70Cw== dependencies: - "@csstools/postcss-progressive-custom-properties" "^3.0.1" + "@csstools/postcss-progressive-custom-properties" "^3.0.2" postcss-value-parser "^4.2.0" postcss-flexbugs-fixes@^5.0.2: @@ -3034,15 +3048,15 @@ postcss-js@^4.0.1: dependencies: camelcase-css "^2.0.1" -postcss-lab-function@^6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-6.0.4.tgz#6715a451f9411710a614d0e7c50827e0a36f494a" - integrity sha512-CAgjmxoAoBgZqotwyRX0osAfPOSAwrUanNT0O0ibHapDAiyv/uDJKhy2j6IdFAwnw6XwwXMP4wwnd5ncXuzTbw== +postcss-lab-function@^6.0.7: + version "6.0.7" + resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-6.0.7.tgz#b1dd0ad5a4c993b7695614239754b9be48f3b24b" + integrity sha512-4d1lhDVPukHFqkMv4G5vVcK+tgY52vwb5uR1SWKOaO5389r2q8fMxBWuXSW+YtbCOEGP0/X9KERi9E9le2pJuw== dependencies: - "@csstools/css-color-parser" "^1.3.1" - "@csstools/css-parser-algorithms" "^2.3.1" - "@csstools/css-tokenizer" "^2.2.0" - "@csstools/postcss-progressive-custom-properties" "^3.0.1" + "@csstools/css-color-parser" "^1.4.0" + "@csstools/css-parser-algorithms" "^2.3.2" + "@csstools/css-tokenizer" "^2.2.1" + "@csstools/postcss-progressive-custom-properties" "^3.0.2" postcss-load-config@^4.0.0, postcss-load-config@^4.0.1: version "4.0.1" @@ -3098,58 +3112,59 @@ postcss-place@^9.0.0: dependencies: postcss-value-parser "^4.2.0" -postcss-preset-env@^9.1.4: - version "9.1.4" - resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-9.1.4.tgz#9a4b0b7ac2b2eb2b319fc76fd4ede0dd3e61a524" - integrity sha512-k2scWtmYBZhjAzMJw8Fgc4hnfkZa4KpPjK0z6+tTAJ4/3ZAmaJJ1VBQ9T7OS0qvper8AyD+kqN2UB2tYFQ4eeA== +postcss-preset-env@^9.2.0: + version "9.2.0" + resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-9.2.0.tgz#9106ed870811a6da44a5607860f8a2afffccec30" + integrity sha512-Lnr4C5gb7t5Cc8akQMJzNdJkqw7s7s7BHUaQSgsuf+CTY9Lsz5lqQTft5yNZr59JyCLz0aFNSAqSLm/xRtcTpg== dependencies: "@csstools/postcss-cascade-layers" "^4.0.0" - "@csstools/postcss-color-function" "^3.0.4" - "@csstools/postcss-color-mix-function" "^2.0.4" - "@csstools/postcss-exponential-functions" "^1.0.0" + "@csstools/postcss-color-function" "^3.0.7" + "@csstools/postcss-color-mix-function" "^2.0.7" + "@csstools/postcss-exponential-functions" "^1.0.1" "@csstools/postcss-font-format-keywords" "^3.0.0" - "@csstools/postcss-gradients-interpolation-method" "^4.0.4" - "@csstools/postcss-hwb-function" "^3.0.3" - "@csstools/postcss-ic-unit" "^3.0.1" + "@csstools/postcss-gamut-mapping" "^1.0.0" + "@csstools/postcss-gradients-interpolation-method" "^4.0.7" + "@csstools/postcss-hwb-function" "^3.0.6" + "@csstools/postcss-ic-unit" "^3.0.2" "@csstools/postcss-initial" "^1.0.0" - "@csstools/postcss-is-pseudo-class" "^4.0.2" + "@csstools/postcss-is-pseudo-class" "^4.0.3" "@csstools/postcss-logical-float-and-clear" "^2.0.0" "@csstools/postcss-logical-resize" "^2.0.0" - "@csstools/postcss-logical-viewport-units" "^2.0.2" - "@csstools/postcss-media-minmax" "^1.0.7" - "@csstools/postcss-media-queries-aspect-ratio-number-values" "^2.0.2" + "@csstools/postcss-logical-viewport-units" "^2.0.3" + "@csstools/postcss-media-minmax" "^1.1.0" + "@csstools/postcss-media-queries-aspect-ratio-number-values" "^2.0.3" "@csstools/postcss-nested-calc" "^3.0.0" "@csstools/postcss-normalize-display-values" "^3.0.1" - "@csstools/postcss-oklab-function" "^3.0.4" - "@csstools/postcss-progressive-custom-properties" "^3.0.1" - "@csstools/postcss-relative-color-syntax" "^2.0.4" + "@csstools/postcss-oklab-function" "^3.0.7" + "@csstools/postcss-progressive-custom-properties" "^3.0.2" + "@csstools/postcss-relative-color-syntax" "^2.0.7" "@csstools/postcss-scope-pseudo-class" "^3.0.0" - "@csstools/postcss-stepped-value-functions" "^3.0.1" + "@csstools/postcss-stepped-value-functions" "^3.0.2" "@csstools/postcss-text-decoration-shorthand" "^3.0.3" - "@csstools/postcss-trigonometric-functions" "^3.0.1" + "@csstools/postcss-trigonometric-functions" "^3.0.2" "@csstools/postcss-unset-value" "^3.0.0" - autoprefixer "^10.4.15" - browserslist "^4.21.10" + autoprefixer "^10.4.16" + browserslist "^4.22.1" css-blank-pseudo "^6.0.0" css-has-pseudo "^6.0.0" css-prefers-color-scheme "^9.0.0" - cssdb "^7.7.2" + cssdb "^7.8.0" postcss-attribute-case-insensitive "^6.0.2" postcss-clamp "^4.1.0" - postcss-color-functional-notation "^6.0.1" + postcss-color-functional-notation "^6.0.2" postcss-color-hex-alpha "^9.0.2" postcss-color-rebeccapurple "^9.0.1" - postcss-custom-media "^10.0.1" - postcss-custom-properties "^13.3.1" - postcss-custom-selectors "^7.1.5" + postcss-custom-media "^10.0.2" + postcss-custom-properties "^13.3.2" + postcss-custom-selectors "^7.1.6" postcss-dir-pseudo-class "^8.0.0" - postcss-double-position-gradients "^5.0.1" + postcss-double-position-gradients "^5.0.2" postcss-focus-visible "^9.0.0" postcss-focus-within "^8.0.0" postcss-font-variant "^5.0.0" postcss-gap-properties "^5.0.0" postcss-image-set-function "^6.0.1" - postcss-lab-function "^6.0.4" + postcss-lab-function "^6.0.7" postcss-logical "^7.0.0" postcss-nesting "^12.0.1" postcss-opacity-percentage "^2.0.0" @@ -4005,10 +4020,10 @@ unzipper@^0.10.14: readable-stream "~2.3.6" setimmediate "~1.0.4" -update-browserslist-db@^1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940" - integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA== +update-browserslist-db@^1.0.13: + version "1.0.13" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4" + integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg== dependencies: escalade "^3.1.1" picocolors "^1.0.0" From aee29bf88c92e3e78d9787c6034b661490a3353a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 23:57:10 +0000 Subject: [PATCH 20/60] Bump sidekiq from 7.1.5 to 7.1.6 (#1878) --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8be96a3d5..f13d358ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -418,7 +418,7 @@ GEM concurrent-ruby (~> 1.0, >= 1.0.2) shoulda-matchers (5.3.0) activesupport (>= 5.2.0) - sidekiq (7.1.5) + sidekiq (7.1.6) concurrent-ruby (< 2) connection_pool (>= 2.3.0) rack (>= 2.2.4) From 78cbd52556d1d3c86f9de0000c78ea61167a8048 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:22:27 +0000 Subject: [PATCH 21/60] Bump standard from 1.31.1 to 1.31.2 (#1882) --- Gemfile.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f13d358ad..94254939e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -274,7 +274,7 @@ GEM racc (~> 1.4) pagy (6.1.0) parallel (1.23.0) - parser (3.2.2.3) + parser (3.2.2.4) ast (~> 2.4.1) racc pg (1.5.4) @@ -340,7 +340,7 @@ GEM redcarpet (3.6.0) redis-client (0.17.0) connection_pool - regexp_parser (2.8.1) + regexp_parser (2.8.2) rexml (3.2.6) rotp (6.3.0) rouge (4.1.3) @@ -389,7 +389,7 @@ GEM rubocop (~> 1.41) rubocop-factory_bot (2.24.0) rubocop (~> 1.33) - rubocop-performance (1.19.0) + rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) rubocop-rails (2.21.2) @@ -441,18 +441,18 @@ GEM apimatic_core (~> 0.3.0) apimatic_core_interfaces (~> 0.2.0) apimatic_faraday_client_adapter (~> 0.1.0) - standard (1.31.1) + standard (1.31.2) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.0) - rubocop (~> 1.56.2) + rubocop (~> 1.56.4) standard-custom (~> 1.0.0) standard-performance (~> 1.2) standard-custom (1.0.2) lint_roller (~> 1.0) rubocop (~> 1.50) - standard-performance (1.2.0) + standard-performance (1.2.1) lint_roller (~> 1.1) - rubocop-performance (~> 1.19.0) + rubocop-performance (~> 1.19.1) stimulus-rails (1.2.2) railties (>= 6.0.0) strip_attributes (1.13.0) From 756fec87a03fe5e3855158dc569b2b8010ca16fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:22:42 +0000 Subject: [PATCH 22/60] Bump selenium-webdriver from 4.13.0 to 4.14.0 (#1880) --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index d9800ebda..f53ae9310 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "lodash": "^4.17.21", "prettier": "^3.0.3", "promise-retry": "^2.0.1", - "selenium-webdriver": "^4.13.0", + "selenium-webdriver": "^4.14.0", "webpack-dev-server": "^4.15.1" }, "dependencies": { diff --git a/yarn.lock b/yarn.lock index 39323f8bd..eb9824b07 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3534,14 +3534,14 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= -selenium-webdriver@^4.13.0: - version "4.13.0" - resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.13.0.tgz#1e06bab7adedb308e3635131bc75bd32038261d5" - integrity sha512-8JS0h5E0Sq7gNfbGg8LVaQ+Eqek97tvOONn3Jmy+NiWfb12WYpftz4VTC4D2JT4wakdG6VUzGKpA8cFGg0IjkA== +selenium-webdriver@^4.14.0: + version "4.14.0" + resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.14.0.tgz#d39917cd7c1bb30f753c1f668158f37d1905fafc" + integrity sha512-637rs8anqMKHbWxcBZpyG3Gcs+rBUtAUiqk0O/knUqH4Paj3MFUZrz88/pVGOLNryEVy2z92fZomT8p1ENl1gA== dependencies: jszip "^3.10.1" tmp "^0.2.1" - ws ">=8.13.0" + ws ">=8.14.2" selfsigned@^2.1.1: version "2.1.1" @@ -4265,10 +4265,10 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -ws@>=8.13.0, ws@^8.13.0: - version "8.13.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" - integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== +ws@>=8.14.2, ws@^8.13.0: + version "8.14.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.2.tgz#6c249a806eb2db7a20d26d51e7709eab7b2e6c7f" + integrity sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g== xmlbuilder@^15.1.1: version "15.1.1" From 4b985cce9498d93419a210efec392bde969e5f28 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:23:12 +0000 Subject: [PATCH 23/60] Bump sentry-rails, sentry-ruby and spring-watcher-listen (#1881) --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 94254939e..106b03a6c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -187,7 +187,7 @@ GEM net-http-persistent (~> 4.0) faraday-retry (2.2.0) faraday (~> 2.0) - ffi (1.15.5) + ffi (1.16.3) friendly_id (5.5.0) activerecord (>= 4.0.0) globalid (1.1.0) @@ -219,7 +219,7 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) lockbox (1.3.0) - loofah (2.21.3) + loofah (2.21.4) crass (~> 1.0.2) nokogiri (>= 1.12.0) lookbook (2.1.1) @@ -411,10 +411,10 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - sentry-rails (5.11.0) + sentry-rails (5.12.0) railties (>= 5.0) - sentry-ruby (~> 5.11.0) - sentry-ruby (5.11.0) + sentry-ruby (~> 5.12.0) + sentry-ruby (5.12.0) concurrent-ruby (~> 1.0, >= 1.0.2) shoulda-matchers (5.3.0) activesupport (>= 5.2.0) From f2e112bf9f73248866d1f5d1b080ab28e8ed6703 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:26:50 +0000 Subject: [PATCH 24/60] Bump selenium-webdriver from 4.13.1 to 4.14.0 (#1883) --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 106b03a6c..58d010abf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -407,7 +407,7 @@ GEM ffi (~> 1.12) ruby2_keywords (0.0.5) rubyzip (2.3.2) - selenium-webdriver (4.13.1) + selenium-webdriver (4.14.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) From 024e425e780ec6f3c28d428db1616b1deb5bf6a6 Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Mon, 9 Oct 2023 17:01:46 -0700 Subject: [PATCH 25/60] =?UTF-8?q?=F0=9F=A7=B9=20Node=2016=20has=20reached?= =?UTF-8?q?=20End-of-Life!=20Long=20Live=20Node=2018!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - https://github.com/zinc-collective/convene/issues/892 Per https://github.com/nodejs/release#release-schedule, Node 16 is decommissioned! This bumps us to the newest LTS, Node 18! Hooray! Make sure to delete your `node_modules` folder, since I have no idea how any of this works but I expect that keeping old node modules around is bad-idea-jeans. --- .nvmrc | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.nvmrc b/.nvmrc index 47979412e..02c8b485e 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16.20.1 +18.18.0 diff --git a/package.json b/package.json index f53ae9310..33a990b9d 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "exports": "./index.js", "type": "module", "engines": { - "node": "^16.13", + "node": "^18.8", "yarn": "^1.22" }, "scripts": { From 3847f855bed2d9620b51df94dc601ca7c1a1aea7 Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Mon, 9 Oct 2023 17:06:39 -0700 Subject: [PATCH 26/60] I know what I'm doing! I swear! --- .github/workflows/test-convene-web.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-convene-web.yml b/.github/workflows/test-convene-web.yml index f8d825072..8b5e0a53c 100644 --- a/.github/workflows/test-convene-web.yml +++ b/.github/workflows/test-convene-web.yml @@ -48,7 +48,7 @@ jobs: - name: Setup Node with cache uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 cache: 'yarn' - name: Install Node dependencies @@ -109,7 +109,7 @@ jobs: - name: Setup Node with cache uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 cache: 'yarn' - name: Allow Ruby process to access port 80 @@ -177,7 +177,7 @@ jobs: - name: Setup Node with cache uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 cache: 'yarn' - name: Install Firefox @@ -238,7 +238,7 @@ jobs: - name: Setup Node with cache uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 cache: 'yarn' - name: Install Node dependencies From 4987d114193cc6202796a418278991fa315f6edc Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Mon, 9 Oct 2023 19:39:06 -0700 Subject: [PATCH 27/60] Give it some more time? --- .github/workflows/test-convene-web.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-convene-web.yml b/.github/workflows/test-convene-web.yml index 8b5e0a53c..2238092db 100644 --- a/.github/workflows/test-convene-web.yml +++ b/.github/workflows/test-convene-web.yml @@ -212,7 +212,7 @@ jobs: run: | # To wait for asset built # TODO: Start server in production mode - curl --connect-timeout 5 --retry 5 --retry-delay 5 --retry-max-time 40 --retry-connrefused localhost:3000 1> /dev/null + curl --connect-timeout 5 --retry 5 --retry-delay 5 --retry-max-time 60 --retry-connrefused localhost:3000 1> /dev/null yarn run test - name: Upload Test Results uses: actions/upload-artifact@v2 From 2ff657b39c7796021613017f9155c5799aab9e0e Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Mon, 9 Oct 2023 19:41:28 -0700 Subject: [PATCH 28/60] In Node 18 "localhost" is `::1`, not `127.0.0.1` So, the server starts and the connection works! But node uses ::1 instead of 127.0.0.1 for `localhost`, which I don't think puma listens to by default; and I didn't want to fiddle with that. --- features/lib/appUrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/lib/appUrl.js b/features/lib/appUrl.js index 9c6b43e98..fbc05a872 100644 --- a/features/lib/appUrl.js +++ b/features/lib/appUrl.js @@ -1,5 +1,5 @@ export default (function () { return process.env.APP_ROOT_URL ? process.env.APP_ROOT_URL - : "http://localhost:3000"; + : "http://127.0.0.1:3000"; }); From 377cae89cd0ae7b41c3dad2c4aec304583475d78 Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Mon, 9 Oct 2023 19:49:08 -0700 Subject: [PATCH 29/60] Well that didn't work, let's try again! --- config/puma.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/puma.rb b/config/puma.rb index 5bff0271b..249369912 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -10,7 +10,8 @@ # Specifies the `port` that Puma will listen on to receive requests; default is 3000. # -port ENV.fetch("PORT", 3000) +# port ENV.fetch("PORT", 3000) +bind "tcp://0.0.0.0:#{ENV.fetch("PORT", 3000)}" # Specifies the `environment` that Puma will run in. # From 6e7bf2217d4613de2b2ce03a231f136aad085386 Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Mon, 9 Oct 2023 19:59:04 -0700 Subject: [PATCH 30/60] WTF --- features/lib/appUrl.js | 1 + 1 file changed, 1 insertion(+) diff --git a/features/lib/appUrl.js b/features/lib/appUrl.js index fbc05a872..10b61d6e7 100644 --- a/features/lib/appUrl.js +++ b/features/lib/appUrl.js @@ -1,4 +1,5 @@ export default (function () { + console.log({APP_ROOT_URL: process.env.APP_ROOT_URL}) return process.env.APP_ROOT_URL ? process.env.APP_ROOT_URL : "http://127.0.0.1:3000"; From a4ac481eaa38890f43dda72b52e3fa6e401f8ddc Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Mon, 9 Oct 2023 20:16:44 -0700 Subject: [PATCH 31/60] Apparently yarn loads the .env --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index f93bebf78..295539aca 100644 --- a/.env.example +++ b/.env.example @@ -21,7 +21,7 @@ PORT=3000 # Used to build URLs in mailers -APP_ROOT_URL=http://localhost:3000 +APP_ROOT_URL=http://127.0.0.1:3000 EMAIL_DEFAULT_FROM='Neighborhood Support ' # Ensures the data in our database is fully encrypted From 4f4f459251930544d19f02b9dabbe7833a73112d Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Wed, 11 Oct 2023 13:34:58 -0700 Subject: [PATCH 32/60] Missed Localhost --- features/lib/MailServer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/lib/MailServer.js b/features/lib/MailServer.js index 09c98bf78..0fa432d5b 100644 --- a/features/lib/MailServer.js +++ b/features/lib/MailServer.js @@ -36,7 +36,7 @@ class MailServer { */ emails() { return axios - .get("http://localhost:1080/email") + .get("http://127.0.0.1:1080/email") .then((res) => res.data) .catch((err) => console.log(err)); } From 62306d19eba3296ab8f13222786cb3f65e541e70 Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Wed, 11 Oct 2023 13:36:34 -0700 Subject: [PATCH 33/60] Clean the file --- features/lib/appUrl.js | 1 - 1 file changed, 1 deletion(-) diff --git a/features/lib/appUrl.js b/features/lib/appUrl.js index 10b61d6e7..fbc05a872 100644 --- a/features/lib/appUrl.js +++ b/features/lib/appUrl.js @@ -1,5 +1,4 @@ export default (function () { - console.log({APP_ROOT_URL: process.env.APP_ROOT_URL}) return process.env.APP_ROOT_URL ? process.env.APP_ROOT_URL : "http://127.0.0.1:3000"; From e67fbb018b0092782db75f02a23bdbc6de311f18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 20:52:29 +0000 Subject: [PATCH 34/60] Bump @cucumber/cucumber from 9.5.1 to 10.0.0 (#1877) --- package.json | 2 +- yarn.lock | 335 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 323 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 33a990b9d..5a62c147b 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ }, "homepage": "https://github.com/zinc-collective/convene#readme", "devDependencies": { - "@cucumber/cucumber": "^9.5.1", + "@cucumber/cucumber": "^10.0.0", "@cucumber/pretty-formatter": "^1.0.0", "axios": "^1.5.1", "axios-case-converter": "^1.1.0", diff --git a/yarn.lock b/yarn.lock index eb9824b07..63b9d29e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7,6 +7,28 @@ resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30" integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw== +"@babel/code-frame@^7.0.0": + version "7.22.13" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e" + integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w== + dependencies: + "@babel/highlight" "^7.22.13" + chalk "^2.4.2" + +"@babel/helper-validator-identifier@^7.22.20": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" + integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== + +"@babel/highlight@^7.22.13": + version "7.22.20" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54" + integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg== + dependencies: + "@babel/helper-validator-identifier" "^7.22.20" + chalk "^2.4.2" + js-tokens "^4.0.0" + "@colors/colors@1.5.0": version "1.5.0" resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" @@ -277,10 +299,10 @@ dependencies: regexp-match-indices "1.0.2" -"@cucumber/cucumber@^9.5.1": - version "9.5.1" - resolved "https://registry.yarnpkg.com/@cucumber/cucumber/-/cucumber-9.5.1.tgz#49328c0f473ee4636f3ac27591ba0143ef94f052" - integrity sha512-9fRRxbRRkXxRB4D7C21ZjmEvBWI3Su7yNQDvRPfgHnd+xVKaOTvfPs/lZWN1TOiwYlnW5nupRaaCx5xV+fzurw== +"@cucumber/cucumber@^10.0.0": + version "10.0.0" + resolved "https://registry.yarnpkg.com/@cucumber/cucumber/-/cucumber-10.0.0.tgz#08ed8ae6ed0d50c706aa709e5af584c9331dfe7a" + integrity sha512-TPPIftmegCyoIWyitYzHa8ucuFtwiFVvYAolVHc6oLP7hqa79exHiRiADcPtIJiiqe0JallDuYtKhT5tW/wOIA== dependencies: "@cucumber/ci-environment" "9.2.0" "@cucumber/cucumber-expressions" "16.1.2" @@ -299,7 +321,7 @@ debug "^4.3.4" error-stack-parser "^2.1.4" figures "^3.2.0" - glob "^7.1.6" + glob "^10.3.10" has-ansi "^4.0.1" indent-string "^4.0.0" is-installed-globally "^0.4.0" @@ -311,6 +333,7 @@ mkdirp "^2.1.5" mz "^2.7.0" progress "^2.0.3" + read-pkg-up "^7.0.1" resolve-pkg "^2.0.0" semver "7.5.3" string-argv "^0.3.1" @@ -429,6 +452,18 @@ resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.3.0.tgz#2226000fff1aabda9fd9587474565c9929dbf15d" integrity sha512-Dcu+NaSvHLT7EjrDrkEmH4qET2ZJZ5IcCWmNXxNQTBwlnE5tBZfN6WxZ842n5cHV52DH/AKNirbPBtcEXDLW4g== +"@isaacs/cliui@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" + integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== + dependencies: + string-width "^5.1.2" + string-width-cjs "npm:string-width@^4.2.0" + strip-ansi "^7.0.1" + strip-ansi-cjs "npm:strip-ansi@^6.0.1" + wrap-ansi "^8.1.0" + wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" + "@jridgewell/gen-mapping@^0.3.0": version "0.3.2" resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" @@ -504,6 +539,11 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@pkgjs/parseargs@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" + integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== + "@rails/actioncable@^7.0", "@rails/actioncable@^7.1.0": version "7.1.0" resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.1.0.tgz#9b1543b0abf5a0a7ef7088882ee3d6092b2745b3" @@ -688,6 +728,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz#e1cf817d70a1e118e81922c4ff6683ce9d422e26" integrity sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA== +"@types/normalize-package-data@^2.4.0": + version "2.4.2" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.2.tgz#9b0e3e8533fe5024ad32d6637eb9589988b6fdca" + integrity sha512-lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A== + "@types/qs@*": version "6.9.7" resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" @@ -995,6 +1040,13 @@ ansi-regex@^6.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" @@ -1007,6 +1059,11 @@ ansi-styles@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== +ansi-styles@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + any-promise@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" @@ -1157,6 +1214,13 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" @@ -1238,6 +1302,15 @@ chainsaw@~0.1.0: dependencies: traverse ">=0.3.0 <0.4" +chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" @@ -1315,6 +1388,13 @@ clone-regexp@^3.0.0: dependencies: is-regexp "^3.0.0" +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + color-convert@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" @@ -1322,6 +1402,11 @@ color-convert@^2.0.1: dependencies: color-name "~1.1.4" +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== + color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" @@ -1426,7 +1511,7 @@ core-util-is@1.0.2, core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cross-spawn@^7.0.3: +cross-spawn@^7.0.0, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -1581,6 +1666,11 @@ duplexer2@~0.1.4: dependencies: readable-stream "^2.0.2" +eastasianwidth@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" + integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== + ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -1596,6 +1686,11 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== +emoji-regex@^9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== + encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -1626,6 +1721,13 @@ err-code@^2.0.2: resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== +error-ex@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" + integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== + dependencies: + is-arrayish "^0.2.1" + error-stack-parser@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286" @@ -1834,7 +1936,7 @@ finalhandler@~1.1.2: statuses "~1.5.0" unpipe "~1.0.0" -find-up@^4.0.0: +find-up@^4.0.0, find-up@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== @@ -1847,6 +1949,14 @@ follow-redirects@^1.0.0, follow-redirects@^1.15.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== +foreground-child@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" + integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== + dependencies: + cross-spawn "^7.0.0" + signal-exit "^4.0.1" + form-data@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" @@ -1991,7 +2101,18 @@ glob@7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.3, glob@^7.1.6: +glob@^10.3.10: + version "10.3.10" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b" + integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== + dependencies: + foreground-child "^3.1.0" + jackspeak "^2.3.5" + minimatch "^9.0.1" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry "^1.10.1" + +glob@^7.1.3: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== @@ -2038,6 +2159,11 @@ has-ansi@^4.0.1: dependencies: ansi-regex "^4.1.0" +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== + has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" @@ -2058,6 +2184,11 @@ header-case@^2.0.3: capital-case "^1.0.4" tslib "^2.0.3" +hosted-git-info@^2.1.4: + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== + hpack.js@^2.1.6: version "2.1.6" resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" @@ -2218,6 +2349,11 @@ ipaddr.js@^2.0.1: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== +is-arrayish@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" + integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== + is-binary-path@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" @@ -2232,6 +2368,13 @@ is-core-module@^2.11.0: dependencies: has "^1.0.3" +is-core-module@^2.13.0: + version "2.13.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db" + integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ== + dependencies: + has "^1.0.3" + is-docker@^2.0.0, is-docker@^2.1.1: version "2.2.1" resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" @@ -2321,6 +2464,15 @@ isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= +jackspeak@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" + integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + jest-worker@^27.0.6: version "27.4.4" resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.4.tgz#9390a97c013a54d07f5c2ad2b5f6109f30c4966d" @@ -2335,7 +2487,12 @@ jiti@^1.18.2: resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.18.2.tgz#80c3ef3d486ebf2450d9335122b32d121f2a83cd" integrity sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg== -json-parse-even-better-errors@^2.3.1: +js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== @@ -2497,6 +2654,11 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +"lru-cache@^9.1.1 || ^10.0.0": + version "10.0.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a" + integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g== + luxon@3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/luxon/-/luxon-3.2.1.tgz#14f1af209188ad61212578ea7e3d518d18cee45f" @@ -2605,11 +2767,23 @@ minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" +minimatch@^9.0.1: + version "9.0.3" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" + integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== + dependencies: + brace-expansion "^2.0.1" + minimist@^1.2.6: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0": + version "7.0.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" + integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== + mkdirp-classic@^0.5.2: version "0.5.3" resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" @@ -2711,6 +2885,16 @@ node-releases@^2.0.13: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== +normalize-package-data@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" + integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== + dependencies: + hosted-git-info "^2.1.4" + resolve "^1.10.0" + semver "2 || 3 || 4 || 5" + validate-npm-package-license "^3.0.1" + normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" @@ -2822,6 +3006,16 @@ pako@~1.0.2: resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== +parse-json@^5.0.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== + dependencies: + "@babel/code-frame" "^7.0.0" + error-ex "^1.3.1" + json-parse-even-better-errors "^2.3.0" + lines-and-columns "^1.1.6" + parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -2855,6 +3049,14 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== +path-scurry@^1.10.1: + version "1.10.1" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698" + integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== + dependencies: + lru-cache "^9.1.1 || ^10.0.0" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" @@ -3340,6 +3542,25 @@ read-cache@^1.0.0: dependencies: pify "^2.3.0" +read-pkg-up@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" + integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== + dependencies: + find-up "^4.1.0" + read-pkg "^5.2.0" + type-fest "^0.8.1" + +read-pkg@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" + integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== + dependencies: + "@types/normalize-package-data" "^2.4.0" + normalize-package-data "^2.5.0" + parse-json "^5.0.0" + type-fest "^0.6.0" + readable-stream@^2.0.1, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" @@ -3454,6 +3675,15 @@ resolve@^1.1.7, resolve@^1.20.0, resolve@^1.22.2: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +resolve@^1.10.0: + version "1.22.8" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" + integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + retry@^0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" @@ -3550,6 +3780,11 @@ selfsigned@^2.1.1: dependencies: node-forge "^1" +"semver@2 || 3 || 4 || 5": + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== + semver@7.5.3: version "7.5.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e" @@ -3650,6 +3885,11 @@ signal-exit@^3.0.3: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== +signal-exit@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" + integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== + slash@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" @@ -3700,6 +3940,32 @@ spark-md5@^3.0.1: resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc" integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw== +spdx-correct@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.2.0.tgz#4f5ab0668f0059e34f9c00dce331784a12de4e9c" + integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA== + dependencies: + spdx-expression-parse "^3.0.0" + spdx-license-ids "^3.0.0" + +spdx-exceptions@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== + +spdx-expression-parse@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== + dependencies: + spdx-exceptions "^2.1.0" + spdx-license-ids "^3.0.0" + +spdx-license-ids@^3.0.0: + version "3.0.16" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f" + integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw== + spdy-transport@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" @@ -3746,7 +4012,7 @@ string-argv@^0.3.1: resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da" integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== -string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -3755,6 +4021,15 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" +string-width@^5.0.1, string-width@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" + integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== + dependencies: + eastasianwidth "^0.2.0" + emoji-regex "^9.2.2" + strip-ansi "^7.0.1" + string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -3769,14 +4044,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: ansi-regex "^5.0.1" -strip-ansi@^7.1.0: +strip-ansi@^7.0.1, strip-ansi@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== @@ -3810,6 +4085,13 @@ super-regex@^0.2.0: function-timeout "^0.1.0" time-span "^5.1.0" +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" @@ -3981,6 +4263,16 @@ tslib@^2.0.3, tslib@^2.3.0, "tslib@^2.4.1 || ^1.9.3": resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3" integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== +type-fest@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" + integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== + +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + type-fest@^2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b" @@ -4075,6 +4367,14 @@ uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== +validate-npm-package-license@^3.0.1: + version "3.0.4" + resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" + integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== + dependencies: + spdx-correct "^3.0.0" + spdx-expression-parse "^3.0.0" + vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" @@ -4251,7 +4551,7 @@ wildcard@^2.0.0: resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== -wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -4260,6 +4560,15 @@ wrap-ansi@^7.0.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" + integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== + dependencies: + ansi-styles "^6.1.0" + string-width "^5.0.1" + strip-ansi "^7.0.1" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" From cb9653c878d034b1b59a198af0a63d87a174997c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 23:56:29 +0000 Subject: [PATCH 35/60] Bump @rails/actioncable from 7.1.0 to 7.1.1 (#1890) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 5a62c147b..abf3f7a5c 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@hotwired/stimulus": "^3.2.2", "@hotwired/stimulus-webpack-helpers": "^1.0.1", "@hotwired/turbo-rails": "^7.3.0", - "@rails/actioncable": "^7.1.0", + "@rails/actioncable": "^7.1.1", "@rails/activestorage": "^7.1.0", "@sentry/browser": "^7.73.0", "@tailwindcss/forms": "^0.5.6", diff --git a/yarn.lock b/yarn.lock index 63b9d29e1..3776fca4f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -544,10 +544,10 @@ resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== -"@rails/actioncable@^7.0", "@rails/actioncable@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.1.0.tgz#9b1543b0abf5a0a7ef7088882ee3d6092b2745b3" - integrity sha512-MBGzAQHOk+sXblpCQsM0MPxQDzvTLFwaFu8jqYbfWDejpZPszo9xaAOF/3+iv7ab1o6PFiTpdbh+PR4osofIWw== +"@rails/actioncable@^7.0", "@rails/actioncable@^7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.1.1.tgz#e8c49769d41f35a4473133c259cc98adc04dddf8" + integrity sha512-ZRJ9rdwFQQjRbtgJnweY0/4UQyxN6ojEGRdib0JkjnuIciv+4ok/aAeZmBJqNreTMaBqS0eHyA9hCArwN58opg== "@rails/activestorage@^7.1.0": version "7.1.0" From 0d8c6bd30df0f4d2f0a531190cc6138530172721 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 23:56:40 +0000 Subject: [PATCH 36/60] Bump stimulus-rails from 1.2.2 to 1.3.0 (#1888) --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 58d010abf..d8260c8a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -453,7 +453,7 @@ GEM standard-performance (1.2.1) lint_roller (~> 1.1) rubocop-performance (~> 1.19.1) - stimulus-rails (1.2.2) + stimulus-rails (1.3.0) railties (>= 6.0.0) strip_attributes (1.13.0) activemodel (>= 3.0, < 8.0) From f30476d72e7922f19994540275e89c3b1abf0d93 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 23:56:45 +0000 Subject: [PATCH 37/60] Bump turbo-rails from 1.4.0 to 1.5.0 (#1887) --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d8260c8a3..747344f00 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -190,8 +190,8 @@ GEM ffi (1.16.3) friendly_id (5.5.0) activerecord (>= 4.0.0) - globalid (1.1.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) gretel (4.6.0) actionview (>= 5.1, < 7.2) railties (>= 5.1, < 7.2) @@ -462,7 +462,7 @@ GEM activerecord (>= 5.2) thor (1.2.2) 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) From 9fcb427005e517dfaf88ff569ee4fb4a47734435 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 23:56:51 +0000 Subject: [PATCH 38/60] Bump rswag-specs from 2.10.1 to 2.11.0 (#1885) --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 747344f00..807e540d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -363,10 +363,10 @@ GEM rspec-support (3.12.1) rswag-api (2.10.1) railties (>= 3.1, < 7.1) - rswag-specs (2.10.1) - activesupport (>= 3.1, < 7.1) + rswag-specs (2.11.0) + activesupport (>= 3.1, < 7.2) json-schema (>= 2.2, < 4.0) - railties (>= 3.1, < 7.1) + railties (>= 3.1, < 7.2) rspec-core (>= 2.14) rswag-ui (2.10.1) actionpack (>= 3.1, < 7.1) From 2c1a024d8ad04aac9369f489848ec1cb3fd2bd65 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 23:56:56 +0000 Subject: [PATCH 39/60] Bump rswag-ui from 2.10.1 to 2.11.0 (#1884) --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 807e540d7..07b795a93 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -368,9 +368,9 @@ GEM json-schema (>= 2.2, < 4.0) railties (>= 3.1, < 7.2) rspec-core (>= 2.14) - rswag-ui (2.10.1) - actionpack (>= 3.1, < 7.1) - railties (>= 3.1, < 7.1) + rswag-ui (2.11.0) + actionpack (>= 3.1, < 7.2) + railties (>= 3.1, < 7.2) rubocop (1.56.4) base64 (~> 0.1.1) json (~> 2.3) From 62b6308eec08088dd4937b5420a774caaaf4f300 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 00:04:10 +0000 Subject: [PATCH 40/60] Bump @rails/activestorage from 7.1.0 to 7.1.1 (#1889) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index abf3f7a5c..14130a333 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "@hotwired/stimulus-webpack-helpers": "^1.0.1", "@hotwired/turbo-rails": "^7.3.0", "@rails/actioncable": "^7.1.1", - "@rails/activestorage": "^7.1.0", + "@rails/activestorage": "^7.1.1", "@sentry/browser": "^7.73.0", "@tailwindcss/forms": "^0.5.6", "@tailwindcss/typography": "^0.5.10", diff --git a/yarn.lock b/yarn.lock index 3776fca4f..9e988dd03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -549,10 +549,10 @@ resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.1.1.tgz#e8c49769d41f35a4473133c259cc98adc04dddf8" integrity sha512-ZRJ9rdwFQQjRbtgJnweY0/4UQyxN6ojEGRdib0JkjnuIciv+4ok/aAeZmBJqNreTMaBqS0eHyA9hCArwN58opg== -"@rails/activestorage@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.1.0.tgz#6aeea30720f98ea25f790596862ac89251bcc05d" - integrity sha512-TYc3AkBaXgBlavODTHPgyaOMqt0MRkFlPCa7BiQJJyND17GYS7pP0lT0bgcDQgpuKMvsCdVxQaRwl6tzL5AW0g== +"@rails/activestorage@^7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@rails/activestorage/-/activestorage-7.1.1.tgz#3f12e8ac784f460f6a9d205744354abd79a525f2" + integrity sha512-QGBj+y4fbZt/QMMpjqnpKlzCKpDGTYrvJ+qc0QLis34AfbBLVgRo7kPzmdmeOTtwvWqpcivB9CrjTcV/C/7ruA== dependencies: spark-md5 "^3.0.1" From ddcaeee712b62aff78a031563ae043983c1f59b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 00:25:36 +0000 Subject: [PATCH 41/60] Bump rswag-api from 2.10.1 to 2.11.0 (#1886) --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 07b795a93..0350cabb2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -361,8 +361,8 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.1) - rswag-api (2.10.1) - railties (>= 3.1, < 7.1) + rswag-api (2.11.0) + railties (>= 3.1, < 7.2) rswag-specs (2.11.0) activesupport (>= 3.1, < 7.2) json-schema (>= 2.2, < 4.0) From c4446ba3abbdba302e42640b1a9e1b5ad303577c Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Wed, 11 Oct 2023 17:38:22 -0700 Subject: [PATCH 42/60] =?UTF-8?q?=F0=9F=90=9E=F0=9F=94=A8=20`Authenticatio?= =?UTF-8?q?n`:=20Don't=20explode=20when=20OTP=20or=20OTP=20secrets=20are?= =?UTF-8?q?=20nil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - https://github.com/zinc-collective/convene/issues/1809 There's a couple things happening, one of which is if an `AuthenticationMethod` does not have a One Time Password Secret, it can't actually do the verification. So i've added a check to make sure it returns false in cases when the OTP secret has not been set yet; as well as when a nil OTP is provided. --- app/models/authentication_method.rb | 1 + spec/models/authentication_method_spec.rb | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/app/models/authentication_method.rb b/app/models/authentication_method.rb index c4429ea1f..d9cd377a6 100644 --- a/app/models/authentication_method.rb +++ b/app/models/authentication_method.rb @@ -37,6 +37,7 @@ def contact_location=(contact_location) end def verify?(one_time_password) + return false if one_time_password.blank? || one_time_password_secret.blank? totp.verify(one_time_password).present? end diff --git a/spec/models/authentication_method_spec.rb b/spec/models/authentication_method_spec.rb index abdf466ca..e3b75115b 100644 --- a/spec/models/authentication_method_spec.rb +++ b/spec/models/authentication_method_spec.rb @@ -41,6 +41,15 @@ expect(authentication_method).not_to be_verify(one_time_password) end + + it "is false when the OTP is nil" do + expect(authentication_method).not_to be_verify(nil) + end + + it "is false when the OTPS is nil" do + authentication_method.one_time_password_secret = nil + expect(authentication_method).not_to be_verify("an otp") + end end describe "#send_one_time_password!(space)" do From 591199d553dc2e18c9406b768c953bb33b96e284 Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Fri, 13 Oct 2023 09:10:20 -0700 Subject: [PATCH 43/60] =?UTF-8?q?=F0=9F=90=9E=F0=9F=94=A8=20`Contributors`?= =?UTF-8?q?:=20Fix=20link=20to=20Github?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - https://github.com/zinc-collective/convene/issues/1520 Well, that's embaressing. --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index bd7788d2d..22b791257 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -46,7 +46,7 @@
- <%= link_to "💾 Contribute", "https://github.com/zinccollective/convene", class: "px-2 py-1" %> + <%= link_to "💾 Contribute", "https://github.com/zinc-collective/convene", class: "px-2 py-1" %> <%= link_to "💚 Sponsor", "https://opencollective.com/zinccommunity", class: "px-2 py-1" %> <%- current_space&.agreements&.each do |agreement| %> From ab517f82c24d4c63509d32a0b24c62cf16835b6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 14 Oct 2023 03:07:07 +0000 Subject: [PATCH 44/60] Bump @sentry/browser from 7.73.0 to 7.74.0 (#1894) --- package.json | 2 +- yarn.lock | 78 ++++++++++++++++++++++++++-------------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/package.json b/package.json index 14130a333..dd67a7c3b 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@hotwired/turbo-rails": "^7.3.0", "@rails/actioncable": "^7.1.1", "@rails/activestorage": "^7.1.1", - "@sentry/browser": "^7.73.0", + "@sentry/browser": "^7.74.0", "@tailwindcss/forms": "^0.5.6", "@tailwindcss/typography": "^0.5.10", "@webpack-cli/serve": "^2.0.5", diff --git a/yarn.lock b/yarn.lock index 9e988dd03..4ebcd03b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -556,57 +556,57 @@ dependencies: spark-md5 "^3.0.1" -"@sentry-internal/tracing@7.73.0": - version "7.73.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.73.0.tgz#4838f31e41d23a6041ef4520519b80f788bf1cac" - integrity sha512-ig3WL/Nqp8nRQ52P205NaypGKNfIl/G+cIqge9xPW6zfRb5kJdM1YParw9GSJ1SPjEZBkBORGAML0on5H2FILw== - dependencies: - "@sentry/core" "7.73.0" - "@sentry/types" "7.73.0" - "@sentry/utils" "7.73.0" +"@sentry-internal/tracing@7.74.0": + version "7.74.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.74.0.tgz#11b0762d0b18b01cc18dfb1e40bbaa41c6f97452" + integrity sha512-JK6IRGgdtZjswGfaGIHNWIThffhOHzVIIaGmglui+VFIzOsOqePjoxaDV0MEvzafxXZD7eWqGE5RGuZ0n6HFVg== + dependencies: + "@sentry/core" "7.74.0" + "@sentry/types" "7.74.0" + "@sentry/utils" "7.74.0" tslib "^2.4.1 || ^1.9.3" -"@sentry/browser@^7.73.0": - version "7.73.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.73.0.tgz#a8eaeb50cf16ca32f0039a81719c503d7045495f" - integrity sha512-e301hUixcJ5+HNKCJwajFF5smF4opXEFSclyWsJuFNufv5J/1C1SDhbwG2JjBt5zzdSoKWJKT1ewR6vpICyoDw== +"@sentry/browser@^7.74.0": + version "7.74.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.74.0.tgz#4a01bccb34059894007b9a22a89892f2c4dff130" + integrity sha512-Njr8216Z1dFUcl6NqBOk20dssK9SjoVddY74Xq+Q4p3NfXBG3lkMcACXor7SFoJRZXq8CZWGS13Cc5KwViRw4g== dependencies: - "@sentry-internal/tracing" "7.73.0" - "@sentry/core" "7.73.0" - "@sentry/replay" "7.73.0" - "@sentry/types" "7.73.0" - "@sentry/utils" "7.73.0" + "@sentry-internal/tracing" "7.74.0" + "@sentry/core" "7.74.0" + "@sentry/replay" "7.74.0" + "@sentry/types" "7.74.0" + "@sentry/utils" "7.74.0" tslib "^2.4.1 || ^1.9.3" -"@sentry/core@7.73.0": - version "7.73.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.73.0.tgz#1caeeec44f42c4d58c06cc05dec39e5497b65aa3" - integrity sha512-9FEz4Gq848LOgVN2OxJGYuQqxv7cIVw69VlAzWHEm3njt8mjvlTq+7UiFsGRo84+59V2FQuHxzA7vVjl90WfSg== +"@sentry/core@7.74.0": + version "7.74.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.74.0.tgz#2cfcb5133a4a3f82fbac09d3573ea9f508fb7c67" + integrity sha512-83NRuqn7nDZkSVBN5yJQqcpXDG4yMYiB7TkYUKrGTzBpRy6KUOrkCdybuKk0oraTIGiGSe5WEwCFySiNgR9FzA== dependencies: - "@sentry/types" "7.73.0" - "@sentry/utils" "7.73.0" + "@sentry/types" "7.74.0" + "@sentry/utils" "7.74.0" tslib "^2.4.1 || ^1.9.3" -"@sentry/replay@7.73.0": - version "7.73.0" - resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.73.0.tgz#4e6c522bac5c12f596ef76afe15ecb3807407669" - integrity sha512-a8IC9SowBisLYD2IdLkXzx7gN4iVwHDJhQvLp2B8ARs1PyPjJ7gCxSMHeGrYp94V0gOXtorNYkrxvuX8ayPROA== +"@sentry/replay@7.74.0": + version "7.74.0" + resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.74.0.tgz#618d40f7c9ecc7589dd14df0c560b20a24839d3f" + integrity sha512-GoYa3cHTTFVI/J1cnZ0i4X128mf/JljaswO3PWNTe2k3lSHq/LM5aV0keClRvwM0W8hlix8oOTT06nnenOUmmw== dependencies: - "@sentry/core" "7.73.0" - "@sentry/types" "7.73.0" - "@sentry/utils" "7.73.0" + "@sentry/core" "7.74.0" + "@sentry/types" "7.74.0" + "@sentry/utils" "7.74.0" -"@sentry/types@7.73.0": - version "7.73.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.73.0.tgz#6d811bbe413d319df0a592a672d6d72a94a8e716" - integrity sha512-/v8++bly8jW7r4cP2wswYiiVpn7eLLcqwnfPUMeCQze4zj3F3nTRIKc9BGHzU0V+fhHa3RwRC2ksqTGq1oJMDg== +"@sentry/types@7.74.0": + version "7.74.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.74.0.tgz#810a62cd28db21c5f15f131da6525d7ddf7a29db" + integrity sha512-rI5eIRbUycWjn6s6o3yAjjWtIvYSxZDdnKv5je2EZINfLKcMPj1dkl6wQd2F4y7gLfD/N6Y0wZYIXC3DUdJQQg== -"@sentry/utils@7.73.0": - version "7.73.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.73.0.tgz#530cf023f7c395aa7708cd3824e5a45948449c10" - integrity sha512-h3ZK/qpf4k76FhJV9uiSbvMz3V/0Ovy94C+5/9UgPMVCJXFmVsdw8n/dwANJ7LupVPfYP23xFGgebDMFlK1/2w== +"@sentry/utils@7.74.0": + version "7.74.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.74.0.tgz#e0a16d345b2af6f8b09d157c8c8a3145d7a2070a" + integrity sha512-k3np8nuTPtx5KDODPtULfFln4UXdE56MZCcF19Jv6Ljxf+YN/Ady1+0Oi3e0XoSvFpWNyWnglauT7M65qCE6kg== dependencies: - "@sentry/types" "7.73.0" + "@sentry/types" "7.74.0" tslib "^2.4.1 || ^1.9.3" "@tailwindcss/forms@^0.5.6": From 8c6c880a489b1ae2171400babd943b9025ae27c6 Mon Sep 17 00:00:00 2001 From: Zee <50284+zspencer@users.noreply.github.com> Date: Fri, 13 Oct 2023 20:16:21 -0700 Subject: [PATCH 45/60] =?UTF-8?q?=F0=9F=90=9E=F0=9F=94=A8`Authentication`?= =?UTF-8?q?=20Prevent=20race=20condition=20when=20double-tapping=20sign-in?= =?UTF-8?q?=20(#1892)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🐞🔨`Authentication` Prevent a condition when double-tapping sign-in - https://github.com/zinc-collective/convene/issues/1809 OK, so my working assumption is that the bug is caused by two requests being processed at the same time for a new email address, and the first one creates the `AuthenticationMethod` and the second one *tries* to, and fails; resulting in the validation error. This requeries the database and retries the rest of the work. --- app/models/authenticated_session.rb | 25 +++++++----- spec/models/authenticated_session_spec.rb | 47 +++++++++++++++-------- 2 files changed, 47 insertions(+), 25 deletions(-) diff --git a/app/models/authenticated_session.rb b/app/models/authenticated_session.rb index e5b4b59d3..a0f7d3be7 100644 --- a/app/models/authenticated_session.rb +++ b/app/models/authenticated_session.rb @@ -35,16 +35,10 @@ def destroy def save return false if !valid? || !actionable? - if one_time_password.nil? - authentication_method.send_one_time_password!(space) - return false - elsif authentication_method.verify?(one_time_password) - session[:person_id] = authentication_method.person.id - authentication_method.confirm! - return true - end - - false + verify_or_resend_otp + rescue ActiveRecord::RecordInvalid + self.authentication_method = nil + verify_or_resend_otp end # If we don't have a OTP _or_ a way of issuing one, there's nothin' we can do. @@ -56,4 +50,15 @@ def save return if one_time_password.nil? || authentication_method.verify?(one_time_password) errors.add(:one_time_password, :invalid_one_time_password) end + + private def verify_or_resend_otp + if one_time_password.nil? + authentication_method.send_one_time_password!(space) + false + elsif authentication_method.verify?(one_time_password) + session[:person_id] = authentication_method.person.id + authentication_method.confirm! + true + end + end end diff --git a/spec/models/authenticated_session_spec.rb b/spec/models/authenticated_session_spec.rb index 8218d5338..e88635c79 100644 --- a/spec/models/authenticated_session_spec.rb +++ b/spec/models/authenticated_session_spec.rb @@ -71,29 +71,46 @@ expect { authenticated_session.save }.not_to change(AuthenticationMethod, :count) end end - end - context "and the correct otp is provided" do - let(:one_time_password) { "123456" } + context "when a race condition caused the authentication method was created in another thread" do + let(:authentication_method) { nil } + + it "reloads the authentication method and tries again" do + sad_authentication_method = instance_double(AuthenticationMethod) + allow(sad_authentication_method).to receive(:send_one_time_password!).with(space).and_raise(ActiveRecord::RecordInvalid) + happy_authentication_method = instance_double(AuthenticationMethod) + allow(happy_authentication_method).to receive(:send_one_time_password!).with(space) + allow(AuthenticationMethod).to receive(:find_or_initialize_by).with(contact_method: :email, contact_location: "test@example.com").and_return(sad_authentication_method, happy_authentication_method) - before do - allow(authentication_method).to receive(:verify?) - .with(one_time_password).and_return(true) + authenticated_session.save - allow(authentication_method).to receive(:person) - .and_return(build_stubbed(:person, id: SecureRandom.uuid)) + expect(sad_authentication_method).to have_received(:send_one_time_password!).with(space) + expect(happy_authentication_method).to have_received(:send_one_time_password!).with(space) + end end - it "confirms the authentication method" do - authenticated_session.save + context "and the correct otp is provided" do + let(:one_time_password) { "123456" } - expect(authentication_method).to have_received(:confirm!) - end + before do + allow(authentication_method).to receive(:verify?) + .with(one_time_password).and_return(true) - it "populates the persons id in the session" do - authenticated_session.save + allow(authentication_method).to receive(:person) + .and_return(build_stubbed(:person, id: SecureRandom.uuid)) + end - expect(session[:person_id]).to eql(authentication_method.person.id) + it "confirms the authentication method" do + authenticated_session.save + + expect(authentication_method).to have_received(:confirm!) + end + + it "populates the persons id in the session" do + authenticated_session.save + + expect(session[:person_id]).to eql(authentication_method.person.id) + end end end end From b42065183d4add23de7b37fab86e9ea36afdc693 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 17:55:01 +0000 Subject: [PATCH 46/60] Bump strong_migrations from 1.6.3 to 1.6.4 (#1897) --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0350cabb2..3973c86dc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -458,7 +458,7 @@ GEM strip_attributes (1.13.0) activemodel (>= 3.0, < 8.0) stripe (9.4.0) - strong_migrations (1.6.3) + strong_migrations (1.6.4) activerecord (>= 5.2) thor (1.2.2) timeout (0.3.2) From 38fce75a778b5de4af5359df9a703a77ffd4849c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 17:55:12 +0000 Subject: [PATCH 47/60] Bump @sentry/browser from 7.74.0 to 7.74.1 (#1896) --- package.json | 2 +- yarn.lock | 78 ++++++++++++++++++++++++++-------------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/package.json b/package.json index dd67a7c3b..fc2b4580c 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@hotwired/turbo-rails": "^7.3.0", "@rails/actioncable": "^7.1.1", "@rails/activestorage": "^7.1.1", - "@sentry/browser": "^7.74.0", + "@sentry/browser": "^7.74.1", "@tailwindcss/forms": "^0.5.6", "@tailwindcss/typography": "^0.5.10", "@webpack-cli/serve": "^2.0.5", diff --git a/yarn.lock b/yarn.lock index 4ebcd03b0..eb2a36166 100644 --- a/yarn.lock +++ b/yarn.lock @@ -556,57 +556,57 @@ dependencies: spark-md5 "^3.0.1" -"@sentry-internal/tracing@7.74.0": - version "7.74.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.74.0.tgz#11b0762d0b18b01cc18dfb1e40bbaa41c6f97452" - integrity sha512-JK6IRGgdtZjswGfaGIHNWIThffhOHzVIIaGmglui+VFIzOsOqePjoxaDV0MEvzafxXZD7eWqGE5RGuZ0n6HFVg== - dependencies: - "@sentry/core" "7.74.0" - "@sentry/types" "7.74.0" - "@sentry/utils" "7.74.0" +"@sentry-internal/tracing@7.74.1": + version "7.74.1" + resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.74.1.tgz#55ff387e61d2c9533a9a0d099d376332426c8e08" + integrity sha512-nNaiZreQxCitG2PzYPaC7XtyA9OMsETGYMKAtiK4p62/uTmeYbsBva9BoNx1XeiHRwbrVQYRMKQ9nV5e2jS4/A== + dependencies: + "@sentry/core" "7.74.1" + "@sentry/types" "7.74.1" + "@sentry/utils" "7.74.1" tslib "^2.4.1 || ^1.9.3" -"@sentry/browser@^7.74.0": - version "7.74.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.74.0.tgz#4a01bccb34059894007b9a22a89892f2c4dff130" - integrity sha512-Njr8216Z1dFUcl6NqBOk20dssK9SjoVddY74Xq+Q4p3NfXBG3lkMcACXor7SFoJRZXq8CZWGS13Cc5KwViRw4g== +"@sentry/browser@^7.74.1": + version "7.74.1" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.74.1.tgz#9302d440bbdcb018abd5fee5959dab4b2fe97383" + integrity sha512-OYWNne/KO60lOvkIpIlJUyiJt/9j8DGI57thSDFEYSmmbNqMitczUTBOaEStouvHKyfchqLZm1CZfWKt+z0VOA== dependencies: - "@sentry-internal/tracing" "7.74.0" - "@sentry/core" "7.74.0" - "@sentry/replay" "7.74.0" - "@sentry/types" "7.74.0" - "@sentry/utils" "7.74.0" + "@sentry-internal/tracing" "7.74.1" + "@sentry/core" "7.74.1" + "@sentry/replay" "7.74.1" + "@sentry/types" "7.74.1" + "@sentry/utils" "7.74.1" tslib "^2.4.1 || ^1.9.3" -"@sentry/core@7.74.0": - version "7.74.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.74.0.tgz#2cfcb5133a4a3f82fbac09d3573ea9f508fb7c67" - integrity sha512-83NRuqn7nDZkSVBN5yJQqcpXDG4yMYiB7TkYUKrGTzBpRy6KUOrkCdybuKk0oraTIGiGSe5WEwCFySiNgR9FzA== +"@sentry/core@7.74.1": + version "7.74.1" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.74.1.tgz#9e33cf59b754a994e4054c47c74df1d3fbd30d3c" + integrity sha512-LvEhOSfdIvwkr+PdlrT/aA/iOLhkXrSkvjqAQyogE4ddCWeYfS0NoirxNt1EaxMBAWKhYZRqzkA7WA4LDLbzlA== dependencies: - "@sentry/types" "7.74.0" - "@sentry/utils" "7.74.0" + "@sentry/types" "7.74.1" + "@sentry/utils" "7.74.1" tslib "^2.4.1 || ^1.9.3" -"@sentry/replay@7.74.0": - version "7.74.0" - resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.74.0.tgz#618d40f7c9ecc7589dd14df0c560b20a24839d3f" - integrity sha512-GoYa3cHTTFVI/J1cnZ0i4X128mf/JljaswO3PWNTe2k3lSHq/LM5aV0keClRvwM0W8hlix8oOTT06nnenOUmmw== +"@sentry/replay@7.74.1": + version "7.74.1" + resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.74.1.tgz#dcb5040a3b0a9bda160b70cde5368ecbb4f0e782" + integrity sha512-qmbOl+jYdyhoHFbPp9WemKx8UojID5hVmuVLxNIP0ANqAwmE9OQEK9YFg2cf7L/TpKb1tqz0qLgi5MYIdcdpgQ== dependencies: - "@sentry/core" "7.74.0" - "@sentry/types" "7.74.0" - "@sentry/utils" "7.74.0" + "@sentry/core" "7.74.1" + "@sentry/types" "7.74.1" + "@sentry/utils" "7.74.1" -"@sentry/types@7.74.0": - version "7.74.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.74.0.tgz#810a62cd28db21c5f15f131da6525d7ddf7a29db" - integrity sha512-rI5eIRbUycWjn6s6o3yAjjWtIvYSxZDdnKv5je2EZINfLKcMPj1dkl6wQd2F4y7gLfD/N6Y0wZYIXC3DUdJQQg== +"@sentry/types@7.74.1": + version "7.74.1" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.74.1.tgz#b6f9b1bd266254f1f8b55fbcc92fa649ba2100ed" + integrity sha512-2jIuPc+YKvXqZETwr2E8VYnsH1zsSUR/wkIvg1uTVeVNyoowJv+YsOtCdeGyL2AwiotUBSPKu7O1Lz0kq5rMOQ== -"@sentry/utils@7.74.0": - version "7.74.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.74.0.tgz#e0a16d345b2af6f8b09d157c8c8a3145d7a2070a" - integrity sha512-k3np8nuTPtx5KDODPtULfFln4UXdE56MZCcF19Jv6Ljxf+YN/Ady1+0Oi3e0XoSvFpWNyWnglauT7M65qCE6kg== +"@sentry/utils@7.74.1": + version "7.74.1" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.74.1.tgz#e9a8453c954d02ebed2fd3dbe7588483d8f6d3cb" + integrity sha512-qUsqufuHYcy5gFhLZslLxA5kcEOkkODITXW3c7D+x+8iP/AJqa8v8CeUCVNS7RetHCuIeWAbbTClC4c411EwQg== dependencies: - "@sentry/types" "7.74.0" + "@sentry/types" "7.74.1" tslib "^2.4.1 || ^1.9.3" "@tailwindcss/forms@^0.5.6": From 81d7b044c19368afa1086fd210654821b4e951a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Oct 2023 00:05:27 +0000 Subject: [PATCH 48/60] Bump change-case from 5.0.2 to 5.1.0 (#1899) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index fc2b4580c..03541d3ff 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@cucumber/pretty-formatter": "^1.0.0", "axios": "^1.5.1", "axios-case-converter": "^1.1.0", - "change-case": "^5.0.2", + "change-case": "^5.1.0", "dotenv": "^16.3.1", "fs-extra": "^11.1.1", "geckodriver": "^4.2.1", diff --git a/yarn.lock b/yarn.lock index eb2a36166..49e22a183 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1324,10 +1324,10 @@ chalk@^5.1.2: resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3" integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA== -change-case@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/change-case/-/change-case-5.0.2.tgz#0f1885d310b84065a17b20e8231c7dff37207627" - integrity sha512-tH6YZXViaeC2/Mnt8m4gSmbZfNorC2rhwCX2bXw8SYZWr8ljCPB7iA+1TLG9t7yroWBFauc63LlOZ1gucMVCWw== +change-case@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/change-case/-/change-case-5.1.0.tgz#49754b58fdbda90547c696b69233e6fa2795464f" + integrity sha512-YLRzoiIO62vpoI8Qy2Jfy3gLu++QfhIcNtMOAwCbIel5UQGp6/KbL7Yu309dwNQHwbI1ZW39uBFyhrwVzXJSJQ== chokidar@^3.3.0, chokidar@^3.5.3: version "3.5.3" From c8d58ea541b1dc061f33de9301a1afa98015d527 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Oct 2023 00:10:21 +0000 Subject: [PATCH 49/60] Bump square.rb from 32.0.0.20230925 to 33.0.0.20231018 (#1898) --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3973c86dc..11066d220 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -437,7 +437,7 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - square.rb (32.0.0.20230925) + square.rb (33.0.0.20231018) apimatic_core (~> 0.3.0) apimatic_core_interfaces (~> 0.2.0) apimatic_faraday_client_adapter (~> 0.1.0) From 1c0fb1aeca8eafaf094371d33309a658c5389edb Mon Sep 17 00:00:00 2001 From: Zee <50284+zspencer@users.noreply.github.com> Date: Wed, 18 Oct 2023 18:34:54 -0700 Subject: [PATCH 50/60] =?UTF-8?q?=F0=9F=90=9E=F0=9F=94=A8=20`Section`:=20D?= =?UTF-8?q?eleting=20Sections=20is=20possible=20again=20(#1900)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - https://github.com/zinc-collective/convene/issues/1841 So, this was caused by me being FANCY and putting the delete button in the same form as the edit and update. A bad idea. Now, deleting a Section is handled in it's own independent form, rather than attempting to rewrite the forms hidden `_method` field to trick Rails into doing a destroy. This is also better from a design perspective because: A) omg, a delete button so close to the save button is DANGEROUS B) Deleting a Section is kinda a big deal, and while it would be better to bubble-wrap the heck out of it so people who *do* delete a section don't wind up in a sad-mad state; we can at least give them lots of "DANGER WILL ROBINSON DANGER" messaging. This is... irresponsible of us but what we can do now. If a motivated bystander or contributor wanted to design and implement a way for Sections to be Archived instead; I would be Very Happy :tm: --- app/views/rooms/_form.html.erb | 5 ---- app/views/rooms/edit.html.erb | 14 +++++++++ config/locales/room/en.yml | 4 +-- spec/system/sections_spec.rb | 53 ++++++++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 spec/system/sections_spec.rb diff --git a/app/views/rooms/_form.html.erb b/app/views/rooms/_form.html.erb index 93e9a28eb..aa7138862 100644 --- a/app/views/rooms/_form.html.erb +++ b/app/views/rooms/_form.html.erb @@ -8,11 +8,6 @@ <%= render "radio_group", attribute: :access_level, options: Room::access_levels.values, form: room_form %>
- <%- if policy(room).destroy? && room.persisted? %> - <%= room_form.button name: "_method", value: "delete", class: "--danger" do %> - <%=t('.destroy')%> - <%- end %> - <%- end %> <%= room_form.submit %>
diff --git a/app/views/rooms/edit.html.erb b/app/views/rooms/edit.html.erb index d9d80fe79..8eef83d26 100644 --- a/app/views/rooms/edit.html.erb +++ b/app/views/rooms/edit.html.erb @@ -20,3 +20,17 @@ <%= render "furnitures/new", furniture: new_furniture %> <%- end %> <% end %> + + +<%- if policy(room).destroy? && room.persisted? && !room.entrance? %> +
+

Remove this Section?

+ <%- data = {} %> + <%- if !room.gizmos.reload.empty? %> +

Warning! Deleting this Section will also delete all Gizmos and their related data. Please be very sure you want to do this! We recommend making the Section "internal" instead.

+ <%- data[:turbo_confirm] = I18n.t("rooms.destroy.confirm", room_name: room.name) %> + <%- end %> + + <%= button_to(t('rooms.destroy.link_to'), room.location, data: data, method: :delete, class: "--danger w-full") %> +
+<%- end %> diff --git a/config/locales/room/en.yml b/config/locales/room/en.yml index 22970b46c..0dccd1dec 100644 --- a/config/locales/room/en.yml +++ b/config/locales/room/en.yml @@ -7,10 +7,10 @@ en: update: success: You've updated Section '%{room_name}' successfully! 🎉 destroy: + link_to: "Remove Section 🗑️" + confirm: "Removing Section '%{room_name}' is permanent and irreversible! Do you still want to proceed?" success: You've removed Section '%{room_name}' successfully! 🎉 failure: We couldn't remove Section '%{room_name}'. - form: - destroy: "Remove Section 🗑️" helpers: submit: room: diff --git a/spec/system/sections_spec.rb b/spec/system/sections_spec.rb new file mode 100644 index 000000000..e363d7ab1 --- /dev/null +++ b/spec/system/sections_spec.rb @@ -0,0 +1,53 @@ +require "rails_helper" + +RSpec.describe "Sections" do + describe "Removing a Section" do + let(:space) { create(:space, :with_entrance, :with_members, member_count: 1) } + + before do + sign_in(space.members.first, space) + visit(polymorphic_path(section.location(:edit))) + end + + context "when the section is an entrance" do + let(:section) { space.entrance } + + it "doesn't let you delete the entrance" do + expect(page).not_to have_content(I18n.t("rooms.destroy.link_to")) + end + end + + context "when the section is not the entrance" do + let(:section) { create(:room, space: space) } + + context "when the Section has no Gizmos" do + it "deletes the Section from the Database" do + click_on(I18n.t("rooms.destroy.link_to")) + + expect(page).to have_content(I18n.t("rooms.destroy.success", room_name: section.name)) + expect(space.rooms).not_to be_exist(id: section.id) + end + end + + context "when the section has Gizmos" do + before { + create(:furniture, room: section) + refresh + } + + # Design note: It would be far better for us to have a way to safely undo + # the deletion of a Section, or even put the Gizmos into a holding space + # or something to be re-assigned; but that is out of scope for me at the + # moment - ZS 10/18/23 + it "requires confirmation" do + accept_alert(I18n.t("rooms.destroy.confirm", room_name: section.name)) do + click_on(I18n.t("rooms.destroy.link_to")) + end + + expect(page).to have_content(I18n.t("rooms.destroy.success", room_name: section.name)) + expect(space.rooms).not_to be_exist(id: section.id) + end + end + end + end +end From e1131fecd9fea415601f8ac80c5e8b703759ea5e Mon Sep 17 00:00:00 2001 From: Ana Ulin Date: Wed, 18 Oct 2023 21:20:40 -0700 Subject: [PATCH 51/60] Update Rails to 7.1.1 (#1901) * Update Rails to 7.1.1 * Update `polymorphic_path` implementation to match parameters of Rails' original method. * Update test environment configuration to fix deprecation warning. * Remove unnecessary `as: :html` from specs, which break with the latest Rails update. --- Gemfile.lock | 170 ++++++++++-------- app/controllers/application_controller.rb | 8 +- config/environments/test.rb | 3 +- .../cart_products_controller_request_spec.rb | 21 ++- .../tax_rates_controller_request_spec.rb | 23 ++- 5 files changed, 136 insertions(+), 89 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 11066d220..b352e5c30 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,76 +9,84 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.0.4.3) - actionpack (= 7.0.4.3) - activesupport (= 7.0.4.3) + actioncable (7.1.1) + actionpack (= 7.1.1) + activesupport (= 7.1.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.4.3) - actionpack (= 7.0.4.3) - activejob (= 7.0.4.3) - activerecord (= 7.0.4.3) - activestorage (= 7.0.4.3) - activesupport (= 7.0.4.3) + zeitwerk (~> 2.6) + actionmailbox (7.1.1) + actionpack (= 7.1.1) + activejob (= 7.1.1) + activerecord (= 7.1.1) + activestorage (= 7.1.1) + activesupport (= 7.1.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.4.3) - actionpack (= 7.0.4.3) - actionview (= 7.0.4.3) - activejob (= 7.0.4.3) - activesupport (= 7.0.4.3) + actionmailer (7.1.1) + actionpack (= 7.1.1) + actionview (= 7.1.1) + activejob (= 7.1.1) + activesupport (= 7.1.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.4.3) - actionview (= 7.0.4.3) - activesupport (= 7.0.4.3) - rack (~> 2.0, >= 2.2.0) + rails-dom-testing (~> 2.2) + actionpack (7.1.1) + actionview (= 7.1.1) + activesupport (= 7.1.1) + nokogiri (>= 1.8.5) + rack (>= 2.2.4) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.4.3) - actionpack (= 7.0.4.3) - activerecord (= 7.0.4.3) - activestorage (= 7.0.4.3) - activesupport (= 7.0.4.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.1) + actionpack (= 7.1.1) + activerecord (= 7.1.1) + activestorage (= 7.1.1) + activesupport (= 7.1.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.4.3) - activesupport (= 7.0.4.3) + actionview (7.1.1) + activesupport (= 7.1.1) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) active_record_extended (3.2.1) activerecord (>= 5.2, < 7.2.0) pg (< 3.0) - activejob (7.0.4.3) - activesupport (= 7.0.4.3) + activejob (7.1.1) + activesupport (= 7.1.1) globalid (>= 0.3.6) - activemodel (7.0.4.3) - activesupport (= 7.0.4.3) - activerecord (7.0.4.3) - activemodel (= 7.0.4.3) - activesupport (= 7.0.4.3) + activemodel (7.1.1) + activesupport (= 7.1.1) + activerecord (7.1.1) + activemodel (= 7.1.1) + activesupport (= 7.1.1) + timeout (>= 0.4.0) activerecord-postgres_enum (2.0.1) activerecord (>= 5.2) pg - activestorage (7.0.4.3) - actionpack (= 7.0.4.3) - activejob (= 7.0.4.3) - activerecord (= 7.0.4.3) - activesupport (= 7.0.4.3) + activestorage (7.1.1) + actionpack (= 7.1.1) + activejob (= 7.1.1) + activerecord (= 7.1.1) + activesupport (= 7.1.1) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.4.3) + activesupport (7.1.1) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) @@ -122,6 +130,7 @@ GEM erubi (>= 1.0.0) rack (>= 0.9.0) rouge (>= 1.0.0) + bigdecimal (3.1.4) bindex (0.8.1) binding_of_caller (1.0.0) debug_inspector (>= 0.0.1) @@ -160,6 +169,8 @@ GEM dotenv-rails (2.8.1) dotenv (= 2.8.1) railties (>= 3.2) + drb (2.1.1) + ruby2_keywords erubi (1.12.0) factory_bot (6.2.0) activesupport (>= 5.0.0) @@ -203,6 +214,10 @@ GEM image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) + io-console (0.6.0) + irb (1.8.3) + rdoc + reline (>= 0.3.8) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) @@ -243,7 +258,7 @@ GEM matrix (0.4.2) method_source (1.0.0) mini_magick (4.12.0) - mini_mime (1.1.2) + mini_mime (1.1.5) mini_portile2 (2.8.4) minitest (5.20.0) monetize (1.12.0) @@ -257,16 +272,17 @@ GEM railties (>= 3.0) msgpack (1.6.0) multipart-post (2.3.0) + mutex_m (0.1.2) net-http-persistent (4.0.2) connection_pool (~> 2.2) - net-imap (0.3.4) + net-imap (0.4.1) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.1) timeout - net-smtp (0.3.3) + net-smtp (0.4.0) net-protocol nio4r (2.5.9) nokogiri (1.15.4) @@ -284,6 +300,8 @@ GEM pry-byebug (3.10.1) byebug (~> 11.0) pry (>= 0.13, < 0.15) + psych (5.1.1.1) + stringio public_suffix (5.0.3) puma (6.4.0) nio4r (~> 2.0) @@ -291,22 +309,27 @@ GEM activesupport (>= 3.0.0) racc (1.7.1) rack (2.2.8) + rack-session (1.0.1) + rack (< 3) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.4.3) - actioncable (= 7.0.4.3) - actionmailbox (= 7.0.4.3) - actionmailer (= 7.0.4.3) - actionpack (= 7.0.4.3) - actiontext (= 7.0.4.3) - actionview (= 7.0.4.3) - activejob (= 7.0.4.3) - activemodel (= 7.0.4.3) - activerecord (= 7.0.4.3) - activestorage (= 7.0.4.3) - activesupport (= 7.0.4.3) + rackup (1.0.0) + rack (< 3) + webrick + rails (7.1.1) + actioncable (= 7.1.1) + actionmailbox (= 7.1.1) + actionmailer (= 7.1.1) + actionpack (= 7.1.1) + actiontext (= 7.1.1) + actionview (= 7.1.1) + activejob (= 7.1.1) + activemodel (= 7.1.1) + activerecord (= 7.1.1) + activestorage (= 7.1.1) + activesupport (= 7.1.1) bundler (>= 1.15.0) - railties (= 7.0.4.3) + railties (= 7.1.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -323,13 +346,14 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.4.3) - actionpack (= 7.0.4.3) - activesupport (= 7.0.4.3) - method_source + railties (7.1.1) + actionpack (= 7.1.1) + activesupport (= 7.1.1) + irb + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.0.6) ranked-model (0.4.9) @@ -337,10 +361,14 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) + rdoc (6.5.0) + psych (>= 4.0.0) redcarpet (3.6.0) redis-client (0.17.0) connection_pool regexp_parser (2.8.2) + reline (0.3.9) + io-console (~> 0.5) rexml (3.2.6) rotp (6.3.0) rouge (4.1.3) @@ -455,13 +483,14 @@ GEM rubocop-performance (~> 1.19.1) stimulus-rails (1.3.0) railties (>= 6.0.0) + stringio (3.0.8) strip_attributes (1.13.0) activemodel (>= 3.0, < 8.0) stripe (9.4.0) strong_migrations (1.6.4) activerecord (>= 5.2) - thor (1.2.2) - timeout (0.3.2) + thor (1.3.0) + timeout (0.4.0) turbo-rails (1.5.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) @@ -482,8 +511,9 @@ GEM addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) + webrick (1.8.1) websocket (1.2.10) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 88b1bb113..edb083e15 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -64,10 +64,10 @@ class ApplicationController < ActionController::Base # Removes the root branded domain from the path builder # @see http://api.rubyonrails.org/classes/ActionDispatch/Routing/PolymorphicRoutes.html#method-i-polymorphic_path - helper_method def polymorphic_path(options, **attributes) - if options[0].try(:branded_domain).present? && options.length > 1 - options.delete_at(0) - elsif [:edit, :new].include?(options[0]) && options.try(:branded_domain).present? + helper_method def polymorphic_path(record_or_hash_or_array, options = {}) + if record_or_hash_or_array[0].try(:branded_domain).present? && record_or_hash_or_array.length > 1 + record_or_hash_or_array.delete_at(0) + elsif [:edit, :new].include?(record_or_hash_or_array[0]) && record_or_hash_or_array.try(:branded_domain).present? options.delete_at(1) end diff --git a/config/environments/test.rb b/config/environments/test.rb index 87675afa3..9129a26fd 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -29,7 +29,8 @@ config.cache_store = :null_store # Raise exceptions instead of rendering exception templates. - config.action_dispatch.show_exceptions = false + # @see https://guides.rubyonrails.org/configuring.html#actiondispatch-showexceptions + config.action_dispatch.show_exceptions = :none # Disable request forgery protection in test environment. config.action_controller.allow_forgery_protection = false diff --git a/spec/furniture/marketplace/cart_products_controller_request_spec.rb b/spec/furniture/marketplace/cart_products_controller_request_spec.rb index d8dbfcc92..99bbdebd2 100644 --- a/spec/furniture/marketplace/cart_products_controller_request_spec.rb +++ b/spec/furniture/marketplace/cart_products_controller_request_spec.rb @@ -6,11 +6,10 @@ let(:room) { marketplace.room } let(:member) { create(:membership, space: space).member } let(:document_root_element) { Nokogiri::HTML::Document.parse(response.body) } - let(:request_as) { :html } describe "#create" do subject(:perform_request) do - post path, as: request_as, params: {cart_product: {product_id: product.id, quantity: 1}} + post path, params: {cart_product: {product_id: product.id, quantity: 1}} response end @@ -25,7 +24,10 @@ end context "when a turbo stream" do - let(:request_as) { :turbo_stream } + subject(:perform_request) do + post path, as: :turbo_stream, params: {cart_product: {product_id: product.id, quantity: 1}} + response + end it "Replaces the cart product, cart footer and cart total" do perform_request && cart.reload @@ -47,7 +49,7 @@ describe "#update" do subject(:perform_request) do - put path, params: params, as: request_as + put path, params: params end let(:product) { create(:marketplace_product, marketplace: marketplace) } @@ -64,7 +66,9 @@ end context "when a turbo stream" do - let(:request_as) { :turbo_stream } + subject(:perform_request) do + put path, as: :turbo_stream, params: params + end it "Replaces the cart product, cart footer and cart total" do perform_request && cart.reload @@ -86,7 +90,7 @@ describe "#destroy" do subject(:perform_request) do - delete path, as: request_as + delete path response end @@ -99,7 +103,10 @@ specify { expect { perform_request }.to change { Marketplace::CartProduct.exists?(cart_product.id) }.to(false) } context "when a turbo stream" do - let(:request_as) { :turbo_stream } + subject(:perform_request) do + delete path, as: :turbo_stream + response + end it "Replaces the cart product, cart footer and cart total" do perform_request diff --git a/spec/furniture/marketplace/tax_rates_controller_request_spec.rb b/spec/furniture/marketplace/tax_rates_controller_request_spec.rb index 2532045cd..4ac240939 100644 --- a/spec/furniture/marketplace/tax_rates_controller_request_spec.rb +++ b/spec/furniture/marketplace/tax_rates_controller_request_spec.rb @@ -11,7 +11,6 @@ let(:space) { marketplace.space } let(:marketplace) { create(:marketplace) } let(:person) { create(:membership, space: space).member } - let(:as) { :html } describe "#new" do let(:perform_request) do @@ -36,7 +35,7 @@ describe "#edit" do let(:perform_request) do - get polymorphic_path(tax_rate.location(:edit)), as: as + get polymorphic_path(tax_rate.location(:edit)) end let(:tax_rate) { create(:marketplace_tax_rate, marketplace: marketplace) } @@ -52,7 +51,7 @@ describe "#update" do let(:perform_request) do - put(polymorphic_path(tax_rate.location), as: as, params: {tax_rate: tax_rate_params}).tap do + put(polymorphic_path(tax_rate.location), params: {tax_rate: tax_rate_params}).tap do tax_rate.reload end end @@ -65,7 +64,11 @@ it { is_expected.to redirect_to(marketplace.location(child: :tax_rates)) } context "when a turbo stream" do - let(:as) { :turbo_stream } + let(:perform_request) do + put(polymorphic_path(tax_rate.location), as: :turbo_stream, params: {tax_rate: tax_rate_params}).tap do + tax_rate.reload + end + end it { is_expected.to have_rendered_turbo_stream(:replace, tax_rate, Marketplace::TaxRateComponent.new(tax_rate: tax_rate.reload).render_in(controller.view_context)) } end @@ -76,7 +79,11 @@ it { is_expected.to render_template(:edit) } context "when a a turbo stream" do - let(:as) { :turbo_stream } + let(:perform_request) do + put(polymorphic_path(tax_rate.location), as: :turbo_stream, params: {tax_rate: tax_rate_params}).tap do + tax_rate.reload + end + end it { is_expected.to have_rendered_turbo_stream(:replace, tax_rate, partial: "form") } end @@ -85,7 +92,7 @@ describe "#destroy" do let(:perform_request) do - delete polymorphic_path(tax_rate.location), as: as + delete polymorphic_path(tax_rate.location) end let(:tax_rate) { create(:marketplace_tax_rate, marketplace: marketplace) } @@ -97,7 +104,9 @@ it { is_expected.to redirect_to(marketplace.location(child: :tax_rates)) } context "when a turbo_stream" do - let(:as) { :turbo_stream } + let(:perform_request) do + delete polymorphic_path(tax_rate.location), as: :turbo_stream + end it { is_expected.to have_rendered_turbo_stream(:remove, tax_rate) } end From 8fdf3e007e42d31d965365ebab0aea16caf78a96 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:21:56 +0000 Subject: [PATCH 52/60] Bump change-case from 5.1.0 to 5.1.2 (#1903) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 03541d3ff..8a7d25b0f 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@cucumber/pretty-formatter": "^1.0.0", "axios": "^1.5.1", "axios-case-converter": "^1.1.0", - "change-case": "^5.1.0", + "change-case": "^5.1.2", "dotenv": "^16.3.1", "fs-extra": "^11.1.1", "geckodriver": "^4.2.1", diff --git a/yarn.lock b/yarn.lock index 49e22a183..f02bd68c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1324,10 +1324,10 @@ chalk@^5.1.2: resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3" integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA== -change-case@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/change-case/-/change-case-5.1.0.tgz#49754b58fdbda90547c696b69233e6fa2795464f" - integrity sha512-YLRzoiIO62vpoI8Qy2Jfy3gLu++QfhIcNtMOAwCbIel5UQGp6/KbL7Yu309dwNQHwbI1ZW39uBFyhrwVzXJSJQ== +change-case@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/change-case/-/change-case-5.1.2.tgz#1a1feb43f88b7595c6e8db44b5a27b24fa8a9ebd" + integrity sha512-CAtbGEDulyjzs05RXy3uKcwqeztz/dMEuAc1Xu9NQBsbrhuGMneL0u9Dj5SoutLKBFYun8txxYIwhjtLNfUmCA== chokidar@^3.3.0, chokidar@^3.5.3: version "3.5.3" From 1632384a76a55cb1ceaf805882df7eefbfd094cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 21 Oct 2023 00:22:43 +0000 Subject: [PATCH 53/60] Bump @cucumber/cucumber from 10.0.0 to 10.0.1 (#1904) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8a7d25b0f..d74ed0c19 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ }, "homepage": "https://github.com/zinc-collective/convene#readme", "devDependencies": { - "@cucumber/cucumber": "^10.0.0", + "@cucumber/cucumber": "^10.0.1", "@cucumber/pretty-formatter": "^1.0.0", "axios": "^1.5.1", "axios-case-converter": "^1.1.0", diff --git a/yarn.lock b/yarn.lock index f02bd68c7..547e77e39 100644 --- a/yarn.lock +++ b/yarn.lock @@ -299,10 +299,10 @@ dependencies: regexp-match-indices "1.0.2" -"@cucumber/cucumber@^10.0.0": - version "10.0.0" - resolved "https://registry.yarnpkg.com/@cucumber/cucumber/-/cucumber-10.0.0.tgz#08ed8ae6ed0d50c706aa709e5af584c9331dfe7a" - integrity sha512-TPPIftmegCyoIWyitYzHa8ucuFtwiFVvYAolVHc6oLP7hqa79exHiRiADcPtIJiiqe0JallDuYtKhT5tW/wOIA== +"@cucumber/cucumber@^10.0.1": + version "10.0.1" + resolved "https://registry.yarnpkg.com/@cucumber/cucumber/-/cucumber-10.0.1.tgz#b530c8da5b411d67daea58225fc48de38606f9d1" + integrity sha512-g7W7SQnNMSNnMRQVGubjefCxdgNFyq4P3qxT2Ve7Xhh8ZLoNkoRDcWsyfKQVWnxNfgW3aGJmxbucWRoTi+ZUqg== dependencies: "@cucumber/ci-environment" "9.2.0" "@cucumber/cucumber-expressions" "16.1.2" From 2c2f53125a1bcfb5bc7ef1f6ca36c99ea1480d8e Mon Sep 17 00:00:00 2001 From: Ross Chapman Date: Mon, 23 Oct 2023 18:56:11 -0700 Subject: [PATCH 54/60] Adds content for Stripe Account settings component when Stripe utility missing (#1842) --- .../stripe_overview_component.html.erb | 32 ++++++++++++++----- .../stripe_overview_component_spec.rb | 29 +++++++++++------ .../collecting_payments_system_spec.rb | 4 ++- 3 files changed, 47 insertions(+), 18 deletions(-) diff --git a/app/components/marketplace/stripe_overview_component/stripe_overview_component.html.erb b/app/components/marketplace/stripe_overview_component/stripe_overview_component.html.erb index f67c97130..d66281c94 100644 --- a/app/components/marketplace/stripe_overview_component/stripe_overview_component.html.erb +++ b/app/components/marketplace/stripe_overview_component/stripe_overview_component.html.erb @@ -1,14 +1,30 @@ -<%= render CardComponent.new(classes: "flex flex-col h-full +<%= render CardComponent.new(dom_id: "stripe_overview", classes: "flex flex-col h-full ") do %> -
- <%= marketplace_stripe_utility&.name %> -
-
- <%= render ButtonComponent.new( + <%- if marketplace.stripe_api_key? %> +
+ <%= marketplace_stripe_utility.name %> +
+
+ <%= render ButtonComponent.new( label: "View #{t('marketplace.stripe_accounts.show.link_to')}", - title: t('marketplace.stripe_accounts.show.link_to'), + title: "View #{t('marketplace.stripe_accounts.show.link_to')}", href: marketplace.location(:index, child: :stripe_account), method: :get, scheme: :secondary) %> -
+
+ <%- else %> +
To start accepting payments, add your Stripe Account.
+
+ <%= render ButtonComponent.new( + label: "Add #{t('marketplace.stripe_accounts.show.link_to')}", + title: "Add #{t('marketplace.stripe_accounts.show.link_to')}", + href: marketplace.location(:index, child: :stripe_account), + method: :get, + scheme: :secondary + ) + %> +
+ <%- end %> <%- end %> diff --git a/spec/components/marketplace/stripe_overview_component_spec.rb b/spec/components/marketplace/stripe_overview_component_spec.rb index a9295d606..91550e636 100644 --- a/spec/components/marketplace/stripe_overview_component_spec.rb +++ b/spec/components/marketplace/stripe_overview_component_spec.rb @@ -3,13 +3,24 @@ require "rails_helper" RSpec.describe Marketplace::StripeOverviewComponent, type: :component do - pending "add some examples to (or delete) #{__FILE__}" - - # it "renders something useful" do - # expect( - # render_inline(described_class.new(attr: "value")) { "Hello, components!" }.css("p").to_html - # ).to include( - # "Hello, components!" - # ) - # end + # pending "add some examples to (or delete) #{__FILE__}" + subject(:output) { render_inline(component) } + + let(:component) { described_class.new(marketplace: marketplace) } + + context "when the Marketplace has a Stripe Utility" do + let(:marketplace) { create(:marketplace, :with_stripe_utility) } + + it { is_expected.to have_content marketplace.stripe_utility.name } + + it { is_expected.to have_link "View #{I18n.t("marketplace.stripe_accounts.show.link_to")}" } + end + + context "when the Marketplace is missing a Stripe Utility" do + let(:marketplace) { create(:marketplace) } + + it { is_expected.to have_link "Add #{I18n.t("marketplace.stripe_accounts.show.link_to")}" } + + it { is_expected.to have_content "To start accepting payments, add your Stripe Account." } + end end diff --git a/spec/furniture/marketplace/collecting_payments_system_spec.rb b/spec/furniture/marketplace/collecting_payments_system_spec.rb index 52f677949..6e8cb9e5c 100644 --- a/spec/furniture/marketplace/collecting_payments_system_spec.rb +++ b/spec/furniture/marketplace/collecting_payments_system_spec.rb @@ -19,7 +19,9 @@ end click_on("Payment Settings") - click_on("View Stripe Account") + within("#stripe_overview") do + click_on("Add Stripe Account") + end click_on("Add a Stripe API key to #{space.name}") click_on("Add Utility") select("stripe", from: "Type") From abfa9ef15b7c4c1a31e92006d83c72b126fdd46b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 17:12:57 +0000 Subject: [PATCH 55/60] Bump tailwindcss from 3.3.3 to 3.3.4 (#1906) --- package.json | 2 +- yarn.lock | 46 +++++++++++++++------------------------------- 2 files changed, 16 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index d74ed0c19..dcac286cc 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "postcss-flexbugs-fixes": "^5.0.2", "postcss-import": "^15.1.0", "postcss-preset-env": "^9.2.0", - "tailwindcss": "^3.3.3", + "tailwindcss": "^3.3.4", "webpack": "^5.76.0", "webpack-cli": "^5.1.4" } diff --git a/yarn.lock b/yarn.lock index 547e77e39..a0be968e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1866,10 +1866,10 @@ fast-fifo@^1.1.0, fast-fifo@^1.2.0: resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.0.tgz#03e381bcbfb29932d7c3afde6e15e83e05ab4d8b" integrity sha512-IgfweLvEpwyA4WgiQe9Nx6VV2QkML2NkvZnk1oKnIzXgXdWxuhF7zw4DvLTPZJn6PIUneiAXPF24QmoEqHTjyw== -fast-glob@^3.2.11, fast-glob@^3.2.12: - version "3.2.12" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" - integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== +fast-glob@^3.2.11, fast-glob@^3.3.0: + version "3.3.1" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4" + integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -2361,13 +2361,6 @@ is-binary-path@~2.1.0: dependencies: binary-extensions "^2.0.0" -is-core-module@^2.11.0: - version "2.12.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4" - integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ== - dependencies: - has "^1.0.3" - is-core-module@^2.13.0: version "2.13.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db" @@ -2482,10 +2475,10 @@ jest-worker@^27.0.6: merge-stream "^2.0.0" supports-color "^8.0.0" -jiti@^1.18.2: - version "1.18.2" - resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.18.2.tgz#80c3ef3d486ebf2450d9335122b32d121f2a83cd" - integrity sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg== +jiti@^1.19.1: + version "1.20.0" + resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.20.0.tgz#2d823b5852ee8963585c8dd8b7992ffc1ae83b42" + integrity sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA== js-tokens@^4.0.0: version "4.0.0" @@ -3666,16 +3659,7 @@ resolve-pkg@^2.0.0: dependencies: resolve-from "^5.0.0" -resolve@^1.1.7, resolve@^1.20.0, resolve@^1.22.2: - version "1.22.2" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" - integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== - dependencies: - is-core-module "^2.11.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -resolve@^1.10.0: +resolve@^1.1.7, resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.2: version "1.22.8" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== @@ -4111,20 +4095,20 @@ 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@^3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.3.tgz#90da807393a2859189e48e9e7000e6880a736daf" - integrity sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w== +tailwindcss@^3.3.4: + version "3.3.4" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.4.tgz#f08c493ff3ddf03081c40e780e98f129e1c8214d" + integrity sha512-JXZNOkggUAc9T5E7nCrimoXHcSf9h3NWFe5sh36CGD/3M5TRLuQeFnQoDsit2uVTqgoOZHLx5rTykLUu16vsMQ== dependencies: "@alloc/quick-lru" "^5.2.0" arg "^5.0.2" chokidar "^3.5.3" didyoumean "^1.2.2" dlv "^1.1.3" - fast-glob "^3.2.12" + fast-glob "^3.3.0" glob-parent "^6.0.2" is-glob "^4.0.3" - jiti "^1.18.2" + jiti "^1.19.1" lilconfig "^2.1.0" micromatch "^4.0.5" normalize-path "^3.0.0" From 2204963800ed208d1c251dbab6016e48b339951f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 17:15:19 +0000 Subject: [PATCH 56/60] Bump stripe from 9.4.0 to 10.0.0 (#1895) --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b352e5c30..cc662d518 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -486,7 +486,7 @@ GEM stringio (3.0.8) strip_attributes (1.13.0) activemodel (>= 3.0, < 8.0) - stripe (9.4.0) + stripe (10.0.0) strong_migrations (1.6.4) activerecord (>= 5.2) thor (1.3.0) From 64e6c56edb3e1a278fdb30390342c277396d03aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 17:18:17 +0000 Subject: [PATCH 57/60] Bump @sentry/browser from 7.74.1 to 7.75.0 (#1905) --- package.json | 2 +- yarn.lock | 103 +++++++++++++++++++++++++-------------------------- 2 files changed, 51 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index dcac286cc..adb0190b1 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@hotwired/turbo-rails": "^7.3.0", "@rails/actioncable": "^7.1.1", "@rails/activestorage": "^7.1.1", - "@sentry/browser": "^7.74.1", + "@sentry/browser": "^7.75.0", "@tailwindcss/forms": "^0.5.6", "@tailwindcss/typography": "^0.5.10", "@webpack-cli/serve": "^2.0.5", diff --git a/yarn.lock b/yarn.lock index a0be968e2..a907c1959 100644 --- a/yarn.lock +++ b/yarn.lock @@ -556,58 +556,55 @@ dependencies: spark-md5 "^3.0.1" -"@sentry-internal/tracing@7.74.1": - version "7.74.1" - resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.74.1.tgz#55ff387e61d2c9533a9a0d099d376332426c8e08" - integrity sha512-nNaiZreQxCitG2PzYPaC7XtyA9OMsETGYMKAtiK4p62/uTmeYbsBva9BoNx1XeiHRwbrVQYRMKQ9nV5e2jS4/A== - dependencies: - "@sentry/core" "7.74.1" - "@sentry/types" "7.74.1" - "@sentry/utils" "7.74.1" - tslib "^2.4.1 || ^1.9.3" - -"@sentry/browser@^7.74.1": - version "7.74.1" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.74.1.tgz#9302d440bbdcb018abd5fee5959dab4b2fe97383" - integrity sha512-OYWNne/KO60lOvkIpIlJUyiJt/9j8DGI57thSDFEYSmmbNqMitczUTBOaEStouvHKyfchqLZm1CZfWKt+z0VOA== - dependencies: - "@sentry-internal/tracing" "7.74.1" - "@sentry/core" "7.74.1" - "@sentry/replay" "7.74.1" - "@sentry/types" "7.74.1" - "@sentry/utils" "7.74.1" - tslib "^2.4.1 || ^1.9.3" - -"@sentry/core@7.74.1": - version "7.74.1" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.74.1.tgz#9e33cf59b754a994e4054c47c74df1d3fbd30d3c" - integrity sha512-LvEhOSfdIvwkr+PdlrT/aA/iOLhkXrSkvjqAQyogE4ddCWeYfS0NoirxNt1EaxMBAWKhYZRqzkA7WA4LDLbzlA== - dependencies: - "@sentry/types" "7.74.1" - "@sentry/utils" "7.74.1" - tslib "^2.4.1 || ^1.9.3" - -"@sentry/replay@7.74.1": - version "7.74.1" - resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.74.1.tgz#dcb5040a3b0a9bda160b70cde5368ecbb4f0e782" - integrity sha512-qmbOl+jYdyhoHFbPp9WemKx8UojID5hVmuVLxNIP0ANqAwmE9OQEK9YFg2cf7L/TpKb1tqz0qLgi5MYIdcdpgQ== - dependencies: - "@sentry/core" "7.74.1" - "@sentry/types" "7.74.1" - "@sentry/utils" "7.74.1" - -"@sentry/types@7.74.1": - version "7.74.1" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.74.1.tgz#b6f9b1bd266254f1f8b55fbcc92fa649ba2100ed" - integrity sha512-2jIuPc+YKvXqZETwr2E8VYnsH1zsSUR/wkIvg1uTVeVNyoowJv+YsOtCdeGyL2AwiotUBSPKu7O1Lz0kq5rMOQ== - -"@sentry/utils@7.74.1": - version "7.74.1" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.74.1.tgz#e9a8453c954d02ebed2fd3dbe7588483d8f6d3cb" - integrity sha512-qUsqufuHYcy5gFhLZslLxA5kcEOkkODITXW3c7D+x+8iP/AJqa8v8CeUCVNS7RetHCuIeWAbbTClC4c411EwQg== - dependencies: - "@sentry/types" "7.74.1" - tslib "^2.4.1 || ^1.9.3" +"@sentry-internal/tracing@7.75.0": + version "7.75.0" + resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.75.0.tgz#0d6cb4d3ff4ea6dd456f64455b2d505d7eb27656" + integrity sha512-/j4opF/jB9j8qnSiQK75/lFLtkfqXS5/MoOKc2KWK/pOaf15W+6uJzGQ8jRBHLYd9dDg6AyqsF48Wqy561/mNg== + dependencies: + "@sentry/core" "7.75.0" + "@sentry/types" "7.75.0" + "@sentry/utils" "7.75.0" + +"@sentry/browser@^7.75.0": + version "7.75.0" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.75.0.tgz#7ea88f335c7bbaf3b5eecbf4e12590785abc0ee7" + integrity sha512-DXH/69vzp2j8xjydX+lrUYasrk7a1mpbXFGA9GtnII7shMCy55+QkVxpa6cLojYUaG2K/8yFDMcrP9N395LnWg== + dependencies: + "@sentry-internal/tracing" "7.75.0" + "@sentry/core" "7.75.0" + "@sentry/replay" "7.75.0" + "@sentry/types" "7.75.0" + "@sentry/utils" "7.75.0" + +"@sentry/core@7.75.0": + version "7.75.0" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.75.0.tgz#d5477faf9afdfbf45b4ff46b809729f14d4e1b80" + integrity sha512-vXg3cdJgwzP24oTS9zFCgLW4MgTkMZqXx+ESRq7gTD9qJTpcmAmYT+Ckmvebg8K6DBThV6+0v61r50na2+XdrA== + dependencies: + "@sentry/types" "7.75.0" + "@sentry/utils" "7.75.0" + +"@sentry/replay@7.75.0": + version "7.75.0" + resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.75.0.tgz#0b1d9e9a6954ecc004597456f2c82e7630b8139c" + integrity sha512-TAAlj7JCMF6hFFL71RmPzVX89ltyPYFWR+t4SuWaBmU6HmTliI2eJvK+M36oE+N7s3CkyRVTaXXRe0YMwRMuZQ== + dependencies: + "@sentry-internal/tracing" "7.75.0" + "@sentry/core" "7.75.0" + "@sentry/types" "7.75.0" + "@sentry/utils" "7.75.0" + +"@sentry/types@7.75.0": + version "7.75.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.75.0.tgz#e171f1680785a155cb828942af890ad4ee657ca3" + integrity sha512-xG8OLADxG7HpGhMxrF4v4tKq/v/gqmLsTZ858R51pz0xCWM8SK6ZSWOKudkAGBIpRjI6RUHMnkBtRAN2aKDOkQ== + +"@sentry/utils@7.75.0": + version "7.75.0" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.75.0.tgz#7a638c4c027ca2018518ee8d2eead1397cb97d66" + integrity sha512-UHWKeevhUNRp+mAWDbMVFOMgseoq8t/xFgdUywO/2PC14qZKRBH+0k1BKoNkp5sOzDT06ETj2w6wYoYhy6i+dA== + dependencies: + "@sentry/types" "7.75.0" "@tailwindcss/forms@^0.5.6": version "0.5.6" @@ -4242,7 +4239,7 @@ ts-interface-checker@^0.1.9: resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699" integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA== -tslib@^2.0.3, tslib@^2.3.0, "tslib@^2.4.1 || ^1.9.3": +tslib@^2.0.3, tslib@^2.3.0: version "2.6.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3" integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== From 9c4568b3f7bf486823e7d8fdf32f650e095c01b1 Mon Sep 17 00:00:00 2001 From: Ross Chapman Date: Wed, 25 Oct 2023 17:42:32 -0700 Subject: [PATCH 58/60] Match capy click selectors with underlying html (#1856) --- .rubocop.yml | 3 --- .../buying_products_system_spec.rb | 10 +++---- .../collecting_payments_system_spec.rb | 26 +++++++++---------- spec/support/system_helpers.rb | 2 +- spec/system/furniture_spec.rb | 6 ++--- spec/system/sections_spec.rb | 4 +-- 6 files changed, 24 insertions(+), 27 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 38ce4995f..3d05101d7 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -37,6 +37,3 @@ Style/TrailingCommaInArrayLiteral: Rails/CreateTableWithTimestamps: Exclude: - db/schema.rb - -Capybara/ClickLinkOrButtonStyle: - EnforcedStyle: link_or_button diff --git a/spec/furniture/marketplace/buying_products_system_spec.rb b/spec/furniture/marketplace/buying_products_system_spec.rb index e90dfabb6..0f55f9e96 100644 --- a/spec/furniture/marketplace/buying_products_system_spec.rb +++ b/spec/furniture/marketplace/buying_products_system_spec.rb @@ -27,13 +27,13 @@ def url_options it "Works for Guests" do # rubocop:disable RSpec/ExampleLength visit(polymorphic_path(marketplace.room.location)) select(marketplace.delivery_areas.first.label, from: "cart[delivery_area_id]") - click_on("Save changes") + click_button("Save changes") add_product_to_cart(marketplace.products.first) expect(page).to have_content("Total: #{humanized_money_with_symbol(marketplace.products.first.price + marketplace.delivery_areas.first.price)}") - click_on("Checkout") + click_link("Checkout") set_delivery_details(delivery_address: "123 N West St Oakland, CA", contact_email: "AhsokaTano@example.com", @@ -62,7 +62,7 @@ def url_options def add_product_to_cart(product) within("##{dom_id(product).gsub("product", "cart_product")}") do - click_on(t("marketplace.cart_product_component.add")) + click_link(t("marketplace.cart_product_component.add")) end end @@ -70,11 +70,11 @@ def set_delivery_details(delivery_address:, contact_phone_number:, contact_email fill_in("Delivery address", with: delivery_address) fill_in("Contact phone number", with: contact_phone_number) fill_in("Contact email", with: contact_email) - click_on("Save changes") + click_button("Save changes") end def pay(card_number:, card_expiry:, card_cvc:, billing_name:, email:, billing_postal_code:) - click_on("Make Payment") + click_button("Make Payment") fill_in("cardNumber", with: card_number) fill_in("cardExpiry", with: card_expiry) fill_in("cardCvc", with: card_cvc) diff --git a/spec/furniture/marketplace/collecting_payments_system_spec.rb b/spec/furniture/marketplace/collecting_payments_system_spec.rb index 6e8cb9e5c..67b096489 100644 --- a/spec/furniture/marketplace/collecting_payments_system_spec.rb +++ b/spec/furniture/marketplace/collecting_payments_system_spec.rb @@ -15,29 +15,29 @@ visit polymorphic_path(marketplace.room.location) within("##{dom_id(marketplace, :onboarding)}") do - click_on("Manage Marketplace") + click_link("Manage Marketplace") end - click_on("Payment Settings") + click_link("Payment Settings") within("#stripe_overview") do - click_on("Add Stripe Account") + click_link("Add Stripe Account") end - click_on("Add a Stripe API key to #{space.name}") - click_on("Add Utility") + click_link("Add a Stripe API key to #{space.name}") + click_link("Add Utility") select("stripe", from: "Type") fill_in("Name", with: "Test Stripe Account") - click_on("Create") - click_on("Edit stripe 'Test Stripe Account'") + click_button("Create") + click_link("Edit stripe 'Test Stripe Account'") fill_in("Api token", with: ENV.fetch("STRIPE_API_KEY", "not-a-real-key")) - click_on("Save changes to Stripe Utility") + click_button("Save changes to Stripe Utility") expect(page).to have_content("Test Stripe Account") expect(space.utilities).to exist(utility_slug: "stripe") expect(space.utilities.find_by(utility_slug: "stripe").utility.api_token).to eq(ENV.fetch("STRIPE_API_KEY", "not-a-real-key")) visit polymorphic_path(marketplace.location(:edit)) - click_on("Payment Settings") - click_on("View Stripe Account") + click_link("Payment Settings") + click_link("View Stripe Account") expect(page).to have_content("Connect to Stripe") end @@ -46,10 +46,10 @@ visit polymorphic_path(marketplace.room.location) within("##{dom_id(marketplace, :onboarding)}") do - click_on("Manage Marketplace") + click_link("Manage Marketplace") end - click_on("Payment Settings") - click_on("View Stripe Account") + click_link("Payment Settings") + click_link("View Stripe Account") expect(page).to have_content("Connect to Stripe") # @todo actually figure out how to do the connect to stripe bit :X end diff --git a/spec/support/system_helpers.rb b/spec/support/system_helpers.rb index a5dbb3e03..8c3efeaad 100644 --- a/spec/support/system_helpers.rb +++ b/spec/support/system_helpers.rb @@ -2,7 +2,7 @@ module Spec module SystemHelpers def sign_in(user, space) visit(polymorphic_path(space.location)) - click_link_or_button("Sign in") + click_link("Sign in") fill_in("authenticated_session[contact_location]", with: user.email) find('input[type="submit"]').click perform_enqueued_jobs diff --git a/spec/system/furniture_spec.rb b/spec/system/furniture_spec.rb index 466aaffee..4e9a05483 100644 --- a/spec/system/furniture_spec.rb +++ b/spec/system/furniture_spec.rb @@ -16,15 +16,15 @@ def add_gizmo(type, room:) visit(polymorphic_path(room.location(:edit))) select(type, from: "Type of gizmo") - click_link_or_button("Add Gizmo") + click_button("Add Gizmo") end def remove_gizmo(type, room:) visit(polymorphic_path(room.location(:edit))) expect(page).to have_text("Markdown Text Block") within("##{dom_id(room.gizmos.first)}") do - click_link_or_button "Configure Markdown Text Block" + click_link "Configure Markdown Text Block" end - click_link_or_button "Remove Gizmo" + click_link "Remove Gizmo" end end diff --git a/spec/system/sections_spec.rb b/spec/system/sections_spec.rb index e363d7ab1..af0a65d63 100644 --- a/spec/system/sections_spec.rb +++ b/spec/system/sections_spec.rb @@ -22,7 +22,7 @@ context "when the Section has no Gizmos" do it "deletes the Section from the Database" do - click_on(I18n.t("rooms.destroy.link_to")) + click_button(I18n.t("rooms.destroy.link_to")) expect(page).to have_content(I18n.t("rooms.destroy.success", room_name: section.name)) expect(space.rooms).not_to be_exist(id: section.id) @@ -41,7 +41,7 @@ # moment - ZS 10/18/23 it "requires confirmation" do accept_alert(I18n.t("rooms.destroy.confirm", room_name: section.name)) do - click_on(I18n.t("rooms.destroy.link_to")) + click_button(I18n.t("rooms.destroy.link_to")) end expect(page).to have_content(I18n.t("rooms.destroy.success", room_name: section.name)) From c5e89d2cde8f76e64d349c4cd91c406d34c940c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:17:54 +0000 Subject: [PATCH 59/60] Bump tailwindcss from 3.3.4 to 3.3.5 (#1907) --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index adb0190b1..56915b34c 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "postcss-flexbugs-fixes": "^5.0.2", "postcss-import": "^15.1.0", "postcss-preset-env": "^9.2.0", - "tailwindcss": "^3.3.4", + "tailwindcss": "^3.3.5", "webpack": "^5.76.0", "webpack-cli": "^5.1.4" } diff --git a/yarn.lock b/yarn.lock index a907c1959..f790404da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4092,10 +4092,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@^3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.4.tgz#f08c493ff3ddf03081c40e780e98f129e1c8214d" - integrity sha512-JXZNOkggUAc9T5E7nCrimoXHcSf9h3NWFe5sh36CGD/3M5TRLuQeFnQoDsit2uVTqgoOZHLx5rTykLUu16vsMQ== +tailwindcss@^3.3.5: + version "3.3.5" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.5.tgz#22a59e2fbe0ecb6660809d9cc5f3976b077be3b8" + integrity sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA== dependencies: "@alloc/quick-lru" "^5.2.0" arg "^5.0.2" From 91bc6b743a9c14a04dc7338321f84904aaa849bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 16:37:10 +0000 Subject: [PATCH 60/60] Bump @sentry/browser from 7.75.0 to 7.75.1 (#1908) --- package.json | 2 +- yarn.lock | 98 ++++++++++++++++++++++++++-------------------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/package.json b/package.json index 56915b34c..473184c13 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "@hotwired/turbo-rails": "^7.3.0", "@rails/actioncable": "^7.1.1", "@rails/activestorage": "^7.1.1", - "@sentry/browser": "^7.75.0", + "@sentry/browser": "^7.75.1", "@tailwindcss/forms": "^0.5.6", "@tailwindcss/typography": "^0.5.10", "@webpack-cli/serve": "^2.0.5", diff --git a/yarn.lock b/yarn.lock index f790404da..a0b9cf208 100644 --- a/yarn.lock +++ b/yarn.lock @@ -556,55 +556,55 @@ dependencies: spark-md5 "^3.0.1" -"@sentry-internal/tracing@7.75.0": - version "7.75.0" - resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.75.0.tgz#0d6cb4d3ff4ea6dd456f64455b2d505d7eb27656" - integrity sha512-/j4opF/jB9j8qnSiQK75/lFLtkfqXS5/MoOKc2KWK/pOaf15W+6uJzGQ8jRBHLYd9dDg6AyqsF48Wqy561/mNg== - dependencies: - "@sentry/core" "7.75.0" - "@sentry/types" "7.75.0" - "@sentry/utils" "7.75.0" - -"@sentry/browser@^7.75.0": - version "7.75.0" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.75.0.tgz#7ea88f335c7bbaf3b5eecbf4e12590785abc0ee7" - integrity sha512-DXH/69vzp2j8xjydX+lrUYasrk7a1mpbXFGA9GtnII7shMCy55+QkVxpa6cLojYUaG2K/8yFDMcrP9N395LnWg== - dependencies: - "@sentry-internal/tracing" "7.75.0" - "@sentry/core" "7.75.0" - "@sentry/replay" "7.75.0" - "@sentry/types" "7.75.0" - "@sentry/utils" "7.75.0" - -"@sentry/core@7.75.0": - version "7.75.0" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.75.0.tgz#d5477faf9afdfbf45b4ff46b809729f14d4e1b80" - integrity sha512-vXg3cdJgwzP24oTS9zFCgLW4MgTkMZqXx+ESRq7gTD9qJTpcmAmYT+Ckmvebg8K6DBThV6+0v61r50na2+XdrA== - dependencies: - "@sentry/types" "7.75.0" - "@sentry/utils" "7.75.0" - -"@sentry/replay@7.75.0": - version "7.75.0" - resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.75.0.tgz#0b1d9e9a6954ecc004597456f2c82e7630b8139c" - integrity sha512-TAAlj7JCMF6hFFL71RmPzVX89ltyPYFWR+t4SuWaBmU6HmTliI2eJvK+M36oE+N7s3CkyRVTaXXRe0YMwRMuZQ== - dependencies: - "@sentry-internal/tracing" "7.75.0" - "@sentry/core" "7.75.0" - "@sentry/types" "7.75.0" - "@sentry/utils" "7.75.0" - -"@sentry/types@7.75.0": - version "7.75.0" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.75.0.tgz#e171f1680785a155cb828942af890ad4ee657ca3" - integrity sha512-xG8OLADxG7HpGhMxrF4v4tKq/v/gqmLsTZ858R51pz0xCWM8SK6ZSWOKudkAGBIpRjI6RUHMnkBtRAN2aKDOkQ== - -"@sentry/utils@7.75.0": - version "7.75.0" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.75.0.tgz#7a638c4c027ca2018518ee8d2eead1397cb97d66" - integrity sha512-UHWKeevhUNRp+mAWDbMVFOMgseoq8t/xFgdUywO/2PC14qZKRBH+0k1BKoNkp5sOzDT06ETj2w6wYoYhy6i+dA== - dependencies: - "@sentry/types" "7.75.0" +"@sentry-internal/tracing@7.75.1": + version "7.75.1" + resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.75.1.tgz#978c5ec58a704c423a9b33a58ca3e3e6521725f8" + integrity sha512-nynV+7iVcF8k3CqhvI2K7iA8h4ovJhgYHKnXR8RDDevQOqNG2AEX9+hjCj9fZM4MhKHYFqf1od2oO9lTr38kwg== + dependencies: + "@sentry/core" "7.75.1" + "@sentry/types" "7.75.1" + "@sentry/utils" "7.75.1" + +"@sentry/browser@^7.75.1": + version "7.75.1" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.75.1.tgz#70422d26e2651443bcf15ea6bb5142774926c5ae" + integrity sha512-0+jPfPA5P9HVYYRQraDokGCY2NiMknSfz11dggClK4VmjvG+hOXiEyf73SFVwLFnv/hwrkWySjoIrVCX65xXQA== + dependencies: + "@sentry-internal/tracing" "7.75.1" + "@sentry/core" "7.75.1" + "@sentry/replay" "7.75.1" + "@sentry/types" "7.75.1" + "@sentry/utils" "7.75.1" + +"@sentry/core@7.75.1": + version "7.75.1" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.75.1.tgz#f48cc424990ee4f31541e93f2c0277bfd5be9ed3" + integrity sha512-Kw4KyKBxbxbh8OKO0S11Tm0gWP+6AaXXYrsq3hp8H338l/wOmIzyckmCbUrc/XJeoRqaFLJbdcCrcUEDZUvsVQ== + dependencies: + "@sentry/types" "7.75.1" + "@sentry/utils" "7.75.1" + +"@sentry/replay@7.75.1": + version "7.75.1" + resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.75.1.tgz#7790e80f7cb4dc856f5e72f70a51febd5898e04d" + integrity sha512-MKQTDWNYs9QXCJ+irGX5gu8Kxdk/Ds5puhILy8+DnCoXgXuPFRMGob1Sxt8qXmbQmcGeogsx221MNTselsRS6g== + dependencies: + "@sentry-internal/tracing" "7.75.1" + "@sentry/core" "7.75.1" + "@sentry/types" "7.75.1" + "@sentry/utils" "7.75.1" + +"@sentry/types@7.75.1": + version "7.75.1" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.75.1.tgz#48b11336a0e70433d41bbe41c617dd339d4992ea" + integrity sha512-km+ygqgMDaFfTrbQwdhrptFqx0Oq15jZABqIoIpbaOCkCAMm+tyCqrFS8dTfaq5wpCktqWOy2qU/DOpppO99Cg== + +"@sentry/utils@7.75.1": + version "7.75.1" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.75.1.tgz#169040ba13ff4d4ecccb7b7aa23f84724d108b97" + integrity sha512-QzW2eRjY20epD//9/tQ0FTNwdAL6XZi+LyJNUQIeK3NMnc5NgHrgpxId87gmFq8cNx47utH1Blub8RuMbKqiwQ== + dependencies: + "@sentry/types" "7.75.1" "@tailwindcss/forms@^0.5.6": version "0.5.6"