Add CommonJS builds for Kysely and Drizzle

Author: stevensJourney

package.json

@@ -33,13 +33,17 @@
     "@actions/core": "^1.10.1",
     "@changesets/cli": "2.27.2",
     "@pnpm/workspace.find-packages": "^4.0.2",
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-node-resolve": "15.2.3",
+    "@rollup/plugin-typescript": "^12.1.4",
     "@vitest/browser": "^3.2.4",
     "husky": "^9.0.11",
     "lint-staged": "^15.2.2",
     "playwright": "^1.51.0",
     "prettier": "^3.2.5",
     "prettier-plugin-embed": "^0.4.15",
     "prettier-plugin-sql": "^0.18.1",
+    "rollup": "4.14.3",
     "typescript": "^5.7.2",
     "vitest": "^3.2.4"
   }

packages/attachments/package.json

@@ -17,22 +17,23 @@
   },
   "description": "An PowerSync library to manage attachments for TypeScript and React Native apps",
   "type": "module",
-  "main": "./lib/index.js",
+  "main": "./dist/index.cjs",
   "module": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "exports": {
     ".": {
       "types": "./lib/index.d.ts",
       "import": "./lib/index.js",
+      "require": "./dist/index.cjs",
       "default": "./lib/index.js"
     }
   },
   "files": [
     "lib"
   ],
   "scripts": {
-    "build": "tsc -b",
-    "build:prod": "tsc -b --sourceMap false",
+    "build": "tsc -b && rollup --config",
+    "build:prod": "tsc -b --sourceMap false && rollup --config --sourceMap=false",
     "clean": "rm -rf lib",
     "watch": "tsc -b -w",
     "test": "pnpm build && vitest"

packages/attachments/rollup.config.js

@@ -0,0 +1,31 @@
+import commonjs from '@rollup/plugin-commonjs';
+import resolve from '@rollup/plugin-node-resolve';
+import typescript from '@rollup/plugin-typescript';
+
+/** @type {import('rollup').RollupOptions} */
+export default (commandLineArgs) => {
+  const sourceMap = (commandLineArgs.sourceMap || 'true') == 'true';
+
+  // Clears rollup CLI warning https://github.com/rollup/rollup/issues/2694
+  delete commandLineArgs.sourceMap;
+
+  return {
+    input: 'src/index.ts',
+    output: {
+      format: 'cjs',
+      file: 'dist/index.cjs',
+      sourcemap: sourceMap,
+      exports: 'named'
+    },
+    plugins: [
+      resolve(),
+      commonjs(),
+      typescript({
+        tsconfig: './tsconfig.json',
+        outDir: 'dist',
+        sourceMap
+      })
+    ],
+    external: ['@powersync/common']
+  };
+};

packages/drizzle-driver/package.json

@@ -3,13 +3,14 @@
   "version": "0.4.0",
   "description": "Drizzle driver for PowerSync",
   "type": "module",
-  "main": "lib/src/index.js",
+  "main": "dist/index.cjs",
   "module": "lib/src/index.js",
   "types": "lib/src/index.d.ts",
   "exports": {
     ".": {
       "types": "./lib/src/index.d.ts",
       "import": "./lib/src/index.js",
+      "require": "./dist/index.cjs",
       "default": "./lib/src/index.js"
     }
   },
@@ -28,8 +29,8 @@
   },
   "homepage": "https://docs.powersync.com",
   "scripts": {
-    "build": "tsc --build",
-    "build:prod": "tsc --build --sourceMap false",
+    "build": "tsc -b && rollup --config",
+    "build:prod": "tsc -b --sourceMap false && rollup --config --sourceMap=false",
     "clean": "rm -rf lib",
     "watch": "tsc --build -w",
     "test": "vitest"

packages/drizzle-driver/rollup.config.js

@@ -0,0 +1,36 @@
+import commonjs from '@rollup/plugin-commonjs';
+import resolve from '@rollup/plugin-node-resolve';
+import typescript from '@rollup/plugin-typescript';
+
+/** @type {import('rollup').RollupOptions} */
+export default (commandLineArgs) => {
+  const sourceMap = (commandLineArgs.sourceMap || 'true') == 'true';
+
+  // Clears rollup CLI warning https://github.com/rollup/rollup/issues/2694
+  delete commandLineArgs.sourceMap;
+
+  return {
+    input: 'src/index.ts',
+    output: {
+      format: 'cjs',
+      file: 'dist/index.cjs',
+      sourcemap: sourceMap,
+      exports: 'named'
+    },
+    plugins: [
+      resolve(),
+      commonjs(),
+      typescript({
+        tsconfig: './tsconfig.json',
+        outDir: 'dist',
+        sourceMap,
+        /**
+         * The Typescript plugin complains about internal Drizzle types not matching when selecting
+         * other moduleResolution settings.
+         */
+        moduleResolution: 'bundler'
+      })
+    ],
+    external: ['@powersync/common', /^drizzle-orm(\/.*)?$/]
+  };
+};

packages/kysely-driver/package.json

@@ -3,13 +3,14 @@
   "version": "1.2.0",
   "description": "Kysely driver for PowerSync",
   "type": "module",
-  "main": "lib/src/index.js",
+  "main": "dist/index.cjs",
   "module": "lib/src/index.js",
   "types": "lib/src/index.d.ts",
   "exports": {
     ".": {
       "types": "./lib/src/index.d.ts",
       "import": "./lib/src/index.js",
+      "require": "./dist/index.cjs",
       "default": "./lib/src/index.js"
     }
   },
@@ -28,8 +29,8 @@
   },
   "homepage": "https://docs.powersync.com",
   "scripts": {
-    "build": "tsc --build",
-    "build:prod": "tsc --build --sourceMap false",
+    "build": "tsc -b && rollup --config",
+    "build:prod": "tsc -b --sourceMap false && rollup --config --sourceMap=false",
     "clean": "rm -rf lib",
     "watch": "tsc --build -w",
     "test": "pnpm build && vitest"

packages/kysely-driver/rollup.config.js

@@ -0,0 +1,31 @@
+import commonjs from '@rollup/plugin-commonjs';
+import resolve from '@rollup/plugin-node-resolve';
+import typescript from '@rollup/plugin-typescript';
+
+/** @type {import('rollup').RollupOptions} */
+export default (commandLineArgs) => {
+  const sourceMap = (commandLineArgs.sourceMap || 'true') == 'true';
+
+  // Clears rollup CLI warning https://github.com/rollup/rollup/issues/2694
+  delete commandLineArgs.sourceMap;
+
+  return {
+    input: 'src/index.ts',
+    output: {
+      format: 'cjs',
+      file: 'dist/index.cjs',
+      sourcemap: sourceMap,
+      exports: 'named'
+    },
+    plugins: [
+      resolve(),
+      commonjs(),
+      typescript({
+        tsconfig: './tsconfig.json',
+        outDir: 'dist',
+        sourceMap
+      })
+    ],
+    external: ['@powersync/common', 'kysely']
+  };
+};

packages/react/package.json

@@ -7,10 +7,18 @@
   },
   "description": "React components for JourneyApps PowerSync",
   "main": "./lib/index.js",
+  "module": "lib/index.js",
   "types": "./lib/index.d.ts",
   "files": [
     "lib"
   ],
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "import": "./lib/index.js",
+      "default": "./lib/index.js"
+    }
+  },
   "scripts": {
     "build": "tsc -b",
     "build:prod": "tsc -b --sourceMap false",

packages/web/src/db/sync/WebStreamingSyncImplementation.ts

@@ -1,7 +1,6 @@
 import {
   AbstractStreamingSyncImplementation,
   AbstractStreamingSyncImplementationOptions,
-  createLogger,
   LockOptions,
   LockType
 } from '@powersync/common';
@@ -25,7 +24,7 @@ export class WebStreamingSyncImplementation extends AbstractStreamingSyncImpleme
     return this.options as WebStreamingSyncImplementationOptions;
   }
 
-  obtainLock<T>(lockOptions: LockOptions<T>): Promise<T> {
+  async obtainLock<T>(lockOptions: LockOptions<T>): Promise<T> {
     const identifier = `streaming-sync-${lockOptions.type}-${this.webOptions.identifier}`;
     if (lockOptions.type == LockType.SYNC) {
       this.logger.debug('requesting lock for ', identifier);

packages/web/src/worker/db/WASQLiteDB.worker.ts

@@ -3,6 +3,7 @@
  */
 
 import '@journeyapps/wa-sqlite';
+import { createBaseLogger, createLogger } from '@powersync/common';
 import * as Comlink from 'comlink';
 import { AsyncDatabaseConnection } from '../../db/adapters/AsyncDatabaseConnection';
 import { WASqliteConnection } from '../../db/adapters/wa-sqlite/WASQLiteConnection';
@@ -11,7 +12,6 @@ import {
   WorkerDBOpenerOptions
 } from '../../db/adapters/wa-sqlite/WASQLiteOpenFactory';
 import { getNavigatorLocks } from '../../shared/navigator';
-import { createBaseLogger, createLogger } from '@powersync/common';
 
 const baseLogger = createBaseLogger();
 baseLogger.useDefaults();
@@ -71,10 +71,10 @@ const openDBShared = async (options: WorkerDBOpenerOptions): Promise<AsyncDataba
 
     const wrappedConnection = {
       ...db,
-      init: Comlink.proxy(() => {
+      init: Comlink.proxy(async () => {
         // the init has been done automatically
       }),
-      close: Comlink.proxy(() => {
+      close: Comlink.proxy(async () => {
         const { clientIds } = dbEntry;
         logger.debug(`Close requested from client ${clientId} of ${[...clientIds]}`);
         clientIds.delete(clientId);