diff --git a/.changeset/mergeable-undo-redo-marker.md b/.changeset/mergeable-undo-redo-marker.md deleted file mode 100644 index ad71cb28f..000000000 --- a/.changeset/mergeable-undo-redo-marker.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"loro-crdt": patch -"loro-crdt-map": patch ---- - -Fix undo/redo restoring mergeable map children as regular non-mergeable containers. diff --git a/.changeset/quick-kv-deadlock-fix.md b/.changeset/quick-kv-deadlock-fix.md deleted file mode 100644 index 8e8d5a47c..000000000 --- a/.changeset/quick-kv-deadlock-fix.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"loro-crdt": patch -"loro-crdt-map": patch ---- - -Fix a potential deadlock when lazy snapshot loading resolves mergeable container parent depths. diff --git a/crates/loro-wasm-map/CHANGELOG.md b/crates/loro-wasm-map/CHANGELOG.md index 201c91827..df3d306c9 100644 --- a/crates/loro-wasm-map/CHANGELOG.md +++ b/crates/loro-wasm-map/CHANGELOG.md @@ -1,5 +1,12 @@ # loro-crdt-map +## 1.13.6 + +### Patch Changes + +- a4e6174: Fix undo/redo restoring mergeable map children as regular non-mergeable containers. +- 78f6c8a: Fix a potential deadlock when lazy snapshot loading resolves mergeable container parent depths. + ## 1.13.5 ### Patch Changes diff --git a/crates/loro-wasm-map/package.json b/crates/loro-wasm-map/package.json index 61ceb7c48..65532eeb4 100644 --- a/crates/loro-wasm-map/package.json +++ b/crates/loro-wasm-map/package.json @@ -1,6 +1,6 @@ { "name": "loro-crdt-map", - "version": "1.13.5", + "version": "1.13.6", "description": "Source maps for the loro-crdt WebAssembly bundles.", "repository": { "type": "git", diff --git a/crates/loro-wasm/CHANGELOG.md b/crates/loro-wasm/CHANGELOG.md index 511e71775..49fb0818a 100644 --- a/crates/loro-wasm/CHANGELOG.md +++ b/crates/loro-wasm/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 1.13.6 + +### Patch Changes + +- a4e6174: Fix undo/redo restoring mergeable map children as regular non-mergeable containers. +- 78f6c8a: Fix a potential deadlock when lazy snapshot loading resolves mergeable container parent depths. + ## 1.13.5 ### Patch Changes diff --git a/crates/loro-wasm/Cargo.toml b/crates/loro-wasm/Cargo.toml index 85fe05247..4a8b817e0 100644 --- a/crates/loro-wasm/Cargo.toml +++ b/crates/loro-wasm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "loro-wasm" -version = "1.13.5" +version = "1.13.6" edition = "2021" publish = false repository = "https://github.com/loro-dev/loro/" diff --git a/crates/loro-wasm/package.json b/crates/loro-wasm/package.json index de80ef7fb..fb34fde6e 100644 --- a/crates/loro-wasm/package.json +++ b/crates/loro-wasm/package.json @@ -1,6 +1,6 @@ { "name": "loro-crdt", - "version": "1.13.5", + "version": "1.13.6", "description": "Loro CRDTs is a high-performance CRDT framework that makes your app state synchronized, collaborative and maintainable effortlessly.", "keywords": [ "crdt",