-
Notifications
You must be signed in to change notification settings - Fork 0
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 #33 from codeforjapan/feat/react-router-7
feat: migrate into React Router 7
- Loading branch information
Showing
16 changed files
with
288 additions
and
2,443 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,3 +7,5 @@ node_modules | |
| .vscode/* | ||
| !.vscode/settings.example.json | ||
| eslint-typegen.d.ts | ||
|
|
||
| .react-router/* | ||
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,142 +1,19 @@ | ||
| /** | ||
| * By default, Remix will handle generating the HTTP Response for you. | ||
| * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨ | ||
| * For more information, see https://remix.run/file-conventions/entry.server | ||
| */ | ||
|
|
||
| import { PassThrough } from "node:stream"; | ||
|
|
||
| import type { AppLoadContext, EntryContext } from "@remix-run/node"; | ||
| import { createReadableStreamFromReadable } from "@remix-run/node"; | ||
| import { RemixServer } from "@remix-run/react"; | ||
| import { isbot } from "isbot"; | ||
| import { renderToPipeableStream } from "react-dom/server"; | ||
|
|
||
| const ABORT_DELAY = 5_000; | ||
| import { handleRequest as vercelHandleRequest } from "@vercel/react-router/entry.server"; | ||
| import type { AppLoadContext, EntryContext } from "react-router"; | ||
|
|
||
| export default async function handleRequest( | ||
| request: Request, | ||
| responseStatusCode: number, | ||
| responseHeaders: Headers, | ||
| remixContext: EntryContext, | ||
| // This is ignored so we can keep it in the template for visibility. Feel | ||
| // free to delete this parameter in your app if you're not using it! | ||
| // eslint-disable-next-line @typescript-eslint/no-unused-vars | ||
| loadContext: AppLoadContext, | ||
| ) { | ||
| return isbot(request.headers.get("user-agent") ?? "") | ||
| ? handleBotRequest( | ||
| request, | ||
| responseStatusCode, | ||
| responseHeaders, | ||
| remixContext, | ||
| ) | ||
| : handleBrowserRequest( | ||
| request, | ||
| responseStatusCode, | ||
| responseHeaders, | ||
| remixContext, | ||
| ); | ||
| } | ||
|
|
||
| async function handleBotRequest( | ||
| request: Request, | ||
| responseStatusCode: number, | ||
| responseHeaders: Headers, | ||
| remixContext: EntryContext, | ||
| ) { | ||
| return new Promise((resolve, reject) => { | ||
| let shellRendered = false; | ||
| const { pipe, abort } = renderToPipeableStream( | ||
| <RemixServer | ||
| abortDelay={ABORT_DELAY} | ||
| context={remixContext} | ||
| url={request.url} | ||
| />, | ||
| { | ||
| onAllReady() { | ||
| shellRendered = true; | ||
| const body = new PassThrough(); | ||
| const stream = createReadableStreamFromReadable(body); | ||
|
|
||
| responseHeaders.set("Content-Type", "text/html"); | ||
|
|
||
| resolve( | ||
| new Response(stream, { | ||
| headers: responseHeaders, | ||
| status: responseStatusCode, | ||
| }), | ||
| ); | ||
|
|
||
| pipe(body); | ||
| }, | ||
| onShellError(error: unknown) { | ||
| // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors | ||
| reject(error); | ||
| }, | ||
| onError(error: unknown) { | ||
| responseStatusCode = 500; | ||
| // Log streaming rendering errors from inside the shell. Don't log | ||
| // errors encountered during initial shell rendering since they'll | ||
| // reject and get logged in handleDocumentRequest. | ||
| if (shellRendered) { | ||
| console.error(error); | ||
| } | ||
| }, | ||
| }, | ||
| ); | ||
|
|
||
| setTimeout(abort, ABORT_DELAY); | ||
| }); | ||
| } | ||
|
|
||
| async function handleBrowserRequest( | ||
| request: Request, | ||
| responseStatusCode: number, | ||
| responseHeaders: Headers, | ||
| remixContext: EntryContext, | ||
| ) { | ||
| return new Promise((resolve, reject) => { | ||
| let shellRendered = false; | ||
| const { pipe, abort } = renderToPipeableStream( | ||
| <RemixServer | ||
| abortDelay={ABORT_DELAY} | ||
| context={remixContext} | ||
| url={request.url} | ||
| />, | ||
| { | ||
| onShellReady() { | ||
| shellRendered = true; | ||
| const body = new PassThrough(); | ||
| const stream = createReadableStreamFromReadable(body); | ||
|
|
||
| responseHeaders.set("Content-Type", "text/html"); | ||
|
|
||
| resolve( | ||
| new Response(stream, { | ||
| headers: responseHeaders, | ||
| status: responseStatusCode, | ||
| }), | ||
| ); | ||
|
|
||
| pipe(body); | ||
| }, | ||
| onShellError(error: unknown) { | ||
| // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors | ||
| reject(error); | ||
| }, | ||
| onError(error: unknown) { | ||
| responseStatusCode = 500; | ||
| // Log streaming rendering errors from inside the shell. Don't log | ||
| // errors encountered during initial shell rendering since they'll | ||
| // reject and get logged in handleDocumentRequest. | ||
| if (shellRendered) { | ||
| console.error(error); | ||
| } | ||
| }, | ||
| }, | ||
| ); | ||
|
|
||
| setTimeout(abort, ABORT_DELAY); | ||
| }); | ||
| routerContext: EntryContext, | ||
| loadContext?: AppLoadContext, | ||
| ): Promise<Response> { | ||
| const response = await vercelHandleRequest( | ||
| request, | ||
| responseStatusCode, | ||
| responseHeaders, | ||
| routerContext, | ||
| loadContext, | ||
| ); | ||
| return response; | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| import { flatRoutes } from "@react-router/fs-routes"; | ||
|
|
||
| export default flatRoutes(); |
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.