diff --git a/mbTest/package-lock.json b/mbTest/package-lock.json index 8f83fca78..eabeb5157 100644 --- a/mbTest/package-lock.json +++ b/mbTest/package-lock.json @@ -9,6 +9,7 @@ "version": "0.0.1", "license": "MIT", "dependencies": { + "@xmldom/xmldom": "0.8.0", "express": "4.17.1", "fs-extra": "10.0.0", "hpagent": "0.1.1", @@ -20,7 +21,6 @@ "nodemailer": "6.6.3", "safe-stable-stringify": "1.1.1", "w3cjs": "0.4.0", - "xmldom": "0.6.0", "xpath": "0.0.32" }, "engines": { @@ -28,10 +28,11 @@ } }, "..": { - "version": "2.5.0", + "version": "2.6.0", "hasInstallScript": true, "license": "MIT", "dependencies": { + "@xmldom/xmldom": "0.8.0", "cors": "2.8.5", "csv-parse": "4.16.3", "ejs": "3.1.6", @@ -50,7 +51,6 @@ "safe-stable-stringify": "1.1.1", "smtp-server": "3.9.0", "winston": "3.3.3", - "xmldom": "0.6.0", "xpath": "0.0.32", "yargs": "17.1.1" }, @@ -338,14 +338,6 @@ "tlds": "bin.js" } }, - "../node_modules/xmldom": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz", - "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==", - "engines": { - "node": ">=10.0.0" - } - }, "../node_modules/yargs": { "version": "17.1.1", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz", @@ -376,6 +368,14 @@ "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==" }, + "node_modules/@xmldom/xmldom": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.0.tgz", + "integrity": "sha512-7wVnF+rKrVDEo1xjzkkidTG0grclaVnX0vKa0z9JSXcEdtftUJjvU33jLGg6SHyvs3eeqEsI7jZ6NxYfRypEEg==", + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/abab": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", @@ -3630,14 +3630,6 @@ "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" }, - "node_modules/xmldom": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz", - "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==", - "engines": { - "node": ">=10.0.0" - } - }, "node_modules/xpath": { "version": "0.0.32", "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz", @@ -3788,6 +3780,11 @@ "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==" }, + "@xmldom/xmldom": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.0.tgz", + "integrity": "sha512-7wVnF+rKrVDEo1xjzkkidTG0grclaVnX0vKa0z9JSXcEdtftUJjvU33jLGg6SHyvs3eeqEsI7jZ6NxYfRypEEg==" + }, "abab": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", @@ -5211,6 +5208,7 @@ "mountebank": { "version": "file:..", "requires": { + "@xmldom/xmldom": "0.8.0", "cors": "2.8.5", "coveralls": "3.1.1", "csv-parse": "4.16.3", @@ -5242,7 +5240,6 @@ "snyk": "1.705.0", "w3cjs": "0.4.0", "winston": "3.3.3", - "xmldom": "0.6.0", "xpath": "0.0.32", "yargs": "17.1.1" }, @@ -5441,11 +5438,6 @@ "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.221.1.tgz", "integrity": "sha512-N1Afn/SLeOQRpxMwHBuNFJ3GvGrdtY4XPXKPFcx8he0U9Jg9ZkvTKE1k3jQDtCmlFn44UxjVtouF6PT4rEGd3Q==" }, - "xmldom": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz", - "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==" - }, "yargs": { "version": "17.1.1", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz", @@ -6580,11 +6572,6 @@ "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" }, - "xmldom": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz", - "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==" - }, "xpath": { "version": "0.0.32", "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz", diff --git a/mbTest/package.json b/mbTest/package.json index 4ebf23622..9c6a5df0a 100644 --- a/mbTest/package.json +++ b/mbTest/package.json @@ -23,6 +23,7 @@ "airplane": "MB_AIRPLANE_MODE=true npm test" }, "dependencies": { + "@xmldom/xmldom": "0.8.0", "express": "4.17.1", "fs-extra": "10.0.0", "hpagent": "0.1.1", @@ -34,7 +35,6 @@ "nodemailer": "6.6.3", "safe-stable-stringify": "1.1.1", "w3cjs": "0.4.0", - "xmldom": "0.6.0", "xpath": "0.0.32" }, "engines": { diff --git a/mbTest/web/feedTest.js b/mbTest/web/feedTest.js index 5b495bf64..9d4fbf797 100644 --- a/mbTest/web/feedTest.js +++ b/mbTest/web/feedTest.js @@ -4,7 +4,7 @@ const assert = require('assert'), api = require('../api').create(), httpClient = require('../baseHttpClient').create('http'), xpath = require('xpath'), - DOMParser = require('xmldom').DOMParser, + DOMParser = require('@xmldom/xmldom').DOMParser, timeout = parseInt(process.env.MB_SLOW_TEST_TIMEOUT || 3000); function entryCount (body) { diff --git a/package-lock.json b/package-lock.json index 1c7182d9a..544ffbb3e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -917,6 +917,11 @@ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", "dev": true }, + "@xmldom/xmldom": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.0.tgz", + "integrity": "sha512-7wVnF+rKrVDEo1xjzkkidTG0grclaVnX0vKa0z9JSXcEdtftUJjvU33jLGg6SHyvs3eeqEsI7jZ6NxYfRypEEg==" + }, "JSONStream": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", @@ -10719,11 +10724,6 @@ "integrity": "sha512-HgS+X6zAztGa9zIK3Y3LXuJes33Lz9x+YyTxgrkIdabu2vqcGOWwdfCpf1hWLRrd553wd4QCDf6BBO6FfdsRiQ==", "dev": true }, - "xmldom": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.6.0.tgz", - "integrity": "sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==" - }, "xpath": { "version": "0.0.32", "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz", diff --git a/package.json b/package.json index 5d62cbfd3..662da6425 100644 --- a/package.json +++ b/package.json @@ -53,6 +53,7 @@ "service virtualization" ], "dependencies": { + "@xmldom/xmldom": "0.8.0", "cors": "2.8.5", "csv-parse": "4.16.3", "ejs": "3.1.6", @@ -71,7 +72,6 @@ "safe-stable-stringify": "1.1.1", "smtp-server": "3.9.0", "winston": "3.3.3", - "xmldom": "0.6.0", "xpath": "0.0.32", "yargs": "17.1.1" }, diff --git a/src/models/xpath.js b/src/models/xpath.js index 97b55e53f..cb2cb7f5b 100644 --- a/src/models/xpath.js +++ b/src/models/xpath.js @@ -51,7 +51,7 @@ function nodeValue (node) { */ function select (selector, ns, possibleXML, logger) { const xpath = require('xpath'), - DOMParser = require('xmldom').DOMParser, + DOMParser = require('@xmldom/xmldom').DOMParser, parser = new DOMParser({ errorHandler: (level, message) => { const warn = (logger || {}).warn || (() => {});