chore(deps): react-router-7

packages/insomnia/package.json

@@ -167,7 +167,7 @@
     "react-aria-components": "^1.1.1",
     "react-dom": "^18.2.0",
     "react-resizable-panels": "^2.0.17",
-    "react-router-dom": "^6.26.2",
+    "react-router": "^7.0.1",
     "react-stately": "3.30.1",
     "react-use": "^17.5.0",
     "tailwindcss": "^3.4.3",

packages/insomnia/src/ui/components/command-palette.tsx

@@ -1,7 +1,7 @@
 import React, { memo, useEffect, useRef } from 'react';
 import { useState } from 'react';
 import { Button, Collection, ComboBox, Dialog, DialogTrigger, Header, Input, Keyboard, Label, ListBox, ListBoxItem, Modal, ModalOverlay, Popover, Section, Text } from 'react-aria-components';
-import { useFetcher, useNavigate, useParams, useRouteLoaderData } from 'react-router-dom';
+import { useFetcher, useNavigate, useParams, useRouteLoaderData } from 'react-router';
 
 import { constructKeyCombinationDisplay, getPlatformKeyCombinations } from '../../common/hotkeys';
 import { fuzzyMatch } from '../../common/misc';

packages/insomnia/src/ui/components/dropdowns/auth-dropdown.tsx

@@ -1,7 +1,7 @@
 import type { IconName } from '@fortawesome/fontawesome-svg-core';
 import React, { type FC, useCallback } from 'react';
 import { Button, Collection, Header, ListBox, ListBoxItem, Popover, Section, Select, SelectValue } from 'react-aria-components';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 
 import {
   HAWK_ALGORITHM_SHA256,

packages/insomnia/src/ui/components/dropdowns/content-type-dropdown.tsx

@@ -1,7 +1,7 @@
 import type { IconName } from '@fortawesome/fontawesome-svg-core';
 import React, { type FC } from 'react';
 import { Button, Collection, Header, ListBox, ListBoxItem, Popover, Section, Select, SelectValue } from 'react-aria-components';
-import { useParams, useRouteLoaderData } from 'react-router-dom';
+import { useParams, useRouteLoaderData } from 'react-router';
 
 import {
   CONTENT_TYPE_EDN,

packages/insomnia/src/ui/components/dropdowns/git-sync-dropdown.tsx

@@ -1,7 +1,7 @@
 import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core';
 import React, { type FC, useEffect, useState } from 'react';
 import { Button, Collection, Menu, MenuItem, MenuTrigger, Popover, Section, Tooltip, TooltipTrigger } from 'react-aria-components';
-import { useFetcher, useParams, useRevalidator } from 'react-router-dom';
+import { useFetcher, useParams, useRevalidator } from 'react-router';
 import { useInterval } from 'react-use';
 
 import type { GitRepository } from '../../../models/git-repository';

packages/insomnia/src/ui/components/dropdowns/preview-mode-dropdown.tsx

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import React, { type FC, useCallback } from 'react';
 import { Button } from 'react-aria-components';
-import { useRouteLoaderData } from 'react-router-dom';
+import { useRouteLoaderData } from 'react-router';
 
 import { getPreviewModeName, PREVIEW_MODE_SOURCE, PREVIEW_MODES } from '../../../common/constants';
 import { exportHarCurrentRequest } from '../../../common/har';

packages/insomnia/src/ui/components/dropdowns/project-dropdown.tsx

@@ -18,7 +18,7 @@ import {
   Tooltip,
   TooltipTrigger,
 } from 'react-aria-components';
-import { useFetcher } from 'react-router-dom';
+import { useFetcher } from 'react-router';
 
 import {
   isRemoteProject,

packages/insomnia/src/ui/components/dropdowns/request-actions-dropdown.tsx

@@ -1,7 +1,7 @@
 import type { IconName } from '@fortawesome/fontawesome-svg-core';
 import React, { Fragment, useCallback, useState } from 'react';
 import { Button, Collection, Header, Menu, MenuItem, MenuTrigger, Popover, Section } from 'react-aria-components';
-import { useFetcher, useParams } from 'react-router-dom';
+import { useFetcher, useParams } from 'react-router';
 
 import { exportHarRequest } from '../../../common/har';
 import { toKebabCase } from '../../../common/misc';

packages/insomnia/src/ui/components/dropdowns/request-group-actions-dropdown.tsx

@@ -1,7 +1,7 @@
 import type { IconName } from '@fortawesome/fontawesome-svg-core';
 import React, { Fragment, useRef, useState } from 'react';
 import { Button, Collection, Header, Menu, MenuItem, MenuTrigger, Popover, Section } from 'react-aria-components';
-import { useFetcher, useNavigate, useParams, useRouteLoaderData } from 'react-router-dom';
+import { useFetcher, useNavigate, useParams, useRouteLoaderData } from 'react-router';
 
 import { toKebabCase } from '../../../common/misc';
 import { RENDER_PURPOSE_NO_RENDER } from '../../../common/render';

packages/insomnia/src/ui/components/dropdowns/response-history-dropdown.tsx

@@ -1,8 +1,8 @@
 import { differenceInHours, differenceInMinutes, isThisWeek, isToday } from 'date-fns';
 import React, { useCallback, useRef } from 'react';
 import { Button } from 'react-aria-components';
-import { useFetcher, useRouteLoaderData } from 'react-router-dom';
-import { useParams } from 'react-router-dom';
+import { useFetcher, useRouteLoaderData } from 'react-router';
+import { useParams } from 'react-router';
 
 import { decompressObject } from '../../../common/misc';
 import * as models from '../../../models/index';

packages/insomnia/src/ui/components/dropdowns/sync-dropdown.tsx

@@ -1,7 +1,7 @@
 import type { IconProp } from '@fortawesome/fontawesome-svg-core';
 import React, { type FC, Fragment, useCallback, useEffect, useState } from 'react';
 import { Button, Collection, Menu, MenuItem, MenuTrigger, Popover, Section, Tooltip, TooltipTrigger } from 'react-aria-components';
-import { useFetcher, useParams } from 'react-router-dom';
+import { useFetcher, useParams } from 'react-router';
 import { useInterval } from 'react-use';
 
 import * as session from '../../../account/session';

packages/insomnia/src/ui/components/dropdowns/workspace-card-dropdown.tsx

@@ -1,6 +1,6 @@
 import React, { type FC, Fragment, useCallback, useState } from 'react';
 import { Button, Dialog, Heading, Modal, ModalOverlay } from 'react-aria-components';
-import { useFetcher, useParams } from 'react-router-dom';
+import { useFetcher, useParams } from 'react-router';
 
 import { parseApiSpec } from '../../../common/api-specs';
 import { getProductName } from '../../../common/constants';

packages/insomnia/src/ui/components/dropdowns/workspace-dropdown.tsx

@@ -1,7 +1,7 @@
 import type { IconName } from '@fortawesome/fontawesome-svg-core';
 import React, { type FC, type ReactNode, useCallback, useEffect, useState } from 'react';
 import { Button, Collection, Dialog, Header, Heading, Menu, MenuItem, MenuTrigger, Modal, ModalOverlay, Popover, Section } from 'react-aria-components';
-import { useFetcher, useNavigate, useParams, useRouteLoaderData } from 'react-router-dom';
+import { useFetcher, useNavigate, useParams, useRouteLoaderData } from 'react-router';
 
 import { getProductName } from '../../../common/constants';
 import { database as db } from '../../../common/database';

packages/insomnia/src/ui/components/dropdowns/workspace-sync-dropdown.tsx

@@ -1,6 +1,6 @@
 import { type FC } from 'react';
 import React from 'react';
-import { useRouteLoaderData } from 'react-router-dom';
+import { useRouteLoaderData } from 'react-router';
 
 import { isRemoteProject } from '../../../models/project';
 import { useOrganizationPermissions } from '../../hooks/use-organization-features';

packages/insomnia/src/ui/components/editors/auth/components/auth-accordion.tsx

@@ -1,6 +1,6 @@
 import classnames from 'classnames';
 import React, { type FC, type PropsWithChildren } from 'react';
-import { useRouteLoaderData } from 'react-router-dom';
+import { useRouteLoaderData } from 'react-router';
 
 import type { RequestAccordionKeys } from '../../../../../models/request-meta';
 import { useRequestMetaPatcher } from '../../../../hooks/use-request';

packages/insomnia/src/ui/components/editors/auth/components/auth-input-row.tsx

@@ -1,5 +1,5 @@
 import React, { type ComponentProps, type FC, type ReactNode, useCallback } from 'react';
-import { useRouteLoaderData } from 'react-router-dom';
+import { useRouteLoaderData } from 'react-router';
 import { useToggle } from 'react-use';
 
 import { toKebabCase } from '../../../../../common/misc';

packages/insomnia/src/ui/components/editors/auth/components/auth-private-key-row.tsx

@@ -1,5 +1,5 @@
 import React, { type FC, type ReactNode, useCallback } from 'react';
-import { useRouteLoaderData } from 'react-router-dom';
+import { useRouteLoaderData } from 'react-router';
 
 import { toKebabCase } from '../../../../../common/misc';
 import { invariant } from '../../../../../utils/invariant';

packages/insomnia/src/ui/components/editors/auth/components/auth-row.tsx

@@ -1,6 +1,6 @@
 import classnames from 'classnames';
 import React, { type FC, type PropsWithChildren, type ReactNode } from 'react';
-import { useRouteLoaderData } from 'react-router-dom';
+import { useRouteLoaderData } from 'react-router';
 
 import type { RequestLoaderData } from '../../../../routes/request';
 import type { RequestGroupLoaderData } from '../../../../routes/request-group';

packages/insomnia/src/ui/components/editors/auth/components/auth-select-row.tsx

@@ -1,5 +1,5 @@
 import React, { type ChangeEvent, type FC, type ReactNode, useCallback } from 'react';
-import { useRouteLoaderData } from 'react-router-dom';
+import { useRouteLoaderData } from 'react-router';
 
 import { toKebabCase } from '../../../../../common/misc';
 import { useRequestGroupPatcher, useRequestPatcher } from '../../../../hooks/use-request';

packages/insomnia/src/ui/components/editors/auth/components/auth-toggle-row.tsx

@@ -1,5 +1,5 @@
 import React, { type FC, type ReactNode, useCallback } from 'react';
-import { useRouteLoaderData } from 'react-router-dom';
+import { useRouteLoaderData } from 'react-router';
 
 import { toKebabCase } from '../../../../../common/misc';
 import { useRequestGroupPatcher, useRequestPatcher } from '../../../../hooks/use-request';

packages/insomnia/src/ui/components/editors/auth/o-auth-1-auth.tsx

@@ -1,5 +1,5 @@
 import React, { type FC } from 'react';
-import { useRouteLoaderData } from 'react-router-dom';
+import { useRouteLoaderData } from 'react-router';
 
 import type { AuthTypeOAuth1 } from '../../../../models/request';
 import {

packages/insomnia/src/ui/components/editors/auth/o-auth-2-auth.tsx

@@ -1,5 +1,5 @@
 import React, { type ChangeEvent, type FC, type ReactNode, useEffect, useMemo, useState } from 'react';
-import { useRouteLoaderData } from 'react-router-dom';
+import { useRouteLoaderData } from 'react-router';
 
 import { AUTH_OAUTH_2 } from '../../../../common/constants';
 import { toKebabCase } from '../../../../common/misc';

packages/insomnia/src/ui/components/editors/body/body-editor.tsx

@@ -2,7 +2,7 @@ import clone from 'clone';
 import { lookup } from 'mime-types';
 import React, { type FC, useCallback } from 'react';
 import { Toolbar } from 'react-aria-components';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 
 import {
   CONTENT_TYPE_FILE,

packages/insomnia/src/ui/components/editors/mock-response-extractor.tsx

@@ -1,11 +1,11 @@
 import fs from 'fs/promises';
 import React, { useState } from 'react';
 import { Button } from 'react-aria-components';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useNavigate, useParams } from 'react-router';
 import {
   useFetcher,
   useRouteLoaderData,
-} from 'react-router-dom';
+} from 'react-router';
 
 import { getContentTypeName, getMimeTypeFromContentType } from '../../../common/constants';
 import type { ResponseHeader } from '../../../models/response';

packages/insomnia/src/ui/components/editors/mock-response-headers-editor.tsx

@@ -1,5 +1,5 @@
 import React, { type FC, useCallback } from 'react';
-import { useParams, useRouteLoaderData } from 'react-router-dom';
+import { useParams, useRouteLoaderData } from 'react-router';
 
 import { getCommonHeaderNames, getCommonHeaderValues } from '../../../common/common-headers';
 import type { RequestHeader } from '../../../models/request';

packages/insomnia/src/ui/components/editors/request-headers-editor.tsx

@@ -1,5 +1,5 @@
 import React, { type FC, useCallback } from 'react';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 
 import { getCommonHeaderNames, getCommonHeaderValues } from '../../../common/common-headers';
 import { generateId } from '../../../common/misc';

packages/insomnia/src/ui/components/editors/request-parameters-editor.tsx

@@ -1,5 +1,5 @@
 import React, { type FC, useCallback } from 'react';
-import { useParams, useRouteLoaderData } from 'react-router-dom';
+import { useParams, useRouteLoaderData } from 'react-router';
 
 import type { RequestParameter } from '../../../models/request';
 import { useRequestPatcher } from '../../hooks/use-request';