Reduce bundling code

Author: simolus3

packages/common/package.json

@@ -12,6 +12,16 @@
   "types": "lib/index.d.ts",
   "exports": {
     ".": {
+      "node": {
+        "import": {
+          "types": "./lib/index.d.ts",
+          "default": "./dist/bundle.node.mjs"
+        },
+        "require": {
+          "types": "./dist/index.d.cts",
+          "require": "./dist/bundle.node.cjs"
+        }
+      },
       "import": {
         "types": "./lib/index.d.ts",
         "default": "./dist/bundle.mjs"
@@ -47,19 +57,19 @@
     "async-mutex": "^0.5.0",
     "bson": "^6.10.4",
     "buffer": "^6.0.3",
-    "event-iterator": "^2.0.0",
-    "rsocket-core": "1.0.0-alpha.3",
-    "rsocket-websocket-client": "1.0.0-alpha.3"
+    "event-iterator": "^2.0.0"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^29.0.0",
+    "@rollup/plugin-inject": "^5.0.5",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "15.2.3",
     "@types/node": "^20.5.9",
     "@types/uuid": "^9.0.1",
     "rollup": "^4.52.5",
-    "rollup-plugin-node-externals": "^8.1.1",
     "cross-fetch": "^4.0.0",
-    "js-logger": "^1.6.1"
+    "js-logger": "^1.6.1",
+    "rsocket-core": "1.0.0-alpha.3",
+    "rsocket-websocket-client": "1.0.0-alpha.3"
   }
 }

packages/common/rollup.config.mjs

@@ -1,30 +1,49 @@
+import * as path from 'node:path';
+
 import commonjs from '@rollup/plugin-commonjs';
+import inject from '@rollup/plugin-inject';
 import json from '@rollup/plugin-json';
 import nodeResolve from '@rollup/plugin-node-resolve';
-import { nodeExternals } from 'rollup-plugin-node-externals';
 import { dts } from 'rollup-plugin-dts';
 
+function defineBuild(isNode) {
+  const suffix = isNode ? '.node' : '';
+
+  return {
+    input: 'lib/index.js',
+    output: [
+      {
+        file: `dist/bundle${suffix}.mjs`,
+        format: 'esm',
+        sourcemap: true
+      },
+      {
+        file: `dist/bundle${suffix}.cjs`,
+        format: 'cjs',
+        sourcemap: true
+      }
+    ],
+    plugins: [
+      [
+        json(),
+        nodeResolve({ preferBuiltins: false, browser: true }),
+        commonjs({}),
+        inject({
+          Buffer: isNode ? 'node:buffer' : path.resolve('lib/buffer.js')
+        })
+      ]
+    ],
+    external: ['async-mutex', 'bson', 'buffer/', 'event-iterator']
+  };
+}
+
 /**
  * @returns {import('rollup').RollupOptions}
  */
-export default (commandLineArgs) => {
+export default () => {
   return [
-    {
-      input: 'lib/index.js',
-      output: [
-        {
-          file: 'dist/bundle.mjs',
-          format: 'esm',
-          sourcemap: true
-        },
-        {
-          file: 'dist/bundle.cjs',
-          format: 'cjs',
-          sourcemap: true
-        }
-      ],
-      plugins: [json(), nodeResolve({ preferBuiltins: false, browser: true }), commonjs({}), nodeExternals()]
-    },
+    defineBuild(false),
+    defineBuild(true),
     {
       input: './lib/index.d.ts',
       output: [{ file: 'dist/index.d.cts', format: 'cjs' }],

packages/common/src/buffer.ts

@@ -0,0 +1,3 @@
+import { Buffer } from 'buffer/';
+
+export default Buffer;

packages/common/src/client/sync/stream/AbstractRemote.ts

@@ -1,5 +1,4 @@
 import type { BSON } from 'bson';
-import { Buffer } from 'buffer';
 import { type fetch } from 'cross-fetch';
 import Logger, { ILogger } from 'js-logger';
 import { RSocket, RSocketConnector, Requestable } from 'rsocket-core';
@@ -263,6 +262,14 @@ export abstract class AbstractRemote {
    */
   abstract getBSON(): Promise<BSONImplementation>;
 
+  /**
+   * @returns A text decoder decoding UTF-8. This is a method to allow patching it for Hermes which doesn't support the
+   * builtin, without forcing us to bundle a polyfill with `@powersync/common`.
+   */
+  protected createTextDecoder(): TextDecoder {
+    return new TextDecoder();
+  }
+
   protected createSocket(url: string): WebSocket {
     return new WebSocket(url);
   }
@@ -564,7 +571,7 @@ export abstract class AbstractRemote {
       closeReader();
     });
 
-    const decoder = new TextDecoder();
+    const decoder = this.createTextDecoder();
     let buffer = '';
 
     const stream = new DataStream<T, string>({

packages/react-native/package.json

@@ -57,7 +57,7 @@
     "@rollup/plugin-terser": "^0.4.4",
     "@types/async-lock": "^1.4.0",
     "async-lock": "^1.4.0",
-    "bson": "^6.6.0",
+    "bson": "^6.10.4",
     "react": "18.3.1",
     "react-native": "0.72.4",
     "react-native-fetch-api": "^3.0.0",

packages/react-native/src/sync/stream/ReactNativeRemote.ts

@@ -14,6 +14,7 @@ import {
 import { Platform } from 'react-native';
 // Note docs for React Native https://github.com/mongodb/js-bson?tab=readme-ov-file#react-native
 import { BSON } from 'bson';
+import { TextDecoder } from 'text-encoding';
 
 import { fetch } from 'react-native-fetch-api';
 
@@ -55,6 +56,10 @@ export class ReactNativeRemote extends AbstractRemote {
     return BSON;
   }
 
+  protected createTextDecoder(): TextDecoder {
+    return new TextDecoder();
+  }
+
   async postStreamRaw<T>(options: SyncStreamOptions, mapLine: (line: string) => T): Promise<DataStream<T>> {
     const timeout =
       Platform.OS == 'android'

packages/web/package.json

@@ -66,7 +66,7 @@
   "dependencies": {
     "@powersync/common": "workspace:*",
     "async-mutex": "^0.4.0",
-    "bson": "^6.6.0",
+    "bson": "^6.10.4",
     "comlink": "^4.4.2",
     "commander": "^12.1.0"
   },