From 1112cde0d78780eb88091808ac55b907f0966e40 Mon Sep 17 00:00:00 2001 From: Cameron Dutro Date: Tue, 21 Feb 2023 10:56:26 -0800 Subject: [PATCH 1/2] Fix condition for including polymorphic slots module --- app/components/primer/component.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/primer/component.rb b/app/components/primer/component.rb index c7827b0c4c..ccdd0b6940 100644 --- a/app/components/primer/component.rb +++ b/app/components/primer/component.rb @@ -12,7 +12,7 @@ class Component < ViewComponent::Base end if Module.const_defined?("ViewComponent::PolymorphicSlots") && - ViewComponent::Base < ViewComponent::PolymorphicSlots + !(ViewComponent::Base < ViewComponent::PolymorphicSlots) include ViewComponent::PolymorphicSlots end From 0b2ccc30b03295c5d8081ee1872bd61dff3c70bb Mon Sep 17 00:00:00 2001 From: Cameron Dutro Date: Tue, 21 Feb 2023 11:00:24 -0800 Subject: [PATCH 2/2] Add changeset --- .changeset/shaggy-apes-listen.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/shaggy-apes-listen.md diff --git a/.changeset/shaggy-apes-listen.md b/.changeset/shaggy-apes-listen.md new file mode 100644 index 0000000000..cd441a19c9 --- /dev/null +++ b/.changeset/shaggy-apes-listen.md @@ -0,0 +1,5 @@ +--- +'@primer/view-components': patch +--- + +Fix conditional inclusion of polymorphic slots module