From 8a81ad488a0c4e09617a2b33fd72111fb4ab46ba Mon Sep 17 00:00:00 2001 From: Gordon Smith Date: Wed, 8 Oct 2025 22:05:29 +0100 Subject: [PATCH] fix: NodeJS bundle invalid safe-buffer was using require Signed-off-by: Gordon Smith --- package-lock.json | 29 ++++++++++++++--------------- packages/comms/package.json | 1 - packages/comms/src/index.node.ts | 2 +- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 751dc6e78e..8db8be820c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1919,16 +1919,16 @@ "link": true }, "node_modules/@hpcc-js/marshaller": { - "version": "2.28.4", - "resolved": "https://registry.npmjs.org/@hpcc-js/marshaller/-/marshaller-2.28.4.tgz", - "integrity": "sha512-ijEelVEBwsSgAkB7WKlE3sW5kZE3q6uGrDlLl2DfxJwF07iequ8obcLmmIM5BBiPTcrS2Z+CCmqKTBzD37b3pQ==", + "version": "2.28.5", + "resolved": "https://registry.npmjs.org/@hpcc-js/marshaller/-/marshaller-2.28.5.tgz", + "integrity": "sha512-qgBEadSwmLOdmHpGFF37gCfVjB86VYnj9OcBgBsHe8GC/CdayzX/boBQjYpMszUxfeyCfcd3W9pOUldaDmwK1Q==", "dev": true, "license": "Apache-2.0", "dependencies": { "@hpcc-js/chart": "^2.86.1", - "@hpcc-js/codemirror": "^2.65.1", + "@hpcc-js/codemirror": "^2.66.0", "@hpcc-js/common": "^2.73.1", - "@hpcc-js/comms": "^2.101.3", + "@hpcc-js/comms": "^2.102.0", "@hpcc-js/composite": "^2.9.3", "@hpcc-js/ddl-shim": "^2.22.0", "@hpcc-js/dgrid": "^2.34.2", @@ -1964,9 +1964,9 @@ } }, "node_modules/@hpcc-js/marshaller/node_modules/@hpcc-js/codemirror": { - "version": "2.65.1", - "resolved": "https://registry.npmjs.org/@hpcc-js/codemirror/-/codemirror-2.65.1.tgz", - "integrity": "sha512-c7VvZCHYX4zDEA52bHW0lWwAkl2mxnIERARYsf77TZQeGVcfeDMOFOVVdr4ZNazyn+4Pi26vspxVbzdvzzhakw==", + "version": "2.66.0", + "resolved": "https://registry.npmjs.org/@hpcc-js/codemirror/-/codemirror-2.66.0.tgz", + "integrity": "sha512-XOEQ7BUJNo8nTsUjKbaG/bu7MYjbeQ/YMbBAIIiRtdCHSHbFB24iMLnQ87bQuL9r7P7WiSCua+HwYLaSY/f2Sg==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -1999,9 +1999,9 @@ } }, "node_modules/@hpcc-js/marshaller/node_modules/@hpcc-js/comms": { - "version": "2.101.3", - "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.101.3.tgz", - "integrity": "sha512-NQOpSolyqMeYzm+RNUWa1ExGDPHt5O2NLdT2D8OdGQp6N1xK9KmuwH+U7Evnnh9jIdCMyYMkqVEEAqx+FYC62Q==", + "version": "2.102.0", + "resolved": "https://registry.npmjs.org/@hpcc-js/comms/-/comms-2.102.0.tgz", + "integrity": "sha512-mHrAXltB9BUAfY/urhiGZj2hoODyvMjudBt2pT1EWTfEDycBbegeMncjBgX6H9tiZIRhd+3cRiRULX1pI0XVMQ==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -19564,9 +19564,9 @@ } }, "node_modules/tar-fs": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.0.tgz", - "integrity": "sha512-5Mty5y/sOF1YWj1J6GiBodjlDc05CUR8PKXrsnFAiSG0xA+GHeWLovaZPYUDXkH/1iKRf2+M5+OrRgzC7O9b7w==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.1.tgz", + "integrity": "sha512-LZA0oaPOc2fVo82Txf3gw+AkEd38szODlptMYejQUhndHMLQ9M059uXR+AfS7DNo0NpINvSqDsvyaCrBVkptWg==", "dev": true, "license": "MIT", "dependencies": { @@ -22330,7 +22330,6 @@ "d3-format": "^1", "d3-time-format": "^2", "data-uri-to-buffer": "6.0.2", - "safe-buffer": "5.2.1", "soap": "1.4.1", "tmp": "0.2.5", "typescript-formatter": "^7.2.2" diff --git a/packages/comms/package.json b/packages/comms/package.json index 34faaadf7b..3c49cd9bf7 100644 --- a/packages/comms/package.json +++ b/packages/comms/package.json @@ -90,7 +90,6 @@ "d3-format": "^1", "d3-time-format": "^2", "data-uri-to-buffer": "6.0.2", - "safe-buffer": "5.2.1", "tmp": "0.2.5", "soap": "1.4.1", "typescript-formatter": "^7.2.2" diff --git a/packages/comms/src/index.node.ts b/packages/comms/src/index.node.ts index 391fecbd8f..8863d57161 100644 --- a/packages/comms/src/index.node.ts +++ b/packages/comms/src/index.node.ts @@ -58,7 +58,7 @@ root.fetch.__trustwaveAgent = new https.Agent({ }); // btoa polyfill --- -import { Buffer } from "safe-buffer"; +import { Buffer } from "node:buffer"; if (typeof root.btoa === "undefined") { root.btoa = function (str: string) { return Buffer.from(str || "", "utf8").toString("base64");