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.

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

Ensure the app shell is rendered before rendering the document #35732

Merged
merged 2 commits into from
Mar 30, 2022

Conversation

shuding
Copy link
Member

@shuding shuding commented Mar 30, 2022

When concurrent features is enabled (React 18), we always render the documentStream before bodyResult, which results in the missing of head tags that should be collected from the app content (using Head).

This PR ensures that the initial app shell is always rendered before document.

Bug

  • Related issues linked using fixes #number
  • Integration tests added
  • Errors have helpful link attached, see contributing.md

Feature

  • Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
  • Related issues linked using fixes #number
  • Integration tests added
  • Documentation added
  • Telemetry added. In case of a feature if it's used or not.
  • Errors have helpful link attached, see contributing.md

Documentation / Examples

  • Make sure the linting passes by running yarn lint

@ijjk
Copy link
Member

ijjk commented Mar 30, 2022

Stats from current PR

Default Build (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary shuding/next.js shu/66b9 Change
buildDuration 15.7s 15.6s -84ms
buildDurationCached 6.2s 6.2s -4ms
nodeModulesSize 467 MB 467 MB ⚠️ +3.19 kB
Page Load Tests Overall increase ✓
vercel/next.js canary shuding/next.js shu/66b9 Change
/ failed reqs 0 0
/ total time (seconds) 3.144 3.1 -0.04
/ avg req/sec 795.26 806.43 +11.17
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.393 1.382 -0.01
/error-in-render avg req/sec 1794.63 1808.43 +13.8
Client Bundles (main, webpack)
vercel/next.js canary shuding/next.js shu/66b9 Change
925.HASH.js gzip 179 B 179 B
framework-HASH.js gzip 42 kB 42 kB
main-HASH.js gzip 28.4 kB 28.4 kB
webpack-HASH.js gzip 1.44 kB 1.44 kB
Overall change 72.1 kB 72.1 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary shuding/next.js shu/66b9 Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary shuding/next.js shu/66b9 Change
_app-HASH.js gzip 1.36 kB 1.36 kB
_error-HASH.js gzip 192 B 192 B
amp-HASH.js gzip 309 B 309 B
css-HASH.js gzip 327 B 327 B
dynamic-HASH.js gzip 2.57 kB 2.57 kB
head-HASH.js gzip 351 B 351 B
hooks-HASH.js gzip 920 B 920 B
image-HASH.js gzip 5.48 kB 5.48 kB
index-HASH.js gzip 263 B 263 B
link-HASH.js gzip 2.26 kB 2.26 kB
routerDirect..HASH.js gzip 320 B 320 B
script-HASH.js gzip 387 B 387 B
withRouter-HASH.js gzip 319 B 319 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 15.2 kB 15.2 kB
Client Build Manifests
vercel/next.js canary shuding/next.js shu/66b9 Change
_buildManifest.js gzip 460 B 460 B
Overall change 460 B 460 B
Rendered Page Sizes
vercel/next.js canary shuding/next.js shu/66b9 Change
index.html gzip 530 B 530 B
link.html gzip 544 B 544 B
withRouter.html gzip 524 B 524 B
Overall change 1.6 kB 1.6 kB

Default Build with SWC (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary shuding/next.js shu/66b9 Change
buildDuration 19.1s 18.9s -191ms
buildDurationCached 6.1s 6.2s ⚠️ +22ms
nodeModulesSize 467 MB 467 MB ⚠️ +3.19 kB
Page Load Tests Overall increase ✓
vercel/next.js canary shuding/next.js shu/66b9 Change
/ failed reqs 0 0
/ total time (seconds) 3.134 3.132 0
/ avg req/sec 797.65 798.27 +0.62
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.4 1.378 -0.02
/error-in-render avg req/sec 1785.86 1813.65 +27.79
Client Bundles (main, webpack)
vercel/next.js canary shuding/next.js shu/66b9 Change
925.HASH.js gzip 178 B 178 B
framework-HASH.js gzip 42.3 kB 42.3 kB
main-HASH.js gzip 28.8 kB 28.8 kB
webpack-HASH.js gzip 1.45 kB 1.45 kB
Overall change 72.7 kB 72.7 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary shuding/next.js shu/66b9 Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary shuding/next.js shu/66b9 Change
_app-HASH.js gzip 1.35 kB 1.35 kB
_error-HASH.js gzip 179 B 179 B
amp-HASH.js gzip 313 B 313 B
css-HASH.js gzip 324 B 324 B
dynamic-HASH.js gzip 2.56 kB 2.56 kB
head-HASH.js gzip 351 B 351 B
hooks-HASH.js gzip 921 B 921 B
image-HASH.js gzip 5.59 kB 5.59 kB
index-HASH.js gzip 261 B 261 B
link-HASH.js gzip 2.33 kB 2.33 kB
routerDirect..HASH.js gzip 322 B 322 B
script-HASH.js gzip 388 B 388 B
withRouter-HASH.js gzip 317 B 317 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 15.3 kB 15.3 kB
Client Build Manifests
vercel/next.js canary shuding/next.js shu/66b9 Change
_buildManifest.js gzip 458 B 458 B
Overall change 458 B 458 B
Rendered Page Sizes
vercel/next.js canary shuding/next.js shu/66b9 Change
index.html gzip 532 B 532 B
link.html gzip 546 B 546 B
withRouter.html gzip 526 B 526 B
Overall change 1.6 kB 1.6 kB
Commit: 47b1937

@ijjk
Copy link
Member

ijjk commented Mar 30, 2022

Failing test suites

Commit: 47b1937

yarn testheadless test/e2e/prerender.test.ts

  • Prerender > should handle manual revalidate for fallback: blocking
Expand output

● Prerender › should handle manual revalidate for fallback: blocking

expect(received).toMatch(expected)

Expected pattern: /(HIT|STALE)/
Received string:  "MISS"

  1982 |         const html2 = await res2.text()
  1983 |         const $2 = cheerio.load(html2)
> 1984 |         expect(res2.headers.get('x-nextjs-cache')).toMatch(/(HIT|STALE)/)
       |                                                    ^
  1985 |
  1986 |         expect(initialTime).toBe($2('#time').text())
  1987 |

  at Object.<anonymous> (e2e/prerender.test.ts:1984:52)

Read more about building and testing Next.js in contributing.md.

@timneutkens timneutkens merged commit 9fc1904 into vercel:canary Mar 30, 2022
@shuding shuding deleted the shu/66b9 branch March 30, 2022 13:15
kodiakhq bot pushed a commit that referenced this pull request Mar 31, 2022
x-ref: #35728

The hydration mismatch is fixed by #35732, that document could collect the dyamic imports module ids before the shell is flushed. Add a test for it
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants