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

rsc: remove router injection #36101

Merged
merged 2 commits into from Apr 13, 2022
Merged

Conversation

huozhi
Copy link
Member

@huozhi huozhi commented Apr 12, 2022

Remove router injection for RSC page, recommend to access query or params through getServerSideProps, so that we can:

  • keep aligned with normal next pages
  • avoid static optimization for pages that require url query information

@ijjk ijjk added created-by: Next.js team PRs by the Next.js team type: next labels Apr 12, 2022
@huozhi huozhi force-pushed the rsc/remove-router-injection branch from 65eed19 to bfda084 Compare April 12, 2022 18:52
@ijjk
Copy link
Member

ijjk commented Apr 12, 2022

Stats from current PR

Default Build (Decrease detected ✓)
General Overall decrease ✓
vercel/next.js canary huozhi/next.js rsc/remove-router-injection Change
buildDuration 15.6s 14.7s -826ms
buildDurationCached 5.7s 5.5s -160ms
nodeModulesSize 484 MB 484 MB -156 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary huozhi/next.js rsc/remove-router-injection Change
/ failed reqs 0 0
/ total time (seconds) 3.1 3.127 ⚠️ +0.03
/ avg req/sec 806.33 799.41 ⚠️ -6.92
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.326 1.349 ⚠️ +0.02
/error-in-render avg req/sec 1884.75 1853.09 ⚠️ -31.66
Client Bundles (main, webpack)
vercel/next.js canary huozhi/next.js rsc/remove-router-injection Change
925.HASH.js gzip 179 B 179 B
framework-HASH.js gzip 42 kB 42 kB
main-HASH.js gzip 28.3 kB 28.3 kB
webpack-HASH.js gzip 1.44 kB 1.44 kB
Overall change 72 kB 72 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary huozhi/next.js rsc/remove-router-injection Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary huozhi/next.js rsc/remove-router-injection 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 3.05 kB 3.05 kB
head-HASH.js gzip 351 B 351 B
hooks-HASH.js gzip 920 B 920 B
image-HASH.js gzip 5.73 kB 5.73 kB
index-HASH.js gzip 263 B 263 B
link-HASH.js gzip 2.36 kB 2.36 kB
routerDirect..HASH.js gzip 320 B 320 B
script-HASH.js gzip 392 B 392 B
withRouter-HASH.js gzip 319 B 319 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 16 kB 16 kB
Client Build Manifests
vercel/next.js canary huozhi/next.js rsc/remove-router-injection Change
_buildManifest.js gzip 460 B 460 B
Overall change 460 B 460 B
Rendered Page Sizes
vercel/next.js canary huozhi/next.js rsc/remove-router-injection Change
index.html gzip 532 B 532 B
link.html gzip 546 B 546 B
withRouter.html gzip 527 B 527 B
Overall change 1.6 kB 1.6 kB

Default Build with SWC (Decrease detected ✓)
General Overall decrease ✓
vercel/next.js canary huozhi/next.js rsc/remove-router-injection Change
buildDuration 18s 18.2s ⚠️ +227ms
buildDurationCached 5.9s 6s ⚠️ +111ms
nodeModulesSize 484 MB 484 MB -156 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary huozhi/next.js rsc/remove-router-injection Change
/ failed reqs 0 0
/ total time (seconds) 3.235 3.316 ⚠️ +0.08
/ avg req/sec 772.87 754.03 ⚠️ -18.84
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.366 1.357 -0.01
/error-in-render avg req/sec 1829.63 1842.68 +13.05
Client Bundles (main, webpack)
vercel/next.js canary huozhi/next.js rsc/remove-router-injection Change
925.HASH.js gzip 178 B 178 B
framework-HASH.js gzip 42.3 kB 42.3 kB
main-HASH.js gzip 28.7 kB 28.7 kB
webpack-HASH.js gzip 1.45 kB 1.45 kB
Overall change 72.6 kB 72.6 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary huozhi/next.js rsc/remove-router-injection Change
polyfills-HASH.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary huozhi/next.js rsc/remove-router-injection 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 325 B 325 B
dynamic-HASH.js gzip 3.03 kB 3.03 kB
head-HASH.js gzip 351 B 351 B
hooks-HASH.js gzip 921 B 921 B
image-HASH.js gzip 5.77 kB 5.77 kB
index-HASH.js gzip 261 B 261 B
link-HASH.js gzip 2.44 kB 2.44 kB
routerDirect..HASH.js gzip 322 B 322 B
script-HASH.js gzip 393 B 393 B
withRouter-HASH.js gzip 317 B 317 B
85e02e95b279..7e3.css gzip 107 B 107 B
Overall change 16.1 kB 16.1 kB
Client Build Manifests
vercel/next.js canary huozhi/next.js rsc/remove-router-injection Change
_buildManifest.js gzip 458 B 458 B
Overall change 458 B 458 B
Rendered Page Sizes
vercel/next.js canary huozhi/next.js rsc/remove-router-injection Change
index.html gzip 532 B 532 B
link.html gzip 547 B 547 B
withRouter.html gzip 527 B 527 B
Overall change 1.61 kB 1.61 kB
Commit: 498952a

@huozhi huozhi marked this pull request as ready for review April 12, 2022 19:40
@huozhi huozhi merged commit 20600ad into vercel:canary Apr 13, 2022
@huozhi huozhi deleted the rsc/remove-router-injection branch April 13, 2022 08:16
Comment on lines 1217 to 1220
// Pass router to the Server Component as a temporary workaround.
if (isServerComponent) {
props.pageProps = Object.assign({}, props.pageProps, { router })
props.pageProps = Object.assign({}, props.pageProps)
}
Copy link

Choose a reason for hiding this comment

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

Isn't this comment and the whole if block redundant now?

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 2, 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.

None yet

4 participants