From cc2c71ad4aa4fe1f3f493c1b11e3ae4f4c15c3eb Mon Sep 17 00:00:00 2001
From: Christiaan Landman <chriz.ek@gmail.com>
Date: Wed, 25 Jun 2025 14:17:10 +0200
Subject: [PATCH 1/3] CommonJS output added for @powersync/common

---
 .changeset/orange-turtles-beam.md |  5 +++++
 packages/common/package.json      |  1 +
 packages/common/rollup.config.mjs | 17 ++++++++++++-----
 3 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/orange-turtles-beam.md

diff --git a/.changeset/orange-turtles-beam.md b/.changeset/orange-turtles-beam.md
new file mode 100644
index 00000000..5078991d
--- /dev/null
+++ b/.changeset/orange-turtles-beam.md
@@ -0,0 +1,5 @@
+---
+'@powersync/common': patch
+---
+
+CommonJS output added.
diff --git a/packages/common/package.json b/packages/common/package.json
index 7f424d13..2f57a52e 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -14,6 +14,7 @@
     ".": {
       "import": "./dist/bundle.mjs",
       "default": "./dist/bundle.mjs",
+      "require": "./dist/bundle.cjs",
       "types": "./lib/index.d.ts"
     }
   },
diff --git a/packages/common/rollup.config.mjs b/packages/common/rollup.config.mjs
index 1fc8fedd..792ba783 100644
--- a/packages/common/rollup.config.mjs
+++ b/packages/common/rollup.config.mjs
@@ -15,11 +15,18 @@ export default (commandLineArgs) => {
 
   return {
     input: 'lib/index.js',
-    output: {
-      file: 'dist/bundle.mjs',
-      format: 'esm',
-      sourcemap: sourceMap
-    },
+    output: [
+      {
+        file: 'dist/bundle.mjs',
+        format: 'esm',
+        sourcemap: sourceMap
+      },
+      {
+        file: 'dist/bundle.cjs',
+        format: 'cjs',
+        sourcemap: sourceMap
+      }
+    ],
     plugins: [
       json(),
       nodeResolve({ preferBuiltins: false, browser: true }),

From c6947f965ab667aa5df7039a55423c181e731e30 Mon Sep 17 00:00:00 2001
From: Christiaan Landman <chriz.ek@gmail.com>
Date: Wed, 25 Jun 2025 16:03:45 +0200
Subject: [PATCH 2/3] Moved default export entry to the end of the list.
 According to the docs, this condition should always come last.

---
 packages/common/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/common/package.json b/packages/common/package.json
index 2f57a52e..180f0599 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -13,9 +13,9 @@
   "exports": {
     ".": {
       "import": "./dist/bundle.mjs",
-      "default": "./dist/bundle.mjs",
       "require": "./dist/bundle.cjs",
-      "types": "./lib/index.d.ts"
+      "types": "./lib/index.d.ts",
+      "default": "./dist/bundle.mjs"
     }
   },
   "author": "JOURNEYAPPS",

From c7cc82ffd5459f3a7b1b168f92f382d0751b50e4 Mon Sep 17 00:00:00 2001
From: Christiaan Landman <chriz.ek@gmail.com>
Date: Wed, 25 Jun 2025 16:07:19 +0200
Subject: [PATCH 3/3] Updated changeset entry.

---
 .changeset/orange-turtles-beam.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/orange-turtles-beam.md b/.changeset/orange-turtles-beam.md
index 5078991d..cb38e877 100644
--- a/.changeset/orange-turtles-beam.md
+++ b/.changeset/orange-turtles-beam.md
@@ -2,4 +2,4 @@
 '@powersync/common': patch
 ---
 
-CommonJS output added.
+Added CommonJs output for common package. Ensuring default export entry is last so that require statements don't use .mjs output instead of .cjs.