Skip to content

Commit be9293a

Browse files
aslilacaslilac
committed
try upgrading react router
1 parent 52c4617 commit be9293a

File tree

145 files changed

+895
-1151
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+895
-1151
lines changed

‎site/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"react-helmet-async": "2.0.5",
100100
"react-markdown": "9.0.1",
101101
"react-query": "npm:@tanstack/react-query@4.35.3",
102-
"react-router-dom": "6.26.2",
102+
"react-router": "7.0.2",
103103
"react-syntax-highlighter": "15.5.0",
104104
"react-virtualized-auto-sizer": "1.0.24",
105105
"react-window": "1.8.10",

‎site/pnpm-lock.yaml

Lines changed: 751 additions & 1003 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
} from "react";
1010
import { HelmetProvider } from "react-helmet-async";
1111
import { QueryClient, QueryClientProvider } from "react-query";
12-
import { RouterProvider } from "react-router-dom";
12+
import { RouterProvider } from "react-router";
1313
import { ErrorBoundary } from "./components/ErrorBoundary/ErrorBoundary";
1414
import { GlobalSnackbar } from "./components/GlobalSnackbar/GlobalSnackbar";
1515
import { ThemeProvider } from "./contexts/ThemeProvider";

‎site/src/components/Filter/Filter.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { InputGroup } from "components/InputGroup/InputGroup";
1616
import { SearchField } from "components/SearchField/SearchField";
1717
import { useDebouncedFunction } from "hooks/debounce";
1818
import { type FC, type ReactNode, useEffect, useRef, useState } from "react";
19-
import type { useSearchParams } from "react-router-dom";
19+
import type { useSearchParams } from "react-router";
2020

2121
export type PresetFilter = {
2222
name: string;

‎site/src/components/FullPageLayout/Sidebar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { type Interpolation, type Theme, useTheme } from "@emotion/react";
22
import type { ComponentProps, FC, HTMLAttributes } from "react";
3-
import { Link, type LinkProps } from "react-router-dom";
3+
import { Link, type LinkProps } from "react-router";
44
import { TopbarIconButton } from "./Topbar";
55

66
export const Sidebar: FC<HTMLAttributes<HTMLDivElement>> = (props) => {

‎site/src/components/Sidebar/Sidebar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { CSSObject, Interpolation, Theme } from "@emotion/react";
33
import { Stack } from "components/Stack/Stack";
44
import { type ClassName, useClassName } from "hooks/useClassName";
55
import type { ElementType, FC, ReactNode } from "react";
6-
import { Link, NavLink } from "react-router-dom";
6+
import { Link, NavLink } from "react-router";
77

88
interface SidebarProps {
99
children?: ReactNode;

‎site/src/components/Tabs/Tabs.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { type Interpolation, type Theme, useTheme } from "@emotion/react";
22
import { type FC, type HTMLAttributes, createContext, useContext } from "react";
3-
import { Link, type LinkProps } from "react-router-dom";
3+
import { Link, type LinkProps } from "react-router";
44

55
export const TAB_PADDING_Y = 12;
66
export const TAB_PADDING_X = 16;

‎site/src/contexts/auth/RequireAuth.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Loader } from "components/Loader/Loader";
44
import { ProxyProvider as ProductionProxyProvider } from "contexts/ProxyContext";
55
import { DashboardProvider as ProductionDashboardProvider } from "modules/dashboard/DashboardProvider";
66
import { type FC, useEffect } from "react";
7-
import { Navigate, Outlet, useLocation } from "react-router-dom";
7+
import { Navigate, Outlet, useLocation } from "react-router";
88
import { embedRedirect } from "utils/redirect";
99
import { type AuthContextValue, useAuthContext } from "./AuthProvider";
1010

‎site/src/contexts/auth/RequirePermission.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { FC, ReactNode } from "react";
2-
import { Navigate } from "react-router-dom";
2+
import { Navigate } from "react-router";
33

44
export interface RequirePermissionProps {
55
children?: ReactNode;

‎site/src/hooks/usePaginatedQuery.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
useQuery,
99
useQueryClient,
1010
} from "react-query";
11-
import { type SetURLSearchParams, useSearchParams } from "react-router-dom";
11+
import { type SetURLSearchParams, useSearchParams } from "react-router";
1212
import { useEffectEvent } from "./hookPolyfills";
1313

1414
const DEFAULT_RECORDS_PER_PAGE = 25;

‎site/src/hooks/usePagination.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { DEFAULT_RECORDS_PER_PAGE } from "components/PaginationWidget/utils";
2-
import type { useSearchParams } from "react-router-dom";
2+
import type { useSearchParams } from "react-router";
33

44
export const usePagination = ({
55
searchParamsResult,

‎site/src/hooks/useSearchParamsKey.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useSearchParams } from "react-router-dom";
1+
import { useSearchParams } from "react-router";
22

33
export type UseSearchParamsKeyConfig = Readonly<{
44
key: string;

‎site/src/modules/dashboard/DashboardLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { useAuthenticated } from "contexts/auth/RequireAuth";
77
import { AnnouncementBanners } from "modules/dashboard/AnnouncementBanners/AnnouncementBanners";
88
import { LicenseBanner } from "modules/dashboard/LicenseBanner/LicenseBanner";
99
import { type FC, type HTMLAttributes, Suspense } from "react";
10-
import { Outlet } from "react-router-dom";
10+
import { Outlet } from "react-router";
1111
import { dashboardContentBottomPadding } from "theme/constants";
1212
import { docs } from "utils/docs";
1313
import { DeploymentBanner } from "./DeploymentBanner/DeploymentBanner";

‎site/src/modules/dashboard/DeploymentBanner/DeploymentBannerView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import {
3232
useMemo,
3333
useState,
3434
} from "react";
35-
import { Link as RouterLink } from "react-router-dom";
35+
import { Link as RouterLink } from "react-router";
3636
import { MONOSPACE_FONT_FAMILY } from "theme/constants";
3737
import colors from "theme/tailwindColors";
3838
import { getDisplayWorkspaceStatus } from "utils/workspace";

‎site/src/modules/dashboard/Navbar/DeploymentDropdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
} from "components/deprecated/Popover/Popover";
1111
import { linkToAuditing, linkToUsers } from "modules/navigation";
1212
import type { FC } from "react";
13-
import { NavLink } from "react-router-dom";
13+
import { NavLink } from "react-router";
1414

1515
interface DeploymentDropdownProps {
1616
canViewDeployment: boolean;

‎site/src/modules/dashboard/Navbar/NavbarView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { ExternalImage } from "components/ExternalImage/ExternalImage";
77
import { CoderIcon } from "components/Icons/CoderIcon";
88
import type { ProxyContextValue } from "contexts/ProxyContext";
99
import { type FC, useState } from "react";
10-
import { NavLink, useLocation } from "react-router-dom";
10+
import { NavLink, useLocation } from "react-router";
1111
import { navHeight } from "theme/constants";
1212
import { DeploymentDropdown } from "./DeploymentDropdown";
1313
import { ProxyMenu } from "./ProxyMenu";

‎site/src/modules/dashboard/Navbar/ProxyMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { Latency } from "components/Latency/Latency";
1313
import type { ProxyContextValue } from "contexts/ProxyContext";
1414
import { useAuthenticated } from "contexts/auth/RequireAuth";
1515
import { type FC, useRef, useState } from "react";
16-
import { useNavigate } from "react-router-dom";
16+
import { useNavigate } from "react-router";
1717
import { BUTTON_SM_HEIGHT } from "theme/constants";
1818

1919
interface ProxyMenuProps {

‎site/src/modules/dashboard/Navbar/UserDropdown/UserDropdownContent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { ExternalImage } from "components/ExternalImage/ExternalImage";
2020
import { Stack } from "components/Stack/Stack";
2121
import type { FC, JSX } from "react";
2222
import { usePopover } from "components/deprecated/Popover/Popover";
23-
import { Link } from "react-router-dom";
23+
import { Link } from "react-router";
2424

2525
export const Language = {
2626
accountLabel: "Account",

‎site/src/modules/management/DeploymentSettingsProvider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { useAuthenticated } from "contexts/auth/RequireAuth";
66
import { RequirePermission } from "contexts/auth/RequirePermission";
77
import { type FC, createContext, useContext } from "react";
88
import { useQuery } from "react-query";
9-
import { Outlet } from "react-router-dom";
9+
import { Outlet } from "react-router";
1010

1111
export const DeploymentSettingsContext = createContext<
1212
DeploymentSettingsValue | undefined

‎site/src/modules/management/ManagementSettingsLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { useAuthenticated } from "contexts/auth/RequireAuth";
66
import { RequirePermission } from "contexts/auth/RequirePermission";
77
import { useDashboard } from "modules/dashboard/useDashboard";
88
import { type FC, Suspense, createContext, useContext } from "react";
9-
import { Outlet, useParams } from "react-router-dom";
9+
import { Outlet, useParams } from "react-router";
1010
import { Sidebar } from "./Sidebar";
1111

1212
export const ManagementSettingsContext = createContext<

‎site/src/modules/management/Sidebar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
} from "modules/management/ManagementSettingsLayout";
88
import type { FC } from "react";
99
import { useQuery } from "react-query";
10-
import { useLocation, useParams } from "react-router-dom";
10+
import { useLocation, useParams } from "react-router";
1111
import { type OrganizationWithPermissions, SidebarView } from "./SidebarView";
1212

1313
/**

‎site/src/modules/management/SidebarView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { type ClassName, useClassName } from "hooks/useClassName";
1313
import { useDashboard } from "modules/dashboard/useDashboard";
1414
import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
1515
import type { FC, ReactNode } from "react";
16-
import { Link, NavLink } from "react-router-dom";
16+
import { Link, NavLink } from "react-router";
1717

1818
export interface OrganizationWithPermissions extends Organization {
1919
permissions: AuthorizationResponse;

‎site/src/modules/templates/TemplateExampleCard/TemplateExampleCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { TemplateExample } from "api/typesGenerated";
55
import { ExternalImage } from "components/ExternalImage/ExternalImage";
66
import { Pill } from "components/Pill/Pill";
77
import type { FC, HTMLAttributes } from "react";
8-
import { Link as RouterLink } from "react-router-dom";
8+
import { Link as RouterLink } from "react-router";
99

1010
type TemplateExampleCardProps = HTMLAttributes<HTMLDivElement> & {
1111
example: TemplateExample;

‎site/src/modules/templates/TemplateFiles/TemplateFiles.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { SyntaxHighlighter } from "components/SyntaxHighlighter/SyntaxHighlighte
55
import set from "lodash/set";
66
import { linkToTemplate, useLinks } from "modules/navigation";
77
import { type FC, useCallback, useMemo } from "react";
8-
import { Link } from "react-router-dom";
8+
import { Link } from "react-router";
99
import type { FileTree } from "utils/filetree";
1010
import type { TemplateVersionFiles } from "utils/templateVersion";
1111
import { TemplateFileTree } from "./TemplateFileTree";

‎site/src/modules/workspaces/WorkspaceTiming/Chart/Tooltip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import MUITooltip, {
55
type TooltipProps as MUITooltipProps,
66
} from "@mui/material/Tooltip";
77
import type { FC, HTMLProps } from "react";
8-
import { Link, type LinkProps } from "react-router-dom";
8+
import { Link, type LinkProps } from "react-router";
99

1010
export type TooltipProps = MUITooltipProps;
1111

‎site/src/pages/AuditPage/AuditLogRow/AuditLogDescription/AuditLogDescription.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Link from "@mui/material/Link";
22
import type { AuditLog } from "api/typesGenerated";
33
import type { FC } from "react";
4-
import { Link as RouterLink } from "react-router-dom";
4+
import { Link as RouterLink } from "react-router";
55
import { BuildAuditDescription } from "./BuildAuditDescription";
66

77
interface AuditLogDescriptionProps {

‎site/src/pages/AuditPage/AuditLogRow/AuditLogDescription/BuildAuditDescription.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Link from "@mui/material/Link";
22
import type { AuditLog } from "api/typesGenerated";
33
import { type FC, useMemo } from "react";
4-
import { Link as RouterLink } from "react-router-dom";
4+
import { Link as RouterLink } from "react-router";
55

66
interface BuildAuditDescriptionProps {
77
auditLog: AuditLog;

‎site/src/pages/AuditPage/AuditLogRow/AuditLogRow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { Stack } from "components/Stack/Stack";
1111
import { TimelineEntry } from "components/Timeline/TimelineEntry";
1212
import { UserAvatar } from "components/UserAvatar/UserAvatar";
1313
import { type FC, useState } from "react";
14-
import { Link as RouterLink } from "react-router-dom";
14+
import { Link as RouterLink } from "react-router";
1515
import type { ThemeRole } from "theme/roles";
1616
import userAgentParser from "ua-parser-js";
1717
import { AuditLogDescription } from "./AuditLogDescription/AuditLogDescription";

‎site/src/pages/AuditPage/AuditPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
88
import { useOrganizationsFilterMenu } from "modules/tableFiltering/options";
99
import type { FC } from "react";
1010
import { Helmet } from "react-helmet-async";
11-
import { useSearchParams } from "react-router-dom";
11+
import { useSearchParams } from "react-router";
1212
import { pageTitle } from "utils/page";
1313
import { useActionFilterMenu, useResourceTypeFilterMenu } from "./AuditFilter";
1414
import { AuditPageView } from "./AuditPageView";

‎site/src/pages/CliAuthPage/CliAuthPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Loader } from "components/Loader/Loader";
55
import { SignInLayout } from "components/SignInLayout/SignInLayout";
66
import { Welcome } from "components/Welcome/Welcome";
77
import type { FC } from "react";
8-
import { Link as RouterLink } from "react-router-dom";
8+
import { Link as RouterLink } from "react-router";
99

1010
export interface CliAuthPageViewProps {
1111
sessionToken?: string;

‎site/src/pages/CreateTemplateGalleryPage/CreateTemplateGalleryPage.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { render, screen } from "@testing-library/react";
22
import { AppProviders } from "App";
33
import { RequireAuth } from "contexts/auth/RequireAuth";
44
import { http, HttpResponse } from "msw";
5-
import { RouterProvider, createMemoryRouter } from "react-router-dom";
5+
import { RouterProvider, createMemoryRouter } from "react-router";
66
import {
77
MockTemplateExample,
88
MockTemplateExample2,

‎site/src/pages/CreateTemplateGalleryPage/CreateTemplateGalleryPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Loader } from "components/Loader/Loader";
99
import { Margins } from "components/Margins/Margins";
1010
import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader";
1111
import type { FC } from "react";
12-
import { Link as RouterLink } from "react-router-dom";
12+
import { Link as RouterLink } from "react-router";
1313
import type { StarterTemplatesByTag } from "utils/starterTemplates";
1414
import { StarterTemplates } from "./StarterTemplates";
1515

‎site/src/pages/CreateTemplateGalleryPage/StarterTemplates.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { Interpolation, Theme } from "@emotion/react";
22
import { Stack } from "components/Stack/Stack";
33
import { TemplateExampleCard } from "modules/templates/TemplateExampleCard/TemplateExampleCard";
44
import type { FC } from "react";
5-
import { Link, useSearchParams } from "react-router-dom";
5+
import { Link, useSearchParams } from "react-router";
66
import type { StarterTemplatesByTag } from "utils/starterTemplates";
77

88
const getTagLabel = (tag: string) => {

‎site/src/pages/CreateTemplatePage/CreateTemplateForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import capitalize from "lodash/capitalize";
2525
import { SelectedTemplate } from "pages/CreateWorkspacePage/SelectedTemplate";
2626
import { type FC, useState } from "react";
2727
import { useQuery } from "react-query";
28-
import { useSearchParams } from "react-router-dom";
28+
import { useSearchParams } from "react-router";
2929
import { docs } from "utils/docs";
3030
import {
3131
displayNameValidator,

‎site/src/pages/CreateTemplatePage/CreateTemplatePage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { linkToTemplate, useLinks } from "modules/navigation";
55
import { type FC, useRef, useState } from "react";
66
import { Helmet } from "react-helmet-async";
77
import { useMutation } from "react-query";
8-
import { useNavigate, useSearchParams } from "react-router-dom";
8+
import { useNavigate, useSearchParams } from "react-router";
99
import { pageTitle } from "utils/page";
1010
import { BuildLogsDrawer } from "./BuildLogsDrawer";
1111
import { DuplicateTemplateView } from "./DuplicateTemplateView";

‎site/src/pages/CreateTemplatePage/DuplicateTemplateView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Loader } from "components/Loader/Loader";
1010
import { useDashboard } from "modules/dashboard/useDashboard";
1111
import type { FC } from "react";
1212
import { useQuery } from "react-query";
13-
import { useNavigate, useSearchParams } from "react-router-dom";
13+
import { useNavigate, useSearchParams } from "react-router";
1414
import { CreateTemplateForm } from "./CreateTemplateForm";
1515
import type { CreateTemplatePageViewProps } from "./types";
1616
import { firstVersionFromFile, getFormPermissions, newTemplate } from "./utils";

‎site/src/pages/CreateTemplatePage/ImportStarterTemplateView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { useDashboard } from "modules/dashboard/useDashboard";
1010
import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
1111
import type { FC } from "react";
1212
import { useQuery } from "react-query";
13-
import { useNavigate, useSearchParams } from "react-router-dom";
13+
import { useNavigate, useSearchParams } from "react-router";
1414
import { CreateTemplateForm } from "./CreateTemplateForm";
1515
import type { CreateTemplatePageViewProps } from "./types";
1616
import {

‎site/src/pages/CreateTemplatePage/TemplateUpload.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Link from "@mui/material/Link";
22
import { FileUpload } from "components/FileUpload/FileUpload";
33
import type { FC } from "react";
4-
import { Link as RouterLink } from "react-router-dom";
4+
import { Link as RouterLink } from "react-router";
55

66
export interface TemplateUploadProps {
77
isUploading: boolean;

‎site/src/pages/CreateTemplatePage/UploadTemplateView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { useDashboard } from "modules/dashboard/useDashboard";
1010
import { useFeatureVisibility } from "modules/dashboard/useFeatureVisibility";
1111
import type { FC } from "react";
1212
import { useMutation, useQuery } from "react-query";
13-
import { useNavigate } from "react-router-dom";
13+
import { useNavigate } from "react-router";
1414
import { CreateTemplateForm } from "./CreateTemplateForm";
1515
import type { CreateTemplatePageViewProps } from "./types";
1616
import { firstVersionFromFile, getFormPermissions, newTemplate } from "./utils";

‎site/src/pages/CreateTokenPage/CreateTokenForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import dayjs from "dayjs";
1212
import utc from "dayjs/plugin/utc";
1313
import type { FormikContextType } from "formik";
1414
import { type FC, useEffect, useState } from "react";
15-
import { useNavigate } from "react-router-dom";
15+
import { useNavigate } from "react-router";
1616
import { getFormHelpers, onChangeTrimmed } from "utils/formUtils";
1717
import {
1818
type CreateTokenData,

‎site/src/pages/CreateTokenPage/CreateTokenPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { useFormik } from "formik";
99
import { type FC, useState } from "react";
1010
import { Helmet } from "react-helmet-async";
1111
import { useMutation, useQuery } from "react-query";
12-
import { useNavigate } from "react-router-dom";
12+
import { useNavigate } from "react-router";
1313
import { pageTitle } from "utils/page";
1414
import { CreateTokenForm } from "./CreateTokenForm";
1515
import { type CreateTokenData, NANO_HOUR } from "./utils";

‎site/src/pages/CreateUserPage/CreateUserPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { useDebouncedFunction } from "hooks/debounce";
55
import { type FC, useState } from "react";
66
import { Helmet } from "react-helmet-async";
77
import { useMutation, useQuery, useQueryClient } from "react-query";
8-
import { useNavigate } from "react-router-dom";
8+
import { useNavigate } from "react-router";
99
import { pageTitle } from "utils/page";
1010
import { CreateUserForm } from "./CreateUserForm";
1111

‎site/src/pages/CreateWorkspacePage/CreateWorkspacePage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { generateWorkspaceName } from "modules/workspaces/generateWorkspaceName"
2020
import { type FC, useCallback, useEffect, useRef, useState } from "react";
2121
import { Helmet } from "react-helmet-async";
2222
import { useMutation, useQuery, useQueryClient } from "react-query";
23-
import { useNavigate, useParams, useSearchParams } from "react-router-dom";
23+
import { useNavigate, useParams, useSearchParams } from "react-router";
2424
import { pageTitle } from "utils/page";
2525
import type { AutofillBuildParameter } from "utils/richParameters";
2626
import { paramsUsedToCreateWorkspace } from "utils/workspace";

‎site/src/pages/CreateWorkspacePage/useWorkspaceDuplication.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { Workspace, WorkspaceBuildParameter } from "api/typesGenerated";
33
import { linkToTemplate, useLinks } from "modules/navigation";
44
import { useCallback } from "react";
55
import { useQuery } from "react-query";
6-
import { useNavigate } from "react-router-dom";
6+
import { useNavigate } from "react-router";
77
import type { CreateWorkspaceMode } from "./CreateWorkspacePage";
88

99
function getDuplicationUrlParams(

‎site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/AddNewLicensePage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { displayError, displaySuccess } from "components/GlobalSnackbar/utils";
33
import type { FC } from "react";
44
import { Helmet } from "react-helmet-async";
55
import { useMutation } from "react-query";
6-
import { useNavigate } from "react-router-dom";
6+
import { useNavigate } from "react-router";
77
import { pageTitle } from "utils/page";
88
import { AddNewLicensePageView } from "./AddNewLicensePageView";
99

‎site/src/pages/DeploymentSettingsPage/LicensesSettingsPage/AddNewLicensePageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { displayError } from "components/GlobalSnackbar/utils";
77
import { SettingsHeader } from "components/SettingsHeader/SettingsHeader";
88
import { Stack } from "components/Stack/Stack";
99
import type { FC } from "react";
10-
import { Link as RouterLink } from "react-router-dom";
10+
import { Link as RouterLink } from "react-router";
1111
import { Fieldset } from "../Fieldset";
1212
import { DividerWithText } from "./DividerWithText";
1313

0 commit comments

Comments
 (0)