Skip to content

Commit

Permalink
fix: Invalid versions redirect to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
lachlancollins committed Jan 25, 2024
1 parent f9b7ff9 commit 150fffd
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 6 deletions.
15 changes: 13 additions & 2 deletions app/routes/form.$version.docs.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,24 @@
import type { LoaderFunctionArgs } from '@remix-run/node'
import { json } from '@remix-run/node'
import { json, redirect } from '@remix-run/node'
import { Outlet, useLoaderData } from '@remix-run/react'
import { DocsLayout } from '~/components/DocsLayout'
import { createLogo, getBranch, repo, useFormDocsConfig } from '~/projects/form'
import {
availableVersions,
createLogo,
getBranch,
repo,
useFormDocsConfig,
} from '~/projects/form'
import { getTanstackDocsConfig } from '~/utils/config'

export const loader = async (context: LoaderFunctionArgs) => {
const { version } = context.params
const branch = getBranch(version)

if (!availableVersions.concat('latest').includes(version!)) {
throw redirect(context.request.url.replace(version!, 'latest'))
}

const tanstackDocsConfig = await getTanstackDocsConfig(repo, branch)

return json({
Expand Down
8 changes: 7 additions & 1 deletion app/routes/query.$version.docs.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react'
import type { LoaderFunctionArgs, MetaFunction } from '@remix-run/node'
import { json, useLoaderData } from '@remix-run/react'
import { json, redirect, useLoaderData } from '@remix-run/react'
import { seo } from '~/utils/seo'
import { DocsLayout } from '~/components/DocsLayout'
import { QueryGGBanner } from '~/components/QueryGGBanner'
Expand All @@ -9,12 +9,18 @@ import {
createLogo,
repo,
useQueryDocsConfig,
availableVersions,
} from '~/projects/query'
import { getTanstackDocsConfig } from '~/utils/config'

export const loader = async (context: LoaderFunctionArgs) => {
const { version } = context.params
const branch = getBranch(version)

if (!availableVersions.concat('latest').includes(version!)) {
throw redirect(context.request.url.replace(version!, 'latest'))
}

const tanstackDocsConfig = await getTanstackDocsConfig(repo, branch)

return json({
Expand Down
8 changes: 7 additions & 1 deletion app/routes/store.$version.docs.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { type LoaderFunctionArgs, json } from '@remix-run/node'
import { type LoaderFunctionArgs, json, redirect } from '@remix-run/node'
import { Outlet, useLoaderData } from '@remix-run/react'
import { DocsLayout } from '~/components/DocsLayout'
import {
availableVersions,
createLogo,
getBranch,
repo,
Expand All @@ -12,6 +13,11 @@ import { getTanstackDocsConfig } from '~/utils/config'
export const loader = async (context: LoaderFunctionArgs) => {
const { version } = context.params
const branch = getBranch(version)

if (!availableVersions.concat('latest').includes(version!)) {
throw redirect(context.request.url.replace(version!, 'latest'))
}

const tanstackDocsConfig = await getTanstackDocsConfig(repo, branch)

return json({
Expand Down
8 changes: 7 additions & 1 deletion app/routes/table.$version.docs.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { Outlet, json, useLoaderData } from '@remix-run/react'
import { Outlet, json, redirect, useLoaderData } from '@remix-run/react'
import {
getBranch,
createLogo,
repo,
useTableDocsConfig,
availableVersions,
} from '~/projects/table'
import { seo } from '~/utils/seo'
import { DocsLayout } from '~/components/DocsLayout'
Expand All @@ -14,6 +15,11 @@ import { getTanstackDocsConfig } from '~/utils/config'
export const loader = async (context: LoaderFunctionArgs) => {
const version = context.params.version
const branch = getBranch(version)

if (!availableVersions.concat('latest').includes(version!)) {
throw redirect(context.request.url.replace(version!, 'latest'))
}

const tanstackDocsConfig = await getTanstackDocsConfig(repo, branch)

return json({
Expand Down
8 changes: 7 additions & 1 deletion app/routes/virtual.$version.docs.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Outlet, json, useLoaderData } from '@remix-run/react'
import { Outlet, json, redirect, useLoaderData } from '@remix-run/react'
import {
availableVersions,
createLogo,
getBranch,
repo,
Expand All @@ -13,6 +14,11 @@ import type { LoaderFunctionArgs, MetaFunction } from '@remix-run/node'
export const loader = async (context: LoaderFunctionArgs) => {
const version = context.params.version
const branch = getBranch(version)

if (!availableVersions.concat('latest').includes(version!)) {
throw redirect(context.request.url.replace(version!, 'latest'))
}

const tanstackDocsConfig = await getTanstackDocsConfig(repo, branch)

return json({
Expand Down

0 comments on commit 150fffd

Please sign in to comment.