Skip to content

Commit 3098f87

Browse files
committed
Stop using legacy root
1 parent 3755598 commit 3098f87

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

test/integration/app-tree/pages/_app.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from 'react'
22
import Link from 'next/link'
33
import { createContext } from 'react'
4-
// eslint-disable-next-line react/no-deprecated
5-
import { render } from 'react-dom'
4+
import { flushSync } from 'react-dom'
5+
import { createRoot } from 'react-dom/client'
66
import App, { AppContext } from 'next/app'
77
import { renderToString } from 'react-dom/server'
88

@@ -22,7 +22,9 @@ export default class MyApp extends App<{ html: string }> {
2222
if (typeof window !== 'undefined') {
2323
const el = document.createElement('div')
2424
document.querySelector('body')?.appendChild(el)
25-
render(toRender, el)
25+
flushSync(() => {
26+
createRoot(el).render(toRender)
27+
})
2628
html = el.innerHTML
2729
el.remove()
2830
} else {

test/integration/app-tree/pages/hello.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
2-
// eslint-disable-next-line react/no-deprecated
3-
import { render } from 'react-dom'
2+
import { flushSync } from 'react-dom'
3+
import { createRoot } from 'react-dom/client'
44
import { renderToString } from 'react-dom/server'
55
import { NextPage } from 'next'
66

@@ -22,7 +22,9 @@ Page.getInitialProps = async ({ AppTree }) => {
2222
if (typeof window !== 'undefined') {
2323
const el = document.createElement('div')
2424
document.querySelector('body')?.appendChild(el)
25-
render(toRender, el)
25+
flushSync(() => {
26+
createRoot(el).render(toRender)
27+
})
2628
html = el.innerHTML
2729
el.remove()
2830
} else {

test/integration/app-tree/test/index.test.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,19 @@ const runTests = () => {
3333
const browser = await webdriver(appPort, '/')
3434
let html = await browser.eval(`document.documentElement.innerHTML`)
3535
expect(html).toMatch(/page:.*?\//)
36+
console.log(1)
3637

3738
browser.elementByCss('#another').click()
3839
await waitFor(waitTime)
3940
html = await browser.eval(`document.documentElement.innerHTML`)
4041
expect(html).toMatch(/page:.*?\//)
42+
console.log(2)
4143

4244
browser.elementByCss('#home').click()
4345
await waitFor(waitTime)
4446
html = await browser.eval(`document.documentElement.innerHTML`)
4547
expect(html).toMatch(/page:.*?\/another/)
48+
console.log(3)
4649
})
4750

4851
it('should pass AppTree to NextPageContext', async () => {

0 commit comments

Comments
 (0)