-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: upgrade core packages to react-18 (#3917)
- Loading branch information
1 parent
05b8ef7
commit 6ab5cc3
Showing
15 changed files
with
123 additions
and
79 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@remix-run/react": patch | ||
| --- | ||
|
|
||
| React 18 gets more strict with types, this adds a runtime cast to a string for the `<title>` tag value. |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import { hydrateRoot } from "react-dom/client"; | ||
| import { RemixBrowser } from "@remix-run/react"; | ||
| import { hydrate } from "react-dom"; | ||
|
|
||
| hydrate(<RemixBrowser />, document); | ||
| hydrateRoot(document, <RemixBrowser />); |
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 |
|---|---|---|
| @@ -1,21 +1,45 @@ | ||
| import { PassThrough } from "stream"; | ||
| import { renderToPipeableStream } from "react-dom/server"; | ||
| import type { EntryContext } from "@remix-run/node"; | ||
| import { Response } from "@remix-run/node"; | ||
| import { RemixServer } from "@remix-run/react"; | ||
| import { renderToString } from "react-dom/server"; | ||
|
|
||
| const ABORT_DELAY = 5000; | ||
|
|
||
| export default function handleRequest( | ||
| request: Request, | ||
| responseStatusCode: number, | ||
| responseHeaders: Headers, | ||
| remixContext: EntryContext | ||
| ) { | ||
| let markup = renderToString( | ||
| <RemixServer context={remixContext} url={request.url} /> | ||
| ); | ||
| return new Promise((resolve, reject) => { | ||
| let didError = false; | ||
|
|
||
| let { pipe, abort } = renderToPipeableStream( | ||
| <RemixServer context={remixContext} url={request.url} />, | ||
| { | ||
| onShellReady() { | ||
| let body = new PassThrough(); | ||
|
|
||
| responseHeaders.set("Content-Type", "text/html"); | ||
| responseHeaders.set("Content-Type", "text/html"); | ||
|
|
||
| return new Response("<!DOCTYPE html>" + markup, { | ||
| status: responseStatusCode, | ||
| headers: responseHeaders, | ||
| resolve( | ||
| new Response(body, { | ||
| status: didError ? 500 : responseStatusCode, | ||
| headers: responseHeaders, | ||
| }) | ||
| ); | ||
| pipe(body); | ||
| }, | ||
| onShellError(err) { | ||
| reject(err); | ||
| }, | ||
| onError(error) { | ||
| didError = true; | ||
| console.error(error); | ||
| }, | ||
| } | ||
| ); | ||
| setTimeout(abort, ABORT_DELAY); | ||
| }); | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,3 @@ | ||
| // @ts-nocheck | ||
| import * as AbortController from "abort-controller"; | ||
| import * as nodeFetch from "@remix-run/node/fetch"; | ||
| import { installGlobals } from "@remix-run/node"; | ||
|
|
||
| global.AbortController = AbortController.AbortController; | ||
| global.Headers = nodeFetch.Headers; | ||
| global.Response = nodeFetch.Response; | ||
| global.Request = nodeFetch.Request; | ||
| global.fetch = nodeFetch; | ||
| installGlobals(); |
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.