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

Fix broken html on streaming render for error page #33399

Merged
merged 3 commits into from
Jan 17, 2022

Conversation

huozhi
Copy link
Member

@huozhi huozhi commented Jan 17, 2022

Bug

Fixes: #32515

Previously, we render the suffix after consuming 1st chunk, instead we should render it after stream finished

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

@huozhi huozhi force-pushed the stream/fix-node-stream-render branch from 9f6f142 to 3d6cb7e Compare January 17, 2022 16:09
@huozhi huozhi marked this pull request as draft January 17, 2022 16:11
@ijjk

This comment has been minimized.

@ijjk
Copy link
Member

ijjk commented Jan 17, 2022

Failing test suites

Commit: 3d6cb7e

test/integration/react-streaming-and-server-components/test/index.test.js

  • concurrentFeatures - prod > should render html correctly
Expand output

● concurrentFeatures - prod › should render html correctly

expect(received).toBe(expected) // Object.is equality

Expected: "custom-404-page"
Received: ""

  264 | runSuite('document', 'dev', documentSuite)
  265 | runSuite('document', 'prod', documentSuite)
> 266 |
      | ^
  267 | async function runBasicTests(context, env) {
  268 |   const isDev = env === 'dev'
  269 |   it('should render html correctly', async () => {

  at Object.<anonymous> (integration/react-streaming-and-server-components/test/index.test.js:266:40)

@huozhi huozhi marked this pull request as ready for review January 17, 2022 18:16
Copy link
Member

@shuding shuding left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fix looks good! But there's a test failing... It seems that there's a bug in the comment bot...

@ijjk
Copy link
Member

ijjk commented Jan 17, 2022

Stats from current PR

Default Build (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary huozhi/next.js stream/fix-node-stream-render Change
buildDuration 14.2s 14.6s ⚠️ +425ms
buildDurationCached 3.2s 3.2s -13ms
nodeModulesSize 352 MB 352 MB ⚠️ +1.2 kB
Page Load Tests Overall decrease ⚠️
vercel/next.js canary huozhi/next.js stream/fix-node-stream-render Change
/ failed reqs 0 0
/ total time (seconds) 2.932 2.935 0
/ avg req/sec 852.67 851.93 ⚠️ -0.74
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.33 1.375 ⚠️ +0.04
/error-in-render avg req/sec 1879.22 1817.83 ⚠️ -61.39
Client Bundles (main, webpack, commons)
vercel/next.js canary huozhi/next.js stream/fix-node-stream-render Change
450.HASH.js gzip 179 B 179 B
framework-HASH.js gzip 42.2 kB 42.2 kB
main-HASH.js gzip 27.2 kB 27.2 kB
webpack-HASH.js gzip 1.44 kB 1.44 kB
Overall change 71 kB 71 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary huozhi/next.js stream/fix-node-stream-render Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary huozhi/next.js stream/fix-node-stream-render Change
_app-HASH.js gzip 1.37 kB 1.37 kB
_error-HASH.js gzip 194 B 194 B
amp-HASH.js gzip 312 B 312 B
css-HASH.js gzip 326 B 326 B
dynamic-HASH.js gzip 2.37 kB 2.37 kB
head-HASH.js gzip 350 B 350 B
hooks-HASH.js gzip 919 B 919 B
image-HASH.js gzip 4.7 kB 4.7 kB
index-HASH.js gzip 263 B 263 B
link-HASH.js gzip 2.13 kB 2.13 kB
routerDirect..HASH.js gzip 321 B 321 B
script-HASH.js gzip 383 B 383 B
withRouter-HASH.js gzip 318 B 318 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 14.1 kB 14.1 kB
Client Build Manifests
vercel/next.js canary huozhi/next.js stream/fix-node-stream-render Change
_buildManifest.js gzip 459 B 459 B
Overall change 459 B 459 B
Rendered Page Sizes
vercel/next.js canary huozhi/next.js stream/fix-node-stream-render Change
index.html gzip 531 B 531 B
link.html gzip 545 B 545 B
withRouter.html gzip 526 B 526 B
Overall change 1.6 kB 1.6 kB

Default Build with SWC (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary huozhi/next.js stream/fix-node-stream-render Change
buildDuration 16.1s 15.9s -161ms
buildDurationCached 3.2s 3.2s -52ms
nodeModulesSize 352 MB 352 MB ⚠️ +1.2 kB
Page Load Tests Overall decrease ⚠️
vercel/next.js canary huozhi/next.js stream/fix-node-stream-render Change
/ failed reqs 0 0
/ total time (seconds) 2.919 2.934 ⚠️ +0.02
/ avg req/sec 856.58 852.03 ⚠️ -4.55
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.347 1.371 ⚠️ +0.02
/error-in-render avg req/sec 1855.65 1823.37 ⚠️ -32.28
Client Bundles (main, webpack, commons)
vercel/next.js canary huozhi/next.js stream/fix-node-stream-render Change
450.HASH.js gzip 179 B 179 B
framework-HASH.js gzip 42.3 kB 42.3 kB
main-HASH.js gzip 27.3 kB 27.3 kB
webpack-HASH.js gzip 1.44 kB 1.44 kB
Overall change 71.3 kB 71.3 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary huozhi/next.js stream/fix-node-stream-render Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary huozhi/next.js stream/fix-node-stream-render Change
_app-HASH.js gzip 1.35 kB 1.35 kB
_error-HASH.js gzip 180 B 180 B
amp-HASH.js gzip 305 B 305 B
css-HASH.js gzip 321 B 321 B
dynamic-HASH.js gzip 2.36 kB 2.36 kB
head-HASH.js gzip 342 B 342 B
hooks-HASH.js gzip 911 B 911 B
image-HASH.js gzip 4.73 kB 4.73 kB
index-HASH.js gzip 256 B 256 B
link-HASH.js gzip 2.19 kB 2.19 kB
routerDirect..HASH.js gzip 314 B 314 B
script-HASH.js gzip 375 B 375 B
withRouter-HASH.js gzip 309 B 309 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 14.1 kB 14.1 kB
Client Build Manifests
vercel/next.js canary huozhi/next.js stream/fix-node-stream-render Change
_buildManifest.js gzip 459 B 459 B
Overall change 459 B 459 B
Rendered Page Sizes
vercel/next.js canary huozhi/next.js stream/fix-node-stream-render Change
index.html gzip 531 B 531 B
link.html gzip 545 B 545 B
withRouter.html gzip 526 B 526 B
Overall change 1.6 kB 1.6 kB
Commit: 78c6e37

@kodiakhq kodiakhq bot merged commit 41614e5 into vercel:canary Jan 17, 2022
@huozhi huozhi deleted the stream/fix-node-stream-render branch February 3, 2022 15:14
natew pushed a commit to natew/next.js that referenced this pull request Feb 16, 2022
## Bug

Fixes: vercel#32515

Previously, we render the `suffix` after consuming 1st chunk, instead we should render it after stream finished

- [x] Related issues linked using `fixes #number`
- [x] Integration tests added
- [x] Errors have helpful link attached, see `contributing.md`
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 6, 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.

404 renders __NEXT_DATA__ as string to DOM when using RSC after deploy, locally no response
3 participants