Skip to content

Commit 5e6630e

Browse files
committed
update to automerge 3.0.0
1 parent 788cbf4 commit 5e6630e

6 files changed

Lines changed: 15 additions & 17 deletions

File tree

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
"dist/**/*.js"
1717
],
1818
"dependencies": {
19-
"@automerge/automerge": "^2.2.3",
19+
"@automerge/automerge": "^3.0.0",
2020
"@codemirror/state": "^6.0.0",
2121
"@codemirror/view": "^6.0.0",
2222
"codemirror": "^6.0.0"
2323
},
2424
"devDependencies": {
25-
"@automerge/automerge-repo": "^2.0.0",
25+
"@automerge/automerge-repo": "^2.1.0",
2626
"@types/react": "^18.2.79",
2727
"@typescript-eslint/eslint-plugin": "^8.32.1",
2828
"@typescript-eslint/parser": "^8.32.1",

src/DocHandle.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { next as A } from "@automerge/automerge"
1+
import * as A from "@automerge/automerge"
22

33
export interface DocHandle<T> {
44
isReady: () => boolean

src/codeMirrorToAm.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { next as A } from "@automerge/automerge"
1+
import * as A from "@automerge/automerge"
22
import { Text, Transaction } from "@codemirror/state"
33
import { isReconcileTx } from "./plugin.js"
44
import { type DocHandle } from "./DocHandle.js"

src/plugin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { next as A } from "@automerge/automerge"
1+
import * as A from "@automerge/automerge"
22
import { EditorView, ViewPlugin, ViewUpdate } from "@codemirror/view"
33
import { Transaction, Annotation } from "@codemirror/state"
44
import { applyCmTransactionsToAmHandle } from "./codeMirrorToAm.js"

test/Editor.cy.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react"
22
import { Editor } from "./Editor.js"
3-
import { next as automerge } from "@automerge/automerge"
3+
import * as automerge from "@automerge/automerge"
44
import { DocHandle, Repo } from "@automerge/automerge-repo"
55
import { mount } from "cypress/react"
66

yarn.lock

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
"@jridgewell/gen-mapping" "^0.3.5"
1111
"@jridgewell/trace-mapping" "^0.3.24"
1212

13-
"@automerge/automerge-repo@^2.0.0":
14-
version "2.0.0"
15-
resolved "https://registry.yarnpkg.com/@automerge/automerge-repo/-/automerge-repo-2.0.0.tgz#1aae3fc913a4bc0de8609ea6c364cbb87d1466c2"
16-
integrity sha512-c1VDrR6s8BE36m6xDcSC8f4ECccPcaK1E6q3vIlBHOEyyLvLQbFmlmFIZulaV//S0B0HW2lLSrK/2cFwQblQ+A==
13+
"@automerge/automerge-repo@^2.1.0":
14+
version "2.1.0"
15+
resolved "https://registry.yarnpkg.com/@automerge/automerge-repo/-/automerge-repo-2.1.0.tgz#6968eeaebe983fcf2c399765d248900e0e3b9590"
16+
integrity sha512-gqJkyM6Adbgqx7amn4uuz9ezuJHkiYRd9Ad5Z1xoKLq2GjlIIXDvW/NEHGP12CAS3pAbXJsBD0KyP949KvgywA==
1717
dependencies:
18-
"@automerge/automerge" "^2.2.8"
18+
"@automerge/automerge" "2.2.8 - 3"
1919
bs58check "^3.0.1"
2020
cbor-x "^1.3.0"
2121
debug "^4.3.4"
@@ -24,12 +24,10 @@
2424
uuid "^9.0.0"
2525
xstate "^5.9.1"
2626

27-
"@automerge/automerge@^2.2.3", "@automerge/automerge@^2.2.8":
28-
version "2.2.9"
29-
resolved "https://registry.yarnpkg.com/@automerge/automerge/-/automerge-2.2.9.tgz#d575f888dde39d0483e0b6bc6f5316740e996689"
30-
integrity sha512-6HM52Ops79hAQBWMg/t0MNfGOdEiXyenQjO9F1hKZq0RWDsMLpPa1SzRy/C4/4UyX67sTHuA5CwBpH34SpfZlA==
31-
dependencies:
32-
uuid "^9.0.0"
27+
"@automerge/automerge@2.2.8 - 3", "@automerge/automerge@^3.0.0":
28+
version "3.0.0"
29+
resolved "https://registry.yarnpkg.com/@automerge/automerge/-/automerge-3.0.0.tgz#313284465c150f84f6f230c3baaa4d4347fa3a72"
30+
integrity sha512-vp/LrAzOyS4J+YmEKRjnCjCUqN6itzz9nKvPEcSLJuapZXfPmY72TYg0F05DVnLCvGe+sLuVAoVntJT6K0qutQ==
3331

3432
"@babel/code-frame@^7.27.1":
3533
version "7.27.1"

0 commit comments

Comments
 (0)