Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/App/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
"@types/node": "24.10.7",
"@types/react": "19.2.8",
"@types/react-dom": "19.2.3",
"@types/react-router-dom": "5.3.3",
"@types/uuid": "11.0.0",
"@typescript-eslint/eslint-plugin": "8.52.0",
"@typescript-eslint/parser": "8.52.0",
Expand Down Expand Up @@ -176,7 +175,7 @@
"react-dropzone": "14.3.8",
"react-leaflet": "5.0.0",
"react-number-format": "5.4.4",
"react-router-dom": "6.30.3",
"react-router": "7.13.0",
"react-toastify": "11.0.5",
"terraformer-wkt-parser": "1.2.1",
"typescript": "5.9.3",
Expand Down
137 changes: 0 additions & 137 deletions src/App/frontend/src/App.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/App/frontend/src/components/form/Form.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useMemo } from 'react';
import { useLocation, useNavigate, useSearchParams } from 'react-router-dom';
import { useLocation, useNavigate, useSearchParams } from 'react-router';

import { Flex } from 'src/app-components/Flex/Flex';
import classes from 'src/components/form/Form.module.css';
Expand Down
4 changes: 2 additions & 2 deletions src/App/frontend/src/components/form/LinkToPotentialNode.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Link } from 'react-router-dom';
import type { LinkProps } from 'react-router-dom';
import { Link } from 'react-router';
import type { LinkProps } from 'react-router';

import { SearchParams } from 'src/core/routing/types';
import { useIsHidden } from 'src/utils/layout/hidden';
Expand Down
4 changes: 2 additions & 2 deletions src/App/frontend/src/components/form/LinkToPotentialPage.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Link } from 'react-router-dom';
import type { LinkProps } from 'react-router-dom';
import { Link } from 'react-router';
import type { LinkProps } from 'react-router';

import { useNavigatePage } from 'src/hooks/useNavigatePage';
import { useIsHiddenPage } from 'src/utils/layout/hidden';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from 'react';
import { useLocation, useNavigate } from 'react-router-dom';
import { useLocation, useNavigate } from 'react-router';
import type { PropsWithChildren } from 'react';

import { useQueryClient } from '@tanstack/react-query';
Expand Down
2 changes: 1 addition & 1 deletion src/App/frontend/src/core/routing/useIsNavigating.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useLocation, useNavigation } from 'react-router-dom';
import { useLocation, useNavigation } from 'react-router';

// TODO: make this redundant
export function useIsNavigating() {
Expand Down
2 changes: 1 addition & 1 deletion src/App/frontend/src/core/ui/RenderStart.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect } from 'react';
import { useLocation } from 'react-router-dom';
import { useLocation } from 'react-router';
import type { PropsWithChildren } from 'react';

import { loadingAttribute, useHasElementsByAttribute } from 'src/components/ReadyForPrint';
Expand Down
2 changes: 1 addition & 1 deletion src/App/frontend/src/features/entrypoint/Entrypoint.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Navigate, Outlet } from 'react-router-dom';
import { Navigate, Outlet } from 'react-router';

import { Loader } from 'src/core/loading/Loader';
import { getApplicationMetadata, useIsStateless } from 'src/features/applicationMetadata';
Expand Down
4 changes: 2 additions & 2 deletions src/App/frontend/src/features/formData/FormData.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useState } from 'react';
import { MemoryRouter, Route, Routes, useNavigate } from 'react-router-dom';
import { MemoryRouter, Route, Routes, useNavigate } from 'react-router';
import type { PropsWithChildren } from 'react';

import { afterAll, beforeAll, expect, jest } from '@jest/globals';
Expand Down Expand Up @@ -114,7 +114,7 @@ async function statelessRender(props: RenderProps) {
...props,
initialRenderRef,
router: ({ children }: PropsWithChildren) => (
<MemoryRouter future={{ v7_relativeSplatPath: true, v7_startTransition: true }}>
<MemoryRouter>
<Routes>
<Route
path='/'
Expand Down
2 changes: 1 addition & 1 deletion src/App/frontend/src/features/instance/InstanceContext.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { useNavigation } from 'react-router-dom';
import { useNavigation } from 'react-router';
import type { PropsWithChildren } from 'react';

import { queryOptions, skipToken, useQuery, useQueryClient } from '@tanstack/react-query';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { useParams } from 'react-router-dom';
import { useParams } from 'react-router';

import { InstantiateValidationError } from 'src/features/instantiate/containers/InstantiateValidationError';
import { MissingRolesError } from 'src/features/instantiate/containers/MissingRolesError';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from 'react';
import type { RouteProps } from 'react-router-dom';

import { Flex } from 'src/app-components/Flex/Flex';
import { AltinnError } from 'src/components/altinnError';
Expand All @@ -10,7 +9,7 @@ export type IInstantiationErrorPageProps = {
content: React.ReactNode;
statusCode?: React.ReactNode;
showContactInfo?: boolean;
} & RouteProps;
};

export function InstantiationErrorPage({ content, statusCode, title, showContactInfo }: IInstantiationErrorPageProps) {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Link } from 'react-router-dom';
import { Link } from 'react-router';

import { InstantiationErrorPage } from 'src/features/instantiate/containers/InstantiationErrorPage';
import { Lang } from 'src/features/language/Lang';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { useMatch, useNavigate } from 'react-router-dom';
import { useMatch, useNavigate } from 'react-router';

import { Checkbox, Heading, Paragraph } from '@digdir/designsystemet-react';
import { PlusIcon } from '@navikt/aksel-icons';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { useNavigate } from 'react-router';

import { Heading, Paragraph, Table } from '@digdir/designsystemet-react';
import { PencilIcon } from '@navikt/aksel-icons';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useNavigate } from 'react-router-dom';
import { useNavigate } from 'react-router';

import { useMutation, useMutationState, useQueryClient } from '@tanstack/react-query';
import type { MutateOptions } from '@tanstack/react-query';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useSearchParams } from 'react-router-dom';
import { useSearchParams } from 'react-router';

import { SearchParams } from 'src/core/routing/types';
import { useProfile } from 'src/features/profile/ProfileProvider';
Expand Down
2 changes: 1 addition & 1 deletion src/App/frontend/src/features/pdf/PDFWrapper.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Form } from 'react-router-dom';
import { Form } from 'react-router';

import { jest } from '@jest/globals';
import { screen, waitFor } from '@testing-library/react';
Expand Down
2 changes: 1 addition & 1 deletion src/App/frontend/src/features/pdf/PdfFromLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useMemo } from 'react';
import { useSearchParams } from 'react-router-dom';
import { useSearchParams } from 'react-router';
import type { PropsWithChildren } from 'react';

import { Heading } from '@digdir/designsystemet-react';
Expand Down
2 changes: 1 addition & 1 deletion src/App/frontend/src/hooks/navigation.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { matchPath, useLocation } from 'react-router-dom';
import { matchPath, useLocation } from 'react-router';

import { useAsRef } from 'src/hooks/useAsRef';
import type { SearchParams } from 'src/core/routing/types';
Expand Down
6 changes: 3 additions & 3 deletions src/App/frontend/src/hooks/useNavigatePage.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useCallback, useEffect, useMemo } from 'react';
import { useLocation, useNavigate, useSearchParams } from 'react-router-dom';
import type { NavigateOptions } from 'react-router-dom';
import { useLocation, useNavigate, useSearchParams } from 'react-router';
import type { NavigateOptions } from 'react-router';

import { SearchParams } from 'src/core/routing/types';
import { useIsStateless } from 'src/features/applicationMetadata';
Expand Down Expand Up @@ -34,7 +34,7 @@ export enum TaskKeys {
}

/**
* Navigation function for react-router-dom
* Navigation function for react-router
* Makes sure to clear returnToView and summaryNodeOfOrigin on navigation
* Takes an optional callback
*/
Expand Down
Loading
Loading