Skip to content

Feat/migrate to react router 7 #897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 35 commits into from
Jan 16, 2025
Merged

Feat/migrate to react router 7 #897

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
e899918
activate v3_singleFetch
hakimLyon Oct 13, 2024
d0a9ff5
mv installGlobals --> vite conf
hakimLyon Oct 14, 2024
56603cc
Fix: playwright failures
hakimLyon Oct 16, 2024
e6eca57
add installGlobals
hakimLyon Oct 16, 2024
c2d2244
Fix: eslint
hakimLyon Oct 16, 2024
b4d40b6
format
hakimLyon Oct 16, 2024
cb2f5c9
import as data
hakimLyon Oct 16, 2024
6b40b78
remove installGlobals
hakimLyon Oct 16, 2024
5044ab5
fix typecheck
hakimLyon Oct 16, 2024
359f494
rename auth.$provider to auth_.$provider
hakimLyon Oct 20, 2024
edb182e
Merge branch 'main' into v3_singleFetch
hakimLyon Oct 21, 2024
bc898bc
enable v3_singleFetch
hakimLyon Oct 21, 2024
75a6fc3
Merge branch 'hakim-single-fetch' into feat/migrate-to-react-router-7
DennisKraaijeveld Dec 31, 2024
4102828
feat: init
DennisKraaijeveld Dec 31, 2024
889be28
feat: initial codemod remix > rr7
DennisKraaijeveld Dec 31, 2024
96a2142
feat: SerializeFrom: https://github.com/remix-run/react-router/discus…
DennisKraaijeveld Dec 31, 2024
44a44b9
feat: await results from submit hooks
DennisKraaijeveld Dec 31, 2024
a9a9553
feat: move to new file uploading package
DennisKraaijeveld Dec 31, 2024
55645fc
feat: add routes.ts
DennisKraaijeveld Dec 31, 2024
f016946
feat: typegen
DennisKraaijeveld Dec 31, 2024
eeb5069
feat: rr config file; enable ssr
DennisKraaijeveld Dec 31, 2024
66815e6
feat: rr config file; enable ssr
DennisKraaijeveld Dec 31, 2024
939c7b6
fix: move ignore .react-router to the correct file
DennisKraaijeveld Dec 31, 2024
ac9ad5e
fix: remove typegen folder
DennisKraaijeveld Dec 31, 2024
1c2f055
feat: small fixes
DennisKraaijeveld Dec 31, 2024
489f675
feat: code format/styling
DennisKraaijeveld Dec 31, 2024
a31cce4
fix: dev server broke due to sentry package
DennisKraaijeveld Dec 31, 2024
de4c39a
fix: uncommented commented comment jeezz
DennisKraaijeveld Dec 31, 2024
31d4690
feat: prod server
DennisKraaijeveld Dec 31, 2024
e5b70ac
feat: move to @sentry/node
DennisKraaijeveld Jan 4, 2025
1895661
fix: typo
DennisKraaijeveld Jan 4, 2025
1c7480d
fix: correct import sentry node
DennisKraaijeveld Jan 4, 2025
2084016
chore: format everything
kentcdodds Jan 15, 2025
0f380b5
use new type helpers
kentcdodds Jan 15, 2025
e06e003
remove use of SerializeFrom
kentcdodds Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 17 additions & 19 deletions app/root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
import {
data,
type LoaderFunctionArgs,
type HeadersFunction,
type LinksFunction,
type MetaFunction,
} from 'react-router';
import {
Form,
Link,
Links,
Meta,
Outlet,
Scripts,
ScrollRestoration,
useLoaderData,
useMatches,
useSubmit,
} from 'react-router';
import { withSentry } from '@sentry/remix'
import { useRef } from 'react'
import {
data,
type LoaderFunctionArgs,
type HeadersFunction,
type LinksFunction,
type MetaFunction,
Form,
Link,
Links,
Meta,
Outlet,
Scripts,
ScrollRestoration,
useLoaderData,
useMatches,
useSubmit,
} from 'react-router'
import { HoneypotProvider } from 'remix-utils/honeypot/react'
import appleTouchIconAssetUrl from './assets/favicons/apple-touch-icon.png'
import faviconAssetUrl from './assets/favicons/favicon.svg'
Expand Down
3 changes: 2 additions & 1 deletion app/routes/settings+/profile.connections.tsx
View file
Open in desktop
Copy link
Contributor

@hakimLyon hakimLyon Jan 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, Rather than defining SerializeFrom, it is possible to directly use the types from the .react-router folder as follows:

import { type Route, type Info } from './+types/profile.connections.ts
...

export async function loader({ request }: Route.LoaderArgs) {
...
export const headers: Route.HeadersFunction = ({ loaderHeaders }) => {
...

export async function action({ request }: Route.ActionArgs) {
...

export default function Connections({ loaderData }: Route.ComponentProps) {
...
function Connection({
	connection,
	canDelete,
}: {
	connection: Info['loaderData']['connections'][number]
	canDelete: boolean
}) {
...

';

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
data,
type LoaderFunctionArgs,
type ActionFunctionArgs,
type SerializeFrom,
type HeadersFunction,
useFetcher,
useLoaderData,
Expand Down Expand Up @@ -159,6 +158,8 @@ export default function Connections() {
)
}

type SerializeFrom<T> = ReturnType<typeof useLoaderData<T>>

function Connection({
connection,
canDelete,
Expand Down
5 changes: 3 additions & 2 deletions app/routes/users+/$username_+/__note-editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ import {
} from '@conform-to/react'
import { getZodConstraint, parseWithZod } from '@conform-to/zod'
import { type Note, type NoteImage } from '@prisma/client'
import { type SerializeFrom } from 'react-router';
import { Form, useActionData } from 'react-router';
import { useState } from 'react'
import { Form, useActionData, type useLoaderData } from 'react-router'
import { z } from 'zod'
import { GeneralErrorBoundary } from '#app/components/error-boundary.tsx'
import { floatingToolbarClassName } from '#app/components/floating-toolbar.tsx'
Expand Down Expand Up @@ -44,6 +43,8 @@ const ImageFieldsetSchema = z.object({

export type ImageFieldset = z.infer<typeof ImageFieldsetSchema>

type SerializeFrom<T> = ReturnType<typeof useLoaderData<T>>

export const NoteEditorSchema = z.object({
id: z.string().optional(),
title: z.string().min(titleMinLength).max(titleMaxLength),
Expand Down
6 changes: 4 additions & 2 deletions app/utils/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { type SerializeFrom, useRouteLoaderData } from 'react-router'
import { useRouteLoaderData } from 'react-router'
import { type loader as rootLoader } from '#app/root.tsx'

function isUser(user: any): user is SerializeFrom<typeof rootLoader>['user'] {
function isUser(
user: any,
): user is Awaited<ReturnType<typeof rootLoader>>['data']['user'] {
return user && typeof user === 'object' && typeof user.id === 'string'
}

Expand Down