more progress

Author: kentcdodds

package-lock.json

@@ -1,8 +1,8 @@
-import { useRouteLoaderData } from 'react-router';
-import { type loader as rootLoader } from '#app/root.tsx'
+import { useRouteLoaderData } from 'react-router'
+import { type RootLoaderData } from '#app/root.tsx'
 
 export function useApps() {
-	const data = useRouteLoaderData<typeof rootLoader>('root')
+	const data = useRouteLoaderData('root') as RootLoaderData
 	if (!data) {
 		throw new Error('useApps requires a data object from the root loader')
 	}

packages/workshop-app/app/components/apps.tsx

@@ -1,5 +1,5 @@
-import { Link } from 'react-router';
 import { clsx } from 'clsx'
+import { Link } from 'react-router';
 
 function PendingState() {
 	return <span className="inline-block animate-spin">🌀</span>

packages/workshop-app/app/components/button.tsx

@@ -1,8 +1,8 @@
 import * as Accordion from '@radix-ui/react-accordion'
 import * as Select from '@radix-ui/react-select'
-import { Await, Form, Link, useNavigation, useSearchParams, useSubmit } from 'react-router';
 import { clsx } from 'clsx'
 import React, { Suspense } from 'react'
+import { Await, Form, Link, useNavigation, useSearchParams, useSubmit } from 'react-router';
 import { useSpinDelay } from 'spin-delay'
 import AccordionComponent from '#app/components/accordion.tsx'
 import { Mdx } from '#app/utils/mdx.tsx'

packages/workshop-app/app/components/diff.tsx

@@ -1,7 +1,7 @@
 import { type EpicVideoInfos } from '@epic-web/workshop-utils/epic-api.server'
 import { type MuxPlayerRefAttributes } from '@mux/mux-player-react'
-import { Await, Link } from 'react-router';
 import * as React from 'react'
+import { Await, Link } from 'react-router';
 import { useTheme } from '#app/routes/theme/index.tsx'
 import { MuxPlayer } from '#app/routes/video-player/index.tsx'
 import { cn } from '#app/utils/misc.tsx'

packages/workshop-app/app/components/epic-video.tsx

@@ -1,4 +1,3 @@
-import { Form, useSearchParams, type NavigateFunction } from 'react-router';
 import { clsx } from 'clsx'
 import {
 	forwardRef,
@@ -8,6 +7,7 @@ import {
 	useState,
 	type ForwardedRef,
 } from 'react'
+import { Form, useSearchParams, type NavigateFunction } from 'react-router'
 import { z } from 'zod'
 import { Icon } from '#app/components/icons.tsx'
 import { AppStarter, AppStopper, PortStopper } from '#app/routes/start.tsx'
@@ -324,7 +324,7 @@ function InBrowserBrowserForRealzImpl(
 		setPathnameInputValue(newPathnameInputValue)
 
 		const currentPathname = iframeContext.history[iframeContext.index]
-		navigateChild(newPathnameInputValue, {
+		void navigateChild(newPathnameInputValue, {
 			replace: currentPathname === newPathnameInputValue,
 		})
 	}

packages/workshop-app/app/components/in-browser-browser.tsx

@@ -1,5 +1,5 @@
-import { useFetchers, useNavigation } from 'react-router';
 import { useEffect, useRef, useState } from 'react'
+import { useFetchers, useNavigation } from 'react-router';
 import { useSpinDelay } from 'spin-delay'
 import { cn } from '#app/utils/misc.tsx'
 

packages/workshop-app/app/components/progress-bar.tsx

@@ -1,5 +1,5 @@
-import { useRevalidator } from 'react-router';
 import { useEffect, useRef } from 'react'
+import { useRevalidator } from 'react-router'
 import { z } from 'zod'
 import { useRequestInfo } from '#app/utils/request-info.js'
 
@@ -46,7 +46,7 @@ function useRevalidationWSImpl({ watchPaths }: { watchPaths: Array<string> }) {
 					'🐨 Revalidating due to file changes:',
 					event.data.filePaths,
 				)
-				latestRevalidatorRef.current.revalidate()
+				void latestRevalidatorRef.current.revalidate()
 			}
 
 			ws.onclose = (event) => {

packages/workshop-app/app/components/revalidation-ws.tsx

@@ -1,8 +1,8 @@
-import { useRouteLoaderData } from 'react-router';
-import { type loader as rootLoader } from '#app/root.tsx'
+import { useRouteLoaderData } from 'react-router'
+import { type RootLoaderData } from '#app/root.tsx'
 
 export function useOptionalUser() {
-	const data = useRouteLoaderData<typeof rootLoader>('root')
+	const data = useRouteLoaderData('root') as RootLoaderData
 	return data?.user
 }
 
@@ -17,7 +17,7 @@ export function useUser() {
 }
 
 export function useOptionalDiscordMember() {
-	const data = useRouteLoaderData<typeof rootLoader>('root')
+	const data = useRouteLoaderData('root') as RootLoaderData
 	return data?.user?.discordProfile
 		? {
 				id: data.user.discordProfile.user.id,
@@ -40,6 +40,6 @@ export function useDiscordMember() {
 }
 
 export function useUserHasAccess() {
-	const data = useRouteLoaderData<typeof rootLoader>('root')
+	const data = useRouteLoaderData('root') as RootLoaderData
 	return data?.userHasAccess ?? false
 }

packages/workshop-app/app/components/user.tsx

@@ -1,8 +1,8 @@
-import { useRouteLoaderData } from 'react-router';
-import { type loader as rootLoader } from '#app/root.tsx'
+import { useRouteLoaderData } from 'react-router'
+import { type RootLoaderData } from '#app/root.tsx'
 
 export function useWorkshopConfig() {
-	const data = useRouteLoaderData<typeof rootLoader>('root')
+	const data = useRouteLoaderData('root') as RootLoaderData
 	if (!data?.workshopConfig) {
 		throw new Error('useWorkshopConfig requires a workshopConfig.')
 	}