From b48d22dd62eccccf4c208cec2ac8d96165d2ab04 Mon Sep 17 00:00:00 2001
From: kivvvvv <sirapop.iam.0131@gmail.com>
Date: Mon, 12 Aug 2024 14:16:49 +0700
Subject: [PATCH 1/2] fix: component props from attrs not respecting provided
 transient props

---
 src/index.test.tsx | 16 ++++++++++++++++
 src/index.tsx      |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/index.test.tsx b/src/index.test.tsx
index 8d82a5c..b102d90 100644
--- a/src/index.test.tsx
+++ b/src/index.test.tsx
@@ -279,4 +279,20 @@ describe("twc", () => {
     expect(svg).toBeDefined();
     expect(svg.tagName).toBe("SVG");
   });
+
+  test("component props from attrs should respect provided transient props", () => {
+    type ButtonProps = TwcComponentProps<"button"> & {
+      variant: "primary" | "secondary";
+    };
+    const Button = twc.button
+      .transientProps(["variant"])
+      .attrs<ButtonProps>(({ type = "button", variant }) => {
+        expect(variant).toBe("primary");
+        return { type };
+      })`text-xl`;
+    render(<Button data-testid="button" variant="primary" />);
+
+    const renderedButton = screen.getByTestId("button");
+    expect(renderedButton.getAttribute("variant")).toBeNull();
+  });
 });
diff --git a/src/index.tsx b/src/index.tsx
index 083d28c..42999d9 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -171,7 +171,7 @@ export const createTwc = <TCompose extends AbstractCompose = typeof clsx>(
 
       if (attrs === undefined) {
         template.attrs = (attrs: Attributes) => {
-          return createTemplate(attrs);
+          return createTemplate(attrs, shouldForwardProp);
         };
       }
 

From 2d190bcf19e484fc39b0792b83e2238d7cb6d05f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Berg=C3=A9?= <berge.greg@gmail.com>
Date: Sun, 18 Aug 2024 16:03:04 +0200
Subject: [PATCH 2/2] chore: fix pnpm install

---
 .github/composite-actions/install/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/composite-actions/install/action.yml b/.github/composite-actions/install/action.yml
index ee80fd9..69b2c9e 100644
--- a/.github/composite-actions/install/action.yml
+++ b/.github/composite-actions/install/action.yml
@@ -4,9 +4,9 @@ description: "Sets up Node.js and runs install"
 runs:
   using: composite
   steps:
-    - uses: pnpm/action-setup@v2.2.4
+    - uses: pnpm/action-setup@v4
       with:
-        version: 8
+        version: 9
 
     - name: Setup Node.js
       uses: actions/setup-node@v3