Skip to content

Commit 8dc1689

Browse files
jackkavjackkav
committed
bump react-router 7
1 parent 5ed9d73 commit 8dc1689

File tree

128 files changed

+1373
-1364
lines changed

Some content is hidden

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

128 files changed

+1373
-1364
lines changed

‎package-lock.json

+57-45
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/insomnia/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
"react-aria-components": "^1.1.1",
172172
"react-dom": "^18.2.0",
173173
"react-resizable-panels": "^2.1.7",
174-
"react-router-dom": "^6.26.2",
174+
"react-router": "^7.1.1",
175175
"react-stately": "3.30.1",
176176
"react-use": "^17.5.0",
177177
"tailwindcss": "^3.4.3",

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

+45-45
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { memo, useEffect, useRef } from 'react';
22
import { useState } from 'react';
33
import { Button, Collection, ComboBox, Dialog, DialogTrigger, Header, Input, Keyboard, Label, ListBox, ListBoxItem, Modal, ModalOverlay, Popover, Section, Text } from 'react-aria-components';
4-
import { useFetcher, useNavigate, useParams, useRouteLoaderData } from 'react-router-dom';
4+
import { useFetcher, useNavigate, useParams, useRouteLoaderData } from 'react-router';
55

66
import { constructKeyCombinationDisplay, getPlatformKeyCombinations } from '../../common/hotkeys';
77
import { fuzzyMatch } from '../../common/misc';
@@ -69,7 +69,7 @@ const CommandPaletteCombobox = ({ close }: { close: () => void }) => {
6969
projectId: string;
7070
workspaceId: string;
7171
requestId: string;
72-
};
72+
};
7373

7474
const { userSession } = useRouteLoaderData('root') as RootLoaderData;
7575
const { presence } = useInsomniaEventStreamContext();
@@ -214,11 +214,11 @@ const CommandPaletteCombobox = ({ close }: { close: () => void }) => {
214214
{getMethodShortHand(request.item)}
215215
</span>
216216
) : isWebSocketRequest(request.item) ? (
217-
<span className="w-10 flex-shrink-0 flex text-[0.65rem] rounded-sm border border-solid border-[--hl-sm] items-center justify-center text-[--color-font-notice] bg-[rgba(var(--color-notice-rgb),0.5)]">
217+
<span className="w-10 flex-shrink-0 flex text-[0.65rem] rounded-sm border border-solid border-[--hl-sm] items-center justify-center text-[--color-font-notice] bg-[rgba(var(--color-notice-rgb),0.5)]">
218218
WS
219219
</span>
220-
) : isGrpcRequest(request.item) && (
221-
<span className="w-10 flex-shrink-0 flex text-[0.65rem] rounded-sm border border-solid border-[--hl-sm] items-center justify-center text-[--color-font-info] bg-[rgba(var(--color-info-rgb),0.5)]">
220+
) : isGrpcRequest(request.item) && (
221+
<span className="w-10 flex-shrink-0 flex text-[0.65rem] rounded-sm border border-solid border-[--hl-sm] items-center justify-center text-[--color-font-info] bg-[rgba(var(--color-info-rgb),0.5)]">
222222
gRPC
223223
</span>
224224
),
@@ -295,11 +295,11 @@ const CommandPaletteCombobox = ({ close }: { close: () => void }) => {
295295
{getMethodShortHand(request.item)}
296296
</span>
297297
) : isWebSocketRequest(request.item) ? (
298-
<span className="w-10 flex-shrink-0 flex text-[0.65rem] rounded-sm border border-solid border-[--hl-sm] items-center justify-center text-[--color-font-notice] bg-[rgba(var(--color-notice-rgb),0.5)]">
298+
<span className="w-10 flex-shrink-0 flex text-[0.65rem] rounded-sm border border-solid border-[--hl-sm] items-center justify-center text-[--color-font-notice] bg-[rgba(var(--color-notice-rgb),0.5)]">
299299
WS
300300
</span>
301301
) : isGrpcRequest(request.item) && (
302-
<span className="w-10 flex-shrink-0 flex text-[0.65rem] rounded-sm border border-solid border-[--hl-sm] items-center justify-center text-[--color-font-info] bg-[rgba(var(--color-info-rgb),0.5)]">
302+
<span className="w-10 flex-shrink-0 flex text-[0.65rem] rounded-sm border border-solid border-[--hl-sm] items-center justify-center text-[--color-font-info] bg-[rgba(var(--color-info-rgb),0.5)]">
303303
gRPC
304304
</span>
305305
),
@@ -429,48 +429,48 @@ const CommandPaletteCombobox = ({ close }: { close: () => void }) => {
429429
</>
430430
) : (
431431
<>
432-
<Icon icon="search" className="text-[--color-font] absolute left-4" />
433-
<Input
434-
slot='input'
435-
placeholder="Search and switch between requests, collections and documents"
436-
className="py-3 pl-10 pr-7 w-full bg-[--color-bg] transition-none text-[--color-font] rounded-md group-data-[open]:rounded-b-none border border-solid border-[--hl-sm]"
437-
/>
432+
<Icon icon="search" className="text-[--color-font] absolute left-4" />
433+
<Input
434+
slot='input'
435+
placeholder="Search and switch between requests, collections and documents"
436+
className="py-3 pl-10 pr-7 w-full bg-[--color-bg] transition-none text-[--color-font] rounded-md group-data-[open]:rounded-b-none border border-solid border-[--hl-sm]"
437+
/>
438438
</>
439439
)}
440440
</Label>
441441
<Popover offset={0} className={`outline-none rounded-b-md w-[--trigger-width] bg-[--color-bg] text-[--color-font] relative overflow-y-auto flex-1 border ${isOpen ? 'border-solid' : ''} border-[--hl-sm]`}>
442-
<ListBox
443-
aria-label='Commands'
444-
className="outline-none relative overflow-y-auto flex-1"
445-
items={comboboxSections}
446-
>
447-
{section => (
448-
<Section className='flex-1 flex flex-col'>
449-
<Header className='p-2 text-xs uppercase text-[--hl] select-none'>{section.name}</Header>
450-
<Collection items={section.children}>
451-
{item => (
452-
<ListBoxItem textValue={item.textValue} className="group outline-none select-none">
453-
<div
454-
className={`flex select-none outline-none ${item.id === workspaceId || item.id === requestId ? 'text-[--color-font] font-bold' : 'text-[--hl]'} group-aria-selected:text-[--color-font] relative group-hover:bg-[--hl-xs] group-data-[focused]:bg-[--hl-sm] group-focus:bg-[--hl-sm] transition-colors gap-2 px-4 items-center h-[--line-height-xs] w-full overflow-hidden`}
455-
>
456-
{item.icon}
457-
<Text className="flex-shrink-0 px-1 truncate" slot="label">{item.name}</Text>
458-
{item.presence.length > 0 && (
459-
<span className='w-[70px]'>
460-
<AvatarGroup
461-
size="small"
462-
maxAvatars={3}
463-
items={item.presence}
464-
/>
465-
</span>
466-
)}
467-
<Text className="flex-1 px-1 truncate text-sm text-[--hl-md]" slot="description">{item.description}</Text>
468-
</div>
469-
</ListBoxItem>
470-
)}
471-
</Collection>
472-
</Section>
473-
)}
442+
<ListBox
443+
aria-label='Commands'
444+
className="outline-none relative overflow-y-auto flex-1"
445+
items={comboboxSections}
446+
>
447+
{section => (
448+
<Section className='flex-1 flex flex-col'>
449+
<Header className='p-2 text-xs uppercase text-[--hl] select-none'>{section.name}</Header>
450+
<Collection items={section.children}>
451+
{item => (
452+
<ListBoxItem textValue={item.textValue} className="group outline-none select-none">
453+
<div
454+
className={`flex select-none outline-none ${item.id === workspaceId || item.id === requestId ? 'text-[--color-font] font-bold' : 'text-[--hl]'} group-aria-selected:text-[--color-font] relative group-hover:bg-[--hl-xs] group-data-[focused]:bg-[--hl-sm] group-focus:bg-[--hl-sm] transition-colors gap-2 px-4 items-center h-[--line-height-xs] w-full overflow-hidden`}
455+
>
456+
{item.icon}
457+
<Text className="flex-shrink-0 px-1 truncate" slot="label">{item.name}</Text>
458+
{item.presence.length > 0 && (
459+
<span className='w-[70px]'>
460+
<AvatarGroup
461+
size="small"
462+
maxAvatars={3}
463+
items={item.presence}
464+
/>
465+
</span>
466+
)}
467+
<Text className="flex-1 px-1 truncate text-sm text-[--hl-md]" slot="description">{item.description}</Text>
468+
</div>
469+
</ListBoxItem>
470+
)}
471+
</Collection>
472+
</Section>
473+
)}
474474
</ListBox>
475475
</Popover>
476476
</>

‎packages/insomnia/src/ui/components/document-tab.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import classnames from 'classnames';
22
import React from 'react';
3-
import { NavLink } from 'react-router-dom';
3+
import { NavLink } from 'react-router';
44

55
interface Props {
66
organizationId: string;

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { IconName } from '@fortawesome/fontawesome-svg-core';
22
import React, { type FC, useCallback } from 'react';
33
import { Button, Collection, Header, ListBox, ListBoxItem, Popover, Section, Select, SelectValue } from 'react-aria-components';
4-
import { useParams } from 'react-router-dom';
4+
import { useParams } from 'react-router';
55

66
import {
77
HAWK_ALGORITHM_SHA256,
@@ -157,8 +157,8 @@ export const AuthDropdown: FC<Props> = ({ authentication, authTypes = defaultTyp
157157
name: string;
158158
}[] = [
159159
{
160-
id: 'apikey',
161-
name: 'API Key',
160+
id: 'apikey',
161+
name: 'API Key',
162162
},
163163
{
164164
id: 'basic',

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { IconName } from '@fortawesome/fontawesome-svg-core';
22
import React, { type FC } from 'react';
33
import { Button, Collection, Header, ListBox, ListBoxItem, Popover, Section, Select, SelectValue } from 'react-aria-components';
4-
import { useParams, useRouteLoaderData } from 'react-router-dom';
4+
import { useParams, useRouteLoaderData } from 'react-router';
55

66
import {
77
CONTENT_TYPE_EDN,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core';
22
import React, { type FC, useEffect, useState } from 'react';
33
import { Button, Collection, Menu, MenuItem, MenuTrigger, Popover, Section, Tooltip, TooltipTrigger } from 'react-aria-components';
4-
import { useFetcher, useParams, useRevalidator } from 'react-router-dom';
4+
import { useFetcher, useParams, useRevalidator } from 'react-router';
55
import { useInterval } from 'react-use';
66

77
import type { GitRepository } from '../../../models/git-repository';

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { IconName, IconProp } from '@fortawesome/fontawesome-svg-core';
22
import React, { type FC, useEffect, useState } from 'react';
33
import { Button, Collection, Menu, MenuItem, MenuTrigger, Popover, Section, Tooltip, TooltipTrigger } from 'react-aria-components';
4-
import { useFetcher, useParams, useRevalidator } from 'react-router-dom';
4+
import { useFetcher, useParams, useRevalidator } from 'react-router';
55
import { useInterval } from 'react-use';
66

77
import type { GitRepository } from '../../../models/git-repository';
@@ -271,7 +271,7 @@ export const GitSyncDropdown: FC<Props> = ({ gitRepository, isInsomniaSyncEnable
271271
);
272272
},
273273
},
274-
] : []);
274+
] : []);
275275

276276
const gitSyncActions: {
277277
id: string;
@@ -332,9 +332,9 @@ export const GitSyncDropdown: FC<Props> = ({ gitRepository, isInsomniaSyncEnable
332332
action: `/organization/${organizationId}/project/${projectId}/workspace/${workspaceId}/git/reset`,
333333
method: 'post',
334334
});
335-
},
336335
},
337-
] : [];
336+
},
337+
] : [];
338338

339339
const branchesActionList: {
340340
id: string;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import fs from 'fs';
22
import React, { type FC, useCallback } from 'react';
33
import { Button } from 'react-aria-components';
4-
import { useRouteLoaderData } from 'react-router-dom';
4+
import { useRouteLoaderData } from 'react-router';
55

66
import { getPreviewModeName, PREVIEW_MODE_SOURCE, PREVIEW_MODES } from '../../../common/constants';
77
import { exportHarCurrentRequest } from '../../../common/har';

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
Tooltip,
1010
TooltipTrigger,
1111
} from 'react-aria-components';
12-
import { useFetcher } from 'react-router-dom';
12+
import { useFetcher } from 'react-router';
1313

1414
import type { GitRepository } from '../../../models/git-repository';
1515
import {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { IconName } from '@fortawesome/fontawesome-svg-core';
22
import React, { Fragment, useCallback, useState } from 'react';
33
import { Button, Collection, Header, Menu, MenuItem, MenuTrigger, Popover, Section } from 'react-aria-components';
4-
import { useFetcher, useParams } from 'react-router-dom';
4+
import { useFetcher, useParams } from 'react-router';
55

66
import { exportHarRequest } from '../../../common/har';
77
import { toKebabCase } from '../../../common/misc';

0 commit comments

Comments
 (0)