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

Remove early routing failure regarding public routes #16350

Closed
wants to merge 2 commits into from

Conversation

inbeom
Copy link

@inbeom inbeom commented Aug 19, 2020

This fixes #16332

If basePath is set and public routes are present in allRoutes, every request without basePath prefix end up to 404 response, while there might be rewrite routes which don't require basePath.

@ijjk
Copy link
Member

ijjk commented Aug 19, 2020

Stats from current PR

Default Server Mode (Increase detected ⚠️)
General Overall decrease ✓
vercel/next.js canary inbeom/next.js fix/16332-public-catchall Change
buildDuration 10.5s 10.7s ⚠️ +180ms
nodeModulesSize 57.7 MB 57.7 MB -689 B
Page Load Tests Overall increase ✓
vercel/next.js canary inbeom/next.js fix/16332-public-catchall Change
/ failed reqs 0 0
/ total time (seconds) 1.969 2.065 ⚠️ +0.1
/ avg req/sec 1269.39 1210.84 ⚠️ -58.55
/error-in-render failed reqs 0 0
/error-in-render total time (seconds) 1.247 1.193 -0.05
/error-in-render avg req/sec 2004.53 2095.82 +91.29
Client Bundles (main, webpack, commons)
vercel/next.js canary inbeom/next.js fix/16332-public-catchall Change
677f882d2ed8..4e55.js gzip 10.2 kB 10.2 kB
framework.HASH.js gzip 39 kB 39 kB
main-512d5b9..081a.js gzip 7.2 kB 7.2 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 inbeom/next.js fix/16332-public-catchall Change
677f882d2ed8..dule.js gzip 6.11 kB 6.11 kB
framework.HA..dule.js gzip 39 kB 39 kB
main-1203ff1..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 inbeom/next.js fix/16332-public-catchall Change
polyfills-4b..e242.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary inbeom/next.js fix/16332-public-catchall Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB
_error-1464c..a26f.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 inbeom/next.js fix/16332-public-catchall Change
_app-75d3a82..dule.js gzip 625 B 625 B
_error-e550f..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 inbeom/next.js fix/16332-public-catchall Change
_buildManifest.js gzip 322 B 322 B
_buildManife..dule.js gzip 329 B 329 B
Overall change 651 B 651 B
Rendered Page Sizes
vercel/next.js canary inbeom/next.js fix/16332-public-catchall Change
index.html gzip 949 B 949 B
link.html gzip 955 B 955 B
withRouter.html gzip 940 B 940 B
Overall change 2.84 kB 2.84 kB

Serverless Mode (Decrease detected ✓)
General Overall decrease ✓
vercel/next.js canary inbeom/next.js fix/16332-public-catchall Change
buildDuration 12.2s 11.9s -275ms
nodeModulesSize 57.7 MB 57.7 MB -689 B
Client Bundles (main, webpack, commons)
vercel/next.js canary inbeom/next.js fix/16332-public-catchall Change
677f882d2ed8..4e55.js gzip 10.2 kB 10.2 kB
framework.HASH.js gzip 39 kB 39 kB
main-512d5b9..081a.js gzip 7.2 kB 7.2 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 inbeom/next.js fix/16332-public-catchall Change
677f882d2ed8..dule.js gzip 6.11 kB 6.11 kB
framework.HA..dule.js gzip 39 kB 39 kB
main-1203ff1..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 inbeom/next.js fix/16332-public-catchall Change
polyfills-4b..e242.js gzip 31 kB 31 kB
Overall change 31 kB 31 kB
Client Pages
vercel/next.js canary inbeom/next.js fix/16332-public-catchall Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB
_error-1464c..a26f.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 inbeom/next.js fix/16332-public-catchall Change
_app-75d3a82..dule.js gzip 625 B 625 B
_error-e550f..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 inbeom/next.js fix/16332-public-catchall Change
_buildManifest.js gzip 322 B 322 B
_buildManife..dule.js gzip 329 B 329 B
Overall change 651 B 651 B
Serverless bundles
vercel/next.js canary inbeom/next.js fix/16332-public-catchall Change
_error.js 1.03 MB 1.03 MB
404.html 4.18 kB 4.18 kB
hooks.html 3.82 kB 3.82 kB
index.js 1.03 MB 1.03 MB
link.js 1.07 MB 1.07 MB
routerDirect.js 1.07 MB 1.07 MB
withRouter.js 1.07 MB 1.07 MB
Overall change 5.27 MB 5.27 MB
Commit: 8b8b29f

Copy link
Member

@ijjk ijjk left a comment

Choose a reason for hiding this comment

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

This changes more than desired to correct #16332 since we still want to 404 if basePath isn't present for /_next requests. I opened a PR to correct this specifically for the public files check here.

Thanks for taking the time to open a PR!

@kodiakhq kodiakhq bot closed this in #16356 Aug 19, 2020
kodiakhq bot pushed a commit that referenced this pull request Aug 19, 2020
This corrects the basePath being required check for filesystem routes to not consider the public folder catch-all route since it always matches even if the public file isn't present and instead moves the basePath check inside of the public-folder catch-all. Tests already exist that catch this by adding a public folder to the existing `basepath` test suite

Fixes: #16332
Closes: #16350
@inbeom
Copy link
Author

inbeom commented Aug 19, 2020

Perfect. Thanks a lot!

m-lautenbach pushed a commit to m-lautenbach/next.js that referenced this pull request Aug 20, 2020
This corrects the basePath being required check for filesystem routes to not consider the public folder catch-all route since it always matches even if the public file isn't present and instead moves the basePath check inside of the public-folder catch-all. Tests already exist that catch this by adding a public folder to the existing `basepath` test suite

Fixes: vercel#16332
Closes: vercel#16350
@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.

Rewrites bug when using with basePath and public directory
2 participants