Merge branch 'main' into op-sqlite-tests

Author: Chriztiaan

.changeset/green-buckets-talk.md

@@ -0,0 +1,5 @@
+---
+'@powersync/op-sqlite': patch
+---
+
+Promoting package to Beta release.

.changeset/honest-melons-laugh.md

@@ -0,0 +1,5 @@
+---
+'@powersync/web': patch
+---
+
+Fixed issue where broadcast logger wasn't being passed to WebRemote, causing worker remote logs not to be broadcasted to the tab's logs.

demos/react-native-barebones-opsqlite/README.md

@@ -1,8 +1,8 @@
-# PowerSync React Native Barebones OPSQlite
+# PowerSync React Native Barebones OP-SQlite
 
 ## Overview
 
-This is a minimal example demonstrating a barebones react native project using OPSQLite . It shows an update to the local SQLite DB on app launch.
+This is a minimal example demonstrating a barebones React Native project using OP-SQLite. It shows an update to the local SQLite DB on app launch.
 
 
 ## Getting Started

packages/powersync-op-sqlite/README.md

@@ -6,9 +6,9 @@ This package (`packages/powersync-op-sqlite`) enables using [OP-SQLite](https://
 
 If you are not yet familiar with PowerSync, please see the [PowerSync React Native SDK README](https://github.com/powersync-ja/powersync-js/tree/main/packages/react-native) for more information.
 
-### Alpha release
+## Beta Release
 
-This package is currently in an alpha release. If you find a bug or issue, please open a [GitHub issue](https://github.com/powersync-ja/powersync-js/issues). Questions or feedback can be posted on our [community Discord](https://discord.gg/powersync) - we'd love to hear from you.
+This package is currently in a beta release.
 
 ## Installation
 

packages/react-native/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @powersync/react-native
 
+## 1.20.2
+
+### Patch Changes
+
+- 84cdd9d: Fixed issue where CRUD uploads could fail with the error
+
+  ```
+  Exception: require(_dependencyMap[11], "rea(...)/BlobManager").createFromOptions is not a function (it is undefined)
+  ```
+
 ## 1.20.1
 
 ### Patch Changes

packages/react-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@powersync/react-native",
-  "version": "1.20.1",
+  "version": "1.20.2",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"

packages/react-native/rollup.config.mjs

@@ -4,9 +4,9 @@ import inject from '@rollup/plugin-inject';
 import json from '@rollup/plugin-json';
 import nodeResolve from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
+import terser from '@rollup/plugin-terser';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import terser from '@rollup/plugin-terser';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -34,7 +34,7 @@ export default (commandLineArgs) => {
       }),
       json(),
       nodeResolve({
-        preferBuiltins: false,
+        preferBuiltins: false
       }),
       commonjs({}),
       inject({
@@ -48,6 +48,10 @@ export default (commandLineArgs) => {
       alias({
         entries: [
           { find: 'bson', replacement: path.resolve(__dirname, '../../node_modules/bson/lib/bson.rn.cjs') },
+          {
+            find: 'react-native/Libraries/Blob/BlobManager',
+            replacement: path.resolve(__dirname, './vendor/BlobManager.js')
+          }
         ]
       }),
       terser()
@@ -59,7 +63,6 @@ export default (commandLineArgs) => {
       'node-fetch',
       'js-logger',
       'react-native',
-      'react-native/Libraries/Blob/BlobManager',
       'react'
     ]
   };

packages/react-native/vendor/BlobManager.js

@@ -0,0 +1,27 @@
+/**
+ * The current Rollup configuration targets a CommonJs output.
+ * This translates import statements to require statements.
+ * React native recently shifted to ESM exports.
+ * https://github.com/facebook/react-native/pull/48761/files
+ * This causes requiring this module to return an object
+ * of the form:
+ * ```javascript
+ * {
+ *  _esModule: true,
+ *  default: BlobManager
+ * }
+ * ```
+ * This wrapper provides a small shim to conditionally return the default export of the module.
+ */
+const BlobManager = require('react-native/Libraries/Blob/BlobManager');
+const interop = (mod) => (mod && mod.__esModule ? mod.default : mod);
+
+/**
+ * Using an ESM export here is important. Rollup compiles this to
+ * ```javascript
+ *   const BlobManager = require('react-native/Libraries/Blob/BlobManager');
+ *   const interop = (mod) => (mod && mod.__esModule ? mod.default : mod);
+ *   var BlobManager$1 = interop(BlobManager);
+ * ```
+ */
+export default interop(BlobManager);

packages/web/src/worker/sync/SharedSyncImplementation.ts

@@ -306,28 +306,31 @@ export class SharedSyncImplementation
     // Create a new StreamingSyncImplementation for each connect call. This is usually done is all SDKs.
     return new WebStreamingSyncImplementation({
       adapter: new SqliteBucketStorage(this.dbAdapter!, new Mutex(), this.logger),
-      remote: new WebRemote({
-        fetchCredentials: async () => {
-          const lastPort = this.ports[this.ports.length - 1];
-          return new Promise(async (resolve, reject) => {
-            const abortController = new AbortController();
-            this.fetchCredentialsController = {
-              controller: abortController,
-              activePort: lastPort
-            };
-
-            abortController.signal.onabort = reject;
-            try {
-              this.logger.log('calling the last port client provider for credentials');
-              resolve(await lastPort.clientProvider.fetchCredentials());
-            } catch (ex) {
-              reject(ex);
-            } finally {
-              this.fetchCredentialsController = undefined;
-            }
-          });
-        }
-      }),
+      remote: new WebRemote(
+        {
+          fetchCredentials: async () => {
+            const lastPort = this.ports[this.ports.length - 1];
+            return new Promise(async (resolve, reject) => {
+              const abortController = new AbortController();
+              this.fetchCredentialsController = {
+                controller: abortController,
+                activePort: lastPort
+              };
+
+              abortController.signal.onabort = reject;
+              try {
+                this.logger.log('calling the last port client provider for credentials');
+                resolve(await lastPort.clientProvider.fetchCredentials());
+              } catch (ex) {
+                reject(ex);
+              } finally {
+                this.fetchCredentialsController = undefined;
+              }
+            });
+          }
+        },
+        this.logger
+      ),
       uploadCrud: async () => {
         const lastPort = this.ports[this.ports.length - 1];