From 290d2f7db18473e32b103b27ff4562bbdf63b06a Mon Sep 17 00:00:00 2001
From: Nikos Douvlis <nikosdouvlis@gmail.com>
Date: Wed, 24 Dec 2025 16:46:13 +0200
Subject: [PATCH 1/2] fix(backend): bundle cookie package to fix cjs/esm issues

Why: CJS cookie package causing module compatibility problems in Astro and TanStack Start
What: Move cookie to devDependencies and bundle with tsup noExternal config
---
 packages/backend/package.json   | 2 +-
 packages/backend/tsup.config.ts | 2 +-
 pnpm-lock.yaml                  | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 2198a390157..6ba972f19f0 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -110,12 +110,12 @@
   },
   "dependencies": {
     "@clerk/shared": "workspace:^",
-    "cookie": "1.0.2",
     "standardwebhooks": "^1.0.0",
     "tslib": "catalog:repo"
   },
   "devDependencies": {
     "@edge-runtime/vm": "5.0.0",
+    "cookie": "1.0.2",
     "msw": "2.11.6",
     "npm-run-all": "^4.1.5",
     "snakecase-keys": "9.0.2",
diff --git a/packages/backend/tsup.config.ts b/packages/backend/tsup.config.ts
index 70ad241fe25..a501053eb06 100644
--- a/packages/backend/tsup.config.ts
+++ b/packages/backend/tsup.config.ts
@@ -21,7 +21,7 @@ export default defineConfig(overrideOptions => {
     bundle: true,
     clean: true,
     minify: false,
-    noExternal: ['snakecase-keys'],
+    noExternal: ['snakecase-keys', 'cookie'],
   };
 
   const esm: Options = {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4755c33c29d..650aacf832f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -394,9 +394,6 @@ importers:
       '@clerk/shared':
         specifier: workspace:^
         version: link:../shared
-      cookie:
-        specifier: 1.0.2
-        version: 1.0.2
       standardwebhooks:
         specifier: ^1.0.0
         version: 1.0.0
@@ -407,6 +404,9 @@ importers:
       '@edge-runtime/vm':
         specifier: 5.0.0
         version: 5.0.0
+      cookie:
+        specifier: 1.0.2
+        version: 1.0.2
       msw:
         specifier: 2.11.6
         version: 2.11.6(@types/node@22.19.0)(typescript@5.8.3)
@@ -2427,7 +2427,7 @@ packages:
 
   '@expo/bunyan@4.0.1':
     resolution: {integrity: sha512-+Lla7nYSiHZirgK+U/uYzsLv/X+HaJienbD5AKX1UQZHYfWaP+9uuQluRB4GrEVWF0GZ7vEVp/jzaOT9k/SQlg==}
-    engines: {node: '>=0.10.0'}
+    engines: {'0': node >=0.10.0}
 
   '@expo/cli@0.22.26':
     resolution: {integrity: sha512-I689wc8Fn/AX7aUGiwrh3HnssiORMJtR2fpksX+JIe8Cj/EDleblYMSwRPd0025wrwOV9UN1KM/RuEt/QjCS3Q==}

From 00dda79c4cb3a2215ea89da1d550558236200154 Mon Sep 17 00:00:00 2001
From: Nikos Douvlis <nikosdouvlis@gmail.com>
Date: Wed, 24 Dec 2025 16:55:11 +0200
Subject: [PATCH 2/2] Create rotten-months-repair.md

---
 .changeset/rotten-months-repair.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/rotten-months-repair.md

diff --git a/.changeset/rotten-months-repair.md b/.changeset/rotten-months-repair.md
new file mode 100644
index 00000000000..594126ce128
--- /dev/null
+++ b/.changeset/rotten-months-repair.md
@@ -0,0 +1,5 @@
+---
+"@clerk/backend": patch
+---
+
+Move cookie to devDependencies and bundle it within @clerk/backend to fix module compatibility problems in TanStack Start apps.