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 wrong asPath on 404 #15728

Merged
merged 1 commit into from Jul 31, 2020
Merged

Fix wrong asPath on 404 #15728

merged 1 commit into from Jul 31, 2020

Conversation

Janpot
Copy link
Contributor

@Janpot Janpot commented Jul 31, 2020 •
edited

Caught this while reviewing router code for #15710

@ijjk
Copy link
Member

ijjk commented Jul 31, 2020

Stats from current PR

Default Server Mode (Increase detected ⚠️)
General Overall decrease ✓
vercel/next.js canary Janpot/next.js basepath-404 Change
buildDuration 12.8s 12.8s -32ms
nodeModulesSize 65.5 MB 65.5 MB -4 B
Page Load Tests Overall increase ✓
vercel/next.js canary Janpot/next.js basepath-404 Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.23 2.205 -0.02
/ avg req/sec 1121.15 1133.88 +12.73
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.244 1.221 -0.02
/error-in-render avg req/sec 2010.01 2047.92 +37.91
Client Bundles (main, webpack, commons) Overall increase ⚠️
vercel/next.js canary Janpot/next.js basepath-404 Change
677f882d2ed8..b7a9.js gzip 10.2 kB 10.2 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
main-935e413..31c4.js gzip 6.76 kB 6.76 kB ⚠️ +1 B
webpack-488d..c0e7.js gzip 751 B 751 B ✓
Overall change 56.8 kB 56.8 kB ⚠️ +1 B
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
vercel/next.js canary Janpot/next.js basepath-404 Change
677f882d2ed8..dule.js gzip 6.09 kB 6.09 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
main-4b8f4a8..dule.js gzip 5.84 kB 5.84 kB ⚠️ +3 B
webpack-4f62..dule.js gzip 751 B 751 B ✓
Overall change 51.8 kB 51.8 kB ⚠️ +3 B
Legacy Client Bundles (polyfills)
vercel/next.js canary Janpot/next.js basepath-404 Change
polyfills-05..1236.js gzip 30.8 kB 30.8 kB ✓
Overall change 30.8 kB 30.8 kB ✓
Client Pages
vercel/next.js canary Janpot/next.js basepath-404 Change
_app-8f5f611..1f7b.js gzip 1.28 kB 1.28 kB ✓
_error-a98d9..5cb7.js gzip 3.45 kB 3.45 kB ✓
hooks-f7f3d0..7465.js gzip 887 B 887 B ✓
index-08fb3f..c0e9.js gzip 227 B 227 B ✓
link-6f8445b..99e1.js gzip 1.3 kB 1.3 kB ✓
routerDirect..8aa1.js gzip 284 B 284 B ✓
withRouter-f..e777.js gzip 284 B 284 B ✓
Overall change 7.72 kB 7.72 kB ✓
Client Pages Modern
vercel/next.js canary Janpot/next.js basepath-404 Change
_app-669dbe5..dule.js gzip 626 B 626 B ✓
_error-d5979..dule.js gzip 2.3 kB 2.3 kB ✓
hooks-805c40..dule.js gzip 387 B 387 B ✓
index-6ba5a4..dule.js gzip 226 B 226 B ✓
link-91516ae..dule.js gzip 1.25 kB 1.25 kB ✓
routerDirect..dule.js gzip 284 B 284 B ✓
withRouter-d..dule.js gzip 282 B 282 B ✓
Overall change 5.36 kB 5.36 kB ✓
Client Build Manifests
vercel/next.js canary Janpot/next.js basepath-404 Change
_buildManifest.js gzip 274 B 274 B ✓
_buildManife..dule.js gzip 282 B 282 B ✓
Overall change 556 B 556 B ✓
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary Janpot/next.js basepath-404 Change
index.html gzip 945 B 947 B ⚠️ +2 B
link.html gzip 953 B 953 B ✓
withRouter.html gzip 940 B 940 B ✓
Overall change 2.84 kB 2.84 kB ⚠️ +2 B

Diffs

Diff for main-88a4d80..5b.module.js 
@@ -243,7 +243,7 @@
           page === "/_error" &&
           hydrateProps &&
           hydrateProps.pageProps &&
-          hydrateProps.pageProps.statusCode === "404"
+          hydrateProps.pageProps.statusCode === 404
         )
       ) {
         asPath = (0, _router2.delBasePath)(asPath);
Diff for main-e647ae2..b3e1da5ee.js 
@@ -323,7 +323,7 @@ _N_E = (window["webpackJsonp_N_E"] = window["webpackJsonp_N_E"] || []).push([
           page === "/_error" &&
           hydrateProps &&
           hydrateProps.pageProps &&
-          hydrateProps.pageProps.statusCode === "404"
+          hydrateProps.pageProps.statusCode === 404
         )
       ) {
         asPath = (0, _router2.delBasePath)(asPath);
Diff for index.html 
@@ -6,7 +6,7 @@
     <meta name="next-head-count" content="2" />
     <link
       rel="preload"
-      href="/_next/static/chunks/main-88a4d8003836e3421b5b.module.js"
+      href="/_next/static/chunks/main-fbe7700ee735039eb116.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -81,13 +81,13 @@
       src="/_next/static/chunks/polyfills-cdbbd579644400b29b58.js"
     ></script>
     <script
-      src="/_next/static/chunks/main-e647ae20b32b3e1da5ee.js"
+      src="/_next/static/chunks/main-09c9c57d88bf60213597.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/main-88a4d8003836e3421b5b.module.js"
+      src="/_next/static/chunks/main-fbe7700ee735039eb116.module.js"
       async=""
       crossorigin="anonymous"
       type="module"
Diff for link.html 
@@ -6,7 +6,7 @@
     <meta name="next-head-count" content="2" />
     <link
       rel="preload"
-      href="/_next/static/chunks/main-88a4d8003836e3421b5b.module.js"
+      href="/_next/static/chunks/main-fbe7700ee735039eb116.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -86,13 +86,13 @@
       src="/_next/static/chunks/polyfills-cdbbd579644400b29b58.js"
     ></script>
     <script
-      src="/_next/static/chunks/main-e647ae20b32b3e1da5ee.js"
+      src="/_next/static/chunks/main-09c9c57d88bf60213597.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/main-88a4d8003836e3421b5b.module.js"
+      src="/_next/static/chunks/main-fbe7700ee735039eb116.module.js"
       async=""
       crossorigin="anonymous"
       type="module"
Diff for withRouter.html 
@@ -6,7 +6,7 @@
     <meta name="next-head-count" content="2" />
     <link
       rel="preload"
-      href="/_next/static/chunks/main-88a4d8003836e3421b5b.module.js"
+      href="/_next/static/chunks/main-fbe7700ee735039eb116.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -81,13 +81,13 @@
       src="/_next/static/chunks/polyfills-cdbbd579644400b29b58.js"
     ></script>
     <script
-      src="/_next/static/chunks/main-e647ae20b32b3e1da5ee.js"
+      src="/_next/static/chunks/main-09c9c57d88bf60213597.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/main-88a4d8003836e3421b5b.module.js"
+      src="/_next/static/chunks/main-fbe7700ee735039eb116.module.js"
       async=""
       crossorigin="anonymous"
       type="module"
Serverless Mode (Decrease detected ✓)
General Overall decrease ✓
vercel/next.js canary Janpot/next.js basepath-404 Change
buildDuration 14.1s 14.1s ⚠️ +3ms
nodeModulesSize 65.5 MB 65.5 MB -4 B
Client Bundles (main, webpack, commons) Overall increase ⚠️
vercel/next.js canary Janpot/next.js basepath-404 Change
677f882d2ed8..b7a9.js gzip 10.2 kB 10.2 kB ✓
framework.HASH.js gzip 39.1 kB 39.1 kB ✓
main-935e413..31c4.js gzip 6.76 kB N/A N/A
webpack-488d..c0e7.js gzip 751 B 751 B ✓
main-88c5dea..200a.js gzip N/A 6.76 kB N/A
Overall change 56.8 kB 56.8 kB ⚠️ +1 B
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
vercel/next.js canary Janpot/next.js basepath-404 Change
677f882d2ed8..dule.js gzip 6.09 kB 6.09 kB ✓
framework.HA..dule.js gzip 39.1 kB 39.1 kB ✓
main-4b8f4a8..dule.js gzip 5.84 kB N/A N/A
webpack-4f62..dule.js gzip 751 B 751 B ✓
main-001590a..dule.js gzip N/A 5.84 kB N/A
Overall change 51.8 kB 51.8 kB ⚠️ +3 B
Legacy Client Bundles (polyfills)
vercel/next.js canary Janpot/next.js basepath-404 Change
polyfills-05..1236.js gzip 30.8 kB 30.8 kB ✓
Overall change 30.8 kB 30.8 kB ✓
Client Pages
vercel/next.js canary Janpot/next.js basepath-404 Change
_app-8f5f611..1f7b.js gzip 1.28 kB 1.28 kB ✓
_error-a98d9..5cb7.js gzip 3.45 kB 3.45 kB ✓
hooks-f7f3d0..7465.js gzip 887 B 887 B ✓
index-08fb3f..c0e9.js gzip 227 B 227 B ✓
link-6f8445b..99e1.js gzip 1.3 kB 1.3 kB ✓
routerDirect..8aa1.js gzip 284 B 284 B ✓
withRouter-f..e777.js gzip 284 B 284 B ✓
Overall change 7.72 kB 7.72 kB ✓
Client Pages Modern
vercel/next.js canary Janpot/next.js basepath-404 Change
_app-669dbe5..dule.js gzip 626 B 626 B ✓
_error-d5979..dule.js gzip 2.3 kB 2.3 kB ✓
hooks-805c40..dule.js gzip 387 B 387 B ✓
index-6ba5a4..dule.js gzip 226 B 226 B ✓
link-91516ae..dule.js gzip 1.25 kB 1.25 kB ✓
routerDirect..dule.js gzip 284 B 284 B ✓
withRouter-d..dule.js gzip 282 B 282 B ✓
Overall change 5.36 kB 5.36 kB ✓
Client Build Manifests
vercel/next.js canary Janpot/next.js basepath-404 Change
_buildManifest.js gzip 274 B 274 B ✓
_buildManife..dule.js gzip 282 B 282 B ✓
Overall change 556 B 556 B ✓
Serverless bundles
vercel/next.js canary Janpot/next.js basepath-404 Change
_error.js 1.02 MB 1.02 MB ✓
404.html 4.18 kB 4.18 kB ✓
hooks.html 3.82 kB 3.82 kB ✓
index.js 1.02 MB 1.02 MB ✓
link.js 1.06 MB 1.06 MB ✓
routerDirect.js 1.05 MB 1.05 MB ✓
withRouter.js 1.05 MB 1.05 MB ✓
Overall change 5.2 MB 5.2 MB ✓
Commit: bd496ce

@kodiakhq kodiakhq bot merged commit c9e379c into vercel:canary Jul 31, 2020
@Janpot Janpot deleted the basepath-404 branch July 31, 2020 06:40
LauraBeatris pushed a commit to LauraBeatris/next.js that referenced this pull request Sep 1, 2020
@Janpot @LauraBeatris
Fix wrong asPath on 404 (vercel#15728)
37bfc65 
Caught this while reviewing router code for vercel#15710
@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.
Reviewers

@Timer Timer Timer approved these changes

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

@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
3 participants
@Janpot @ijjk @Timer