Skip to content

Commit f939366

Browse files
committed
rename to clientLoader
1 parent 58ed886 commit f939366

File tree

8 files changed

+13
-12
lines changed

8 files changed

+13
-12
lines changed

app-react-router-spa/COURSES/core/06-data-fetching/lecture/App.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { VacationsSubLayout } from '~/VacationsSubLayout'
1212
import { AccountSubLayout } from '~/AccountSubLayout'
1313

1414
// Pages
15-
import { BrowseVacationsPage, loader as browseVacationsLoader } from './BrowseVacationsPage'
15+
import { BrowseVacationsPage, clientLoader as browseVacationsLoader } from './BrowseVacationsPage'
1616
import { VacationDetailsPage } from './VacationDetailsPage'
1717
import { LoginPage } from '~/LoginPage'
1818
import { ErrorPage } from '~/ErrorPage'

app-react-router-spa/COURSES/core/06-data-fetching/lecture/BrowseVacationsPage.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { api } from '~/utils/api'
44
import { BrowseVacationsItem } from '~/BrowseVacationsItem'
55
import { queryClient } from '~/utils/queryClient'
66

7-
export async function loader() {
7+
export async function clientLoader() {
88
const vacations = await queryClient.ensureQueryData({
99
queryKey: ['vacations'],
1010
queryFn: () => api.vacations.getAll(),
@@ -14,7 +14,8 @@ export async function loader() {
1414
}
1515

1616
export function BrowseVacationsPage() {
17-
const vacations = useLoaderData() as Awaited<ReturnType<typeof loader>>
17+
const vacations = useLoaderData() as Awaited<ReturnType<typeof clientLoader>>
18+
1819
return (
1920
<div>
2021
{!vacations && <div>Loading...</div>}

app-react-router-spa/COURSES/core/06-data-fetching/lecture/VacationDetailsPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import type { Vacation } from '~/utils/types'
1717
// staleTime: 1000 * 30,
1818
// })
1919

20-
// export async function loader({ params }: LoaderFunctionArgs) {
20+
// export async function clientLoader({ params }: LoaderFunctionArgs) {
2121
// return api.vacations.getVacation(vacationId)
2222
// }
2323

app-react-router-spa/COURSES/core/06-data-fetching/practice/BrowseVacationsPage.final.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { api } from '~/utils/api'
66
import type { Vacation } from '~/utils/types'
77

88
// 2: Finished with loader
9-
export async function loader() {
9+
export async function clientLoader() {
1010
return api.vacations.getAll()
1111
}
1212

app-react-router-spa/COURSES/core/06-data-fetching/practice/BrowseVacationsPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import type { Vacation } from '~/utils/types'
99
// 2. Then refactor the code that was fetching within the component to fetch
1010
// from this loader instead. Note that React Router is already importing this
1111
// loading and attaching it to the correct route
12-
export async function loader() {
12+
export async function clientLoader() {
1313
return []
1414
}
1515

app-react-router-spa/src/BrowseVacationsPage.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { BrowseVacationsItem } from '~/BrowseVacationsItem'
44
import { queryClient } from './utils/queryClient'
55
import { useLoaderData } from 'react-router'
66

7-
export async function loader() {
7+
export async function clientLoader() {
88
const vacations = await queryClient.fetchQuery({
99
queryKey: ['vacations'],
1010
queryFn: () => api.vacations.getAll(),
@@ -13,7 +13,7 @@ export async function loader() {
1313
return vacations
1414
}
1515

16-
type LoaderData = Awaited<ReturnType<typeof loader>>
16+
type LoaderData = Awaited<ReturnType<typeof clientLoader>>
1717

1818
export function BrowseVacationsPage() {
1919
const vacations = useLoaderData() as LoaderData

app-react-router-spa/src/VacationDetailsPage.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { FavoriteVacationButton } from '~/FavoriteVacationButton'
77
import { LoaderFunctionArgs, useLoaderData } from 'react-router'
88
import { queryClient } from '~/utils/queryClient'
99

10-
export async function loader({ params }: LoaderFunctionArgs) {
10+
export async function clientLoader({ params }: LoaderFunctionArgs) {
1111
const id = parseInt(params.vacationId!)
1212

1313
const vacation = await queryClient.fetchQuery({
@@ -18,7 +18,7 @@ export async function loader({ params }: LoaderFunctionArgs) {
1818
return vacation
1919
}
2020

21-
type LoaderData = Awaited<ReturnType<typeof loader>>
21+
type LoaderData = Awaited<ReturnType<typeof clientLoader>>
2222

2323
export function VacationDetailsPage() {
2424
const vacation = useLoaderData() as LoaderData

app-react-router-spa/src/router.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { VacationsSubLayout } from '~/VacationsSubLayout'
66
import { AccountSubLayout } from '~/AccountSubLayout'
77

88
// Pages
9-
import { BrowseVacationsPage, loader as browseVacationsLoader } from '~/BrowseVacationsPage'
10-
import { VacationDetailsPage, loader as vacationDetailsLoader } from '~/VacationDetailsPage'
9+
import { BrowseVacationsPage, clientLoader as browseVacationsLoader } from '~/BrowseVacationsPage'
10+
import { VacationDetailsPage, clientLoader as vacationDetailsLoader } from '~/VacationDetailsPage'
1111
import { LoginPage } from '~/LoginPage'
1212
import { ErrorPage } from '~/ErrorPage'
1313
import { NotFoundPage } from '~/NotFoundPage'

0 commit comments

Comments
 (0)