-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5 from reactjs/sync-1b5e8861
Sync with react.dev @ 1b5e886
- Loading branch information
Showing
20 changed files
with
308 additions
and
307 deletions.
There are no files selected for viewing
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
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
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
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
This file was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/node_modules/next/dist/server/render.js b/node_modules/next/dist/server/render.js | ||
index a1f8648..1b3d608 100644 | ||
--- a/node_modules/next/dist/server/render.js | ||
+++ b/node_modules/next/dist/server/render.js | ||
@@ -758,9 +758,14 @@ async function renderToHTML(req, res, pathname, query, renderOpts) { | ||
// Always using react concurrent rendering mode with required react version 18.x | ||
const renderShell = async (EnhancedApp, EnhancedComponent)=>{ | ||
const content = renderContent(EnhancedApp, EnhancedComponent); | ||
- return await (0, _nodewebstreamshelper.renderToInitialStream)({ | ||
- ReactDOMServer: _serverbrowser.default, | ||
- element: content | ||
+ return new Promise((resolve, reject) => { | ||
+ (0, _nodewebstreamshelper.renderToInitialStream)({ | ||
+ ReactDOMServer: _serverbrowser.default, | ||
+ element: content, | ||
+ streamOptions: { | ||
+ onError: reject | ||
+ } | ||
+ }).then(resolve, reject); | ||
}); | ||
}; | ||
const createBodyResult = (0, _tracer.getTracer)().wrap(_constants2.RenderSpan.createBodyResult, (initialStream, suffix)=>{ |
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
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
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
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
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
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
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
Oops, something went wrong.