-
Notifications
You must be signed in to change notification settings - Fork 9.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
core(page-functions): don't try to clone a ShadowRoot #9079
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
a5f9343
#9048 Fix Avoid an excess DOM size error
NickolasBenakis 5de9be9
bug-fix: Avoid an excess DOM size error #9079
NickolasBenakis bf80f17
bug-fix: Avoid an excess DOM size error #9079
NickolasBenakis f34fd58
updates
patrickhulce 51449a0
fix tests I broke
patrickhulce a1528b6
Add test for nodes that cannot be inspected
NickolasBenakis 13d4753
Update lighthouse-core/lib/page-functions.js
NickolasBenakis 29b209d
Update lighthouse-core/test/lib/page-functions-test.js
NickolasBenakis cbd0e48
ShadowRoot
brendankenny File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
// @ts-nocheck | ||
'use strict'; | ||
|
||
/* global window document Node */ | ||
/* global window document Node ShadowRoot */ | ||
|
||
/** | ||
* Helper functions that are passed by `toString()` by Driver to be evaluated in target page. | ||
|
@@ -107,24 +107,32 @@ function getElementsInDocument(selector) { | |
|
||
/** | ||
* Gets the opening tag text of the given node. | ||
* @param {Element} element | ||
* @param {Element|ShadowRoot} element | ||
* @param {Array<string>=} ignoreAttrs An optional array of attribute tags to not include in the HTML snippet. | ||
* @return {string} | ||
*/ | ||
/* istanbul ignore next */ | ||
function getOuterHTMLSnippet(element, ignoreAttrs = []) { | ||
const clone = element.cloneNode(); | ||
|
||
ignoreAttrs.forEach(attribute =>{ | ||
clone.removeAttribute(attribute); | ||
}); | ||
|
||
const reOpeningTag = /^[\s\S]*?>/; | ||
const match = clone.outerHTML.match(reOpeningTag); | ||
try { | ||
// ShadowRoots are sometimes passed in; use their hosts' outerHTML. | ||
if (element instanceof ShadowRoot) { | ||
element = element.host; | ||
} | ||
|
||
return (match && match[0]) || ''; | ||
const clone = element.cloneNode(); | ||
ignoreAttrs.forEach(attribute =>{ | ||
clone.removeAttribute(attribute); | ||
}); | ||
const reOpeningTag = /^[\s\S]*?>/; | ||
const match = clone.outerHTML.match(reOpeningTag); | ||
return (match && match[0]) || ''; | ||
} catch (_) { | ||
// As a last resort, fall back to localName. | ||
return `<${element.localName}>`; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can this entire range fail? if it's just the a comment in the catch block would be useful. |
||
} | ||
} | ||
|
||
|
||
/** | ||
* Computes a memory/CPU performance benchmark index to determine rough device class. | ||
* @see https://docs.google.com/spreadsheets/d/1E0gZwKsxegudkjJl8Fki_sOwHKpqgXwt8aBAfuUaB8A/edit?usp=sharing | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the types on this whole function get kind of broken if we aren't really accepting just
Element
.removeAttribute
andouterHTML
(and more or lesslocalName
) exist only onElement
.Maybe we should type it as
@param {Element|ShadowRoot} element
and (if we don't need thatlocalName
check) have the conditional be justif (element instanceof ShadowRoot) element = element.host;
(with a comment somewhere explaining that this function handles the ShadowRoot case).It's still playing a little fast and loose with types (it doesn't help that the tsc built in types don't recognize
ShadowRoot
as a global value), but it simplifies things a bit.