Skip to content

Commit

Permalink
⬆️ Update automerge in frontend
Browse files Browse the repository at this point in the history
  • Loading branch information
phlmn authored and anuejn committed May 2, 2024
1 parent da549d2 commit 466276c
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 64 deletions.
4 changes: 2 additions & 2 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
},
"dependencies": {
"@audapolis/webvtt-writer": "^1.0.6",
"@automerge/automerge": "~2.0.3",
"@automerge/automerge-wasm": "^0.1.26",
"@automerge/automerge": "~2.2.0",
"@automerge/automerge-wasm": "^0.15.0",
"@fontsource/inter": "^4.5.15",
"@podlove/html5-audio-driver": "^2.0.3",
"@popperjs/core": "^2.11.8",
Expand Down
82 changes: 23 additions & 59 deletions frontend/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/src/document.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { expect, test } from '@jest/globals';
import { migrateDocument } from './document';
import { Document } from './editor/types';
import { unstable as Automerge } from '@automerge/automerge';
import { next as Automerge } from '@automerge/automerge';
import * as fs from 'fs';

function testMigrate(baseName: string) {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/document.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Document } from './editor/types';
import { unstable as Automerge } from '@automerge/automerge';
import { next as Automerge } from '@automerge/automerge';
import * as AutomergeStable from '@automerge/automerge';

function convertString(s: string): string {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/editor/automerge_websocket_editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Editor, createEditor } from 'slate';
import { withHistory, HistoryEditor } from 'slate-history';
import { withReact } from 'slate-react';
import { withAutomergeDoc } from 'slate-automerge-doc';
import { unstable as Automerge } from '@automerge/automerge';
import { next as Automerge } from '@automerge/automerge';
import ReconnectingWebSocket from 'reconnecting-websocket';
import { useDebugMode } from '../debugMode';
import { Document, Paragraph } from './types';
Expand Down

0 comments on commit 466276c

Please sign in to comment.