fix(31013): add base path to preflight request url #31101

hi-ogawa · 2021-11-07T02:29:51Z

My understanding is that there are currently two functions Router.change and Router.prefetch leading to Router._preflightRequest and they pass options.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

Related issues linked using fixes #number
Integration tests added
Errors have helpful link attached, see contributing.md

Feature

Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
Related issues linked using fixes #number
Integration tests added
Documentation added
Telemetry added. In case of a feature if it's used or not.
Errors have helpful link attached, see contributing.md

Documentation / Examples

Make sure the linting passes by running yarn lint

packages/next/shared/lib/router/router.ts

…e-request

ijjk

Change and added test look good, thanks!

…e-request

ijjk · 2021-11-09T18:49:20Z

Stats from current PR

Default Build (Increase detected ⚠️)

General Overall increase ⚠️

	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	⚠️ +21 B

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	⚠️ +5 B
webpack-HASH.js gzip	1.45 kB	1.45 kB	✓
Overall change	71.9 kB	71.9 kB	⚠️ +5 B

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	⚠️ +1 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	⚠️ +145ms
buildDurationCached	5s	5s	-73ms
nodeModulesSize	333 MB	333 MB	⚠️ +21 B

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	⚠️ +0.07
/error-in-render avg req/sec	1180.65	1141.09	⚠️ -39.56

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	⚠️ +1 B
webpack-HASH.js gzip	1.43 kB	1.43 kB	✓
Overall change	72.1 kB	72.1 kB	⚠️ +1 B

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

Commit: 15db3aa

hi-ogawa requested review from huozhi, ijjk, shuding and timneutkens as code owners November 7, 2021 02:29

ijjk added the type: next label Nov 7, 2021

ijjk reviewed Nov 8, 2021

View reviewed changes

packages/next/shared/lib/router/router.ts Outdated Show resolved Hide resolved

hi-ogawa added 2 commits November 9, 2021 22:00

fix(31013): add base path to preflight request url

9120ee5

refactor: use addBasePath in Router.prefetch

3b923bf

hi-ogawa force-pushed the 31013-add-base-path-to-preflight-middleware-request branch from 678ab78 to 3b923bf Compare November 9, 2021 13:15

Merge branch 'canary' into 31013-add-base-path-to-preflight-middlewar…

4c90caa

…e-request

ijjk approved these changes Nov 9, 2021

View reviewed changes

This comment has been minimized.

Sign in to view

Merge branch 'canary' into 31013-add-base-path-to-preflight-middlewar…

15db3aa

…e-request

kodiakhq bot merged commit 764e29c into vercel:canary Nov 9, 2021

hi-ogawa deleted the 31013-add-base-path-to-preflight-middleware-request branch November 9, 2021 21:29

vercel locked as resolved and limited conversation to collaborators Jan 27, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(31013): add base path to preflight request url #31101

fix(31013): add base path to preflight request url #31101

hi-ogawa commented Nov 7, 2021

ijjk left a comment

This comment has been minimized.

ijjk commented Nov 9, 2021

Diffs

Diffs

fix(31013): add base path to preflight request url #31101

fix(31013): add base path to preflight request url #31101

Conversation

hi-ogawa commented Nov 7, 2021

Bug

Feature

Documentation / Examples

ijjk left a comment

Choose a reason for hiding this comment

This comment has been minimized.

ijjk commented Nov 9, 2021

Stats from current PR

Diffs

Diffs