From ca983966d92b42f53d9f00e06861e8936c39cc6f Mon Sep 17 00:00:00 2001
From: Rodrigo Pombo <pombopombopombo@gmail.com>
Date: Mon, 23 Dec 2024 17:34:38 +0100
Subject: [PATCH 1/3] Use pull_request_target for write permissions

---
 .github/workflows/pr-merged.yml  | 4 +++-
 .github/workflows/pr-updated.yml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-merged.yml b/.github/workflows/pr-merged.yml
index f0d31127..76d9a2cb 100644
--- a/.github/workflows/pr-merged.yml
+++ b/.github/workflows/pr-merged.yml
@@ -1,7 +1,7 @@
 name: PR Merged
 
 on:
-  pull_request:
+  pull_request_target:
     types: [closed]
     branches:
       - next
@@ -21,6 +21,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          ref: "${{ github.event.pull_request.head.sha }}"
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4
diff --git a/.github/workflows/pr-updated.yml b/.github/workflows/pr-updated.yml
index d138acc5..096b894b 100644
--- a/.github/workflows/pr-updated.yml
+++ b/.github/workflows/pr-updated.yml
@@ -1,7 +1,7 @@
 name: PR Updated
 
 on:
-  pull_request:
+  pull_request_target:
     branches:
       - next
 
@@ -21,6 +21,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          ref: "${{ github.event.pull_request.head.sha }}"
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4

From 6f9b4c19d76bdc6808664918dc5bdb238907dd60 Mon Sep 17 00:00:00 2001
From: Rodrigo Pombo <pombopombopombo@gmail.com>
Date: Mon, 23 Dec 2024 17:37:25 +0100
Subject: [PATCH 2/3] Fix merged commit

---
 .github/workflows/pr-merged.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-merged.yml b/.github/workflows/pr-merged.yml
index 76d9a2cb..52b3bb80 100644
--- a/.github/workflows/pr-merged.yml
+++ b/.github/workflows/pr-merged.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: "${{ github.event.pull_request.head.sha }}"
+          ref: "${{ github.event.pull_request.merge_commit_sha }}"
 
       - name: Install pnpm
         uses: pnpm/action-setup@v4

From 59d5d02d4542ca8c330bdcba46b696240db2b782 Mon Sep 17 00:00:00 2001
From: 87xie <oscar87xie@gmail.com>
Date: Thu, 26 Dec 2024 00:06:44 +0800
Subject: [PATCH 3/3] docs: improve text contrast for hover and focus examples
 in light mode

---
 apps/web/demos/focus/code.tsx | 4 ++--
 apps/web/demos/hover/page.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/web/demos/focus/code.tsx b/apps/web/demos/focus/code.tsx
index e3f3ea1e..d357c6fe 100644
--- a/apps/web/demos/focus/code.tsx
+++ b/apps/web/demos/focus/code.tsx
@@ -35,10 +35,10 @@ export function CodeContainer({ code }: { code: HighlightedCode }) {
         }}
         handlers={[focus]}
       />
-      <div className="p-2 mt-auto font-light text-center">
+      <div className="p-2 mt-auto font-light text-center text-white">
         You can also change the focus annotations on a rendered codeblock:
       </div>
-      <div className="flex justify-center gap-2 pb-4">
+      <div className="flex justify-center gap-2 pb-4 text-white">
         <button
           onClick={() => setFocused("lorem")}
           disabled={focused === "lorem"}
diff --git a/apps/web/demos/hover/page.tsx b/apps/web/demos/hover/page.tsx
index a7e54f91..4eb31af2 100644
--- a/apps/web/demos/hover/page.tsx
+++ b/apps/web/demos/hover/page.tsx
@@ -16,7 +16,7 @@ export default function Page() {
 
 function HoverContainer(props: { children: React.ReactNode }) {
   return (
-    <div className="bg-zinc-900/80 px-2 rounded hover-container">
+    <div className="bg-zinc-900/80 px-2 rounded hover-container text-white">
       {props.children}
     </div>
   )