Merge remote-tracking branch 'origin/main' into watches

Author: stevensJourney

.changeset/chilled-birds-cheer.md

@@ -1,8 +1,7 @@
 import { NavigationPage } from '@/components/navigation/NavigationPage';
-import { Box, Button, Grid, TextField, styled } from '@mui/material';
+import { Alert, Box, Button, Grid, TextField, styled } from '@mui/material';
 import { DataGrid } from '@mui/x-data-grid';
 import { useQuery } from '@powersync/react';
-import { ArrayComparator } from '@powersync/web';
 import React from 'react';
 
 export type LoginFormParams = {
@@ -17,7 +16,7 @@ const DEFAULT_QUERY = /* sql */ `
     lists
 `;
 
-const TableDisplay = React.memo(({ data }: { data: any[] }) => {
+const TableDisplay = React.memo(({ data }: { data: ReadonlyArray<any> }) => {
   const queryDataGridResult = React.useMemo(() => {
     const firstItem = data?.[0];
     return {
@@ -55,7 +54,7 @@ export default function SQLConsolePage() {
   const inputRef = React.useRef<HTMLInputElement>();
   const [query, setQuery] = React.useState(DEFAULT_QUERY);
 
-  const { data } = useQuery(query, [], {
+  const { data, error } = useQuery(query, [], {
     /**
      * We don't use the isFetching status here, we can avoid re-renders if we don't report on it.
      */
@@ -64,9 +63,10 @@ export default function SQLConsolePage() {
      * The query here will only emit results when the query data set changes.
      * Result sets are compared by serializing each item to JSON and comparing the strings.
      */
-    comparator: new ArrayComparator({
-      compareBy: (item) => JSON.stringify(item)
-    })
+    differentiator: {
+      identify: (item: any) => JSON.stringify(item),
+      compareBy: (item: any) => JSON.stringify(item)
+    }
   });
 
   return (
@@ -101,6 +101,7 @@ export default function SQLConsolePage() {
             </Button>
           </S.CenteredGrid>
         </S.CenteredGrid>
+        {error ? <Alert severity="error">{error.message}</Alert> : null}
         <TableDisplay data={data} />
       </S.MainContainer>
     </NavigationPage>

.changeset/dull-mugs-carry.md

@@ -29,7 +29,7 @@
     "test": "pnpm build && vitest"
   },
   "peerDependencies": {
-    "@powersync/common": "workspace:^1.33.0"
+    "@powersync/common": "workspace:^1.33.1"
   },
   "devDependencies": {
     "@powersync/common": "workspace:*",

.changeset/healthy-carrots-exercise.md

@@ -1,5 +1,16 @@
 # @powersync/common
 
+## 1.33.1
+
+### Patch Changes
+
+- ffe3095: Improve websocket keepalive logic to reduce keepalive errors.
+- 36d8f28: Remove unused compaction logic.
+- 53236a8: Rust client: Properly upload CRUD entries made while offline.
+- b7255b7: Rust sync client: Fix `connect()` resolving before a connection is made.
+- 70a9cf5: Added CommonJs output for common package. Ensuring default export entry is last so that require statements don't use .mjs output instead of .cjs.
+- d1b7fcb: Rust sync client: Fix reported `lastSyncedAt` values in sync status.
+
 ## 1.33.0
 
 ### Minor Changes

.changeset/lazy-onions-dance.md

@@ -1,6 +1,6 @@
 {
   "name": "@powersync/common",
-  "version": "1.33.0",
+  "version": "1.33.1",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -13,8 +13,9 @@
   "exports": {
     ".": {
       "import": "./dist/bundle.mjs",
-      "default": "./dist/bundle.mjs",
-      "types": "./lib/index.d.ts"
+      "require": "./dist/bundle.cjs",
+      "types": "./lib/index.d.ts",
+      "default": "./dist/bundle.mjs"
     }
   },
   "author": "JOURNEYAPPS",