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 optional catch-all /index revalidate params #16451

Merged
merged 1 commit into from
Aug 21, 2020

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented Aug 21, 2020

This corrects the case where /index is used during revalidation for an optional catch-all route and index is passed as a param even though it should be undefined. This also adds test cases to make sure the params are normalized correctly

Fixes: #16366

@ijjk
Copy link
Member Author

ijjk commented Aug 21, 2020

Stats from current PR

Default Server Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
buildDuration 10.3s 10.4s ⚠️ +85ms
nodeModulesSize 57.5 MB 57.5 MB ⚠️ +542 B
Page Load Tests Overall increase ✓
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
/ failed reqs 0 0
/ total time (seconds) 1.862 1.843 -0.02
/ avg req/sec 1342.28 1356.82 +14.54
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.035 0.993 -0.04
/error-in-render avg req/sec 2415.61 2517.43 +101.82
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
677f882d2ed8..4e55.js gzip 10.2 kB 10.2 kB
framework.HASH.js gzip 39 kB 39 kB
main-e8a0282..7b6f.js gzip 7.21 kB 7.21 kB
webpack-e067..f178.js gzip 751 B 751 B
Overall change 57.2 kB 57.2 kB
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
677f882d2ed8..dule.js gzip 6.11 kB 6.11 kB
framework.HA..dule.js gzip 39 kB 39 kB
main-90cf36c..dule.js gzip 6.21 kB 6.21 kB
webpack-07c5..dule.js gzip 751 B 751 B
Overall change 52 kB 52 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
polyfills-4b..e242.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB
_error-28298..e0c9.js gzip 3.44 kB 3.44 kB
hooks-89731c..c609.js gzip 887 B 887 B
index-17468f..5d83.js gzip 227 B 227 B
link-000f151..65d4.js gzip 1.29 kB 1.29 kB
routerDirect..924c.js gzip 284 B 284 B
withRouter-7..c13d.js gzip 284 B 284 B
Overall change 7.69 kB 7.69 kB
Client Pages Modern
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
_app-75d3a82..dule.js gzip 625 B 625 B
_error-65c8a..dule.js gzip 2.29 kB 2.29 kB
hooks-cbf13f..dule.js gzip 387 B 387 B
index-b9a643..dule.js gzip 226 B 226 B
link-4cfda7a..dule.js gzip 1.26 kB 1.26 kB
routerDirect..dule.js gzip 284 B 284 B
withRouter-f..dule.js gzip 282 B 282 B
Overall change 5.35 kB 5.35 kB
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
_buildManifest.js gzip 322 B 322 B
_buildManife..dule.js gzip 330 B 330 B
Overall change 652 B 652 B
Rendered Page Sizes
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
index.html gzip 948 B 948 B
link.html gzip 954 B 954 B
withRouter.html gzip 940 B 940 B
Overall change 2.84 kB 2.84 kB

Serverless Mode
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
buildDuration 11.9s 11.9s -15ms
nodeModulesSize 57.5 MB 57.5 MB ⚠️ +542 B
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
677f882d2ed8..4e55.js gzip 10.2 kB 10.2 kB
framework.HASH.js gzip 39 kB 39 kB
main-e8a0282..7b6f.js gzip 7.21 kB 7.21 kB
webpack-e067..f178.js gzip 751 B 751 B
Overall change 57.2 kB 57.2 kB
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
677f882d2ed8..dule.js gzip 6.11 kB 6.11 kB
framework.HA..dule.js gzip 39 kB 39 kB
main-90cf36c..dule.js gzip 6.21 kB 6.21 kB
webpack-07c5..dule.js gzip 751 B 751 B
Overall change 52 kB 52 kB
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
polyfills-4b..e242.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB
_error-28298..e0c9.js gzip 3.44 kB 3.44 kB
hooks-89731c..c609.js gzip 887 B 887 B
index-17468f..5d83.js gzip 227 B 227 B
link-000f151..65d4.js gzip 1.29 kB 1.29 kB
routerDirect..924c.js gzip 284 B 284 B
withRouter-7..c13d.js gzip 284 B 284 B
Overall change 7.69 kB 7.69 kB
Client Pages Modern
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
_app-75d3a82..dule.js gzip 625 B 625 B
_error-65c8a..dule.js gzip 2.29 kB 2.29 kB
hooks-cbf13f..dule.js gzip 387 B 387 B
index-b9a643..dule.js gzip 226 B 226 B
link-4cfda7a..dule.js gzip 1.26 kB 1.26 kB
routerDirect..dule.js gzip 284 B 284 B
withRouter-f..dule.js gzip 282 B 282 B
Overall change 5.35 kB 5.35 kB
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
_buildManifest.js gzip 322 B 322 B
_buildManife..dule.js gzip 330 B 330 B
Overall change 652 B 652 B
Serverless bundles Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/root-optional-revalidate Change
_error.js 1.03 MB 1.03 MB ⚠️ +1 B
404.html 4.18 kB 4.18 kB
hooks.html 3.82 kB 3.82 kB
index.js 1.03 MB 1.03 MB ⚠️ +1 B
link.js 1.07 MB 1.07 MB ⚠️ +1 B
routerDirect.js 1.07 MB 1.07 MB ⚠️ +1 B
withRouter.js 1.07 MB 1.07 MB ⚠️ +1 B
Overall change 5.27 MB 5.27 MB ⚠️ +5 B
Commit: 436e1df

Copy link
Member

@Timer Timer left a comment

Choose a reason for hiding this comment

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

LGTM

@kodiakhq kodiakhq bot merged commit 4507422 into vercel:canary Aug 21, 2020
@ijjk ijjk deleted the fix/root-optional-revalidate branch August 21, 2020 18:33
kodiakhq bot pushed a commit to vercel/vercel that referenced this pull request Aug 24, 2020
This adds test cases from vercel/next.js#16451 which are currently failing and will pass after a new canary of Next.js has been published
ofhouse pushed a commit to milliHQ/terraform-aws-next-js that referenced this pull request Mar 13, 2021
This adds test cases from vercel/next.js#16451 which are currently failing and will pass after a new canary of Next.js has been published
@vercel vercel locked as resolved and limited conversation to collaborators Jan 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Dynamic root page doesn't revalidate when using the optional catch all routes
2 participants