Merge pull request #682 from tgstation/REACTPLS

Cyberboss · web-flow · commit 1e2506cde799 · 2025-01-03T17:26:40.000-05:00
Weekly dependencies update
diff --git a/package.json b/package.json
@@ -60,9 +60,9 @@
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-hook-form": "^7.54.2",
-        "react-intl": "^7.0.4",
+        "react-intl": "^7.1.0",
         "react-relay": "^18.2.0",
-        "react-router-dom": "^7.1.1",
+        "react-router": "^7.1.1",
         "semver": "^7.6.3",
         "tailwind-merge": "^2.6.0",
         "tailwindcss-animate": "^1.0.7",
@@ -86,7 +86,7 @@
         "@storybook/react-vite": "^8.4.7",
         "@storybook/test": "^8.4.7",
         "@storybook/theming": "^8.4.7",
-        "@types/node": "^22.10.2",
+        "@types/node": "^22.10.4",
         "@types/react": "^18",
         "@types/react-dom": "^18.3.1",
         "@types/react-relay": "^18.2.0",
@@ -97,29 +97,29 @@
         "autoprefixer": "^10.4.20",
         "babel-plugin-relay": "^18.2.0",
         "chromatic": "^11.20.2",
-        "concurrently": "^9.1.0",
+        "concurrently": "^9.1.2",
         "escodegen": "^2.1.0",
         "eslint": "^9.17.0",
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-react-hooks": "^5.1.0",
         "eslint-plugin-react-refresh": "^0.4.16",
-        "eslint-plugin-storybook": "0.11.1",
+        "eslint-plugin-storybook": "0.11.2",
         "globals": "^15.14.0",
         "postcss": "^8.4.49",
         "prettier": "^3.4.2",
         "relay-compiler": "^18.2.0",
         "relay-test-utils": "^18.2.0",
         "rollup-plugin-jsx-remove-attributes": "^2.1.0",
         "storybook": "^8.4.7",
-        "storybook-addon-remix-react-router": "^3.0.2",
+        "storybook-addon-remix-react-router": "^4.0.0",
         "tailwindcss": "^3.4.17",
         "type-fest": "^4.31.0",
         "typescript": "^5.7.2",
-        "typescript-eslint": "^8.18.2",
-        "vite": "^6.0.6",
+        "typescript-eslint": "^8.19.0",
+        "vite": "^6.0.7",
         "vite-plugin-relay": "^2.1.0"
     },
-    "packageManager": "yarn@4.5.3",
+    "packageManager": "yarn@4.6.0",
     "eslintConfig": {
         "extends": [
             "plugin:storybook/recommended"
diff --git a/src/components/core/Layout/Layout.tsx b/src/components/core/Layout/Layout.tsx
@@ -1,5 +1,5 @@
 import { Suspense } from "react";
-import { Outlet } from "react-router-dom";
+import { Outlet } from "react-router";
 
 import ErrorViewer from "../ErrorViewer/ErrorViewer";
 import Logo from "../Logo/Logo";
diff --git a/src/components/core/Navbar/Navbar.tsx b/src/components/core/Navbar/Navbar.tsx
@@ -2,7 +2,7 @@
 
 import { Menu, X } from "lucide-react";
 import { useState } from "react";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 
 import { Button } from "@/components/ui/button";
 import { Sheet, SheetContent, SheetTrigger } from "@/components/ui/sheet";
diff --git a/src/components/core/Router/PermissionedRoute/PermissionedRouteLoader.tsx b/src/components/core/Router/PermissionedRoute/PermissionedRouteLoader.tsx
@@ -1,7 +1,7 @@
 import { lazy } from "react";
 import { Environment, PreloadedQuery, useFragment, usePreloadedQuery } from "react-relay";
 import { KeyType } from "react-relay/relay-hooks/helpers";
-import { Outlet, RouteObject } from "react-router-dom";
+import { Outlet, RouteObject } from "react-router";
 
 import IRoutePermissionsChecker from "./IRoutePermissionsChecker";
 import IPermissionedRouteInfo from "./PermissionedRouteInfo";
diff --git a/src/components/core/Router/ProtectedRoute/ProtectedRoute.tsx b/src/components/core/Router/ProtectedRoute/ProtectedRoute.tsx
@@ -1,4 +1,4 @@
-import { Navigate, Outlet, useLocation } from "react-router-dom";
+import { Navigate, Outlet, useLocation } from "react-router";
 
 import ILocationState from "@/components/routed/Login/LocationState";
 import useSession from "@/contexts/session/useSession";
diff --git a/src/components/core/Router/RethrowRouteError/RethrowRouteError.tsx b/src/components/core/Router/RethrowRouteError/RethrowRouteError.tsx
@@ -1,4 +1,4 @@
-import { useRouteError } from "react-router-dom";
+import { useRouteError } from "react-router";
 
 const RethrowRouteError = () => {
     const error = useRouteError();
diff --git a/src/components/core/Router/Router.tsx b/src/components/core/Router/Router.tsx
@@ -1,6 +1,6 @@
 import { lazy, useMemo } from "react";
 import { useRelayEnvironment } from "react-relay";
-import { createBrowserRouter, RouterProvider } from "react-router-dom";
+import { createBrowserRouter, RouterProvider } from "react-router";
 
 import HomeRoutes from "../../routed/Home/HomeRoutes";
 
diff --git a/src/components/routed/Administration/Administration.tsx b/src/components/routed/Administration/Administration.tsx
@@ -2,7 +2,7 @@ import { faLinux, faWindows } from "@fortawesome/free-brands-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { FormattedMessage } from "react-intl";
 import { PreloadedQuery, usePreloadedQuery } from "react-relay";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 import { lt } from "semver";
 
 import { RestartTgsMutation } from "./graphql/__generated__/RestartTgsMutation.graphql";
diff --git a/src/components/routed/Administration/AdministrationRouteLoader.tsx b/src/components/routed/Administration/AdministrationRouteLoader.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { Environment } from "react-relay";
-import { RouteObject } from "react-router-dom";
+import { RouteObject } from "react-router";
 
 import { AdministrationPermissionsFragment$key } from "./graphql/__generated__/AdministrationPermissionsFragment.graphql";
 import { UpdateInformationQuery } from "./graphql/__generated__/UpdateInformationQuery.graphql";
diff --git a/src/components/routed/Administration/Update/UpdateRouteLoader.tsx b/src/components/routed/Administration/Update/UpdateRouteLoader.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { Environment } from "react-relay";
-import { RouteObject } from "react-router-dom";
+import { RouteObject } from "react-router";
 
 import { UpdatePermissionsFragment$key } from "./graphql/__generated__/UpdatePermissionsFragment.graphql";
 import { UpdatePreflightQuery } from "./graphql/__generated__/UpdatePreflightQuery.graphql";
diff --git a/src/components/routed/Home/HomeCard/HomeCard.tsx b/src/components/routed/Home/HomeCard/HomeCard.tsx
@@ -1,6 +1,6 @@
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { FormattedMessage } from "react-intl";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 
 import IHomeCardProps from "./HomeCardProps";
 
diff --git a/src/components/routed/Home/HomeRouteLoader.tsx b/src/components/routed/Home/HomeRouteLoader.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { Environment } from "react-relay";
-import { RouteObject } from "react-router-dom";
+import { RouteObject } from "react-router";
 
 import { HomeCardPermissionsQuery } from "./graphql/__generated__/HomeCardPermissionsQuery.graphql";
 import HomeCardPermissions from "./graphql/HomeCardPermissions";
diff --git a/src/components/routed/Home/HomeRoutes.tsx b/src/components/routed/Home/HomeRoutes.tsx
@@ -8,7 +8,7 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 import { lazy } from "react";
 import { Environment } from "react-relay";
-import { RouteObject } from "react-router-dom";
+import { RouteObject } from "react-router";
 
 import AdministrationRouteLoader from "../Administration/AdministrationRouteLoader";
 import InstancesRouteLoader from "../Instances/InstancesRouteLoader";
diff --git a/src/components/routed/Instances/InstancesRouteLoader.tsx b/src/components/routed/Instances/InstancesRouteLoader.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { Environment } from "react-relay";
-import { RouteObject } from "react-router-dom";
+import { RouteObject } from "react-router";
 
 import { InstancesPermissionsFragment$key } from "./graphql/__generated__/InstancesPermissionsFragment.graphql";
 import InstancesPermissions from "./graphql/InstancesPermissions";
diff --git a/src/components/routed/Login/LocationState.ts b/src/components/routed/Login/LocationState.ts
@@ -1,4 +1,4 @@
-import { Location } from "react-router-dom";
+import { Location } from "react-router";
 
 export default interface ILocationState {
     from?: Location;
diff --git a/src/components/routed/Login/Login.tsx b/src/components/routed/Login/Login.tsx
@@ -1,7 +1,7 @@
 import { Suspense, useCallback, useEffect } from "react";
 import { FormattedMessage } from "react-intl";
 import { useMutation } from "react-relay";
-import { Location, Navigate, useLocation } from "react-router-dom";
+import { Location, Navigate, useLocation } from "react-router";
 
 import ServerLogin from "../../graphql/ServerLogin";
 
diff --git a/src/components/routed/ServerInfo/ServerInfoRouteLoader.tsx b/src/components/routed/ServerInfo/ServerInfoRouteLoader.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { Environment } from "react-relay";
-import { RouteObject } from "react-router-dom";
+import { RouteObject } from "react-router";
 
 import { ServerInformationQuery } from "./graphql/__generated__/ServerInformationQuery.graphql";
 import ServerInformation from "./graphql/ServerInformation";
diff --git a/src/components/routed/Users/ChangePassword/ChangePasswordRouteLoader.tsx b/src/components/routed/Users/ChangePassword/ChangePasswordRouteLoader.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { Environment } from "react-relay";
-import { RouteObject } from "react-router-dom";
+import { RouteObject } from "react-router";
 
 import { ChangePasswordPermissionsFragment$key } from "./graphql/__generated__/ChangePasswordPermissionsFragment.graphql";
 import { ChangePasswordPreflightQuery } from "./graphql/__generated__/ChangePasswordPreflightQuery.graphql";
diff --git a/src/components/routed/Users/UsersRouteLoader.tsx b/src/components/routed/Users/UsersRouteLoader.tsx
@@ -1,6 +1,6 @@
 import { lazy } from "react";
 import { Environment } from "react-relay";
-import { RouteObject } from "react-router-dom";
+import { RouteObject } from "react-router";
 
 import { UsersPermissionsFragment$key } from "./graphql/__generated__/UsersPermissionsFragment.graphql";
 import UsersPermissions from "./graphql/UsersPermissions";
diff --git a/src/lib/RouteQueryLoader.tsx b/src/lib/RouteQueryLoader.tsx
@@ -1,6 +1,6 @@
 import { ReactNode } from "react";
 import { Environment, loadQuery, PreloadedQuery } from "react-relay";
-import { LoaderFunctionArgs, RouteObject, useLoaderData } from "react-router-dom";
+import { LoaderFunctionArgs, RouteObject, useLoaderData } from "react-router";
 import { GraphQLTaggedNode, OperationType, VariablesOf } from "relay-runtime";
 
 import { useOnMountUnsafe } from "./useOnMountUnsafe";
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Navigate, Outlet, useLocation } from "react-router-dom";`
	`1`	`+import { Navigate, Outlet, useLocation } from "react-router";`
`2`	`2`
`3`	`3`	`import ILocationState from "@/components/routed/Login/LocationState";`
`4`	`4`	`import useSession from "@/contexts/session/useSession";`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { useRouteError } from "react-router-dom";`
	`1`	`+import { useRouteError } from "react-router";`
`2`	`2`
`3`	`3`	`const RethrowRouteError = () => {`
`4`	`4`	`const error = useRouteError();`