From 8424bde5742e3304f3f8fbeaa65a8d6860125c7f Mon Sep 17 00:00:00 2001 From: Dan Selman Date: Tue, 9 Apr 2024 23:49:36 +0200 Subject: [PATCH 1/2] fix: remove require of util package Signed-off-by: Dan Selman --- packages/markdown-template/src/ModelVisitor.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/markdown-template/src/ModelVisitor.js b/packages/markdown-template/src/ModelVisitor.js index c49882a6..afa9380e 100644 --- a/packages/markdown-template/src/ModelVisitor.js +++ b/packages/markdown-template/src/ModelVisitor.js @@ -14,8 +14,6 @@ 'use strict'; -const util = require('util'); - const { CommonMarkModel, TemplateMarkModel } = require('@accordproject/markdown-common'); /** @@ -44,10 +42,7 @@ class ModelVisitor { } else if (thing.isEnumValue?.()) { return this.visitEnumValueDeclaration(thing, parameters); } else { - throw new Error('Unrecognised type: ' + typeof thing + ', value: ' + util.inspect(thing, { - showHidden: true, - depth: 2 - })); + throw new Error('Unrecognised type: ' + typeof thing + ', value: ' + thing); } } From 7189256c0db1fc30a886d07b90ed6e1b9a6ae772 Mon Sep 17 00:00:00 2001 From: Dan Selman Date: Wed, 10 Apr 2024 00:41:42 +0200 Subject: [PATCH 2/2] browersify util Signed-off-by: Dan Selman --- package-lock.json | 52 +++++++++++++++++-- package.json | 3 +- packages/markdown-transform/webpack.config.js | 2 +- 3 files changed, 51 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index f32c54a8..7eafe1f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,8 @@ "semver": "7.3.5", "sleep-promise": "8.0.1", "source-map-support": "0.5.12", - "traverse": "^0.6.7" + "traverse": "^0.6.7", + "util": "npm:browserify-util@^0.12.6" }, "engines": { "node": ">=18", @@ -2582,6 +2583,33 @@ "license": "MIT", "optional": true }, + "node_modules/@nolyfill/is-generator-function": { + "version": "1.0.29", + "resolved": "https://registry.npmjs.org/@nolyfill/is-generator-function/-/is-generator-function-1.0.29.tgz", + "integrity": "sha512-dBNj5iWhFQUM3JG8XxdwYMQMes44GY9cHCeBXAZNrsYAuQofcL0ke4c9BNh/2FPSVr+sVjErbQHLpaos/XMpug==", + "dev": true, + "engines": { + "node": ">=12.4.0" + } + }, + "node_modules/@nolyfill/shared": { + "version": "1.0.29", + "resolved": "https://registry.npmjs.org/@nolyfill/shared/-/shared-1.0.29.tgz", + "integrity": "sha512-Z8TABKv9kk8LrOtrfShpjeg9BhPI3AKZ78eVsVduSEhti8D59Fk+UmgO7iRJHLd1aMB7A1aIb+bQtcCjVmWJoA==", + "dev": true + }, + "node_modules/@nolyfill/which-typed-array": { + "version": "1.0.29", + "resolved": "https://registry.npmjs.org/@nolyfill/which-typed-array/-/which-typed-array-1.0.29.tgz", + "integrity": "sha512-FqPYrNSzpICKHoKRVUjNfCS0L5B7uK/gGoE32gbV2THPfpwbLfM1e8C9NuOXhNtMjP3G9ni0DXUUipSCaWdfLQ==", + "dev": true, + "dependencies": { + "@nolyfill/shared": "1.0.29" + }, + "engines": { + "node": ">=12.4.0" + } + }, "node_modules/@oozcitak/dom": { "version": "1.15.6", "license": "MIT", @@ -3973,7 +4001,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001519", + "version": "1.0.30001607", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001607.tgz", + "integrity": "sha512-WcvhVRjXLKFB/kmOFVwELtMxyhq3iM/MvmXcyCe2PNf166c39mptscOc/45TTS96n2gpNV2z7+NakArTWZCQ3w==", "dev": true, "funding": [ { @@ -3988,8 +4018,7 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ], - "license": "CC-BY-4.0" + ] }, "node_modules/caseless": { "version": "0.12.0", @@ -10977,6 +11006,21 @@ "requires-port": "^1.0.0" } }, + "node_modules/util": { + "name": "browserify-util", + "version": "0.12.6", + "resolved": "https://registry.npmjs.org/browserify-util/-/browserify-util-0.12.6.tgz", + "integrity": "sha512-AUwf55wMcb4WpTwYDMCVsLDrEV7GRg+58i4bHFrwUSkjHb1t30ot36nseJ4Ynce35yVX4+4hLsB1Oop7RQI1rg==", + "dev": true, + "dependencies": { + "@nolyfill/is-generator-function": "^1.0.24", + "@nolyfill/which-typed-array": "^1.0.24", + "inherits": "^2.0.3" + }, + "engines": { + "node": ">=12.6.0" + } + }, "node_modules/util-deprecate": { "version": "1.0.2", "license": "MIT" diff --git a/package.json b/package.json index c5726006..e388ab5b 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,8 @@ "semver": "7.3.5", "sleep-promise": "8.0.1", "source-map-support": "0.5.12", - "traverse": "^0.6.7" + "traverse": "^0.6.7", + "util": "npm:browserify-util@^0.12.6" }, "engines": { "node": ">=18", diff --git a/packages/markdown-transform/webpack.config.js b/packages/markdown-transform/webpack.config.js index ba2ae87b..d8d89456 100644 --- a/packages/markdown-transform/webpack.config.js +++ b/packages/markdown-transform/webpack.config.js @@ -74,7 +74,7 @@ module.exports = { 'net': false, 'path': false, 'os': false, - 'util': false, + 'util': require.resolve('browserify-util'), 'url': false, 'assert': false, 'crypto': require.resolve('crypto-browserify'),