Skip to content

Commit

Permalink
Update dependencies; move to @xmldom-scoped is-dom-node package (#402)
Browse files Browse the repository at this point in the history
  • Loading branch information
cjbarth authored Oct 10, 2023
1 parent 6f95f2e commit e044d7a
Show file tree
Hide file tree
Showing 17 changed files with 644 additions and 670 deletions.
1,256 changes: 615 additions & 641 deletions package-lock.json

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,34 +38,34 @@
"test": "nyc mocha"
},
"dependencies": {
"@xmldom/is-dom-node": "^1.0.1",
"@xmldom/xmldom": "^0.8.10",
"is-dom-node": "github:xmldom/is-dom-node#v1.0.0",
"xpath": "^0.0.33"
},
"devDependencies": {
"@cjbarth/github-release-notes": "^4.1.0",
"@cjbarth/github-release-notes": "^4.2.0",
"@istanbuljs/nyc-config-typescript": "^1.0.2",
"@prettier/plugin-xml": "^3.1.1",
"@types/chai": "^4.3.5",
"@types/mocha": "^10.0.1",
"@types/node": "^16.18.52",
"@prettier/plugin-xml": "^3.2.1",
"@types/chai": "^4.3.6",
"@types/mocha": "^10.0.2",
"@types/node": "^16.18.58",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"chai": "^4.3.7",
"chai": "^4.3.10",
"choma": "^1.2.1",
"ejs": "^3.1.9",
"eslint": "^8.45.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-deprecation": "^1.4.1",
"eslint": "^8.51.0",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-deprecation": "^1.5.0",
"lcov": "^1.16.0",
"mocha": "^10.2.0",
"nyc": "^15.1.0",
"prettier": "^3.0.0",
"prettier-plugin-packagejson": "^2.4.5",
"release-it": "^16.1.3",
"prettier": "^3.0.3",
"prettier-plugin-packagejson": "^2.4.6",
"release-it": "^16.2.1",
"source-map-support": "^0.5.21",
"ts-node": "^10.9.1",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
},
"engines": {
"node": ">=16"
Expand Down
2 changes: 1 addition & 1 deletion src/c14n-canonicalization.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import type {
RenderedNamespace,
} from "./types";
import * as utils from "./utils";
import * as isDomNode from "is-dom-node";
import * as isDomNode from "@xmldom/is-dom-node";

export class C14nCanonicalization implements CanonicalizationOrTransformationAlgorithm {
includeComments = false;
Expand Down
2 changes: 1 addition & 1 deletion src/enveloped-signature.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as xpath from "xpath";
import * as isDomNode from "is-dom-node";
import * as isDomNode from "@xmldom/is-dom-node";

import type {
CanonicalizationOrTransformationAlgorithm,
Expand Down
2 changes: 1 addition & 1 deletion src/exclusive-canonicalization.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type {
NamespacePrefix,
} from "./types";
import * as utils from "./utils";
import * as isDomNode from "is-dom-node";
import * as isDomNode from "@xmldom/is-dom-node";

function isPrefixInScope(prefixesInScope, prefix, namespaceURI) {
let ret = false;
Expand Down
2 changes: 1 addition & 1 deletion src/signed-xml.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import * as envelopedSignatures from "./enveloped-signature";
import * as hashAlgorithms from "./hash-algorithms";
import * as signatureAlgorithms from "./signature-algorithms";
import * as crypto from "crypto";
import * as isDomNode from "is-dom-node";
import * as isDomNode from "@xmldom/is-dom-node";

export class SignedXml {
idMode?: "wssecurity";
Expand Down
2 changes: 1 addition & 1 deletion src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as xpath from "xpath";
import type { NamespacePrefix } from "./types";
import * as isDomNode from "is-dom-node";
import * as isDomNode from "@xmldom/is-dom-node";

export function isArrayHasLength(array: unknown): array is unknown[] {
return Array.isArray(array) && array.length > 0;
Expand Down
2 changes: 1 addition & 1 deletion test/c14n-non-exclusive-unit-tests.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { C14nCanonicalization } from "../src/c14n-canonicalization";
import * as xmldom from "@xmldom/xmldom";
import * as xpath from "xpath";
import * as utils from "../src/utils";
import * as isDomNode from "is-dom-node";
import * as isDomNode from "@xmldom/is-dom-node";

const test_C14nCanonicalization = function (xml, xpathArg, expected) {
const doc = new xmldom.DOMParser().parseFromString(xml);
Expand Down
2 changes: 1 addition & 1 deletion test/c14nWithComments-unit-tests.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ExclusiveCanonicalizationWithComments as c14nWithComments } from "../sr
import * as xmldom from "@xmldom/xmldom";
import * as xpath from "xpath";
import { SignedXml } from "../src/index";
import * as isDomNode from "is-dom-node";
import * as isDomNode from "@xmldom/is-dom-node";

const compare = function (xml, xpathArg, expected, inclusiveNamespacesPrefixList?: string[]) {
const doc = new xmldom.DOMParser().parseFromString(xml);
Expand Down
2 changes: 1 addition & 1 deletion test/canonicalization-unit-tests.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ExclusiveCanonicalization } from "../src/exclusive-canonicalization";
import * as xmldom from "@xmldom/xmldom";
import * as xpath from "xpath";
import { SignedXml } from "../src/index";
import * as isDomNode from "is-dom-node";
import * as isDomNode from "@xmldom/is-dom-node";

const compare = function (
xml: string,
Expand Down
2 changes: 1 addition & 1 deletion test/document-tests.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as xpath from "xpath";
import * as xmldom from "@xmldom/xmldom";
import * as fs from "fs";
import { expect } from "chai";
import * as isDomNode from "is-dom-node";
import * as isDomNode from "@xmldom/is-dom-node";

describe("Document tests", function () {
it("test with a document (using FileKeyInfo)", function () {
Expand Down
2 changes: 1 addition & 1 deletion test/hmac-tests.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as xpath from "xpath";
import * as xmldom from "@xmldom/xmldom";
import * as fs from "fs";
import { expect } from "chai";
import * as isDomNode from "is-dom-node";
import * as isDomNode from "@xmldom/is-dom-node";

describe("HMAC tests", function () {
it("test validating HMAC signature", function () {
Expand Down
2 changes: 1 addition & 1 deletion test/key-info-tests.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as fs from "fs";
import * as xpath from "xpath";
import { SignedXml } from "../src/index";
import { expect } from "chai";
import * as isDomNode from "is-dom-node";
import * as isDomNode from "@xmldom/is-dom-node";

describe("KeyInfo tests", function () {
it("adds X509Certificate element during signature", function () {
Expand Down
2 changes: 1 addition & 1 deletion test/saml-response-tests.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as xpath from "xpath";
import * as xmldom from "@xmldom/xmldom";
import * as fs from "fs";
import { expect } from "chai";
import * as isDomNode from "is-dom-node";
import * as isDomNode from "@xmldom/is-dom-node";

describe("SAML response tests", function () {
it("test validating SAML response", function () {
Expand Down
2 changes: 1 addition & 1 deletion test/signature-integration-tests.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as xmldom from "@xmldom/xmldom";
import { SignedXml } from "../src/index";
import * as fs from "fs";
import { expect } from "chai";
import * as isDomNode from "is-dom-node";
import * as isDomNode from "@xmldom/is-dom-node";

describe("Signature integration tests", function () {
function verifySignature(xml, expected, xpath) {
Expand Down
2 changes: 1 addition & 1 deletion test/signature-unit-tests.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { SignedXml, createOptionalCallbackFunction } from "../src/index";
import * as fs from "fs";
import * as crypto from "crypto";
import { expect } from "chai";
import * as isDomNode from "is-dom-node";
import * as isDomNode from "@xmldom/is-dom-node";

describe("Signature unit tests", function () {
function verifySignature(xml: string, idMode?: "wssecurity") {
Expand Down
2 changes: 1 addition & 1 deletion test/wsfed-metadata-tests.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as xpath from "xpath";
import * as xmldom from "@xmldom/xmldom";
import * as fs from "fs";
import { expect } from "chai";
import * as isDomNode from "is-dom-node";
import * as isDomNode from "@xmldom/is-dom-node";

describe("WS-Fed Metadata tests", function () {
it("test validating WS-Fed Metadata", function () {
Expand Down

0 comments on commit e044d7a

Please sign in to comment.