diff --git a/packages/rewriter/lib/html-rules.ts b/packages/rewriter/lib/html-rules.ts index ca2d20109a29..376ef9fa5ac1 100644 --- a/packages/rewriter/lib/html-rules.ts +++ b/packages/rewriter/lib/html-rules.ts @@ -1,5 +1,5 @@ import find from 'lodash/find' -import type RewritingStream from 'parse5-html-rewriting-stream' +import type { RewritingStream } from 'parse5-html-rewriting-stream' import { STRIPPED_INTEGRITY_TAG } from './constants.json' import * as js from './js' diff --git a/packages/rewriter/lib/html.ts b/packages/rewriter/lib/html.ts index aa913fc2fdb4..1dbbc88f594e 100644 --- a/packages/rewriter/lib/html.ts +++ b/packages/rewriter/lib/html.ts @@ -1,4 +1,4 @@ -import RewritingStream from 'parse5-html-rewriting-stream' +import { RewritingStream } from 'parse5-html-rewriting-stream' import * as htmlRules from './html-rules' import type stream from 'stream' import type { DeferSourceMapRewriteFn } from './js' diff --git a/packages/rewriter/package.json b/packages/rewriter/package.json index c57a3fc7a1da..e2aeea52d05f 100644 --- a/packages/rewriter/package.json +++ b/packages/rewriter/package.json @@ -19,12 +19,11 @@ "chai-as-promised": "7.1.1", "debug": "^4.3.4", "lodash": "^4.17.19", - "parse5-html-rewriting-stream": "5.1.1", + "parse5-html-rewriting-stream": "7.0.0", "recast": "0.20.4" }, "devDependencies": { "@cypress/request-promise": "^5.0.0", - "@types/parse5-html-rewriting-stream": "5.1.1", "fs-extra": "9.1.0", "nock": "13.2.9", "sinon": "9.0.2", @@ -38,9 +37,7 @@ "workspaces": { "nohoist": [ "parse5-html-rewriting-stream", - "parse5-html-rewriting-stream/**", - "@types/parse5-html-rewriting-stream", - "@types/parse5-html-rewriting-stream/**" + "parse5-html-rewriting-stream/**" ] } } diff --git a/yarn.lock b/yarn.lock index b200bb832fa9..854e6f2591a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7765,26 +7765,6 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== -"@types/parse5-html-rewriting-stream@5.1.1": - version "5.1.1" - resolved "https://registry.yarnpkg.com/@types/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-5.1.1.tgz#a53feb6070b02193b5fc64e3cd81937a0f2503a9" - integrity sha512-mjD4nx8WudMCR8EQVlU7Trc2uwKND7LMuftzgsbMmiFTeeW+viKjeqg7VnE0TNjSSQv3z9588K8BsT+N1EBLlg== - dependencies: - "@types/parse5-sax-parser" "*" - -"@types/parse5-sax-parser@*": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@types/parse5-sax-parser/-/parse5-sax-parser-5.0.1.tgz#f1e26e82bb09e48cb0c16ff6d1e88aea1e538fd5" - integrity sha512-wBEwg10aACLggnb44CwzAA27M1Jrc/8TR16zA61/rKO5XZoi7JSfLjdpXbshsm7wOlM6hpfvwygh40rzM2RsQQ== - dependencies: - "@types/node" "*" - "@types/parse5" "*" - -"@types/parse5@*": - version "5.0.3" - resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109" - integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw== - "@types/parsimmon@^1.10.1": version "1.10.6" resolved "https://registry.yarnpkg.com/@types/parsimmon/-/parsimmon-1.10.6.tgz#8fcf95990514d2a7624aa5f630c13bf2427f9cdd" @@ -14499,7 +14479,7 @@ entities@^1.1.1, entities@^1.1.2: resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== -entities@^4.2.0, entities@^4.4.0, entities@^4.5.0: +entities@^4.2.0, entities@^4.3.0, entities@^4.4.0, entities@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== @@ -24560,13 +24540,14 @@ parse-url@^8.1.0: dependencies: parse-path "^7.0.0" -parse5-html-rewriting-stream@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-5.1.1.tgz#fc18570ba0d09b5091250956d1c3f716ef0a07b7" - integrity sha512-rbXBeMlJ3pk3tKxLKAUaqvQTZM5KTohXmZvYEv2gU9sQC70w65BxPsh3PVVnwiVNCnNYDtNZRqCKmiMlfdG07Q== +parse5-html-rewriting-stream@7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-7.0.0.tgz#e376d3e762d2950ccbb6bb59823fc1d7e9fdac36" + integrity sha512-mazCyGWkmCRWDI15Zp+UiCqMp/0dgEmkZRvhlsqqKYr4SsVm/TvnSpD9fCvqCA2zoWJcfRym846ejWBBHRiYEg== dependencies: - parse5 "^5.1.1" - parse5-sax-parser "^5.1.1" + entities "^4.3.0" + parse5 "^7.0.0" + parse5-sax-parser "^7.0.0" parse5-htmlparser2-tree-adapter@^6.0.0: version "6.0.1" @@ -24575,12 +24556,12 @@ parse5-htmlparser2-tree-adapter@^6.0.0: dependencies: parse5 "^6.0.1" -parse5-sax-parser@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-5.1.1.tgz#02834a9d08b23ea2d99584841c38be09d5247a15" - integrity sha512-9HIh6zd7bF1NJe95LPCUC311CekdOi55R+HWXNCsGY6053DWaMijVKOv1oPvdvPTvFicifZyimBVJ6/qvG039Q== +parse5-sax-parser@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz#4c05064254f0488676aca75fb39ca069ec96dee5" + integrity sha512-5A+v2SNsq8T6/mG3ahcz8ZtQ0OUFTatxPbeidoMB7tkJSGDY3tdfl4MHovtLQHkEn5CGxijNWRQHhRQ6IRpXKg== dependencies: - parse5 "^5.1.1" + parse5 "^7.0.0" parse5@^5.1.1: version "5.1.1" @@ -24592,6 +24573,13 @@ parse5@^6.0.1: resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== +parse5@^7.0.0: + version "7.1.2" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32" + integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw== + dependencies: + entities "^4.4.0" + parseqs@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"