Skip to content

Commit e58e4dd

Browse files
committed
upgrade: xml-naming v0.3.0, PEM v1.6.2, is-unsafe v2.0.0
1 parent 545e491 commit e58e4dd

4 files changed

Lines changed: 62 additions & 36 deletions

File tree

package-lock.json

Lines changed: 43 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@
8585
"dependencies": {
8686
"@nodable/entities": "^2.2.0",
8787
"fast-xml-builder": "^1.2.0",
88-
"is-unsafe": "^1.0.1",
89-
"path-expression-matcher": "^1.5.0",
88+
"is-unsafe": "^2.0.0",
89+
"path-expression-matcher": "^1.6.2",
9090
"strnum": "^2.4.1",
91-
"xml-naming": "^0.1.0"
91+
"xml-naming": "^0.3.0"
9292
}
93-
}
93+
}

src/xmlparser/OrderedObjParser.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import getIgnoreAttributesFn from "../ignoreAttributes.js";
99
import { Expression, Matcher } from 'path-expression-matcher';
1010
import { ExpressionSet } from 'path-expression-matcher';
1111
import { EntityDecoder, XML, CURRENCY, COMMON_HTML, ENTITY_ACTION } from '@nodable/entities';
12-
import { isUnsafe, VALID_CONTEXTS } from "is-unsafe"
12+
import { isUnsafe, HTML as HTML_CONTEXT, XML as XML_CONTEXT } from "is-unsafe"
1313

1414

1515
// const regx =
@@ -104,8 +104,7 @@ export default class OrderedObjParser {
104104
// onExternalEntity: (name, value) => isUnsafe(value) ? 'block' : 'allow',
105105
onInputEntity: (name, value) =>
106106
//TODO: VALID_CONTEXTS.HTML should be set only if this.options.htmlEntities
107-
isUnsafe(value, [VALID_CONTEXTS.HTML, VALID_CONTEXTS.XML])
108-
? ENTITY_ACTION.BLOCK : ENTITY_ACTION.ALLOW,
107+
isUnsafe(value, [HTML_CONTEXT, XML_CONTEXT]) ? ENTITY_ACTION.BLOCK : ENTITY_ACTION.ALLOW,
109108

110109
//postCheck: resolved => resolved
111110
});

yarn.lock

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2075,10 +2075,10 @@ is-plain-object@^2.0.4:
20752075
dependencies:
20762076
isobject "^3.0.1"
20772077

2078-
is-unsafe@^1.0.1:
2079-
version "1.0.1"
2080-
resolved "https://registry.npmjs.org/is-unsafe/-/is-unsafe-1.0.1.tgz"
2081-
integrity sha512-CLK2+VdgERgD96EYm5lUQssZYlRg2tkZnbsxZoacmSiRxiFJ4Nk4SzjCl+Ur+v3kXIY9dTIdb3IH22y1mZ56LA==
2078+
is-unsafe@^2.0.0:
2079+
version "2.0.0"
2080+
resolved "https://registry.npmjs.org/is-unsafe/-/is-unsafe-2.0.0.tgz"
2081+
integrity sha512-2LdV822R+wmI86unXA93WCFpL6g+av8ynWk0nrHyJqGop5VoocYsSLFgN8jrfalT6iGeLNM4KXuVSsULP53kEA==
20822082

20832083
isexe@^2.0.0:
20842084
version "2.0.0"
@@ -2439,10 +2439,10 @@ path-exists@^4.0.0:
24392439
resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
24402440
integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
24412441

2442-
path-expression-matcher@^1.5.0:
2443-
version "1.5.0"
2444-
resolved "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.5.0.tgz"
2445-
integrity sha512-cbrerZV+6rvdQrrD+iGMcZFEiiSrbv9Tfdkvnusy6y0x0GKBXREFg/Y65GhIfm0tnLntThhzCnfKwp1WRjeCyQ==
2442+
path-expression-matcher@^1.5.0, path-expression-matcher@^1.6.2:
2443+
version "1.6.2"
2444+
resolved "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.6.2.tgz"
2445+
integrity sha512-enSlaiat05iasnzmgNxRj8reFdj3puY2QpNgP1aPIaVfT6nn9ICuPoFlKHk8EN22HcwewshO+mN2DGbkCEOtqQ==
24462446

24472447
path-is-absolute@^1.0.0:
24482448
version "1.0.1"
@@ -3025,6 +3025,11 @@ xml-naming@^0.1.0:
30253025
resolved "https://registry.npmjs.org/xml-naming/-/xml-naming-0.1.0.tgz"
30263026
integrity sha512-k8KO9hrMyNk6tUWqUfkTEZbezRRpONVOzUTnc97VnCvyj6Tf9lyUR9EDAIeiVLv56jsMcoXEwjW8Kv5yPY52lw==
30273027

3028+
xml-naming@^0.3.0:
3029+
version "0.3.0"
3030+
resolved "https://registry.npmjs.org/xml-naming/-/xml-naming-0.3.0.tgz"
3031+
integrity sha512-ghig2TBE/H11aOVgmahA3MhimvkBr6JIYknH/Dhdk10nXwdbIqBJsbfMxpvFPG8bAw77gN29aQWvKpmVoPlvPQ==
3032+
30283033
y18n@^5.0.5:
30293034
version "5.0.8"
30303035
resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"

0 commit comments

Comments
 (0)