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.

Sign up for GitHub

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

Jump to bottom

Fix fallback: false triggering 404 before rewrites #24121

Merged
merged 3 commits into from
Apr 16, 2021
Merged

Fix fallback: false triggering 404 before rewrites #24121

merged 3 commits into from
Apr 16, 2021

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented Apr 15, 2021

This fixes dynamic pages with fallback: false that don't have a matching path causing a 404 before rewrites are checked unexpectedly. This ensures we treat fallback: false pages as a match only if they also have a matching static path so that fallback rewrites can be triggered correctly. An additional test suite as been added to ensure this is working as expected.

Bug

  • Related issues linked using fixes #number
  • Integration tests added

@ijjk

This comment has been minimized.

Sign in to view
@ijjk

This comment has been minimized.

Sign in to view
@ijjk
Copy link
Member Author

ijjk commented Apr 15, 2021

Stats from current PR

Default Server Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
buildDuration 14.9s 14.5s -467ms
buildDurationCached 4.5s 4.3s -185ms
nodeModulesSize 46.2 MB 46.2 MB ⚠️ +2.32 kB
Page Load Tests Overall increase ✓
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.788 2.615 -0.17
/ avg req/sec 896.84 956.11 +59.27
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.53 1.444 -0.09
/error-in-render avg req/sec 1633.54 1731.77 +98.23
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
597-HASH.js gzip 13.3 kB 13.3 kB ✓
778-HASH.js gzip 7.05 kB 7.05 kB ✓
framework-HASH.js gzip 39.3 kB 39.3 kB ✓
main-HASH.js gzip 151 B 151 B ✓
webpack-HASH.js gzip 993 B 993 B ✓
Overall change 60.8 kB 60.8 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
polyfills-HASH.js gzip 31.1 kB 31.1 kB ✓
Overall change 31.1 kB 31.1 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
_app-HASH.js gzip 1.3 kB 1.3 kB ✓
_error-HASH.js gzip 3.68 kB 3.68 kB ✓
amp-HASH.js gzip 558 B 558 B ✓
hooks-HASH.js gzip 924 B 924 B ✓
index-HASH.js gzip 243 B 243 B ✓
link-HASH.js gzip 1.66 kB 1.66 kB ✓
routerDirect..HASH.js gzip 336 B 336 B ✓
withRouter-HASH.js gzip 334 B 334 B ✓
Overall change 9.03 kB 9.03 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
_buildManifest.js gzip 349 B 349 B ✓
Overall change 349 B 349 B ✓
Rendered Page Sizes
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
index.html gzip 611 B 611 B ✓
link.html gzip 616 B 616 B ✓
withRouter.html gzip 605 B 605 B ✓
Overall change 1.83 kB 1.83 kB ✓
Serverless Mode
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
buildDuration 17.8s 17.2s -582ms
buildDurationCached 6.6s 6.1s -554ms
nodeModulesSize 46.2 MB 46.2 MB ⚠️ +2.32 kB
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
597-HASH.js gzip 13.3 kB 13.3 kB ✓
778-HASH.js gzip 7.05 kB 7.05 kB ✓
framework-HASH.js gzip 39.3 kB 39.3 kB ✓
main-HASH.js gzip 151 B 151 B ✓
webpack-HASH.js gzip 993 B 993 B ✓
Overall change 60.8 kB 60.8 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
polyfills-HASH.js gzip 31.1 kB 31.1 kB ✓
Overall change 31.1 kB 31.1 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
_app-HASH.js gzip 1.3 kB 1.3 kB ✓
_error-HASH.js gzip 3.68 kB 3.68 kB ✓
amp-HASH.js gzip 558 B 558 B ✓
hooks-HASH.js gzip 924 B 924 B ✓
index-HASH.js gzip 243 B 243 B ✓
link-HASH.js gzip 1.66 kB 1.66 kB ✓
routerDirect..HASH.js gzip 336 B 336 B ✓
withRouter-HASH.js gzip 334 B 334 B ✓
Overall change 9.03 kB 9.03 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
_buildManifest.js gzip 349 B 349 B ✓
Overall change 349 B 349 B ✓
Serverless bundles Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
_error.js 1.39 MB 1.39 MB ✓
404.html 2.76 kB 2.76 kB ✓
500.html 2.75 kB 2.75 kB ✓
amp.amp.html 10.7 kB 10.7 kB ✓
amp.html 1.96 kB 1.96 kB ✓
hooks.html 2.01 kB 2.01 kB ✓
index.js 1.39 MB 1.39 MB ✓
link.js 1.45 MB 1.45 MB ⚠️ +2 B
routerDirect.js 1.44 MB 1.44 MB ✓
withRouter.js 1.44 MB 1.44 MB ✓
Overall change 7.14 MB 7.14 MB ⚠️ +2 B
Webpack 4 Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
buildDuration 12.6s 11.8s -818ms
buildDurationCached 5.2s 4.7s -427ms
nodeModulesSize 46.2 MB 46.2 MB ⚠️ +2.32 kB
Page Load Tests Overall increase ✓
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.699 2.562 -0.14
/ avg req/sec 926.11 975.93 +49.82
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.462 1.427 -0.03
/error-in-render avg req/sec 1710.23 1752.04 +41.81
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
677f882d2ed8..HASH.js gzip 13.4 kB 13.4 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-HASH.js gzip 7.12 kB 7.12 kB ✓
webpack-HASH.js gzip 751 B 751 B ✓
Overall change 60.2 kB 60.2 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
polyfills-HASH.js gzip 31.3 kB 31.3 kB ✓
Overall change 31.3 kB 31.3 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
_app-HASH.js gzip 1.28 kB 1.28 kB ✓
_error-HASH.js gzip 3.71 kB 3.71 kB ✓
amp-HASH.js gzip 536 B 536 B ✓
hooks-HASH.js gzip 888 B 888 B ✓
index-HASH.js gzip 227 B 227 B ✓
link-HASH.js gzip 1.64 kB 1.64 kB ✓
routerDirect..HASH.js gzip 303 B 303 B ✓
withRouter-HASH.js gzip 302 B 302 B ✓
Overall change 8.89 kB 8.89 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
_buildManifest.js gzip 371 B 371 B ✓
Overall change 371 B 371 B ✓
Rendered Page Sizes
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
index.html gzip 612 B 612 B ✓
link.html gzip 620 B 620 B ✓
withRouter.html gzip 607 B 607 B ✓
Overall change 1.84 kB 1.84 kB ✓
Commit: 25e06f9

@ijjk ijjk marked this pull request as ready for review April 15, 2021 23:04
@ijjk
Copy link
Member Author

ijjk commented Apr 16, 2021

Stats from current PR

Default Server Mode (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
buildDuration 14.1s 14s -153ms
buildDurationCached 4.3s 4.3s ⚠️ +6ms
nodeModulesSize 46.2 MB 46.2 MB ⚠️ +2.32 kB
Page Load Tests Overall decrease ⚠️
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.478 2.506 ⚠️ +0.03
/ avg req/sec 1009.06 997.75 ⚠️ -11.31
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.28 1.285 0
/error-in-render avg req/sec 1952.98 1945.17 ⚠️ -7.81
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
597-HASH.js gzip 13.3 kB 13.3 kB ✓
778-HASH.js gzip 7.05 kB 7.05 kB ✓
framework-HASH.js gzip 39.3 kB 39.3 kB ✓
main-HASH.js gzip 151 B 151 B ✓
webpack-HASH.js gzip 993 B 993 B ✓
Overall change 60.8 kB 60.8 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
polyfills-HASH.js gzip 31.1 kB 31.1 kB ✓
Overall change 31.1 kB 31.1 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
_app-HASH.js gzip 1.3 kB 1.3 kB ✓
_error-HASH.js gzip 3.68 kB 3.68 kB ✓
amp-HASH.js gzip 558 B 558 B ✓
hooks-HASH.js gzip 924 B 924 B ✓
index-HASH.js gzip 243 B 243 B ✓
link-HASH.js gzip 1.66 kB 1.66 kB ✓
routerDirect..HASH.js gzip 336 B 336 B ✓
withRouter-HASH.js gzip 334 B 334 B ✓
Overall change 9.03 kB 9.03 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
_buildManifest.js gzip 349 B 349 B ✓
Overall change 349 B 349 B ✓
Rendered Page Sizes
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
index.html gzip 611 B 611 B ✓
link.html gzip 616 B 616 B ✓
withRouter.html gzip 605 B 605 B ✓
Overall change 1.83 kB 1.83 kB ✓
Serverless Mode
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
buildDuration 17.9s 17.7s -186ms
buildDurationCached 6.4s 6.6s ⚠️ +242ms
nodeModulesSize 46.2 MB 46.2 MB ⚠️ +2.32 kB
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
597-HASH.js gzip 13.3 kB 13.3 kB ✓
778-HASH.js gzip 7.05 kB 7.05 kB ✓
framework-HASH.js gzip 39.3 kB 39.3 kB ✓
main-HASH.js gzip 151 B 151 B ✓
webpack-HASH.js gzip 993 B 993 B ✓
Overall change 60.8 kB 60.8 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
polyfills-HASH.js gzip 31.1 kB 31.1 kB ✓
Overall change 31.1 kB 31.1 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
_app-HASH.js gzip 1.3 kB 1.3 kB ✓
_error-HASH.js gzip 3.68 kB 3.68 kB ✓
amp-HASH.js gzip 558 B 558 B ✓
hooks-HASH.js gzip 924 B 924 B ✓
index-HASH.js gzip 243 B 243 B ✓
link-HASH.js gzip 1.66 kB 1.66 kB ✓
routerDirect..HASH.js gzip 336 B 336 B ✓
withRouter-HASH.js gzip 334 B 334 B ✓
Overall change 9.03 kB 9.03 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
_buildManifest.js gzip 349 B 349 B ✓
Overall change 349 B 349 B ✓
Serverless bundles
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
_error.js 1.39 MB 1.39 MB ✓
404.html 2.76 kB 2.76 kB ✓
500.html 2.75 kB 2.75 kB ✓
amp.amp.html 10.7 kB 10.7 kB ✓
amp.html 1.96 kB 1.96 kB ✓
hooks.html 2.01 kB 2.01 kB ✓
index.js 1.39 MB 1.39 MB ✓
link.js 1.45 MB 1.45 MB ✓
routerDirect.js 1.44 MB 1.44 MB ⚠️ +2 B
withRouter.js 1.44 MB 1.44 MB -2 B
Overall change 7.14 MB 7.14 MB ✓
Webpack 4 Mode (Increase detected ⚠️)
General Overall increase ⚠️
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
buildDuration 11.9s 12.1s ⚠️ +175ms
buildDurationCached 4.9s 4.7s -121ms
nodeModulesSize 46.2 MB 46.2 MB ⚠️ +2.32 kB
Page Load Tests Overall increase ✓
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.571 2.429 -0.14
/ avg req/sec 972.33 1029.33 +57
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.264 1.289 ⚠️ +0.02
/error-in-render avg req/sec 1977.26 1940.12 ⚠️ -37.14
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
677f882d2ed8..HASH.js gzip 13.4 kB 13.4 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-HASH.js gzip 7.12 kB 7.12 kB ✓
webpack-HASH.js gzip 751 B 751 B ✓
Overall change 60.2 kB 60.2 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
polyfills-HASH.js gzip 31.3 kB 31.3 kB ✓
Overall change 31.3 kB 31.3 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
_app-HASH.js gzip 1.28 kB 1.28 kB ✓
_error-HASH.js gzip 3.71 kB 3.71 kB ✓
amp-HASH.js gzip 536 B 536 B ✓
hooks-HASH.js gzip 888 B 888 B ✓
index-HASH.js gzip 227 B 227 B ✓
link-HASH.js gzip 1.64 kB 1.64 kB ✓
routerDirect..HASH.js gzip 303 B 303 B ✓
withRouter-HASH.js gzip 302 B 302 B ✓
Overall change 8.89 kB 8.89 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
_buildManifest.js gzip 371 B 371 B ✓
Overall change 371 B 371 B ✓
Rendered Page Sizes
vercel/next.js canary ijjk/next.js fix/fallback-false-rewrite Change
index.html gzip 612 B 612 B ✓
link.html gzip 620 B 620 B ✓
withRouter.html gzip 607 B 607 B ✓
Overall change 1.84 kB 1.84 kB ✓
Commit: 694eebe

@kodiakhq kodiakhq bot merged commit 7d77a19 into vercel:canary Apr 16, 2021
@ijjk ijjk deleted the fix/fallback-false-rewrite branch April 16, 2021 15:08
SokratisVidros pushed a commit to SokratisVidros/next.js that referenced this pull request Apr 20, 2021
@ijjk @SokratisVidros
Fix fallback: false triggering 404 before rewrites (vercel#24121)
6659fc2 
This fixes dynamic pages with `fallback: false` that don't have a matching path causing a 404 before rewrites are checked unexpectedly. This ensures we treat `fallback: false` pages as a match only if they also have a matching static path so that fallback rewrites can be triggered correctly. An additional test suite as been added to ensure this is working as expected. 

## Bug

- [ ] Related issues linked using `fixes #number`
- [x] Integration tests added
@ijjk ijjk mentioned this pull request May 4, 2021
Closed
@sync-by-unito sync-by-unito bot mentioned this pull request May 18, 2021
Closed
@vercel vercel locked as resolved and limited conversation to collaborators Jan 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@shuding shuding shuding approved these changes

@divmain divmain Awaiting requested review from divmain

@lfades lfades Awaiting requested review from lfades

@timneutkens timneutkens Awaiting requested review from timneutkens timneutkens is a code owner

Assignees
No one assigned
Labels
type: next
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ijjk @shuding