kris/reacord
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update remix imports + format

Browse Source
This commit is contained in:
itsMapleLeaf
2022-04-22 23:50:01 -05:00
parent 3c2d3b4683
commit 752ccc080d
8 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.prettierignore
View File

@@ -4,3 +4,4 @@ coverage
pnpm-lock.yaml pnpm-lock.yaml
build build
.cache .cache
packages/website/public/api

6
packages/website/app/entry.client.tsx
View File

@@ -1,4 +1,4 @@
import { hydrate } from "react-dom"; import { hydrate } from "react-dom"
import { RemixBrowser } from "remix"; import { RemixBrowser } from "@remix-run/react"
hydrate(<RemixBrowser />, document); hydrate(<RemixBrowser />, document)

18
packages/website/app/entry.server.tsx
View File

@@ -1,21 +1,21 @@
import { renderToString } from "react-dom/server"; import { renderToString } from "react-dom/server"
import { RemixServer } from "remix"; import type { EntryContext } from "@remix-run/node"
import type { EntryContext } from "remix"; import { RemixServer } from "@remix-run/react"
export default function handleRequest( export default function handleRequest(
request: Request, request: Request,
responseStatusCode: number, responseStatusCode: number,
responseHeaders: Headers, responseHeaders: Headers,
remixContext: EntryContext remixContext: EntryContext,
) { ) {
const markup = renderToString( const markup = renderToString(
<RemixServer context={remixContext} url={request.url} /> <RemixServer context={remixContext} url={request.url} />,
); )
responseHeaders.set("Content-Type", "text/html"); responseHeaders.set("Content-Type", "text/html")
return new Response("<!DOCTYPE html>" + markup, { return new Response("<!DOCTYPE html>" + markup, {
status: responseStatusCode, status: responseStatusCode,
headers: responseHeaders headers: responseHeaders,
}); })
} }

2
packages/website/app/modules/navigation/app-link.tsx
View File

@@ -1,5 +1,5 @@
import type { ComponentPropsWithoutRef } from "react" import type { ComponentPropsWithoutRef } from "react"
import { Link } from "remix" import { Link } from "@remix-run/react"
import { ExternalLink } from "~/modules/dom/external-link" import { ExternalLink } from "~/modules/dom/external-link"
export type AppLinkProps = ComponentPropsWithoutRef<"a"> & { export type AppLinkProps = ComponentPropsWithoutRef<"a"> & {

8
packages/website/app/root.tsx
View File

@@ -1,5 +1,9 @@
import packageJson from "reacord/package.json" import packageJson from "reacord/package.json"
import type { LinksFunction, LoaderFunction, MetaFunction } from "remix" import type {
LinksFunction,
LoaderFunction,
MetaFunction,
} from "@remix-run/node"
import { import {
Links, Links,
LiveReload, LiveReload,
@@ -8,7 +12,7 @@ import {
Scripts, Scripts,
ScrollRestoration, ScrollRestoration,
useLoaderData, useLoaderData,
} from "remix" } from "@remix-run/react"
import bannerUrl from "~/assets/banner.png" import bannerUrl from "~/assets/banner.png"
import faviconUrl from "~/assets/favicon.png" import faviconUrl from "~/assets/favicon.png"
import { GuideLinksProvider } from "~/modules/navigation/guide-links-context" import { GuideLinksProvider } from "~/modules/navigation/guide-links-context"

2
packages/website/app/routes/guides.tsx
View File

@@ -1,5 +1,5 @@
import clsx from "clsx" import clsx from "clsx"
import { Outlet } from "remix" import { Outlet } from "@remix-run/react"
import { ActiveLink } from "~/modules/navigation/active-link" import { ActiveLink } from "~/modules/navigation/active-link"
import { AppLink } from "~/modules/navigation/app-link" import { AppLink } from "~/modules/navigation/app-link"
import { useGuideLinksContext } from "~/modules/navigation/guide-links-context" import { useGuideLinksContext } from "~/modules/navigation/guide-links-context"

2
packages/website/cypress/support/index.js
View File

@@ -14,7 +14,7 @@
// *********************************************************** // ***********************************************************
// Import commands.js using ES2015 syntax: // Import commands.js using ES2015 syntax:
import './commands' import "./commands"
// Alternatively you can use CommonJS syntax: // Alternatively you can use CommonJS syntax:
// require('./commands') // require('./commands')

4
packages/website/package.json
View File

@@ -14,6 +14,7 @@
"@headlessui/react": "^1.5.0", "@headlessui/react": "^1.5.0",
"@heroicons/react": "^1.0.6", "@heroicons/react": "^1.0.6",
"@reach/rect": "^0.17.0", "@reach/rect": "^0.17.0",
"@remix-run/node": "^1.4.1",
"@remix-run/react": "^1.4.1", "@remix-run/react": "^1.4.1",
"@remix-run/serve": "^1.4.1", "@remix-run/serve": "^1.4.1",
"@tailwindcss/typography": "^0.5.2", "@tailwindcss/typography": "^0.5.2",
@@ -25,8 +26,7 @@
"react-dom": "^18.0.0", "react-dom": "^18.0.0",
"react-focus-on": "^3.5.4", "react-focus-on": "^3.5.4",
"react-router": "^6.3.0", "react-router": "^6.3.0",
"react-router-dom": "^6.3.0", "react-router-dom": "^6.3.0"
"remix": "^1.4.1"
}, },
"devDependencies": { "devDependencies": {
"@remix-run/dev": "^1.4.1", "@remix-run/dev": "^1.4.1",