Skip to content

Commit

Permalink
Refinements after React Router v7 migration (#902)
Browse files Browse the repository at this point in the history
  • Loading branch information
nichtsam authored Jan 16, 2025
1 parent 7367c3d commit 2a97bdc
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/components/progress-bar.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useNavigation } from 'react-router'
import { useEffect, useRef, useState } from 'react'
import { useNavigation } from 'react-router'
import { useSpinDelay } from 'spin-delay'
import { cn } from '#app/utils/misc.tsx'
import { Icon } from './ui/icon.tsx'
Expand Down
3 changes: 1 addition & 2 deletions app/root.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { wrapUseRoutesV7 } from '@sentry/react'
import { useRef } from 'react'
import {
data,
Expand Down Expand Up @@ -270,7 +269,7 @@ function AppWithProviders() {
)
}

export default wrapUseRoutesV7(AppWithProviders)
export default AppWithProviders

function UserDropdown() {
const user = useUser()
Expand Down
2 changes: 1 addition & 1 deletion app/utils/client-hints.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {
subscribeToSchemeChange,
} from '@epic-web/client-hints/color-scheme'
import { clientHint as timeZoneHint } from '@epic-web/client-hints/time-zone'
import { useRevalidator } from 'react-router'
import * as React from 'react'
import { useRevalidator } from 'react-router'
import { useOptionalRequestInfo, useRequestInfo } from './request-info.ts'

const hintsUtils = getHintUtils({
Expand Down
2 changes: 1 addition & 1 deletion app/utils/misc.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useFormAction, useNavigation } from 'react-router'
import { clsx, type ClassValue } from 'clsx'
import { useEffect, useMemo, useRef, useState } from 'react'
import { useFormAction, useNavigation } from 'react-router'
import { useSpinDelay } from 'spin-delay'
import { extendTailwindMerge } from 'tailwind-merge'
import { extendedTheme } from './extended-theme.ts'
Expand Down
3 changes: 3 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ export default [
files: ['**/tests/**/*.ts'],
rules: { 'react-hooks/rules-of-hooks': 'off' },
},
{
ignores: ['.react-router/*'],
},
]
4 changes: 4 additions & 0 deletions react-router.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@ import { type Config } from '@react-router/dev/config'
export default {
// Defaults to true. Set to false to enable SPA for all routes.
ssr: true,

future: {
unstable_optimizeDeps: true,
},
} satisfies Config

0 comments on commit 2a97bdc

Please sign in to comment.