Merge branch 'main' into marks_port

README.md

@@ -113,6 +113,9 @@ brew install cmake node cmocka
 # install yarn
 npm install --global yarn
 
+# install javascript dependencies
+yarn --cwd ./javascript
+
 # install rust dependencies
 cargo install wasm-bindgen-cli wasm-opt cargo-deny
 

flake.nix

@@ -54,6 +54,7 @@
 
           nodejs
           yarn
+          deno
 
           # c deps
           cmake

javascript/package.json

@@ -4,7 +4,7 @@
     "Orion Henry <orion@inkandswitch.com>",
     "Martin Kleppmann"
   ],
-  "version": "2.0.2-alpha.1",
+  "version": "2.0.2",
   "description": "Javascript implementation of automerge, backed by @automerge/automerge-wasm",
   "homepage": "https://github.com/automerge/automerge-rs/tree/main/wrappers/javascript",
   "repository": "github:automerge/automerge-rs",
@@ -47,7 +47,7 @@
     "typescript": "^4.9.4"
   },
   "dependencies": {
-    "@automerge/automerge-wasm": "0.1.24",
+    "@automerge/automerge-wasm": "0.1.25",
     "uuid": "^9.0.0"
   }
 }

rust/automerge-wasm/package.json

@@ -8,7 +8,7 @@
   "description": "wasm-bindgen bindings to the automerge rust implementation",
   "homepage": "https://github.com/automerge/automerge-rs/tree/main/automerge-wasm",
   "repository": "github:automerge/automerge-rs",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "license": "MIT",
   "files": [
     "README.md",

rust/automerge/src/automerge.rs

@@ -913,7 +913,6 @@ impl Automerge {
             .add_change(&change, actor_index)
             .expect("Change's deps should already be in the document");
 
-        self.history_index.insert(change.hash(), history_index);
         self.history.push(change);
 
         history_index