From 1c9227d5b2f3d59201692df226709633bec91a4c Mon Sep 17 00:00:00 2001 From: el3ctrician Date: Thu, 14 May 2026 10:11:32 +0200 Subject: [PATCH 1/2] upgraded to elkjs 0.11.1 --- package.json | 10 +++++----- src/elk/elk-d3.js | 8 +++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 02b9a68..68a320b 100644 --- a/package.json +++ b/package.json @@ -37,16 +37,16 @@ "license": "EPL-1.0", "bugs": { "url": "https://github.com/Nic30/d3-hwschematic/issues", - "email" : "Nic30original@gmail.com" + "email": "Nic30original@gmail.com" }, "homepage": "https://github.com/Nic30/d3-hwschematic#readme", - "engines" : { - "npm" : ">=8.5.1", - "node" : ">=12.22.9" + "engines": { + "npm": ">=8.5.1", + "node": ">=12.22.9" }, "dependencies": { "d3": "^6.5.0", - "elkjs": "^0.8.2" + "elkjs": "^0.11.1" }, "devDependencies": { "@babel/preset-env": "^7.12.1", diff --git a/src/elk/elk-d3.js b/src/elk/elk-d3.js index 951c0e1..4504377 100644 --- a/src/elk/elk-d3.js +++ b/src/elk/elk-d3.js @@ -187,10 +187,12 @@ export default class d3elk { } terminate() { - if (this.layouter) - this.layouter.terminateWorker(); + if (this.layouter) { + try { + this.layouter.terminateWorker(); + } catch(e) {} + } } - /** * Clean all layout possitions from nodes, nets and ports */ From d330040fee9476140ffc1cb29f2368d068debb96 Mon Sep 17 00:00:00 2001 From: el3ctrician Date: Thu, 14 May 2026 17:58:39 +0200 Subject: [PATCH 2/2] updated JEST and D3 to latest --- package.json | 9 +++++++-- tests/d3-hwschematic.test.js | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 68a320b..0ee613e 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "node": ">=12.22.9" }, "dependencies": { - "d3": "^6.5.0", + "d3": "^7.9.0", "elkjs": "^0.11.1" }, "devDependencies": { @@ -55,15 +55,20 @@ "coveralls": "^3.1.0", "eslint": "^7.12.1", "identity-obj-proxy": "^3.0.0", - "jest": "^26.6.3", + "jest": "^30.4.2", + "jest-environment-jsdom": "^30.4.1", "rollup": "^2.33.1", "rollup-plugin-copy": "^3.3.0", "run-script-os": "^1.1.3" }, "jest": { + "testEnvironment": "jsdom", "transformIgnorePatterns": [ "node_modules/.*" ], + "moduleNameMapper": { + "^d3$": "/node_modules/d3/dist/d3.min.js" + }, "coverageDirectory": "/tests/coverage", "coveragePathIgnorePatterns": [ "node_modules/" diff --git a/tests/d3-hwschematic.test.js b/tests/d3-hwschematic.test.js index 45e0e75..73b2474 100644 --- a/tests/d3-hwschematic.test.js +++ b/tests/d3-hwschematic.test.js @@ -49,7 +49,7 @@ describe('Testing scheme rendering', () => { expect(graphData).not.toBeNull(); return sch.bindData(graphData).then( () => { - expect(applyLayoutSpy).toBeCalled(); + expect(applyLayoutSpy).toHaveBeenCalled(); sch.terminate(); }, (reason) => {