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(hydration): avoid observing non-Element node #11954

Merged
merged 11 commits into from
Sep 20, 2024
Merged

fix(hydration): avoid observing non-Element node #11954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cb958b2
fix(runtime-core): regular comment nodes should not use hydrateOnVisible
linzhe141 Sep 17, 2024
91038c9
chore: update for ci
linzhe141 Sep 17, 2024
4c65193
chore: update test
linzhe141 Sep 18, 2024
fb57508
chore: update
linzhe141 Sep 18, 2024
9d74f9c
chore: update test
linzhe141 Sep 18, 2024
f2482b5
chore: Merge branch 'main' into fix-hydration-strategy
linzhe141 Sep 18, 2024
54618ea
chore: update
linzhe141 Sep 18, 2024
ce7ead7
chore: update
linzhe141 Sep 18, 2024
7a634ea
chore: update
linzhe141 Sep 18, 2024
f7dc3ed
test: simplify test cases
edison1105 Sep 19, 2024
7519226
[autofix.ci] apply automated fixes
autofix-ci[bot] Sep 19, 2024
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 packages/runtime-core/src/hydrationStrategies.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export const hydrateOnVisible: HydrationStrategyFactory<
}
}, opts)
forEach(el => {
if (!(el instanceof Element)) return
if (elementIsVisibleInViewport(el)) {
hydrate()
ob.disconnect()
Expand Down
8 changes: 7 additions & 1 deletion packages/vue/__tests__/e2e/hydration-strat-visible.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@
<script>
const rootMargin = location.search.match(/rootMargin=(\d+)/)?.[1] ?? 0
const isFragment = location.search.includes('?fragment')
const isVIf = location.search.includes('?v-if')
if (isFragment) {
document.getElementById('app').innerHTML =
`<!--[--><!--[--><span>one</span><!--]--><button>0</button><span>two</span><!--]-->`
} else if (isVIf) {
document.getElementById('app').innerHTML = `<!---->`
}

window.isHydrated = false
Expand All @@ -24,6 +27,7 @@
ref,
onMounted,
hydrateOnVisible,
createCommentVNode,
} = Vue

const Comp = {
Expand All @@ -39,7 +43,9 @@
{ onClick: () => count.value++ },
count.value,
)
if (isFragment) {
if (isVIf) {
return createCommentVNode('v-if', true)
} else if (isFragment) {
return [[h('span', 'one')], button, h('span', 'two')]
} else {
return button
Expand Down
11 changes: 11 additions & 0 deletions packages/vue/__tests__/e2e/hydrationStrategies.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,17 @@ describe('async component hydration strategies', () => {
await assertHydrationSuccess()
})

test('visible (root v-if) should not throw error', async () => {
const spy = vi.fn()
const currentPage = page()
currentPage.on('pageerror', spy)
await goToCase('visible', '?v-if')
await page().waitForFunction(() => window.isRootMounted)
expect(await page().evaluate(() => window.isHydrated)).toBe(false)
expect(spy).toBeCalledTimes(0)
currentPage.off('pageerror', spy)
})

test('media query', async () => {
await goToCase('media')
await page().waitForFunction(() => window.isRootMounted)
Expand Down