Refactor export marks of server components #34945
Merged
+71
−79
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
Failing test suitesCommit: 6f565dd
Expand output● react 18 streaming SSR in minimal mode › should generate html response by streaming correctly Read more about building and testing Next.js in contributing.md. |
This comment has been minimized.
This comment has been minimized.
huozhi
approved these changes
Mar 2, 2022
Stats from current PRDefault Build (Increase detected
|
| vercel/next.js canary | shuding/next.js shu/f8d8 | Change | |
|---|---|---|---|
| buildDuration | 15.4s | 15.6s | |
| buildDurationCached | 6s | 6.1s | |
| nodeModulesSize | 372 MB | 372 MB | -1.71 kB |
Page Load Tests Overall increase ✓
| vercel/next.js canary | shuding/next.js shu/f8d8 | Change | |
|---|---|---|---|
| / failed reqs | 0 | 0 | ✓ |
| / total time (seconds) | 2.941 | 2.95 | |
| / avg req/sec | 850 | 847.57 | |
| /error-in-render failed reqs | 0 | 0 | ✓ |
| /error-in-render total time (seconds) | 1.196 | 1.176 | -0.02 |
| /error-in-render avg req/sec | 2090.42 | 2126.5 | +36.08 |
Client Bundles (main, webpack) Overall increase ⚠️
| vercel/next.js canary | shuding/next.js shu/f8d8 | Change | |
|---|---|---|---|
| 925.HASH.js gzip | 179 B | 179 B | ✓ |
| framework-HASH.js gzip | 42 kB | 42 kB | ✓ |
| main-HASH.js gzip | 27.9 kB | 27.9 kB | |
| webpack-HASH.js gzip | 1.44 kB | 1.44 kB | ✓ |
| Overall change | 71.5 kB | 71.5 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | shuding/next.js shu/f8d8 | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 31 kB | 31 kB | ✓ |
| Overall change | 31 kB | 31 kB | ✓ |
Client Pages
| vercel/next.js canary | shuding/next.js shu/f8d8 | Change | |
|---|---|---|---|
| _app-HASH.js gzip | 1.36 kB | 1.36 kB | ✓ |
| _error-HASH.js gzip | 192 B | 192 B | ✓ |
| amp-HASH.js gzip | 309 B | 309 B | ✓ |
| css-HASH.js gzip | 327 B | 327 B | ✓ |
| dynamic-HASH.js gzip | 2.57 kB | 2.57 kB | ✓ |
| head-HASH.js gzip | 351 B | 351 B | ✓ |
| hooks-HASH.js gzip | 920 B | 920 B | ✓ |
| image-HASH.js gzip | 5.05 kB | 5.05 kB | ✓ |
| index-HASH.js gzip | 263 B | 263 B | ✓ |
| link-HASH.js gzip | 2.26 kB | 2.26 kB | ✓ |
| routerDirect..HASH.js gzip | 320 B | 320 B | ✓ |
| script-HASH.js gzip | 387 B | 387 B | ✓ |
| withRouter-HASH.js gzip | 319 B | 319 B | ✓ |
| 85e02e95b279..7e3.css gzip | 107 B | 107 B | ✓ |
| Overall change | 14.7 kB | 14.7 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | shuding/next.js shu/f8d8 | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 459 B | 459 B | ✓ |
| Overall change | 459 B | 459 B | ✓ |
Rendered Page Sizes Overall decrease ✓
| vercel/next.js canary | shuding/next.js shu/f8d8 | Change | |
|---|---|---|---|
| index.html gzip | 533 B | 531 B | -2 B |
| link.html gzip | 546 B | 545 B | -1 B |
| withRouter.html gzip | 527 B | 526 B | -1 B |
| Overall change | 1.61 kB | 1.6 kB | -4 B |
Diffs
Diff for main-HASH.js
@@ -700,6 +700,7 @@
var router;
exports.router = router;
var CachedApp, onPerfEntry;
+ var isAppRSC;
headManager.getIsSsr = function() {
return router.isSsr;
};
@@ -842,6 +843,7 @@
(app = appEntrypoint.component),
(mod = appEntrypoint.exports);
CachedApp = app;
+ isAppRSC = !!mod.__next_rsc__;
exportedReportWebVitals = mod && mod.reportWebVitals;
onPerfEntry = function(param) {
var id = param.id,
@@ -882,30 +884,30 @@
// error, so we need to skip waiting for the entrypoint.
true
) {
- _ctx.next = 17;
+ _ctx.next = 18;
break;
}
_ctx.t0 = {
error: hydrateErr
};
- _ctx.next = 20;
+ _ctx.next = 21;
break;
- case 17:
- _ctx.next = 19;
+ case 18:
+ _ctx.next = 20;
return pageLoader.routeLoader.whenEntrypoint(page);
- case 19:
- _ctx.t0 = _ctx.sent;
case 20:
+ _ctx.t0 = _ctx.sent;
+ case 21:
pageEntrypoint = _ctx.t0;
if (!("error" in pageEntrypoint)) {
- _ctx.next = 23;
+ _ctx.next = 24;
break;
}
throw pageEntrypoint.error;
- case 23:
+ case 24:
CachedComponent = pageEntrypoint.component;
if (true) {
- _ctx.next = 28;
+ _ctx.next = 29;
break;
}
isValidElementType = Object(
@@ -918,7 +920,7 @@
})()
);
if (isValidElementType(CachedComponent)) {
- _ctx.next = 28;
+ _ctx.next = 29;
break;
}
throw new Error(
@@ -927,24 +929,24 @@
'"'
)
);
- case 28:
- _ctx.next = 33;
+ case 29:
+ _ctx.next = 34;
break;
- case 30:
- _ctx.prev = 30;
+ case 31:
+ _ctx.prev = 31;
_ctx.t1 = _ctx["catch"](3);
// This catches errors like throwing in the top level of a module
initialErr = (0, _isError).getProperError(_ctx.t1);
- case 33:
+ case 34:
if (false) {
}
if (!window.__NEXT_PRELOADREADY) {
- _ctx.next = 37;
+ _ctx.next = 38;
break;
}
- _ctx.next = 37;
+ _ctx.next = 38;
return window.__NEXT_PRELOADREADY(dynamicIds);
- case 37:
+ case 38:
exports.router = router = (0, _router1).createRouter(
page,
query,
@@ -969,7 +971,8 @@
locales: locales,
defaultLocale: defaultLocale,
domainLocales: domainLocales,
- isPreview: isPreview
+ isPreview: isPreview,
+ isRsc: rsc
}
);
renderCtx = {
@@ -980,21 +983,21 @@
err: initialErr
};
if (!opts.beforeRender) {
- _ctx.next = 42;
+ _ctx.next = 43;
break;
}
- _ctx.next = 42;
+ _ctx.next = 43;
return opts.beforeRender();
- case 42:
- render(renderCtx);
case 43:
+ render(renderCtx);
+ case 44:
case "end":
return _ctx.stop();
}
},
_callee,
null,
- [[3, 30]]
+ [[3, 31]]
);
})
);
@@ -4702,7 +4705,8 @@
locales = param.locales,
defaultLocale = param.defaultLocale,
domainLocales = param.domainLocales,
- isPreview = param.isPreview;
+ isPreview = param.isPreview,
+ isRsc = param.isRsc;
var _this = this;
_classCallCheck(this, Router);
// Static Data Cache
@@ -4785,7 +4789,6 @@
// Otherwise, this cause issues when when going back and
// come again to the errored page.
if (pathname2 !== "/_error") {
- var ref;
this.components[route] = {
Component: Component,
initial: true,
@@ -4793,9 +4796,7 @@
err: err,
__N_SSG: initialProps && initialProps.__N_SSG,
__N_SSP: initialProps && initialProps.__N_SSP,
- __N_RSC: !!((ref = Component) === null || ref === void 0
- ? void 0
- : ref.__next_rsc__)
+ __N_RSC: !!isRsc
};
}
this.components["/_app"] = {
@@ -5876,7 +5877,7 @@
styleSheets: res.styleSheets,
__N_SSG: res.mod.__N_SSG,
__N_SSP: res.mod.__N_SSP,
- __N_RSC: !!res.page.__next_rsc__
+ __N_RSC: !!res.mod.__next_rsc__
};
});
case 10:Diff for index.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-5586bb4c90d7445f.js"
+ src="/_next/static/chunks/main-81c3a56fcaadeab6.js"
defer=""
></script>
<scriptDiff for link.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-5586bb4c90d7445f.js"
+ src="/_next/static/chunks/main-81c3a56fcaadeab6.js"
defer=""
></script>
<scriptDiff for withRouter.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-5586bb4c90d7445f.js"
+ src="/_next/static/chunks/main-81c3a56fcaadeab6.js"
defer=""
></script>
<scriptDefault Build with SWC (Decrease detected ✓)
General Overall decrease ✓
| vercel/next.js canary | shuding/next.js shu/f8d8 | Change | |
|---|---|---|---|
| buildDuration | 18.6s | 18.4s | -176ms |
| buildDurationCached | 6s | 6s | -25ms |
| nodeModulesSize | 372 MB | 372 MB | -1.71 kB |
Page Load Tests Overall decrease ⚠️
| vercel/next.js canary | shuding/next.js shu/f8d8 | Change | |
|---|---|---|---|
| / failed reqs | 0 | 0 | ✓ |
| / total time (seconds) | 2.928 | 2.949 | |
| / avg req/sec | 853.77 | 847.61 | |
| /error-in-render failed reqs | 0 | 0 | ✓ |
| /error-in-render total time (seconds) | 1.172 | 1.184 | |
| /error-in-render avg req/sec | 2133.03 | 2111.9 |
Client Bundles (main, webpack) Overall increase ⚠️
| vercel/next.js canary | shuding/next.js shu/f8d8 | Change | |
|---|---|---|---|
| 925.HASH.js gzip | 178 B | 178 B | ✓ |
| framework-HASH.js gzip | 42.3 kB | 42.3 kB | ✓ |
| main-HASH.js gzip | 28.1 kB | 28.1 kB | |
| webpack-HASH.js gzip | 1.45 kB | 1.45 kB | ✓ |
| Overall change | 72.1 kB | 72.1 kB |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | shuding/next.js shu/f8d8 | Change | |
|---|---|---|---|
| polyfills-HASH.js gzip | 31 kB | 31 kB | ✓ |
| Overall change | 31 kB | 31 kB | ✓ |
Client Pages
| vercel/next.js canary | shuding/next.js shu/f8d8 | Change | |
|---|---|---|---|
| _app-HASH.js gzip | 1.36 kB | 1.36 kB | ✓ |
| _error-HASH.js gzip | 179 B | 179 B | ✓ |
| amp-HASH.js gzip | 313 B | 313 B | ✓ |
| css-HASH.js gzip | 324 B | 324 B | ✓ |
| dynamic-HASH.js gzip | 2.56 kB | 2.56 kB | ✓ |
| head-HASH.js gzip | 351 B | 351 B | ✓ |
| hooks-HASH.js gzip | 921 B | 921 B | ✓ |
| image-HASH.js gzip | 5.2 kB | 5.2 kB | ✓ |
| index-HASH.js gzip | 261 B | 261 B | ✓ |
| link-HASH.js gzip | 2.33 kB | 2.33 kB | ✓ |
| routerDirect..HASH.js gzip | 322 B | 322 B | ✓ |
| script-HASH.js gzip | 388 B | 388 B | ✓ |
| withRouter-HASH.js gzip | 317 B | 317 B | ✓ |
| 85e02e95b279..7e3.css gzip | 107 B | 107 B | ✓ |
| Overall change | 14.9 kB | 14.9 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | shuding/next.js shu/f8d8 | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 456 B | 456 B | ✓ |
| Overall change | 456 B | 456 B | ✓ |
Rendered Page Sizes Overall decrease ✓
| vercel/next.js canary | shuding/next.js shu/f8d8 | Change | |
|---|---|---|---|
| index.html gzip | 531 B | 530 B | -1 B |
| link.html gzip | 545 B | 544 B | -1 B |
| withRouter.html gzip | 526 B | 526 B | ✓ |
| Overall change | 1.6 kB | 1.6 kB | -2 B |
Diffs
Diff for main-HASH.js
@@ -700,6 +700,7 @@
var router;
exports.router = router;
var CachedApp, onPerfEntry;
+ var isAppRSC;
headManager.getIsSsr = function() {
return router.isSsr;
};
@@ -842,6 +843,7 @@
(app = appEntrypoint.component),
(mod = appEntrypoint.exports);
CachedApp = app;
+ isAppRSC = !!mod.__next_rsc__;
exportedReportWebVitals = mod && mod.reportWebVitals;
onPerfEntry = function(param) {
var id = param.id,
@@ -882,30 +884,30 @@
// error, so we need to skip waiting for the entrypoint.
true
) {
- _ctx.next = 17;
+ _ctx.next = 18;
break;
}
_ctx.t0 = {
error: hydrateErr
};
- _ctx.next = 20;
+ _ctx.next = 21;
break;
- case 17:
- _ctx.next = 19;
+ case 18:
+ _ctx.next = 20;
return pageLoader.routeLoader.whenEntrypoint(page);
- case 19:
- _ctx.t0 = _ctx.sent;
case 20:
+ _ctx.t0 = _ctx.sent;
+ case 21:
pageEntrypoint = _ctx.t0;
if (!("error" in pageEntrypoint)) {
- _ctx.next = 23;
+ _ctx.next = 24;
break;
}
throw pageEntrypoint.error;
- case 23:
+ case 24:
CachedComponent = pageEntrypoint.component;
if (true) {
- _ctx.next = 28;
+ _ctx.next = 29;
break;
}
isValidElementType = Object(
@@ -918,7 +920,7 @@
})()
);
if (isValidElementType(CachedComponent)) {
- _ctx.next = 28;
+ _ctx.next = 29;
break;
}
throw new Error(
@@ -927,24 +929,24 @@
'"'
)
);
- case 28:
- _ctx.next = 33;
+ case 29:
+ _ctx.next = 34;
break;
- case 30:
- _ctx.prev = 30;
+ case 31:
+ _ctx.prev = 31;
_ctx.t1 = _ctx["catch"](3);
// This catches errors like throwing in the top level of a module
initialErr = (0, _isError).getProperError(_ctx.t1);
- case 33:
+ case 34:
if (false) {
}
if (!window.__NEXT_PRELOADREADY) {
- _ctx.next = 37;
+ _ctx.next = 38;
break;
}
- _ctx.next = 37;
+ _ctx.next = 38;
return window.__NEXT_PRELOADREADY(dynamicIds);
- case 37:
+ case 38:
exports.router = router = (0, _router1).createRouter(
page,
query,
@@ -969,7 +971,8 @@
locales: locales,
defaultLocale: defaultLocale,
domainLocales: domainLocales,
- isPreview: isPreview
+ isPreview: isPreview,
+ isRsc: rsc
}
);
renderCtx = {
@@ -980,21 +983,21 @@
err: initialErr
};
if (!opts.beforeRender) {
- _ctx.next = 42;
+ _ctx.next = 43;
break;
}
- _ctx.next = 42;
+ _ctx.next = 43;
return opts.beforeRender();
- case 42:
- render(renderCtx);
case 43:
+ render(renderCtx);
+ case 44:
case "end":
return _ctx.stop();
}
},
_callee,
null,
- [[3, 30]]
+ [[3, 31]]
);
})
);
@@ -4702,7 +4705,8 @@
locales = param.locales,
defaultLocale = param.defaultLocale,
domainLocales = param.domainLocales,
- isPreview = param.isPreview;
+ isPreview = param.isPreview,
+ isRsc = param.isRsc;
var _this = this;
_classCallCheck(this, Router);
// Static Data Cache
@@ -4785,7 +4789,6 @@
// Otherwise, this cause issues when when going back and
// come again to the errored page.
if (pathname2 !== "/_error") {
- var ref;
this.components[route] = {
Component: Component,
initial: true,
@@ -4793,9 +4796,7 @@
err: err,
__N_SSG: initialProps && initialProps.__N_SSG,
__N_SSP: initialProps && initialProps.__N_SSP,
- __N_RSC: !!((ref = Component) === null || ref === void 0
- ? void 0
- : ref.__next_rsc__)
+ __N_RSC: !!isRsc
};
}
this.components["/_app"] = {
@@ -5876,7 +5877,7 @@
styleSheets: res.styleSheets,
__N_SSG: res.mod.__N_SSG,
__N_SSP: res.mod.__N_SSP,
- __N_RSC: !!res.page.__next_rsc__
+ __N_RSC: !!res.mod.__next_rsc__
};
});
case 10:Diff for index.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-5586bb4c90d7445f.js"
+ src="/_next/static/chunks/main-81c3a56fcaadeab6.js"
defer=""
></script>
<scriptDiff for link.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-5586bb4c90d7445f.js"
+ src="/_next/static/chunks/main-81c3a56fcaadeab6.js"
defer=""
></script>
<scriptDiff for withRouter.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-5586bb4c90d7445f.js"
+ src="/_next/static/chunks/main-81c3a56fcaadeab6.js"
defer=""
></script>
<script
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.
Currently, we attach
.__next_rsc__and.__webpack_require__to the default export of Server Components. While these two are necessary, it becomes tricky when:export default function () {}For 2., if we remove the default export function name in the test (updated in this PR), we will have the following error:
Due to these reasons, I refactored the loader to add a named export
__next_rsc__for all these necessary things, including the no-op export. That also simplifies the corresponding logic of the loader as we don't need to deal with export expressions.Related changes are mostly passing
ComponentModandAppModto render and client.Bug
fixes #numbercontributing.mdFeature
fixes #numbercontributing.mdDocumentation / Examples
yarn lint