Add fetching 404 SSG data on fallback notFound #18214
Merged
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
Stats from current PRDefault Server Mode (Increase detected
|
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| buildDuration | 13.3s | 13.3s | -50ms |
| nodeModulesSize | 91.3 MB | 91.3 MB |
Page Load Tests Overall decrease ⚠️
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| / failed reqs | 0 | 0 | ✓ |
| / total time (seconds) | 2.618 | 2.739 | |
| / avg req/sec | 954.82 | 912.81 | |
| /error-in-render failed reqs | 0 | 0 | ✓ |
| /error-in-render total time (seconds) | 1.547 | 1.512 | -0.03 |
| /error-in-render avg req/sec | 1616.06 | 1653.9 | +37.84 |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| 677f882d2ed8..574c.js gzip | 11.2 kB | 11.3 kB | |
| framework.HASH.js gzip | 39 kB | 39 kB | ✓ |
| main-3dd37a4..54de.js gzip | 7.34 kB | 7.34 kB | ✓ |
| webpack-e067..f178.js gzip | 751 B | 751 B | ✓ |
| Overall change | 58.3 kB | 58.3 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| 677f882d2ed8..dule.js gzip | 7.02 kB | 7.03 kB | |
| framework.HA..dule.js gzip | 39 kB | 39 kB | ✓ |
| main-082aff9..dule.js gzip | 6.32 kB | 6.32 kB | ✓ |
| webpack-07c5..dule.js gzip | 751 B | 751 B | ✓ |
| Overall change | 53.1 kB | 53.1 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| polyfills-4b..e242.js gzip | 31 kB | 31 kB | ✓ |
| Overall change | 31 kB | 31 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| _app-9a0b9e1..b37e.js gzip | 1.28 kB | 1.28 kB | ✓ |
| _error-ed1b0..8fbd.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-41ceea0..6b62.js gzip | 1.35 kB | 1.35 kB | ✓ |
| routerDirect..924c.js gzip | 284 B | 284 B | ✓ |
| withRouter-7..c13d.js gzip | 284 B | 284 B | ✓ |
| Overall change | 7.75 kB | 7.75 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| _app-75d3a82..dule.js gzip | 625 B | 625 B | ✓ |
| _error-4469a..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-2d41a89..dule.js gzip | 1.31 kB | 1.31 kB | ✓ |
| routerDirect..dule.js gzip | 284 B | 284 B | ✓ |
| withRouter-f..dule.js gzip | 282 B | 282 B | ✓ |
| Overall change | 5.4 kB | 5.4 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 323 B | 323 B | ✓ |
| _buildManife..dule.js gzip | 329 B | 329 B | ✓ |
| Overall change | 652 B | 652 B | ✓ |
Rendered Page Sizes Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| index.html gzip | 1 kB | 1 kB | |
| link.html gzip | 1.01 kB | 1.01 kB | |
| withRouter.html gzip | 994 B | 995 B | |
| Overall change | 3 kB | 3.01 kB |
Diffs
Diff for 677f882d2ed8..12.module.js
@@ -1334,13 +1334,29 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
try {
var Component;
var styleSheets;
+ var props;
var ssg404 = err.message === SSG_DATA_NOT_FOUND_ERROR;
if (ssg404) {
try {
- ({ page: Component, styleSheets } = await this.fetchComponent(
- "/404"
- ));
+ var mod;
+ ({
+ page: Component,
+ styleSheets,
+ mod
+ } = await this.fetchComponent("/404")); // TODO: should we tolerate these props missing and still render the
+ // page instead of falling back to _error?
+
+ if (mod && mod.__N_SSG) {
+ props = await this._getStaticData(
+ this.pageLoader.getDataHref(
+ "/404",
+ "/404",
+ true,
+ this.locale
+ )
+ );
+ }
} catch (_err) {
// non-fatal fallback to _error
}
@@ -1356,27 +1372,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
var routeInfo = {
+ props,
Component,
styleSheets,
err: ssg404 ? undefined : err,
error: ssg404 ? undefined : err
};
- try {
- routeInfo.props = await this.getInitialProps(Component, {
- err,
- pathname,
- query
- });
-
- if (ssg404 && routeInfo.props && routeInfo.props.pageProps) {
- routeInfo.props.pageProps.statusCode = 404;
+ if (!routeInfo.props) {
+ try {
+ routeInfo.props = await this.getInitialProps(Component, {
+ err,
+ pathname,
+ query
+ });
+ } catch (gipErr) {
+ console.error(
+ "Error in error page `getInitialProps`: ",
+ gipErr
+ );
+ routeInfo.props = {};
}
-
- console.log(routeInfo);
- } catch (gipErr) {
- console.error("Error in error page `getInitialProps`: ", gipErr);
- routeInfo.props = {};
}
return routeInfo;Diff for 677f882d2ed8..d5962febf.js
@@ -1672,7 +1672,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
) {
var Component,
styleSheets,
+ props,
ssg404,
+ mod,
_yield$this$fetchComp,
_yield$this$fetchComp2,
routeInfo;
@@ -1711,88 +1713,106 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
ssg404 = err.message === SSG_DATA_NOT_FOUND_ERROR;
if (!ssg404) {
- _context2.next = 20;
+ _context2.next = 24;
break;
}
_context2.prev = 9;
- _context2.next = 13;
+ _context2.next = 12;
return this.fetchComponent("/404");
- case 13:
+ case 12:
_yield$this$fetchComp = _context2.sent;
Component = _yield$this$fetchComp.page;
styleSheets = _yield$this$fetchComp.styleSheets;
- _context2.next = 20;
+ mod = _yield$this$fetchComp.mod;
+
+ if (!(mod && mod.__N_SSG)) {
+ _context2.next = 20;
+ break;
+ }
+
+ _context2.next = 19;
+ return this._getStaticData(
+ this.pageLoader.getDataHref(
+ "/404",
+ "/404",
+ true,
+ this.locale
+ )
+ );
+
+ case 19:
+ props = _context2.sent;
+
+ case 20:
+ _context2.next = 24;
break;
- case 18:
- _context2.prev = 18;
+ case 22:
+ _context2.prev = 22;
_context2.t0 = _context2["catch"](9);
- case 20:
+ case 24:
if (
!(
typeof Component === "undefined" ||
typeof styleSheets === "undefined"
)
) {
- _context2.next = 27;
+ _context2.next = 31;
break;
}
- _context2.next = 24;
+ _context2.next = 28;
return this.fetchComponent("/_error");
- case 24:
+ case 28:
_yield$this$fetchComp2 = _context2.sent;
Component = _yield$this$fetchComp2.page;
styleSheets = _yield$this$fetchComp2.styleSheets;
- case 27:
+ case 31:
routeInfo = {
+ props: props,
Component: Component,
styleSheets: styleSheets,
err: ssg404 ? undefined : err,
error: ssg404 ? undefined : err
};
- _context2.prev = 28;
- _context2.next = 31;
+
+ if (routeInfo.props) {
+ _context2.next = 43;
+ break;
+ }
+
+ _context2.prev = 33;
+ _context2.next = 36;
return this.getInitialProps(Component, {
err: err,
pathname: pathname,
query: query
});
- case 31:
+ case 36:
routeInfo.props = _context2.sent;
-
- if (
- ssg404 &&
- routeInfo.props &&
- routeInfo.props.pageProps
- ) {
- routeInfo.props.pageProps.statusCode = 404;
- }
-
- console.log(routeInfo);
- _context2.next = 40;
+ _context2.next = 43;
break;
- case 36:
- _context2.prev = 36;
- _context2.t1 = _context2["catch"](28);
+ case 39:
+ _context2.prev = 39;
+ _context2.t1 = _context2["catch"](33);
console.error(
"Error in error page `getInitialProps`: ",
_context2.t1
);
routeInfo.props = {};
- case 40:
+ case 43:
return _context2.abrupt("return", routeInfo);
- case 43:
- _context2.prev = 43;
+ case 46:
+ _context2.prev = 46;
_context2.t2 = _context2["catch"](6);
return _context2.abrupt(
"return",
@@ -1805,7 +1825,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
)
);
- case 46:
+ case 49:
case "end":
return _context2.stop();
}
@@ -1814,9 +1834,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
_callee2,
this,
[
- [6, 43],
- [9, 18],
- [28, 36]
+ [6, 46],
+ [9, 22],
+ [33, 39]
]
);
})Diff for index.html
@@ -24,7 +24,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a4a3d644f73d852a2012.module.js"
+ href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.22fb78816363e42d9437.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -121,13 +121,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.be11310f581d5962febf.js"
+ src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.f13175bb4906bc14eb0d.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a4a3d644f73d852a2012.module.js"
+ src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.22fb78816363e42d9437.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for link.html
@@ -24,7 +24,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a4a3d644f73d852a2012.module.js"
+ href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.22fb78816363e42d9437.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -126,13 +126,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.be11310f581d5962febf.js"
+ src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.f13175bb4906bc14eb0d.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a4a3d644f73d852a2012.module.js"
+ src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.22fb78816363e42d9437.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for withRouter.html
@@ -24,7 +24,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a4a3d644f73d852a2012.module.js"
+ href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.22fb78816363e42d9437.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -121,13 +121,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.be11310f581d5962febf.js"
+ src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.f13175bb4906bc14eb0d.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.a4a3d644f73d852a2012.module.js"
+ src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.22fb78816363e42d9437.module.js"
async=""
crossorigin="anonymous"
type="module"Serverless Mode (Increase detected ⚠️ )
General Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| buildDuration | 15.3s | 15.5s | |
| nodeModulesSize | 91.3 MB | 91.3 MB |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| 677f882d2ed8..574c.js gzip | 11.2 kB | N/A | N/A |
| framework.HASH.js gzip | 39 kB | 39 kB | ✓ |
| main-3dd37a4..54de.js gzip | 7.34 kB | 7.34 kB | ✓ |
| webpack-e067..f178.js gzip | 751 B | 751 B | ✓ |
| 677f882d2ed8..3061.js gzip | N/A | 11.3 kB | N/A |
| Overall change | 58.3 kB | 58.3 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| 677f882d2ed8..dule.js gzip | 7.02 kB | N/A | N/A |
| framework.HA..dule.js gzip | 39 kB | 39 kB | ✓ |
| main-082aff9..dule.js gzip | 6.32 kB | 6.32 kB | ✓ |
| webpack-07c5..dule.js gzip | 751 B | 751 B | ✓ |
| 677f882d2ed8..dule.js gzip | N/A | 7.03 kB | N/A |
| Overall change | 53.1 kB | 53.1 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| polyfills-4b..e242.js gzip | 31 kB | 31 kB | ✓ |
| Overall change | 31 kB | 31 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| _app-9a0b9e1..b37e.js gzip | 1.28 kB | 1.28 kB | ✓ |
| _error-ed1b0..8fbd.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-41ceea0..6b62.js gzip | 1.35 kB | 1.35 kB | ✓ |
| routerDirect..924c.js gzip | 284 B | 284 B | ✓ |
| withRouter-7..c13d.js gzip | 284 B | 284 B | ✓ |
| Overall change | 7.75 kB | 7.75 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| _app-75d3a82..dule.js gzip | 625 B | 625 B | ✓ |
| _error-4469a..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-2d41a89..dule.js gzip | 1.31 kB | 1.31 kB | ✓ |
| routerDirect..dule.js gzip | 284 B | 284 B | ✓ |
| withRouter-f..dule.js gzip | 282 B | 282 B | ✓ |
| Overall change | 5.4 kB | 5.4 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 323 B | 323 B | ✓ |
| _buildManife..dule.js gzip | 329 B | 329 B | ✓ |
| Overall change | 652 B | 652 B | ✓ |
Serverless bundles Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| _error.js | 1.06 MB | 1.06 MB | ✓ |
| 404.html | 4.73 kB | 4.73 kB | ✓ |
| hooks.html | 3.92 kB | 3.92 kB | ✓ |
| index.js | 1.06 MB | 1.06 MB | ✓ |
| link.js | 1.1 MB | 1.1 MB | |
| routerDirect.js | 1.1 MB | 1.1 MB | |
| withRouter.js | 1.1 MB | 1.1 MB | |
| Overall change | 5.42 MB | 5.42 MB |
Timer
approved these changes
Oct 27, 2020
Stats from current PRDefault Server Mode (Increase detected
|
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| buildDuration | 14.1s | 14.2s | |
| nodeModulesSize | 91.3 MB | 91.3 MB |
Page Load Tests Overall increase ✓
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| / failed reqs | 0 | 0 | ✓ |
| / total time (seconds) | 2.892 | 2.934 | |
| / avg req/sec | 864.36 | 852.22 | |
| /error-in-render failed reqs | 0 | 0 | ✓ |
| /error-in-render total time (seconds) | 1.913 | 1.77 | -0.14 |
| /error-in-render avg req/sec | 1306.69 | 1412.28 | +105.59 |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| 677f882d2ed8..d3ae.js gzip | 11.2 kB | 11.3 kB | |
| framework.HASH.js gzip | 39 kB | 39 kB | ✓ |
| main-2927f4e..281e.js gzip | 7.34 kB | 7.34 kB | ✓ |
| webpack-e067..f178.js gzip | 751 B | 751 B | ✓ |
| Overall change | 58.3 kB | 58.3 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| 677f882d2ed8..dule.js gzip | 7.01 kB | 7.03 kB | |
| framework.HA..dule.js gzip | 39 kB | 39 kB | ✓ |
| main-1382a2d..dule.js gzip | 6.32 kB | 6.32 kB | ✓ |
| webpack-07c5..dule.js gzip | 751 B | 751 B | ✓ |
| Overall change | 53.1 kB | 53.1 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| polyfills-4b..e242.js gzip | 31 kB | 31 kB | ✓ |
| Overall change | 31 kB | 31 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| _app-9a0b9e1..b37e.js gzip | 1.28 kB | 1.28 kB | ✓ |
| _error-ed1b0..8fbd.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-41ceea0..6b62.js gzip | 1.35 kB | 1.35 kB | ✓ |
| routerDirect..924c.js gzip | 284 B | 284 B | ✓ |
| withRouter-7..c13d.js gzip | 284 B | 284 B | ✓ |
| Overall change | 7.75 kB | 7.75 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| _app-75d3a82..dule.js gzip | 625 B | 625 B | ✓ |
| _error-4469a..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-2d41a89..dule.js gzip | 1.31 kB | 1.31 kB | ✓ |
| routerDirect..dule.js gzip | 284 B | 284 B | ✓ |
| withRouter-f..dule.js gzip | 282 B | 282 B | ✓ |
| Overall change | 5.4 kB | 5.4 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 323 B | 323 B | ✓ |
| _buildManife..dule.js gzip | 329 B | 329 B | ✓ |
| Overall change | 652 B | 652 B | ✓ |
Rendered Page Sizes Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| index.html gzip | 1 kB | 1 kB | |
| link.html gzip | 1.01 kB | 1.01 kB | |
| withRouter.html gzip | 994 B | 993 B | -1 B |
| Overall change | 3 kB | 3 kB |
Diffs
Diff for 677f882d2ed8..d3412aee7.js
@@ -1672,7 +1672,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
) {
var Component,
styleSheets,
+ props,
ssg404,
+ mod,
_yield$this$fetchComp,
_yield$this$fetchComp2,
routeInfo;
@@ -1711,88 +1713,106 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
ssg404 = err.message === SSG_DATA_NOT_FOUND_ERROR;
if (!ssg404) {
- _context2.next = 20;
+ _context2.next = 24;
break;
}
_context2.prev = 9;
- _context2.next = 13;
+ _context2.next = 12;
return this.fetchComponent("/404");
- case 13:
+ case 12:
_yield$this$fetchComp = _context2.sent;
Component = _yield$this$fetchComp.page;
styleSheets = _yield$this$fetchComp.styleSheets;
- _context2.next = 20;
+ mod = _yield$this$fetchComp.mod;
+
+ if (!(mod && mod.__N_SSG)) {
+ _context2.next = 20;
+ break;
+ }
+
+ _context2.next = 19;
+ return this._getStaticData(
+ this.pageLoader.getDataHref(
+ "/404",
+ "/404",
+ true,
+ this.locale
+ )
+ );
+
+ case 19:
+ props = _context2.sent;
+
+ case 20:
+ _context2.next = 24;
break;
- case 18:
- _context2.prev = 18;
+ case 22:
+ _context2.prev = 22;
_context2.t0 = _context2["catch"](9);
- case 20:
+ case 24:
if (
!(
typeof Component === "undefined" ||
typeof styleSheets === "undefined"
)
) {
- _context2.next = 27;
+ _context2.next = 31;
break;
}
- _context2.next = 24;
+ _context2.next = 28;
return this.fetchComponent("/_error");
- case 24:
+ case 28:
_yield$this$fetchComp2 = _context2.sent;
Component = _yield$this$fetchComp2.page;
styleSheets = _yield$this$fetchComp2.styleSheets;
- case 27:
+ case 31:
routeInfo = {
+ props: props,
Component: Component,
styleSheets: styleSheets,
err: ssg404 ? undefined : err,
error: ssg404 ? undefined : err
};
- _context2.prev = 28;
- _context2.next = 31;
+
+ if (routeInfo.props) {
+ _context2.next = 43;
+ break;
+ }
+
+ _context2.prev = 33;
+ _context2.next = 36;
return this.getInitialProps(Component, {
err: err,
pathname: pathname,
query: query
});
- case 31:
+ case 36:
routeInfo.props = _context2.sent;
-
- if (
- ssg404 &&
- routeInfo.props &&
- routeInfo.props.pageProps
- ) {
- routeInfo.props.pageProps.statusCode = 404;
- }
-
- console.log(routeInfo);
- _context2.next = 40;
+ _context2.next = 43;
break;
- case 36:
- _context2.prev = 36;
- _context2.t1 = _context2["catch"](28);
+ case 39:
+ _context2.prev = 39;
+ _context2.t1 = _context2["catch"](33);
console.error(
"Error in error page `getInitialProps`: ",
_context2.t1
);
routeInfo.props = {};
- case 40:
+ case 43:
return _context2.abrupt("return", routeInfo);
- case 43:
- _context2.prev = 43;
+ case 46:
+ _context2.prev = 46;
_context2.t2 = _context2["catch"](6);
return _context2.abrupt(
"return",
@@ -1805,7 +1825,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
)
);
- case 46:
+ case 49:
case "end":
return _context2.stop();
}
@@ -1814,9 +1834,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
_callee2,
this,
[
- [6, 43],
- [9, 18],
- [28, 36]
+ [6, 46],
+ [9, 22],
+ [33, 39]
]
);
})Diff for 677f882d2ed8..6f.module.js
@@ -1329,13 +1329,29 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
try {
var Component;
var styleSheets;
+ var props;
var ssg404 = err.message === SSG_DATA_NOT_FOUND_ERROR;
if (ssg404) {
try {
- ({ page: Component, styleSheets } = await this.fetchComponent(
- "/404"
- ));
+ var mod;
+ ({
+ page: Component,
+ styleSheets,
+ mod
+ } = await this.fetchComponent("/404")); // TODO: should we tolerate these props missing and still render the
+ // page instead of falling back to _error?
+
+ if (mod && mod.__N_SSG) {
+ props = await this._getStaticData(
+ this.pageLoader.getDataHref(
+ "/404",
+ "/404",
+ true,
+ this.locale
+ )
+ );
+ }
} catch (_err) {
// non-fatal fallback to _error
}
@@ -1351,27 +1367,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
var routeInfo = {
+ props,
Component,
styleSheets,
err: ssg404 ? undefined : err,
error: ssg404 ? undefined : err
};
- try {
- routeInfo.props = await this.getInitialProps(Component, {
- err,
- pathname,
- query
- });
-
- if (ssg404 && routeInfo.props && routeInfo.props.pageProps) {
- routeInfo.props.pageProps.statusCode = 404;
+ if (!routeInfo.props) {
+ try {
+ routeInfo.props = await this.getInitialProps(Component, {
+ err,
+ pathname,
+ query
+ });
+ } catch (gipErr) {
+ console.error(
+ "Error in error page `getInitialProps`: ",
+ gipErr
+ );
+ routeInfo.props = {};
}
-
- console.log(routeInfo);
- } catch (gipErr) {
- console.error("Error in error page `getInitialProps`: ", gipErr);
- routeInfo.props = {};
}
return routeInfo;Diff for index.html
@@ -24,7 +24,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c77303353820ee04bf6f.module.js"
+ href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.4c5c4f34cb1aaaa3c077.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -121,13 +121,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.9ab79628c20d3412aee7.js"
+ src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.5ddaca5d46f05a42e394.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c77303353820ee04bf6f.module.js"
+ src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.4c5c4f34cb1aaaa3c077.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for link.html
@@ -24,7 +24,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c77303353820ee04bf6f.module.js"
+ href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.4c5c4f34cb1aaaa3c077.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -126,13 +126,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.9ab79628c20d3412aee7.js"
+ src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.5ddaca5d46f05a42e394.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c77303353820ee04bf6f.module.js"
+ src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.4c5c4f34cb1aaaa3c077.module.js"
async=""
crossorigin="anonymous"
type="module"Diff for withRouter.html
@@ -24,7 +24,7 @@
/>
<link
rel="preload"
- href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c77303353820ee04bf6f.module.js"
+ href="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.4c5c4f34cb1aaaa3c077.module.js"
as="script"
crossorigin="anonymous"
/>
@@ -121,13 +121,13 @@
type="module"
></script>
<script
- src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.9ab79628c20d3412aee7.js"
+ src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.5ddaca5d46f05a42e394.js"
async=""
crossorigin="anonymous"
nomodule=""
></script>
<script
- src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.c77303353820ee04bf6f.module.js"
+ src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.4c5c4f34cb1aaaa3c077.module.js"
async=""
crossorigin="anonymous"
type="module"Serverless Mode (Increase detected ⚠️ )
General Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| buildDuration | 16.5s | 16.8s | |
| nodeModulesSize | 91.3 MB | 91.3 MB |
Client Bundles (main, webpack, commons) Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| 677f882d2ed8..d3ae.js gzip | 11.2 kB | N/A | N/A |
| framework.HASH.js gzip | 39 kB | 39 kB | ✓ |
| main-2927f4e..281e.js gzip | 7.34 kB | 7.34 kB | ✓ |
| webpack-e067..f178.js gzip | 751 B | 751 B | ✓ |
| 677f882d2ed8..3aa9.js gzip | N/A | 11.3 kB | N/A |
| Overall change | 58.3 kB | 58.3 kB |
Client Bundles (main, webpack, commons) Modern Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| 677f882d2ed8..dule.js gzip | 7.01 kB | N/A | N/A |
| framework.HA..dule.js gzip | 39 kB | 39 kB | ✓ |
| main-1382a2d..dule.js gzip | 6.32 kB | 6.32 kB | ✓ |
| webpack-07c5..dule.js gzip | 751 B | 751 B | ✓ |
| 677f882d2ed8..dule.js gzip | N/A | 7.03 kB | N/A |
| Overall change | 53.1 kB | 53.1 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| polyfills-4b..e242.js gzip | 31 kB | 31 kB | ✓ |
| Overall change | 31 kB | 31 kB | ✓ |
Client Pages
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| _app-9a0b9e1..b37e.js gzip | 1.28 kB | 1.28 kB | ✓ |
| _error-ed1b0..8fbd.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-41ceea0..6b62.js gzip | 1.35 kB | 1.35 kB | ✓ |
| routerDirect..924c.js gzip | 284 B | 284 B | ✓ |
| withRouter-7..c13d.js gzip | 284 B | 284 B | ✓ |
| Overall change | 7.75 kB | 7.75 kB | ✓ |
Client Pages Modern
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| _app-75d3a82..dule.js gzip | 625 B | 625 B | ✓ |
| _error-4469a..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-2d41a89..dule.js gzip | 1.31 kB | 1.31 kB | ✓ |
| routerDirect..dule.js gzip | 284 B | 284 B | ✓ |
| withRouter-f..dule.js gzip | 282 B | 282 B | ✓ |
| Overall change | 5.4 kB | 5.4 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 323 B | 323 B | ✓ |
| _buildManife..dule.js gzip | 329 B | 329 B | ✓ |
| Overall change | 652 B | 652 B | ✓ |
Serverless bundles Overall increase ⚠️
| vercel/next.js canary | ijjk/next.js ssg/404-fallback-data | Change | |
|---|---|---|---|
| _error.js | 1.06 MB | 1.06 MB | ✓ |
| 404.html | 4.73 kB | 4.73 kB | ✓ |
| hooks.html | 3.92 kB | 3.92 kB | ✓ |
| index.js | 1.06 MB | 1.06 MB | ✓ |
| link.js | 1.11 MB | 1.11 MB | |
| routerDirect.js | 1.1 MB | 1.1 MB | |
| withRouter.js | 1.1 MB | 1.1 MB | |
| Overall change | 5.43 MB | 5.43 MB |
This was referenced Mar 7, 2021
This was referenced Mar 8, 2021
This was referenced Sep 17, 2021
This was referenced Jan 12, 2022
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.
Continuation of #18205 this also handles fetching SSG data when rendering the 404 page when receiving
notFoundfrom a fallback SSG page.x-ref: #17755
Closes: #18212