build: update to latest version of parse5 (#26086)

crisbeto · crisbeto · commit 9ca1f1544fba · 2022-11-29T06:22:14.000+01:00
Bumps up the version of parse5 to the latest and resolves the various issues. Fixes #26076. (cherry picked from commit bbdadef)
diff --git a/package.json b/package.json
@@ -155,7 +155,6 @@
     "@types/marked": "^2.0.0",
     "@types/node": "^16.10.9",
     "@types/node-fetch": "^2.5.5",
-    "@types/parse5": "^6.0.3",
     "@types/selenium-webdriver": "^3.0.17",
     "@types/semver": "^7.3.9",
     "@types/send": "^0.17.1",
@@ -196,7 +195,7 @@
     "minimatch": "^3.0.4",
     "moment": "^2.29.1",
     "node-fetch": "^2.6.0",
-    "parse5": "^6.0.1",
+    "parse5": "^7.1.2",
     "postcss": "^8.4.17",
     "postcss-scss": "^4.0.4",
     "protractor": "^7.0.0",
diff --git a/src/cdk/package.json b/src/cdk/package.json
@@ -53,7 +53,7 @@
     "tslib": "0.0.0-TSLIB"
   },
   "optionalDependencies": {
-    "parse5": "^5.0.0"
+    "parse5": "^7.1.2"
   },
   "schematics": "./schematics/collection.json",
   "ng-update": {
diff --git a/src/cdk/schematics/BUILD.bazel b/src/cdk/schematics/BUILD.bazel
@@ -34,7 +34,6 @@ ts_library(
         # TODO(devversion): Only include jasmine for test sources (See: tsconfig types).
         "@npm//@types/jasmine",
         "@npm//@types/glob",
-        "@npm//@types/parse5",
         "@npm//@types/node",
         "@npm//glob",
         "@npm//parse5",
diff --git a/src/cdk/schematics/ng-update/html-parsing/elements.ts b/src/cdk/schematics/ng-update/html-parsing/elements.ts
@@ -6,7 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ChildNode, Element, parseFragment} from 'parse5';
+import {parseFragment} from 'parse5';
+import {ChildNode, Element} from '../../utils';
 
 /**
  * Parses a HTML fragment and traverses all AST nodes in order find elements that
diff --git a/src/cdk/schematics/utils/html-manipulation.ts b/src/cdk/schematics/utils/html-manipulation.ts
@@ -7,8 +7,8 @@
  */
 
 import {SchematicsException, Tree} from '@angular-devkit/schematics';
-import {getChildElementIndentation} from './parse5-element';
-import {Element, parse as parseHtml} from 'parse5';
+import {Element, getChildElementIndentation} from './parse5-element';
+import {parse as parseHtml} from 'parse5';
 
 /** Appends the given element HTML fragment to the `<head>` element of the specified HTML file. */
 export function appendHtmlElementToHead(host: Tree, htmlFilePath: string, elementHtml: string) {
@@ -32,7 +32,7 @@ export function appendHtmlElementToHead(host: Tree, htmlFilePath: string, elemen
 
   // We always have access to the source code location here because the `getHeadTagElement`
   // function explicitly has the `sourceCodeLocationInfo` option enabled.
-  const endTagOffset = headTag.sourceCodeLocation!.endTag.startOffset;
+  const endTagOffset = headTag.sourceCodeLocation!.endTag!.startOffset;
   const indentationOffset = getChildElementIndentation(headTag);
   const insertion = `${' '.repeat(indentationOffset)}${elementHtml}`;
 
@@ -81,7 +81,7 @@ export function addBodyClass(host: Tree, htmlFilePath: string, className: string
   } else {
     const recordedChange = host
       .beginUpdate(htmlFilePath)
-      .insertRight(body.sourceCodeLocation!.startTag.endOffset - 1, ` class="${className}"`);
+      .insertRight(body.sourceCodeLocation!.startTag!.endOffset - 1, ` class="${className}"`);
     host.commitUpdate(recordedChange);
   }
 }
diff --git a/src/cdk/schematics/utils/parse5-element.ts b/src/cdk/schematics/utils/parse5-element.ts
@@ -7,7 +7,12 @@
  */
 
 import {SchematicsException} from '@angular-devkit/schematics';
-import {Element} from 'parse5';
+import {DefaultTreeAdapterMap} from 'parse5';
+
+// At the time of writing `parse5` doesn't expose the node interfaces directly, even though
+// they're used as return types, but We can still access them through `DefaultTreeAdapterMap`.
+export type Element = DefaultTreeAdapterMap['element'];
+export type ChildNode = DefaultTreeAdapterMap['childNode'];
 
 /** Determines the indentation of child elements for the given Parse5 element. */
 export function getChildElementIndentation(element: Element) {
diff --git a/yarn.lock b/yarn.lock
@@ -3682,11 +3682,6 @@
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
-"@types/parse5@^6.0.3":
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.3.tgz#705bb349e789efa06f43f128cef51240753424cb"
-  integrity sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==
-
 "@types/ps-tree@^1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@types/ps-tree/-/ps-tree-1.1.2.tgz#5c60773a38ffb1402e049902a7b7a8d3c67cd59a"
@@ -7118,6 +7113,11 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
+entities@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
+  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
+
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
@@ -12100,6 +12100,13 @@ parse5@^6.0.1:
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
+parse5@^7.1.2:
+  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.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
