Commit 3c9ec2f

authored

Merge branch 'main' into chore-rsc-nightly

2 parents 8edd8a7 + ce84449 commit 3c9ec2fCopy full SHA for 3c9ec2f

File tree

+49

-1

lines changed

+49

-1

lines changed

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import { type Fixture, setupIsolatedFixture, useFixture } from './fixture'`
`5`	`5`	`import { expectNoReload, testNoJs, waitForHydration } from './helper'`
`6`	`6`
`7`	`7`	`// TODO: parallel?`
	`8`	`+// TODO: all tests don't need to be tested in all variants?`
`8`	`9`
`9`	`10`	`test.describe('dev-default', () => {`
`10`	`11`	`const f = useFixture({ root: 'examples/basic', mode: 'dev' })`
`@@ -928,4 +929,27 @@ function defineTest(f: Fixture) {`
`928`	`929`	`'(actionCount: 5, innerFnCount: 3)',`
`929`	`930`	`)`
`930`	`931`	`})`
	`932`	`+`
	`933`	`+ test('hydration mismatch', async ({ page }) => {`
	`934`	`+ const errors: Error[] = []`
	`935`	`+ page.on('pageerror', (error) => {`
	`936`	`+ errors.push(error)`
	`937`	`+ })`
	`938`	`+ await page.goto(f.url('/?test-hydration-mismatch'))`
	`939`	`+ await waitForHydration(page)`
	`940`	`+ expect(errors).toMatchObject([`
	`941`	`+ {`
	`942`	`+ message: expect.stringContaining(`
	`943`	`+ f.mode === 'dev'`
	`944`	+ ? `Hydration failed because the server rendered HTML didn't match the client.`
	`945`	+ : `Minified React error #418`,
	`946`	`+ ),`
	`947`	`+ },`
	`948`	`+ ])`
	`949`	`+`
	`950`	`+ errors.length = 0`
	`951`	`+ await page.goto(f.url())`
	`952`	`+ await waitForHydration(page)`
	`953`	`+ expect(errors).toEqual([])`
	`954`	`+ })`
`931`	`955`	`}`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,6 @@`
	`1`	`+'use client'`
	`2`	`+`
	`3`	`+export function Mismatch() {`
	`4`	`+ const value = typeof window !== 'undefined' ? 'browser' : 'ssr'`
	`5`	`+ return <>[{value}]</>`
	`6`	`+}`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,16 @@`
	`1`	`+import { Mismatch } from './client'`
	`2`	`+`
	`3`	`+export function TestHydrationMismatch(props: { url: URL }) {`
	`4`	`+ const show = props.url.searchParams.has('test-hydration-mismatch')`
	`5`	`+ return (`
	`6`	`+ <div>`
	`7`	`+ <span>test-hydration-mismatch</span>{' '}`
	`8`	`+ {show ? (`
	`9`	`+ <a href="?">hide</a>`
	`10`	`+ ) : (`
	`11`	`+ <a href="?test-hydration-mismatch">show</a>`
	`12`	`+ )}{' '}`
	`13`	`+ {show && <Mismatch />}`
	`14`	`+ </div>`
	`15`	`+ )`
	`16`	`+}`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ import { TestTailwindClient } from './tailwind/client'`
`27`	`27`	`import { TestTailwindServer } from './tailwind/server'`
`28`	`28`	`import { TestTemporaryReference } from './temporary-reference/client'`
`29`	`29`	`import { TestUseCache } from './use-cache/server'`
	`30`	`+import { TestHydrationMismatch } from './hydration-mismatch/server'`
`30`	`31`
`31`	`32`	`export function Root(props: { url: URL }) {`
`32`	`33`	`return (`
`@@ -47,6 +48,7 @@ export function Root(props: { url: URL }) {`
`47`	`48`	`<TestCssClientNoSsr url={props.url} />`
`48`	`49`	`<TestTailwindClient />`
`49`	`50`	`<TestTailwindServer />`
	`51`	`+ <TestHydrationMismatch url={props.url} />`
`50`	`52`	`<TestHmrClientDep />`
`51`	`53`	`<TestTemporaryReference />`
`52`	`54`	`<TestServerActionError />`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ input {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`a {`
`12`		`- @apply text-gray-500 underline hover:text-gray-700;`
	`12`	`+ @apply text-gray-500 underline hover:text-gray-700 cursor-pointer;`
`13`	`13`	`}`

Comments

(0)