-
Notifications
You must be signed in to change notification settings - Fork 26.1k
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(31013): add base path to preflight request url #31101
Merged
kodiakhq
merged 4 commits into
vercel:canary
from
hi-ogawa:31013-add-base-path-to-preflight-middleware-request
Nov 9, 2021
Merged
fix(31013): add base path to preflight request url #31101
kodiakhq
merged 4 commits into
vercel:canary
from
hi-ogawa:31013-add-base-path-to-preflight-middleware-request
Nov 9, 2021
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hi-ogawa
requested review from
huozhi,
ijjk,
shuding and
timneutkens
as code owners
November 7, 2021 02:29
ijjk
reviewed
Nov 8, 2021
hi-ogawa
force-pushed
the
31013-add-base-path-to-preflight-middleware-request
branch
from
November 9, 2021 13:15
678ab78
to
3b923bf
Compare
ijjk
approved these changes
Nov 9, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change and added test look good, thanks!
This comment has been minimized.
This comment has been minimized.
Stats from current PRDefault Build (Increase detected
|
vercel/next.js canary | hi-ogawa/next.js 31013-add-base-path-to-preflight-middleware-request | Change | |
---|---|---|---|
buildDuration | 25.4s | 25s | -317ms |
buildDurationCached | 5.1s | 4.9s | -115ms |
nodeModulesSize | 333 MB | 333 MB |
Page Load Tests Overall increase ✓
vercel/next.js canary | hi-ogawa/next.js 31013-add-base-path-to-preflight-middleware-request | Change | |
---|---|---|---|
/ failed reqs | 0 | 0 | ✓ |
/ total time (seconds) | 4.186 | 4.155 | -0.03 |
/ avg req/sec | 597.28 | 601.68 | +4.4 |
/error-in-render failed reqs | 0 | 0 | ✓ |
/error-in-render total time (seconds) | 2.175 | 2.101 | -0.07 |
/error-in-render avg req/sec | 1149.32 | 1189.93 | +40.61 |
Client Bundles (main, webpack, commons) Overall increase ⚠️
vercel/next.js canary | hi-ogawa/next.js 31013-add-base-path-to-preflight-middleware-request | Change | |
---|---|---|---|
450.HASH.js gzip | 179 B | 179 B | ✓ |
framework-HASH.js gzip | 42.2 kB | 42.2 kB | ✓ |
main-HASH.js gzip | 28.1 kB | 28.1 kB | |
webpack-HASH.js gzip | 1.45 kB | 1.45 kB | ✓ |
Overall change | 71.9 kB | 71.9 kB |
Legacy Client Bundles (polyfills)
vercel/next.js canary | hi-ogawa/next.js 31013-add-base-path-to-preflight-middleware-request | Change | |
---|---|---|---|
polyfills-HASH.js gzip | 31 kB | 31 kB | ✓ |
Overall change | 31 kB | 31 kB | ✓ |
Client Pages
vercel/next.js canary | hi-ogawa/next.js 31013-add-base-path-to-preflight-middleware-request | Change | |
---|---|---|---|
_app-HASH.js gzip | 1.23 kB | 1.23 kB | ✓ |
_error-HASH.js gzip | 194 B | 194 B | ✓ |
amp-HASH.js gzip | 312 B | 312 B | ✓ |
css-HASH.js gzip | 327 B | 327 B | ✓ |
dynamic-HASH.js gzip | 2.38 kB | 2.38 kB | ✓ |
head-HASH.js gzip | 350 B | 350 B | ✓ |
hooks-HASH.js gzip | 635 B | 635 B | ✓ |
image-HASH.js gzip | 4.44 kB | 4.44 kB | ✓ |
index-HASH.js gzip | 263 B | 263 B | ✓ |
link-HASH.js gzip | 1.87 kB | 1.87 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 | 13.1 kB | 13.1 kB | ✓ |
Client Build Manifests
vercel/next.js canary | hi-ogawa/next.js 31013-add-base-path-to-preflight-middleware-request | Change | |
---|---|---|---|
_buildManifest.js gzip | 460 B | 460 B | ✓ |
Overall change | 460 B | 460 B | ✓ |
Rendered Page Sizes
vercel/next.js canary | hi-ogawa/next.js 31013-add-base-path-to-preflight-middleware-request | Change | |
---|---|---|---|
index.html gzip | 524 B | 524 B | ✓ |
link.html gzip | 536 B | 535 B | -1 B |
withRouter.html gzip | 517 B | 518 B | |
Overall change | 1.58 kB | 1.58 kB | ✓ |
Diffs
Diff for main-HASH.js
@@ -5656,7 +5656,7 @@
case 24:
_ctx.next = 26;
return this._preflightRequest({
- as: asPath,
+ as: addBasePath(asPath),
cache: true,
pages: pages,
pathname: pathname,
Diff for index.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-f78d3bf7c627c9d4.js"
+ src="/_next/static/chunks/main-10789f4ca49986c9.js"
defer=""
></script>
<script
Diff for link.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-f78d3bf7c627c9d4.js"
+ src="/_next/static/chunks/main-10789f4ca49986c9.js"
defer=""
></script>
<script
Diff for withRouter.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-f78d3bf7c627c9d4.js"
+ src="/_next/static/chunks/main-10789f4ca49986c9.js"
defer=""
></script>
<script
Default Build with SWC (Decrease detected ✓)
General Overall increase ⚠️
vercel/next.js canary | hi-ogawa/next.js 31013-add-base-path-to-preflight-middleware-request | Change | |
---|---|---|---|
buildDuration | 26.9s | 27.1s | |
buildDurationCached | 5s | 5s | -73ms |
nodeModulesSize | 333 MB | 333 MB |
Page Load Tests Overall decrease ⚠️
vercel/next.js canary | hi-ogawa/next.js 31013-add-base-path-to-preflight-middleware-request | Change | |
---|---|---|---|
/ failed reqs | 0 | 0 | ✓ |
/ total time (seconds) | 4.271 | 4.211 | -0.06 |
/ avg req/sec | 585.41 | 593.68 | +8.27 |
/error-in-render failed reqs | 0 | 0 | ✓ |
/error-in-render total time (seconds) | 2.117 | 2.191 | |
/error-in-render avg req/sec | 1180.65 | 1141.09 |
Client Bundles (main, webpack, commons) Overall increase ⚠️
vercel/next.js canary | hi-ogawa/next.js 31013-add-base-path-to-preflight-middleware-request | Change | |
---|---|---|---|
450.HASH.js gzip | 179 B | 179 B | ✓ |
framework-HASH.js gzip | 42.3 kB | 42.3 kB | ✓ |
main-HASH.js gzip | 28.2 kB | 28.2 kB | |
webpack-HASH.js gzip | 1.43 kB | 1.43 kB | ✓ |
Overall change | 72.1 kB | 72.1 kB |
Legacy Client Bundles (polyfills)
vercel/next.js canary | hi-ogawa/next.js 31013-add-base-path-to-preflight-middleware-request | Change | |
---|---|---|---|
polyfills-HASH.js gzip | 31 kB | 31 kB | ✓ |
Overall change | 31 kB | 31 kB | ✓ |
Client Pages
vercel/next.js canary | hi-ogawa/next.js 31013-add-base-path-to-preflight-middleware-request | Change | |
---|---|---|---|
_app-HASH.js gzip | 1.22 kB | 1.22 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.38 kB | 2.38 kB | ✓ |
head-HASH.js gzip | 342 B | 342 B | ✓ |
hooks-HASH.js gzip | 622 B | 622 B | ✓ |
image-HASH.js gzip | 4.46 kB | 4.46 kB | ✓ |
index-HASH.js gzip | 256 B | 256 B | ✓ |
link-HASH.js gzip | 1.91 kB | 1.91 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 | 13.1 kB | 13.1 kB | ✓ |
Client Build Manifests
vercel/next.js canary | hi-ogawa/next.js 31013-add-base-path-to-preflight-middleware-request | Change | |
---|---|---|---|
_buildManifest.js gzip | 459 B | 459 B | ✓ |
Overall change | 459 B | 459 B | ✓ |
Rendered Page Sizes Overall decrease ✓
vercel/next.js canary | hi-ogawa/next.js 31013-add-base-path-to-preflight-middleware-request | Change | |
---|---|---|---|
index.html gzip | 524 B | 523 B | -1 B |
link.html gzip | 536 B | 536 B | ✓ |
withRouter.html gzip | 517 B | 516 B | -1 B |
Overall change | 1.58 kB | 1.57 kB | -2 B |
Diffs
Diff for main-HASH.js
@@ -5656,7 +5656,7 @@
case 24:
_ctx.next = 26;
return this._preflightRequest({
- as: asPath,
+ as: addBasePath(asPath),
cache: true,
pages: pages,
pathname: pathname,
Diff for index.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-f78d3bf7c627c9d4.js"
+ src="/_next/static/chunks/main-10789f4ca49986c9.js"
defer=""
></script>
<script
Diff for link.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-f78d3bf7c627c9d4.js"
+ src="/_next/static/chunks/main-10789f4ca49986c9.js"
defer=""
></script>
<script
Diff for withRouter.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-f78d3bf7c627c9d4.js"
+ src="/_next/static/chunks/main-10789f4ca49986c9.js"
defer=""
></script>
<script
hi-ogawa
deleted the
31013-add-base-path-to-preflight-middleware-request
branch
November 9, 2021 21:29
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #31013
My understanding is that there are currently two functions
Router.change
andRouter.prefetch
leading toRouter._preflightRequest
and they passoptions.as
URL differently regarding base path.In this PR, such difference will be handled in
Router._preflightRequest
to add base path before actually fetching.Thanks for the review!
P.S.
Since middleware feature is a relatively new, official maintainers might not want external contributions around this area at this stage.
I totally understand such situation, so please let me know if that's the case. I can look for other issues to investigate instead.
Bug
fixes #number
contributing.md
Feature
fixes #number
contributing.md
Documentation / Examples
yarn lint