From d23532c0c2bb8c11a07596f985c65c755b9be359 Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Thu, 24 Apr 2025 11:28:59 +0200
Subject: [PATCH 1/5] fix(remix): Add ESM-compatible exports

---
 packages/remix/package.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/remix/package.json b/packages/remix/package.json
index 732f96613c41..081d048f9bd1 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -24,11 +24,15 @@
     "./package.json": "./package.json",
     ".": {
       "types": "./build/types/index.types.d.ts",
+      "default": "./build/esm/index.client.js",
       "browser": {
         "import": "./build/esm/index.client.js",
         "require": "./build/cjs/index.client.js"
       },
-      "node": "./build/cjs/index.server.js"
+      "node": {
+        "import": "./build/esm/index.server.js",
+        "require": "./build/cjs/index.server.js"
+      }
     },
     "./cloudflare": {
       "import": "./build/esm/cloudflare/index.js",

From 76b2469991dae4254a1544d4f520377fc966fb38 Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Thu, 24 Apr 2025 12:17:59 +0200
Subject: [PATCH 2/5] set default to cjs

---
 packages/remix/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/remix/package.json b/packages/remix/package.json
index 081d048f9bd1..09f55034030e 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -24,7 +24,7 @@
     "./package.json": "./package.json",
     ".": {
       "types": "./build/types/index.types.d.ts",
-      "default": "./build/esm/index.client.js",
+      "default": "./build/cjs/index.client.js",
       "browser": {
         "import": "./build/esm/index.client.js",
         "require": "./build/cjs/index.client.js"

From 1383761809289bfc8304888c4af80c3fc3cab14e Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Thu, 24 Apr 2025 14:00:19 +0200
Subject: [PATCH 3/5] change default to server import

---
 packages/remix/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/remix/package.json b/packages/remix/package.json
index 09f55034030e..f8c401ffbc50 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -24,7 +24,7 @@
     "./package.json": "./package.json",
     ".": {
       "types": "./build/types/index.types.d.ts",
-      "default": "./build/cjs/index.client.js",
+      "import": "./build/esm/index.server.js",
       "browser": {
         "import": "./build/esm/index.client.js",
         "require": "./build/cjs/index.client.js"

From 130cbd92b5004e0c307812ec862e48c6889dc141 Mon Sep 17 00:00:00 2001
From: s1gr1d <sigrid.huemer@posteo.at>
Date: Thu, 24 Apr 2025 14:10:40 +0200
Subject: [PATCH 4/5] remove default

---
 packages/remix/package.json | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/remix/package.json b/packages/remix/package.json
index f8c401ffbc50..91b2916a7356 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -24,14 +24,15 @@
     "./package.json": "./package.json",
     ".": {
       "types": "./build/types/index.types.d.ts",
-      "import": "./build/esm/index.server.js",
       "browser": {
         "import": "./build/esm/index.client.js",
-        "require": "./build/cjs/index.client.js"
+        "require": "./build/cjs/index.client.js",
+        "default": "./build/cjs/index.client.js"
       },
       "node": {
         "import": "./build/esm/index.server.js",
-        "require": "./build/cjs/index.server.js"
+        "require": "./build/cjs/index.server.js",
+        "default": "./build/cjs/index.server.js"
       }
     },
     "./cloudflare": {

From 826ae7b55ca5b3de09f1f0660ce687555e7fa71b Mon Sep 17 00:00:00 2001
From: Onur Temizkan <onur@narval.co.uk>
Date: Fri, 25 Apr 2025 11:25:13 +0100
Subject: [PATCH 5/5] Try setting `worker` entry

---
 packages/remix/package.json | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/remix/package.json b/packages/remix/package.json
index 91b2916a7356..4d4d6fb88c16 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -29,10 +29,11 @@
         "require": "./build/cjs/index.client.js",
         "default": "./build/cjs/index.client.js"
       },
-      "node": {
-        "import": "./build/esm/index.server.js",
-        "require": "./build/cjs/index.server.js",
-        "default": "./build/cjs/index.server.js"
+      "node": "./build/cjs/index.server.js",
+      "worker": {
+        "import": "./build/esm/cloudflare/index.js",
+        "require": "./build/cjs/cloudflare/index.js",
+        "default": "./build/esm/cloudflare/index.js"
       }
     },
     "./cloudflare": {