chore: fix react-router typing

argos-ci · Oct 3, 2024 · c1900a1 · c1900a1
1 parent b7ed9c3
commit c1900a1
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 102 deletions.
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
@@ -47,7 +47,7 @@
     "react-dom": "^18.3.1",
     "react-helmet": "^6.1.0",
     "react-hook-form": "^7.53.0",
-    "react-router-dom": "^6.26.1",
+    "react-router-dom": "^6.26.2",
     "tailwindcss": "^3.4.10",
     "tailwindcss-animate": "^1.0.7",
     "use-clipboard-copy": "^0.2.0",

diff --git a/apps/frontend/src/router.tsx b/apps/frontend/src/router.tsx
@@ -2,10 +2,10 @@ import { RouterProvider } from "react-aria-components";
 import {
   createBrowserRouter,
   Navigate,
+  NavigateOptions,
   Outlet,
   useHref,
   useNavigate,
-  type NavigateOptions,
 } from "react-router-dom";
 
 import { Layout } from "@/containers/Layout";
@@ -40,102 +40,103 @@ function Root() {
   );
 }
 
-export const router = createBrowserRouter([
-  {
-    path: `/auth/:provider/callback`,
-    lazy: () => import("./pages/AuthCallback"),
-  },
-  {
-    path: "/",
-    element: <Root />,
-    children: [
-      {
-        path: "/:accountSlug/:projectName/builds/:buildNumber",
-        lazy: () => import("./pages/Build"),
-      },
-      {
-        path: "/:accountSlug/:projectName/builds/:buildNumber/:diffId",
-        lazy: () => import("./pages/Build"),
-      },
-      {
-        path: "/",
-        lazy: () => import("./pages/Home"),
-      },
-      {
-        path: "/",
-        element: (
-          <Layout>
-            <Outlet />
-          </Layout>
-        ),
-        children: [
-          {
-            path: "new",
-            lazy: () => import("./pages/NewProject"),
-          },
-          {
-            path: "login",
-            lazy: () => import("./pages/Login"),
-          },
-          {
-            path: "signup",
-            lazy: () => import("./pages/Signup"),
-          },
-          {
-            path: "invite/:inviteToken",
-            lazy: () => import("./pages/Invite"),
-          },
-          {
-            path: "teams/new",
-            lazy: () => import("./pages/NewTeam"),
-          },
-          {
-            path: ":accountSlug/:projectName",
-            lazy: () => import("./pages/Project"),
-            children: [
-              {
-                index: true,
-                lazy: () => import("./pages/Project/Builds"),
-              },
-              {
-                path: "reference",
-                lazy: () => import("./pages/Project/Reference"),
-              },
-              {
-                path: "builds",
-                element: <Navigate to=".." replace={true} />,
-              },
-              {
-                path: "settings",
-                lazy: () => import("./pages/Project/Settings"),
-              },
-            ],
-          },
-          {
-            id: "account",
-            path: ":accountSlug",
-            lazy: () => import("./pages/Account"),
-            children: [
-              {
-                index: true,
-                lazy: () => import("./pages/Account/Projects"),
-              },
-              {
-                path: "new",
-                lazy: () => import("./pages/Account/NewProject"),
-              },
-              {
-                path: "settings",
-                lazy: () => import("./pages/Account/Settings"),
-              },
-            ],
-          },
-          {
-            path: "*",
-            element: <NotFound />,
-          },
-        ],
-      },
-    ],
-  },
-]);
+export const router: ReturnType<typeof createBrowserRouter> =
+  createBrowserRouter([
+    {
+      path: `/auth/:provider/callback`,
+      lazy: () => import("./pages/AuthCallback"),
+    },
+    {
+      path: "/",
+      element: <Root />,
+      children: [
+        {
+          path: "/:accountSlug/:projectName/builds/:buildNumber",
+          lazy: () => import("./pages/Build"),
+        },
+        {
+          path: "/:accountSlug/:projectName/builds/:buildNumber/:diffId",
+          lazy: () => import("./pages/Build"),
+        },
+        {
+          path: "/",
+          lazy: () => import("./pages/Home"),
+        },
+        {
+          path: "/",
+          element: (
+            <Layout>
+              <Outlet />
+            </Layout>
+          ),
+          children: [
+            {
+              path: "new",
+              lazy: () => import("./pages/NewProject"),
+            },
+            {
+              path: "login",
+              lazy: () => import("./pages/Login"),
+            },
+            {
+              path: "signup",
+              lazy: () => import("./pages/Signup"),
+            },
+            {
+              path: "invite/:inviteToken",
+              lazy: () => import("./pages/Invite"),
+            },
+            {
+              path: "teams/new",
+              lazy: () => import("./pages/NewTeam"),
+            },
+            {
+              path: ":accountSlug/:projectName",
+              lazy: () => import("./pages/Project"),
+              children: [
+                {
+                  index: true,
+                  lazy: () => import("./pages/Project/Builds"),
+                },
+                {
+                  path: "reference",
+                  lazy: () => import("./pages/Project/Reference"),
+                },
+                {
+                  path: "builds",
+                  element: <Navigate to=".." replace={true} />,
+                },
+                {
+                  path: "settings",
+                  lazy: () => import("./pages/Project/Settings"),
+                },
+              ],
+            },
+            {
+              id: "account",
+              path: ":accountSlug",
+              lazy: () => import("./pages/Account"),
+              children: [
+                {
+                  index: true,
+                  lazy: () => import("./pages/Account/Projects"),
+                },
+                {
+                  path: "new",
+                  lazy: () => import("./pages/Account/NewProject"),
+                },
+                {
+                  path: "settings",
+                  lazy: () => import("./pages/Account/Settings"),
+                },
+              ],
+            },
+            {
+              path: "*",
+              element: <NotFound />,
+            },
+          ],
+        },
+      ],
+    },
+  ]);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml