Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix(gatsby): Prevent errors if Head has root text node #36402

Merged
merged 3 commits into from
Aug 18, 2022
Merged

fix(gatsby): Prevent errors if Head has root text node #36402

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ee806e
Don't break when Head has root text node(s)
marvinjude Aug 17, 2022
93edd69
test that we dont break on root text nodes
marvinjude Aug 17, 2022
1e30d80
Merge branch 'master' into dont-break-if-head-has-root-text-node
marvinjude Aug 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions e2e-tests/development-runtime/src/pages/head-function-export/basic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ export function Head() {
<script type="text/javascript">
{`window.__SOME_GLOBAL_TO_CHECK_CALL_COUNT__ = (window.__SOME_GLOBAL_TO_CHECK_CALL_COUNT__ || 0 ) + 1`}
</script>
Adding-this-text-here-should-not-break-things
</>
)
}
1 change: 1 addition & 0 deletions e2e-tests/production-runtime/src/pages/head-function-export/basic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export function Head() {
<script type="text/javascript">
{`window.__SOME_GLOBAL_TO_CHECK_CALL_COUNT__ = (window.__SOME_GLOBAL_TO_CHECK_CALL_COUNT__ || 0 ) + 1`}
</script>
Adding-this-text-here-should-not-break-things
</>
)
}
2 changes: 1 addition & 1 deletion packages/gatsby/cache-dir/head/head-export-handler-for-browser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const onHeadRendered = () => {
const seenIds = new Map()
for (const node of hiddenRoot.childNodes) {
const nodeName = node.nodeName.toLowerCase()
const id = node.attributes.id?.value
const id = node.attributes?.id?.value

if (!VALID_NODE_NAMES.includes(nodeName)) {
warnForInvalidTags(nodeName)
Expand Down
2 changes: 1 addition & 1 deletion packages/gatsby/cache-dir/head/head-export-handler-for-ssr.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export function headHandlerForSSR({
const seenIds = new Map()
for (const node of headNodes) {
const { rawTagName } = node
const id = node.attributes.id
const id = node.attributes?.id

if (!VALID_NODE_NAMES.includes(rawTagName)) {
warnForInvalidTags(rawTagName)
Expand Down