From 0816b3d980f4928887426e0fb90057be1da3f530 Mon Sep 17 00:00:00 2001 From: Nikolaj Frey Date: Tue, 27 Jun 2023 10:28:54 +1000 Subject: [PATCH] feat: main --- app/app/entry.server.tsx | 16 ++++++++-------- app/app/root.tsx | 25 +++++++++++++------------ 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/app/app/entry.server.tsx b/app/app/entry.server.tsx index d2051de..7fd3dec 100644 --- a/app/app/entry.server.tsx +++ b/app/app/entry.server.tsx @@ -1,8 +1,8 @@ -import { renderToString } from "react-dom/server"; -import { RemixServer } from "remix"; -import type { EntryContext } from "remix"; +import { renderToString } from 'react-dom/server' +import { RemixServer } from '@remix-run/react' +import type { EntryContext } from '@remix-run/react/dist/entry' -export default function handleRequest( +export default function handleRequest ( request: Request, responseStatusCode: number, responseHeaders: Headers, @@ -10,12 +10,12 @@ export default function handleRequest( ) { let markup = renderToString( - ); + ) - responseHeaders.set("Content-Type", "text/html"); + responseHeaders.set('Content-Type', 'text/html') - return new Response("" + markup, { + return new Response('' + markup, { status: responseStatusCode, headers: responseHeaders - }); + }) } diff --git a/app/app/root.tsx b/app/app/root.tsx index 833960d..c3b9499 100644 --- a/app/app/root.tsx +++ b/app/app/root.tsx @@ -1,30 +1,31 @@ -import { ChakraProvider } from "@chakra-ui/react" -import type { MetaFunction } from "@vercel/remix" +import { ChakraProvider } from '@chakra-ui/react' +// import type { MetaFunction } from "@vercel/remix" +import type { MetaFunction } from '@remix-run/node' import { Links, LiveReload, Meta, Outlet, Scripts, - ScrollRestoration, -} from "@remix-run/react" -import { Analytics } from "@vercel/analytics/react" + ScrollRestoration +} from '@remix-run/react' +import { Analytics } from '@vercel/analytics/react' export const meta: MetaFunction = () => ({ - charset: "utf-8", - title: "New Remix App", - viewport: "width=device-width,initial-scale=1", + charset: 'utf-8', + title: 'New Remix App', + viewport: 'width=device-width,initial-scale=1' }) -function Document({ +function Document ({ children, - title = "App title", + title = 'App title' }: { children: React.ReactNode title?: string }) { return ( - + {title} @@ -41,7 +42,7 @@ function Document({ ) } -export default function App() { +export default function App () { return (