Skip to content

Commit

Permalink
fix: 🐛 fixing route generation for vite
Browse files Browse the repository at this point in the history
  • Loading branch information
aacevski committed Jan 4, 2025
1 parent da9c10f commit 73ddd6d
Show file tree
Hide file tree
Showing 9 changed files with 108 additions and 48 deletions.
2 changes: 1 addition & 1 deletion apps/web/src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import queryClient from "@/query-client";
import router from "@/router";
import { QueryClientProvider } from "@tanstack/react-query";
import { RouterProvider } from "@tanstack/react-router";
import { StrictMode } from "react";
import { createRoot } from "react-dom/client";
import "@/index.css";
import router from "@/routes";
import { ThemeProvider } from "./components/providers/theme-provider";

const rootElement = document.getElementById("root") as HTMLElement;
Expand Down
36 changes: 0 additions & 36 deletions apps/web/src/pages/auth/index.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion apps/web/src/pages/auth/sign-in.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { rootRoute } from "@/routes";
import { createRoute } from "@tanstack/react-router";
import { AuthLayout } from "../../components/auth/layout";
import { SignInForm } from "../../components/auth/sign-in-form";
import { AuthToggle } from "../../components/auth/toggle";
import { rootRoute } from "../__root";

export const signInRoute = createRoute({
getParentRoute: () => rootRoute,
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/pages/auth/sign-up.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { AuthLayout } from "@/components/auth/layout";
import { SignUpForm } from "@/components/auth/sign-up-form";
import { AuthToggle } from "@/components/auth/toggle";
import { rootRoute } from "@/pages/__root";
import { rootRoute } from "@/routes";
import { createRoute } from "@tanstack/react-router";

export const signUpRoute = createRoute({
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/pages/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import queryClient from "@/query-client";
import { rootRoute } from "@/routes";
import { api } from "@kaneo/libs";
import { Outlet, createRoute, redirect } from "@tanstack/react-router";
import { rootRoute } from "./__root";

export const indexRoute = createRoute({
getParentRoute: () => rootRoute,
Expand Down
88 changes: 88 additions & 0 deletions apps/web/src/routeTree.gen.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
/* eslint-disable */

// @ts-nocheck

// noinspection JSUnusedGlobalSymbols

// This file was automatically generated by TanStack Router.
// You should NOT make any changes in this file as it will be overwritten.
// Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified.

// Import Routes

import { Route as rootRoute } from './routes/__root'
import { Route as IndexImport } from './routes/index'

// Create/Update Routes

const IndexRoute = IndexImport.update({
id: '/',
path: '/',
getParentRoute: () => rootRoute,
} as any)

// Populate the FileRoutesByPath interface

declare module '@tanstack/react-router' {
interface FileRoutesByPath {
'/': {
id: '/'
path: '/'
fullPath: '/'
preLoaderRoute: typeof IndexImport
parentRoute: typeof rootRoute
}
}
}

// Create and export the route tree

export interface FileRoutesByFullPath {
'/': typeof IndexRoute
}

export interface FileRoutesByTo {
'/': typeof IndexRoute
}

export interface FileRoutesById {
__root__: typeof rootRoute
'/': typeof IndexRoute
}

export interface FileRouteTypes {
fileRoutesByFullPath: FileRoutesByFullPath
fullPaths: '/'
fileRoutesByTo: FileRoutesByTo
to: '/'
id: '__root__' | '/'
fileRoutesById: FileRoutesById
}

export interface RootRouteChildren {
IndexRoute: typeof IndexRoute
}

const rootRouteChildren: RootRouteChildren = {
IndexRoute: IndexRoute,
}

export const routeTree = rootRoute
._addFileChildren(rootRouteChildren)
._addFileTypes<FileRouteTypes>()

/* ROUTE_MANIFEST_START
{
"routes": {
"__root__": {
"filePath": "__root.tsx",
"children": [
"/"
]
},
"/": {
"filePath": "index.ts"
}
}
}
ROUTE_MANIFEST_END */
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ function RootComponent() {
</>
);
}

export default RootComponent;
20 changes: 13 additions & 7 deletions apps/web/src/router/index.ts → apps/web/src/routes/index.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
import { indexRoute } from "@/pages";
import { rootRoute } from "@/pages/__root";
import { authIndexRoute } from "@/pages/auth";
import { signInRoute } from "@/pages/auth/sign-in";
import { signUpRoute } from "@/pages/auth/sign-up";
import { dashboardIndexRoute } from "@/pages/dashboard";
import queryClient from "@/query-client";
import { createRouter } from "@tanstack/react-router";
import type { QueryClient } from "@tanstack/react-query";
import {
createRootRouteWithContext,
createRouter,
} from "@tanstack/react-router";
import RootComponent from "./__root";

export const rootRoute = createRootRouteWithContext<{
queryClient: QueryClient;
}>()({
component: RootComponent,
});

const routeTree = rootRoute.addChildren([
indexRoute.addChildren([
authIndexRoute.addChildren([signInRoute, signUpRoute]),
dashboardIndexRoute,
]),
indexRoute.addChildren([signInRoute, signUpRoute, dashboardIndexRoute]),
]);

const router = createRouter({
Expand Down
2 changes: 1 addition & 1 deletion biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"files": {
"ignoreUnknown": false,
"ignore": ["**/tsconfig*.json"]
"ignore": ["**/tsconfig*.json", "routeTree.gen.ts"]
},
"formatter": {
"enabled": true,
Expand Down

0 comments on commit 73ddd6d

Please sign in to comment.