update to replicache 14

see rocicorp#159 which we're merging into this fork with this commit
tantaman · Dec 5, 2023 · a541701 · a541701
1 parent dd1ffc7
commit a541701
Show file tree

Hide file tree

Showing 6 changed files with 1,488 additions and 42 deletions.
diff --git a/client/package.json b/client/package.json
@@ -32,7 +32,7 @@
     "react-remark": "^2.1.0",
     "react-virtualized-auto-sizer": "^1.0.20",
     "react-window": "^1.8.9",
-    "replicache-react": "3.0.0",
+    "replicache-react": "5.0.1",
     "shared": "^0.1.0",
     "todomvc-app-css": "^2.4.2"
   },

diff --git a/client/src/app.tsx b/client/src/app.tsx
@@ -22,7 +22,6 @@ import {
   IssueUpdate,
   IssueUpdateWithID,
   ISSUE_KEY_PREFIX,
-  PartialSyncState,
 } from 'shared';
 import {getFilters, getIssueOrder} from './filters';
 import {Layout} from './layout/layout';
@@ -49,27 +48,20 @@ const App = ({rep, undoManager}: AppProps) => {
     issueOrder: getIssueOrder(view, orderBy),
   });
 
-  const partialSync = useSubscribe<
-    PartialSyncState | 'NOT_RECEIVED_FROM_SERVER'
-  >(
+  const partialSync = useSubscribe(
     rep,
     async (tx: ReadTransaction) => {
       return (await getPartialSyncState(tx)) || 'NOT_RECEIVED_FROM_SERVER';
     },
-    'NOT_RECEIVED_FROM_SERVER',
+    {default: 'NOT_RECEIVED_FROM_SERVER'},
   );
   const partialSyncComplete = partialSync === 'COMPLETE';
-  function pull() {
+  useEffect(() => {
     console.log('partialSync', partialSync);
     if (!partialSyncComplete) {
-      if (document.hidden) {
-        setTimeout(pull, 1000);
-      } else {
-        rep.pull();
-      }
+      void rep.pull();
     }
-  }
-  useEffect(pull, [rep, partialSync, partialSyncComplete]);
+  }, [rep, partialSync, partialSyncComplete]);
 
   useEffect(() => {
     const ev = new EventSource(`/api/replicache/poke?channel=poke`);

diff --git a/client/src/index.tsx b/client/src/index.tsx
@@ -5,7 +5,6 @@ import {Replicache} from 'replicache';
 import {UndoManager} from '@rocicorp/undo';
 import App from './app';
 
-// TODO: see `id.tsx`
 async function init() {
   // See https://doc.replicache.dev/licensing for how to get a license key.
   const licenseKey = import.meta.env.VITE_REPLICACHE_LICENSE_KEY;

diff --git a/client/src/issue/issue-detail.tsx b/client/src/issue/issue-detail.tsx
@@ -19,14 +19,8 @@ import {sortBy} from 'lodash';
 import {useIssueDetailState} from '../hooks/query-state-hooks';
 import {
   Comment,
-<<<<<<< HEAD:frontend/issue-detail.tsx
-  getIssueComments,
-  getIssueDescription,
-=======
-  Description,
   getDescription,
   getIssue,
->>>>>>> f8d3a33 (re-write to use the row versioning strategy and rails.):client/src/issue/issue-detail.tsx
   Issue,
   IssueUpdate,
   Priority,
@@ -101,12 +95,7 @@ export default function IssueDetail({
       }
       return null;
     },
-<<<<<<< HEAD:frontend/issue-detail.tsx
-    { default: null, dependencies: [detailIssueID] }
-=======
-    null,
-    [detailIssueID],
->>>>>>> f8d3a33 (re-write to use the row versioning strategy and rails.):client/src/issue/issue-detail.tsx
+    {default: null, dependencies: [detailIssueID]},
   );
   const description = useSubscribe(
     rep,
@@ -116,12 +105,10 @@ export default function IssueDetail({
       }
       return null;
     },
-<<<<<<< HEAD:frontend/issue-detail.tsx
-    { default: null, dependencies: [detailIssueID] }
-=======
-    null,
-    [detailIssueID],
->>>>>>> f8d3a33 (re-write to use the row versioning strategy and rails.):client/src/issue/issue-detail.tsx
+    {
+      default: null,
+      dependencies: [detailIssueID],
+    },
   );
 
   const comments = useSubscribe(
@@ -132,12 +119,10 @@ export default function IssueDetail({
       }
       return [];
     },
-<<<<<<< HEAD:frontend/issue-detail.tsx
-    { default: [], dependencies: [detailIssueID] }
-=======
-    [],
-    [detailIssueID],
->>>>>>> f8d3a33 (re-write to use the row versioning strategy and rails.):client/src/issue/issue-detail.tsx
+    {
+      default: [],
+      dependencies: [detailIssueID],
+    },
   );
 
   const handleClose = useCallback(async () => {

diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "todo-row-versioning",
+  "name": "repliear-row-versioning",
   "version": "0.1.0",
   "devDependencies": {
     "@headlessui/react": "^1.7.16",
@@ -31,8 +31,8 @@
   "dependencies": {
     "@emotion/styled": "^11.11.0",
     "@mui/styled-engine": "^5.14.17",
-    "@rocicorp/rails": "0.8.0",
+    "@rocicorp/rails": "0.8.1",
     "fractional-indexing": "^3.2.0",
-    "replicache": "^13.0.1"
+    "replicache": ">=14.0.3"
   }
 }