From 4c7bd61ce960115c921875171a8632acc636bad3 Mon Sep 17 00:00:00 2001 From: bokuweb Date: Thu, 31 Oct 2024 22:28:07 +0900 Subject: [PATCH] fix: rc16 (#777) --- docx-core/src/documents/mod.rs | 2 +- docx-wasm/js/index.ts | 2 +- docx-wasm/package.json | 8 ++++--- docx-wasm/pnpm-lock.yaml | 39 ++++++++++++++++++---------------- rust-toolchain | 2 +- 5 files changed, 29 insertions(+), 24 deletions(-) diff --git a/docx-core/src/documents/mod.rs b/docx-core/src/documents/mod.rs index c476bf4..74c30e6 100644 --- 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 index e9fe6a0..e021899 100644 --- 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 index eebeb5b..9d2e17b 100644 --- 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 ", @@ -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 index b731215..5f7be72 100644 --- a/docx-wasm/pnpm-lock.yaml +++ b/docx-wasm/pnpm-lock.yaml @@ -4,6 +4,9 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false +overrides: + serialize-javascript: 6.0.2 + importers: .: @@ -25,7 +28,7 @@ importers: version: 2.0.5 html-webpack-plugin: specifier: 5.5.3 - version: 5.5.3(webpack@4.46.0) + version: 5.5.3(webpack@4.46.0(webpack-cli@5.0.1)) jest: specifier: 28.1.3 version: 28.1.3(@types/node@22.8.2) @@ -37,7 +40,7 @@ importers: version: 0.7.0 ts-loader: specifier: 9.4.2 - version: 9.4.2(typescript@4.9.3)(webpack@4.46.0) + version: 9.4.2(typescript@4.9.3)(webpack@4.46.0(webpack-cli@5.0.1)) typescript: specifier: 4.9.3 version: 4.9.3 @@ -2768,8 +2771,8 @@ packages: resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==} engines: {node: '>= 0.8.0'} - serialize-javascript@4.0.0: - resolution: {integrity: sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==} + serialize-javascript@6.0.2: + resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==} serve-index@1.9.1: resolution: {integrity: sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==} @@ -3962,17 +3965,17 @@ snapshots: '@webassemblyjs/wast-parser': 1.9.0 '@xtuc/long': 4.2.2 - '@webpack-cli/configtest@2.1.1(webpack-cli@5.0.1)(webpack@4.46.0)': + '@webpack-cli/configtest@2.1.1(webpack-cli@5.0.1(webpack-dev-server@3.11.3)(webpack@4.46.0))(webpack@4.46.0(webpack-cli@5.0.1))': dependencies: webpack: 4.46.0(webpack-cli@5.0.1) webpack-cli: 5.0.1(webpack-dev-server@3.11.3)(webpack@4.46.0) - '@webpack-cli/info@2.0.2(webpack-cli@5.0.1)(webpack@4.46.0)': + '@webpack-cli/info@2.0.2(webpack-cli@5.0.1(webpack-dev-server@3.11.3)(webpack@4.46.0))(webpack@4.46.0(webpack-cli@5.0.1))': dependencies: webpack: 4.46.0(webpack-cli@5.0.1) webpack-cli: 5.0.1(webpack-dev-server@3.11.3)(webpack@4.46.0) - '@webpack-cli/serve@2.0.5(webpack-cli@5.0.1)(webpack-dev-server@3.11.3)(webpack@4.46.0)': + '@webpack-cli/serve@2.0.5(webpack-cli@5.0.1(webpack-dev-server@3.11.3)(webpack@4.46.0))(webpack-dev-server@3.11.3(webpack-cli@5.0.1)(webpack@4.46.0))(webpack@4.46.0(webpack-cli@5.0.1))': dependencies: webpack: 4.46.0(webpack-cli@5.0.1) webpack-cli: 5.0.1(webpack-dev-server@3.11.3)(webpack@4.46.0) @@ -5276,7 +5279,7 @@ snapshots: relateurl: 0.2.7 terser: 5.36.0 - html-webpack-plugin@5.5.3(webpack@4.46.0): + html-webpack-plugin@5.5.3(webpack@4.46.0(webpack-cli@5.0.1)): dependencies: '@types/html-minifier-terser': 6.1.0 html-minifier-terser: 6.1.0 @@ -6671,7 +6674,7 @@ snapshots: transitivePeerDependencies: - supports-color - serialize-javascript@4.0.0: + serialize-javascript@6.0.2: dependencies: randombytes: 2.1.0 @@ -6989,13 +6992,13 @@ snapshots: ansi-escapes: 4.3.2 supports-hyperlinks: 2.3.0 - terser-webpack-plugin@1.4.6(webpack@4.46.0): + terser-webpack-plugin@1.4.6(webpack@4.46.0(webpack-cli@5.0.1)): dependencies: cacache: 12.0.4 find-cache-dir: 2.1.0 is-wsl: 1.1.0 schema-utils: 1.0.0 - serialize-javascript: 4.0.0 + serialize-javascript: 6.0.2 source-map: 0.6.1 terser: 4.8.1 webpack: 4.46.0(webpack-cli@5.0.1) @@ -7063,7 +7066,7 @@ snapshots: trim-newlines@4.1.1: {} - ts-loader@9.4.2(typescript@4.9.3)(webpack@4.46.0): + ts-loader@9.4.2(typescript@4.9.3)(webpack@4.46.0(webpack-cli@5.0.1)): dependencies: chalk: 4.1.2 enhanced-resolve: 5.17.1 @@ -7209,9 +7212,9 @@ snapshots: webpack-cli@5.0.1(webpack-dev-server@3.11.3)(webpack@4.46.0): dependencies: '@discoveryjs/json-ext': 0.5.7 - '@webpack-cli/configtest': 2.1.1(webpack-cli@5.0.1)(webpack@4.46.0) - '@webpack-cli/info': 2.0.2(webpack-cli@5.0.1)(webpack@4.46.0) - '@webpack-cli/serve': 2.0.5(webpack-cli@5.0.1)(webpack-dev-server@3.11.3)(webpack@4.46.0) + '@webpack-cli/configtest': 2.1.1(webpack-cli@5.0.1(webpack-dev-server@3.11.3)(webpack@4.46.0))(webpack@4.46.0(webpack-cli@5.0.1)) + '@webpack-cli/info': 2.0.2(webpack-cli@5.0.1(webpack-dev-server@3.11.3)(webpack@4.46.0))(webpack@4.46.0(webpack-cli@5.0.1)) + '@webpack-cli/serve': 2.0.5(webpack-cli@5.0.1(webpack-dev-server@3.11.3)(webpack@4.46.0))(webpack-dev-server@3.11.3(webpack-cli@5.0.1)(webpack@4.46.0))(webpack@4.46.0(webpack-cli@5.0.1)) colorette: 2.0.20 commander: 9.5.0 cross-spawn: 7.0.3 @@ -7225,7 +7228,7 @@ snapshots: optionalDependencies: webpack-dev-server: 3.11.3(webpack-cli@5.0.1)(webpack@4.46.0) - webpack-dev-middleware@3.7.3(webpack@4.46.0): + webpack-dev-middleware@3.7.3(webpack@4.46.0(webpack-cli@5.0.1)): dependencies: memory-fs: 0.4.1 mime: 2.6.0 @@ -7266,7 +7269,7 @@ snapshots: supports-color: 6.1.0 url: 0.11.4 webpack: 4.46.0(webpack-cli@5.0.1) - webpack-dev-middleware: 3.7.3(webpack@4.46.0) + webpack-dev-middleware: 3.7.3(webpack@4.46.0(webpack-cli@5.0.1)) webpack-log: 2.0.0 ws: 6.2.3 yargs: 13.3.2 @@ -7313,7 +7316,7 @@ snapshots: node-libs-browser: 2.2.1 schema-utils: 1.0.0 tapable: 1.1.3 - terser-webpack-plugin: 1.4.6(webpack@4.46.0) + terser-webpack-plugin: 1.4.6(webpack@4.46.0(webpack-cli@5.0.1)) watchpack: 1.7.5 webpack-sources: 1.4.3 optionalDependencies: diff --git a/rust-toolchain b/rust-toolchain index a98f408..5d7eb06 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.82 \ No newline at end of file +1.73 \ No newline at end of file