fix: rc16

bokuweb · Oct 31, 2024 · fd82bc3 · fd82bc3
1 parent 0e4f6cd
commit fd82bc3
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 24 deletions.
diff --git a/docx-core/src/documents/mod.rs b/docx-core/src/documents/mod.rs
@@ -656,7 +656,7 @@ impl Docx {
     pub fn comments_json(&mut self) -> String {
         self.reset();
         self.update_dependencies();
-        serde_json::to_string_pretty(&self.comments.comments).unwrap()
+        serde_json::to_string_pretty(&self.comments).unwrap()
     }
 
     fn reset(&self) {

diff --git a/docx-wasm/js/index.ts b/docx-wasm/js/index.ts
@@ -630,7 +630,7 @@ export class Docx {
     const docx = this.createDocx();
     const json = docx.comments_json();
     docx.free();
-    return JSON.parse(json) as CommentJSON[];
+    return JSON.parse(json) as { comments: CommentJSON[] };
   }
 
   build() {

diff --git a/docx-wasm/package.json b/docx-wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docx-wasm",
-  "version": "0.4.18-rc13",
+  "version": "0.4.18-rc16",
   "main": "dist/node/index.js",
   "browser": "dist/web/index.js",
   "author": "bokuweb <bokuweb12@gmail.com>",
@@ -22,8 +22,10 @@
     "copy:bindings": "cpy '../docx-core/bindings' './js/json'",
     "prepublishOnly": "pnpm run build"
   },
-  "overrides": {
-    "**/serialize-javascript": "6.0.2"
+  "pnpm": {
+    "overrides": {
+      "serialize-javascript": "6.0.2"
+    }
   },
   "devDependencies": {
     "@types/file-saver": "2.0.7",

diff --git a/docx-wasm/pnpm-lock.yaml b/docx-wasm/pnpm-lock.yaml
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.82
+1.73