diff --git a/README.md b/README.md index 6e32fa4e..26b07ed2 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ Example: `````javascript var select = require('xml-crypto').xpath - , dom = require('xmldom').DOMParser + , dom = require('@xmldom/xmldom').DOMParser , SignedXml = require('xml-crypto').SignedXml , FileKeyInfo = require('xml-crypto').FileKeyInfo , fs = require('fs') diff --git a/example/example.js b/example/example.js index eda0c257..351a3052 100644 --- a/example/example.js +++ b/example/example.js @@ -1,5 +1,5 @@ var select = require('xml-crypto').xpath - , dom = require('xmldom').DOMParser + , dom = require('@xmldom/xmldom').DOMParser , SignedXml = require('xml-crypto').SignedXml , FileKeyInfo = require('xml-crypto').FileKeyInfo , fs = require('fs') diff --git a/lib/signed-xml.js b/lib/signed-xml.js index 8db07f21..5b127fec 100644 --- a/lib/signed-xml.js +++ b/lib/signed-xml.js @@ -1,5 +1,5 @@ var xpath = require('xpath') - , Dom = require('xmldom').DOMParser + , Dom = require('@xmldom/xmldom').DOMParser , utils = require('./utils') , c14n = require('./c14n-canonicalization') , execC14n = require('./exclusive-canonicalization') diff --git a/package-lock.json b/package-lock.json index 9a9077ce..cb1f1863 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,11 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@xmldom/xmldom": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.0.tgz", + "integrity": "sha512-imgPU2uvItdwBSO/q/k/pntmrYm/bjiD3Xs6O2daALR1lBjif7JVxS1RYAwTcYxZUPHeBAoiKUcGpyCD9+MRRg==" + }, "ajv": { "version": "5.5.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", @@ -3596,11 +3601,6 @@ "signal-exit": "^3.0.2" } }, - "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.27", "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.27.tgz", diff --git a/package.json b/package.json index b6760397..517dc257 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ "LoneRifle " ], "dependencies": { - "xmldom": "^0.6.0", - "xpath": "0.0.27" + "@xmldom/xmldom": "^0.7.0", + "xpath": "0.0.32" }, "devDependencies": { "ejs": "2.6.1", diff --git a/test/c14n-non-exclusive-unit-test.js b/test/c14n-non-exclusive-unit-test.js index ffcb3dae..49c837b8 100644 --- a/test/c14n-non-exclusive-unit-test.js +++ b/test/c14n-non-exclusive-unit-test.js @@ -1,5 +1,5 @@ var C14nCanonicalization = require("../lib/c14n-canonicalization").C14nCanonicalization - , Dom = require('xmldom').DOMParser + , Dom = require('@xmldom/xmldom').DOMParser , select = require('xpath').select , findAncestorNs = require('../lib/signed-xml').SignedXml.findAncestorNs @@ -175,4 +175,4 @@ exports["C14n: Don't redeclare an attribute's namespace prefix if already in sco var expected = ''; test_C14nCanonicalization(test, xml, xpath, expected); -} \ No newline at end of file +} diff --git a/test/c14nWithComments-unit-tests.js b/test/c14nWithComments-unit-tests.js index 4f112c67..be4af3b6 100644 --- a/test/c14nWithComments-unit-tests.js +++ b/test/c14nWithComments-unit-tests.js @@ -1,5 +1,5 @@ var c14nWithComments = require("../lib/exclusive-canonicalization").ExclusiveCanonicalizationWithComments - , Dom = require('xmldom').DOMParser + , Dom = require('@xmldom/xmldom').DOMParser , select = require('xpath').select , SignedXml = require('../lib/signed-xml.js').SignedXml diff --git a/test/canonicalization-unit-tests.js b/test/canonicalization-unit-tests.js index b7f0fb36..a9069e04 100644 --- a/test/canonicalization-unit-tests.js +++ b/test/canonicalization-unit-tests.js @@ -1,5 +1,5 @@ var ExclusiveCanonicalization = require("../lib/exclusive-canonicalization").ExclusiveCanonicalization - , Dom = require('xmldom').DOMParser + , Dom = require('@xmldom/xmldom').DOMParser , select = require('xpath').select , SignedXml = require('../lib/signed-xml.js').SignedXml diff --git a/test/document-test.js b/test/document-test.js index a9be3233..fd7f12d9 100644 --- a/test/document-test.js +++ b/test/document-test.js @@ -1,6 +1,6 @@ var crypto = require('../index'); var xpath = require('xpath'); -var xmldom = require('xmldom'); +var xmldom = require('@xmldom/xmldom'); var fs = require('fs'); exports['test with a document '] = function (test) { diff --git a/test/hmac-tests.js b/test/hmac-tests.js index 17149afa..17caf0ba 100644 --- a/test/hmac-tests.js +++ b/test/hmac-tests.js @@ -1,6 +1,6 @@ var crypto = require('../index'); var xpath = require('xpath'); -var xmldom = require('xmldom'); +var xmldom = require('@xmldom/xmldom'); var fs = require('fs'); exports['test validating HMAC signature'] = function (test) { diff --git a/test/saml-response-test.js b/test/saml-response-test.js index 28b063d6..d2cddb43 100644 --- a/test/saml-response-test.js +++ b/test/saml-response-test.js @@ -1,6 +1,6 @@ var crypto = require('../index'); var xpath = require('xpath'); -var xmldom = require('xmldom'); +var xmldom = require('@xmldom/xmldom'); var fs = require('fs'); exports['test validating SAML response'] = function (test) { diff --git a/test/signature-integration-tests.js b/test/signature-integration-tests.js index 98f420f8..36d32ef2 100644 --- a/test/signature-integration-tests.js +++ b/test/signature-integration-tests.js @@ -1,5 +1,5 @@ var xpath = require('xpath') - , Dom = require('xmldom').DOMParser + , Dom = require('@xmldom/xmldom').DOMParser , SignedXml = require('../lib/signed-xml.js').SignedXml , fs = require('fs') , crypto = require('../index') diff --git a/test/signature-unit-tests.js b/test/signature-unit-tests.js index f6a6a24e..453919b7 100644 --- a/test/signature-unit-tests.js +++ b/test/signature-unit-tests.js @@ -1,5 +1,5 @@ var select = require('xpath').select - , dom = require('xmldom').DOMParser + , dom = require('@xmldom/xmldom').DOMParser , SignedXml = require('../lib/signed-xml.js').SignedXml , FileKeyInfo = require('../lib/signed-xml.js').FileKeyInfo , fs = require('fs') diff --git a/test/wsfed-metadata-test.js b/test/wsfed-metadata-test.js index f8f2415d..54dd2360 100644 --- a/test/wsfed-metadata-test.js +++ b/test/wsfed-metadata-test.js @@ -1,6 +1,6 @@ var crypto = require('../index'); var xpath = require('xpath'); -var xmldom = require('xmldom'); +var xmldom = require('@xmldom/xmldom'); var fs = require('fs'); exports['test validating WS-Fed Metadata'] = function (test) {