-
Notifications
You must be signed in to change notification settings - Fork 27.8k
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
Clean up Document
in preparation for streaming
#28032
Merged
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
Document
RenderingDocument
in preparation for streaming
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Failing test suitesCommit: 663ae28 test/acceptance/ReactRefreshLogBox.dev.test.js
Expand output● server-side only compilation errors
|
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
ijjk
approved these changes
Aug 12, 2021
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Stats from current PRDefault Build (Increase detected
|
vercel/next.js canary | azukaru/next.js x-document-context-cleaning | Change | |
---|---|---|---|
buildDuration | 18.1s | 18s | -141ms |
buildDurationCached | 3.9s | 4.1s | |
nodeModulesSize | 49.1 MB | 49.1 MB | -1.88 kB |
Page Load Tests Overall increase ✓
vercel/next.js canary | azukaru/next.js x-document-context-cleaning | Change | |
---|---|---|---|
/ failed reqs | 0 | 0 | ✓ |
/ total time (seconds) | 3.213 | 3.236 | |
/ avg req/sec | 777.99 | 772.47 | |
/error-in-render failed reqs | 0 | 0 | ✓ |
/error-in-render total time (seconds) | 2.088 | 2.022 | -0.07 |
/error-in-render avg req/sec | 1197.25 | 1236.12 | +38.87 |
Client Bundles (main, webpack, commons) Overall increase ⚠️
vercel/next.js canary | azukaru/next.js x-document-context-cleaning | Change | |
---|---|---|---|
745.HASH.js gzip | 179 B | 179 B | ✓ |
framework-HASH.js gzip | 42.2 kB | 42.2 kB | ✓ |
main-HASH.js gzip | 23.1 kB | 23.1 kB | |
webpack-HASH.js gzip | 1.5 kB | 1.5 kB | ✓ |
Overall change | 67 kB | 67 kB |
Legacy Client Bundles (polyfills)
vercel/next.js canary | azukaru/next.js x-document-context-cleaning | Change | |
---|---|---|---|
polyfills-HASH.js gzip | 31.1 kB | 31.1 kB | ✓ |
Overall change | 31.1 kB | 31.1 kB | ✓ |
Client Pages
vercel/next.js canary | azukaru/next.js x-document-context-cleaning | Change | |
---|---|---|---|
_app-HASH.js gzip | 980 B | 980 B | ✓ |
_error-HASH.js gzip | 194 B | 194 B | ✓ |
amp-HASH.js gzip | 312 B | 312 B | ✓ |
css-HASH.js gzip | 329 B | 329 B | ✓ |
dynamic-HASH.js gzip | 2.52 kB | 2.52 kB | ✓ |
head-HASH.js gzip | 350 B | 350 B | ✓ |
hooks-HASH.js gzip | 904 B | 904 B | ✓ |
image-HASH.js gzip | 4.13 kB | 4.13 kB | ✓ |
index-HASH.js gzip | 261 B | 261 B | ✓ |
link-HASH.js gzip | 1.66 kB | 1.66 kB | ✓ |
routerDirect..HASH.js gzip | 319 B | 319 B | ✓ |
script-HASH.js gzip | 387 B | 387 B | ✓ |
withRouter-HASH.js gzip | 320 B | 320 B | ✓ |
bb14e60e810b..30f.css gzip | 125 B | 125 B | ✓ |
Overall change | 12.8 kB | 12.8 kB | ✓ |
Client Build Manifests
vercel/next.js canary | azukaru/next.js x-document-context-cleaning | Change | |
---|---|---|---|
_buildManifest.js gzip | 491 B | 491 B | ✓ |
Overall change | 491 B | 491 B | ✓ |
Rendered Page Sizes Overall decrease ✓
vercel/next.js canary | azukaru/next.js x-document-context-cleaning | Change | |
---|---|---|---|
index.html gzip | 531 B | 531 B | ✓ |
link.html gzip | 543 B | 543 B | ✓ |
withRouter.html gzip | 524 B | 523 B | -1 B |
Overall change | 1.6 kB | 1.6 kB | -1 B |
Diffs
Diff for main-HASH.js
@@ -6959,10 +6959,12 @@
exports.normalizeRepeatedSlashes = normalizeRepeatedSlashes;
exports.loadGetInitialProps = loadGetInitialProps;
exports.formatWithValidation = formatWithValidation;
- exports.ST = exports.SP = exports.urlObjectKeys = void 0;
+ exports.ST = exports.SP = exports.HtmlContext = exports.urlObjectKeys = void 0;
var _formatUrl = __webpack_require__(2065);
+ var _react = __webpack_require__(7294);
+
function execOnce(fn) {
var used = false;
var result;
@@ -7165,6 +7167,11 @@
})(/*#__PURE__*/ _wrapNativeSuper(Error));
exports.DecodeError = DecodeError;
+ var HtmlContext = (0, _react).createContext(null);
+ exports.HtmlContext = HtmlContext;
+
+ if (false) {
+ }
/***/
},
Diff for index.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-0aefa51ef739e94d458c.js"
+ src="/_next/static/chunks/main-191f459380b9431f3717.js"
defer=""
></script>
<script
Diff for link.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-0aefa51ef739e94d458c.js"
+ src="/_next/static/chunks/main-191f459380b9431f3717.js"
defer=""
></script>
<script
Diff for withRouter.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/main-0aefa51ef739e94d458c.js"
+ src="/_next/static/chunks/main-191f459380b9431f3717.js"
defer=""
></script>
<script
Webpack 4 Mode (Increase detected ⚠️ )
General Overall decrease ✓
vercel/next.js canary | azukaru/next.js x-document-context-cleaning | Change | |
---|---|---|---|
buildDuration | 14.8s | 14.5s | -356ms |
buildDurationCached | 5.8s | 5.8s | |
nodeModulesSize | 49.1 MB | 49.1 MB | -1.88 kB |
Page Load Tests Overall increase ✓
vercel/next.js canary | azukaru/next.js x-document-context-cleaning | Change | |
---|---|---|---|
/ failed reqs | 0 | 0 | ✓ |
/ total time (seconds) | 3.252 | 3.343 | |
/ avg req/sec | 768.77 | 747.86 | |
/error-in-render failed reqs | 0 | 0 | ✓ |
/error-in-render total time (seconds) | 2.145 | 2.016 | -0.13 |
/error-in-render avg req/sec | 1165.46 | 1240.12 | +74.66 |
Client Bundles (main, webpack, commons) Overall increase ⚠️
vercel/next.js canary | azukaru/next.js x-document-context-cleaning | Change | |
---|---|---|---|
17.HASH.js gzip | 185 B | 185 B | ✓ |
677f882d2ed8..HASH.js gzip | 14 kB | 14 kB | |
framework.HASH.js gzip | 41.9 kB | 41.9 kB | ✓ |
main-HASH.js gzip | 10.6 kB | 10.6 kB | ✓ |
webpack-HASH.js gzip | 1.19 kB | 1.19 kB | ✓ |
Overall change | 67.8 kB | 67.9 kB |
Legacy Client Bundles (polyfills)
vercel/next.js canary | azukaru/next.js x-document-context-cleaning | Change | |
---|---|---|---|
polyfills-HASH.js gzip | 31.3 kB | 31.3 kB | ✓ |
Overall change | 31.3 kB | 31.3 kB | ✓ |
Client Pages
vercel/next.js canary | azukaru/next.js x-document-context-cleaning | Change | |
---|---|---|---|
_app-HASH.js gzip | 965 B | 965 B | ✓ |
_error-HASH.js gzip | 3.71 kB | 3.71 kB | ✓ |
amp-HASH.js gzip | 552 B | 552 B | ✓ |
css-HASH.js gzip | 333 B | 333 B | ✓ |
dynamic-HASH.js gzip | 2.71 kB | 2.71 kB | ✓ |
head-HASH.js gzip | 2.97 kB | 2.97 kB | ✓ |
hooks-HASH.js gzip | 911 B | 911 B | ✓ |
index-HASH.js gzip | 231 B | 231 B | ✓ |
link-HASH.js gzip | 1.64 kB | 1.64 kB | ✓ |
routerDirect..HASH.js gzip | 298 B | 298 B | ✓ |
script-HASH.js gzip | 2.95 kB | 2.95 kB | ✓ |
withRouter-HASH.js gzip | 294 B | 294 B | ✓ |
e025d2764813..52f.css gzip | 125 B | 125 B | ✓ |
Overall change | 17.7 kB | 17.7 kB | ✓ |
Client Build Manifests
vercel/next.js canary | azukaru/next.js x-document-context-cleaning | Change | |
---|---|---|---|
_buildManifest.js gzip | 498 B | 498 B | ✓ |
Overall change | 498 B | 498 B | ✓ |
Rendered Page Sizes
vercel/next.js canary | azukaru/next.js x-document-context-cleaning | Change | |
---|---|---|---|
index.html gzip | 577 B | 577 B | ✓ |
link.html gzip | 589 B | 589 B | ✓ |
withRouter.html gzip | 569 B | 569 B | ✓ |
Overall change | 1.74 kB | 1.74 kB | ✓ |
Diffs
Diff for 677f882d2ed8..c4df.HASH.js
@@ -188,10 +188,12 @@
exports.normalizeRepeatedSlashes = normalizeRepeatedSlashes;
exports.loadGetInitialProps = loadGetInitialProps;
exports.formatWithValidation = formatWithValidation;
- exports.ST = exports.SP = exports.urlObjectKeys = void 0;
+ exports.ST = exports.SP = exports.HtmlContext = exports.urlObjectKeys = void 0;
var _formatUrl = __webpack_require__("JHdK");
+ var _react = __webpack_require__("q1tI");
+
function execOnce(fn) {
var used = false;
var result;
@@ -394,6 +396,11 @@
})(/*#__PURE__*/ _wrapNativeSuper(Error));
exports.DecodeError = DecodeError;
+ var HtmlContext = (0, _react).createContext(null);
+ exports.HtmlContext = HtmlContext;
+
+ if (false) {
+ }
/***/
},
Diff for index.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.87a4eb712c6ed49920c1.js"
+ src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.486b78ffcde253c6f17c.js"
defer=""
></script>
<script
Diff for link.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.87a4eb712c6ed49920c1.js"
+ src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.486b78ffcde253c6f17c.js"
defer=""
></script>
<script
Diff for withRouter.html
@@ -19,7 +19,7 @@
defer=""
></script>
<script
- src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.87a4eb712c6ed49920c1.js"
+ src="/_next/static/chunks/677f882d2ed86fa3467b8979053c1a4c3f8bc4df.486b78ffcde253c6f17c.js"
defer=""
></script>
<script
This was referenced Sep 1, 2021
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.
We generate the HTML for a document in two steps: First, we generate the body (i.e. everything under
<div id="__next">
). Then we generate the rest of the document and embed the body in it.This doesn't work when the body is a stream, because React can't render the body for us unless we buffer it, and buffering it means not streaming. This PR takes the existing approach for AMP and uses it for all scenarios: instead of rendering HTML, we just render a placeholder that we can replace with HTML later. This will be used in a follow-up PR to let us know where to concatenate the body stream.
I also used the opportunity to split out
HtmlContext
fromDocumentProps
, as these will not be the same thing with functional document components.