diff --git a/CHANGELOG.md b/CHANGELOG.md index 277d7a0d..b0a36fb4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed +* Upgrade @hpcc-js/wasm to 2.14.1 (Graphviz 9.0.0) + ## [5.1.0] – 2023-08-01 ### Changed diff --git a/package-lock.json b/package-lock.json index 7d58cbd4..f15a50b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "5.1.0", "license": "BSD-3-Clause", "dependencies": { - "@hpcc-js/wasm": "2.13.1", + "@hpcc-js/wasm": "^2.14.1", "d3-dispatch": "^3.0.1", "d3-format": "^3.1.0", "d3-interpolate": "^3.0.1", @@ -1780,9 +1780,9 @@ "dev": true }, "node_modules/@hpcc-js/wasm": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.13.1.tgz", - "integrity": "sha512-dJO0VQZFtUcqledAAU8b0yCw3HdkIVyrNjv8sAwdhDcOMRKdaNumi7Punj39u5h2CpdMN4g6I4gp584g/zVSzA==", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.14.1.tgz", + "integrity": "sha512-ncPvj0dEjoye8jD1NAwdThXlZ5mpuGRyRwaNWU6JVBgyT8TewVDmG+RAOXPysyaP1Ui8Lm7562W4KawZtPwa1A==", "dependencies": { "yargs": "17.7.2" }, @@ -7020,9 +7020,9 @@ "dev": true }, "@hpcc-js/wasm": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.13.1.tgz", - "integrity": "sha512-dJO0VQZFtUcqledAAU8b0yCw3HdkIVyrNjv8sAwdhDcOMRKdaNumi7Punj39u5h2CpdMN4g6I4gp584g/zVSzA==", + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.14.1.tgz", + "integrity": "sha512-ncPvj0dEjoye8jD1NAwdThXlZ5mpuGRyRwaNWU6JVBgyT8TewVDmG+RAOXPysyaP1Ui8Lm7562W4KawZtPwa1A==", "requires": { "yargs": "17.7.2" } diff --git a/package.json b/package.json index 3b6badba..066a27ef 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "tiny-worker": "^2.3.0" }, "dependencies": { - "@hpcc-js/wasm": "2.13.1", + "@hpcc-js/wasm": "^2.14.1", "d3-dispatch": "^3.0.1", "d3-format": "^3.1.0", "d3-interpolate": "^3.0.1", diff --git a/test/dot-data-test.js b/test/dot-data-test.js index 34a357f6..4854ce36 100644 --- a/test/dot-data-test.js +++ b/test/dot-data-test.js @@ -458,17 +458,17 @@ var basic_data = { "attributes": { "fill": "none", "stroke": "black", - "d": "M27,-71.7C27,-64.24 27,-55.32 27,-46.97" + "d": "M27,-71.7C27,-64.41 27,-55.73 27,-47.54" }, "bbox": { "x": 27, "y": -71.7, "width": 0, - "height": 24.730000000000004 + "height": 24.160000000000004 }, "center": { "x": 27, - "y": -59.335 + "y": -59.620000000000005 }, "totalLength": 100, "parent": "[Circular ~.children.1.children.15]", @@ -490,17 +490,17 @@ var basic_data = { "attributes": { "fill": "black", "stroke": "black", - "points": "30.5,-47.1 27,-37.1 23.5,-47.1 30.5,-47.1" + "points": "30.5,-47.62 27,-37.62 23.5,-47.62 30.5,-47.62" }, "bbox": { "x": 23.5, - "y": -47.1, + "y": -47.62, "width": 7, "height": 10 }, "center": { "x": 27, - "y": -42.1 + "y": -42.62 }, "parent": "[Circular ~.children.1.children.15]", "children": [], diff --git a/test/drawEdge-test.js b/test/drawEdge-test.js index 12c73045..ebf33dd6 100644 --- a/test/drawEdge-test.js +++ b/test/drawEdge-test.js @@ -30,12 +30,12 @@ it("Check our understanding of how Graphviz draws edges.", async () => { assert.equal(d3.selectAll('path').size(), num_edges, 'Number of initial paths'); const arrowHeadLength = 10; const arrowHeadWidth = 7; - const margin = -0.14; + const margin = -0.1; // start of edge tail const x1 = 54.4; const y1 = -18; // end of edge arrowhead - const x2 = 88.62; + const x2 = 88.1; const y2 = -18.000; const line = d3.selectAll('.edge').selectAll('path').filter(function (d) { @@ -55,9 +55,9 @@ it("Check our understanding of how Graphviz draws edges.", async () => { var expected_y = []; expected_x.push(x1); expected_y.push(y1); - expected_x.push(62.06); + expected_x.push(61.89); expected_y.push(y1); - expected_x.push(70.57); + expected_x.push(70.18); expected_y.push(y1); expected_x.push(Math.round((x2 - margin - arrowHeadLength) * 1000) / 1000); expected_y.push(y2); diff --git a/test/graphviz-test.js b/test/graphviz-test.js index e4fa7704..fbbe7e34 100644 --- a/test/graphviz-test.js +++ b/test/graphviz-test.js @@ -30,8 +30,8 @@ it("graphviz().render() renders an SVG from graphviz DOT.", async () => { a->b - - + + `;