diff --git a/package-lock.json b/package-lock.json
index 3358424fd..94f1b7427 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,6 @@
"@types/lodash": "^4.17.13",
"@types/react": "^19.0.2",
"@types/react-dom": "^19.0.2",
- "@types/react-modal": "^3.16.3",
"@types/react-router-dom": "^5.3.3",
"axios": "^1.7.9",
"be-pretty": "^1.1.8",
@@ -41,8 +40,6 @@
"react-device-detect": "^2.2.3",
"react-dom": "^19.0.0",
"react-dropzone": "^14.3.5",
- "react-helmet": "^6.1.0",
- "react-modal": "^3.16.1",
"react-router-dom": "^7.0.2",
"styled-components": "^6.1.13",
"use-debounce": "^10.0.4",
@@ -58,7 +55,6 @@
"@sentry/webpack-plugin": "^2.22.7",
"@svgr/webpack": "^8.1.0",
"@types/node": "^22.10.2",
- "@types/react-helmet": "^6.1.11",
"@types/webpack-hot-middleware": "^2.25.9",
"autoprefixer": "^10.4.20",
"babel-loader": "^9.2.1",
@@ -4147,23 +4143,6 @@
"@types/react": "^19.0.0"
}
},
- "node_modules/@types/react-helmet": {
- "version": "6.1.11",
- "resolved": "https://registry.npmjs.org/@types/react-helmet/-/react-helmet-6.1.11.tgz",
- "integrity": "sha512-0QcdGLddTERotCXo3VFlUSWO3ztraw8nZ6e3zJSgG7apwV5xt+pJUS8ewPBqT4NYB1optGLprNQzFleIY84u/g==",
- "dev": true,
- "dependencies": {
- "@types/react": "*"
- }
- },
- "node_modules/@types/react-modal": {
- "version": "3.16.3",
- "resolved": "https://registry.npmjs.org/@types/react-modal/-/react-modal-3.16.3.tgz",
- "integrity": "sha512-xXuGavyEGaFQDgBv4UVm8/ZsG+qxeQ7f77yNrW3n+1J6XAstUy5rYHeIHPh1KzsGc6IkCIdu6lQ2xWzu1jBTLg==",
- "dependencies": {
- "@types/react": "*"
- }
- },
"node_modules/@types/react-router": {
"version": "5.1.20",
"resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.20.tgz",
@@ -7760,11 +7739,6 @@
"url": "https://github.com/sindresorhus/execa?sponsor=1"
}
},
- "node_modules/exenv": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
- "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw=="
- },
"node_modules/expect-type": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.1.0.tgz",
@@ -14928,61 +14902,11 @@
"react": ">= 16.8 || 18.0.0"
}
},
- "node_modules/react-fast-compare": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz",
- "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
- },
- "node_modules/react-helmet": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
- "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==",
- "dependencies": {
- "object-assign": "^4.1.1",
- "prop-types": "^15.7.2",
- "react-fast-compare": "^3.1.1",
- "react-side-effect": "^2.1.0"
- },
- "peerDependencies": {
- "react": ">=16.3.0"
- }
- },
- "node_modules/react-helmet/node_modules/react-side-effect": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.2.tgz",
- "integrity": "sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==",
- "peerDependencies": {
- "react": "^16.3.0 || ^17.0.0 || ^18.0.0"
- }
- },
"node_modules/react-is": {
"version": "16.13.1",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
},
- "node_modules/react-lifecycles-compat": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
- "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
- },
- "node_modules/react-modal": {
- "version": "3.16.1",
- "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.1.tgz",
- "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==",
- "dependencies": {
- "exenv": "^1.2.0",
- "prop-types": "^15.7.2",
- "react-lifecycles-compat": "^3.0.0",
- "warning": "^4.0.3"
- },
- "engines": {
- "node": ">=8"
- },
- "peerDependencies": {
- "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18",
- "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18"
- }
- },
"node_modules/react-property": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/react-property/-/react-property-2.0.2.tgz",
@@ -18299,14 +18223,6 @@
"node": ">=18"
}
},
- "node_modules/warning": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
- "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
- "dependencies": {
- "loose-envify": "^1.0.0"
- }
- },
"node_modules/watchpack": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
diff --git a/package.json b/package.json
index bab20aaf5..e7ae92414 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,6 @@
"@types/lodash": "^4.17.13",
"@types/react": "^19.0.2",
"@types/react-dom": "^19.0.2",
- "@types/react-modal": "^3.16.3",
"@types/react-router-dom": "^5.3.3",
"@amplitude/analytics-browser": "2.11.9",
"axios": "^1.7.9",
@@ -68,8 +67,6 @@
"react-device-detect": "^2.2.3",
"react-dom": "^19.0.0",
"react-dropzone": "^14.3.5",
- "react-helmet": "^6.1.0",
- "react-modal": "^3.16.1",
"react-router-dom": "^7.0.2",
"styled-components": "^6.1.13",
"use-debounce": "^10.0.4",
@@ -85,7 +82,6 @@
"@sentry/webpack-plugin": "^2.22.7",
"@svgr/webpack": "^8.1.0",
"@types/node": "^22.10.2",
- "@types/react-helmet": "^6.1.11",
"@types/webpack-hot-middleware": "^2.25.9",
"autoprefixer": "^10.4.20",
"babel-loader": "^9.2.1",
@@ -130,7 +126,16 @@
"webpack-dev-middleware": "^7.4.2",
"webpack-hot-middleware": "^2.26.1"
},
- "resolutions": {
- "react": "^19.x"
+ "overrides": {
+ "constate": {
+ "react": "$react"
+ },
+ "nav-dekoratoren-moduler": {
+ "react": "$react"
+ },
+ "html-react-parser": {
+ "react": "$react",
+ "@types/react": "$react"
+ }
}
}
diff --git a/src/App.tsx b/src/App.tsx
index 13917382d..89dadda3f 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -12,7 +12,6 @@ import {
import { useSøknad } from './context/SøknadContext';
import { useToggles } from './context/TogglesContext';
import { Barn, PersonData } from './models/søknad/person';
-import { Helmet } from 'react-helmet';
import LocaleTekst from './language/LocaleTekst';
import { useLokalIntlContext } from './context/LokalIntlContext';
import { Alert, Loader } from '@navikt/ds-react';
@@ -67,11 +66,9 @@ const App = () => {
if (!error) {
return (
<>
-
-
- {intl.formatMessage({ id: 'banner.tittel.overgangsstønad' })}
-
-
+
+ {intl.formatMessage({ id: 'banner.tittel.overgangsstønad' })}
+
{toggles[ToggleName.feilsituasjon] && (
diff --git a/src/barnetilsyn/BarnetilsynApp.tsx b/src/barnetilsyn/BarnetilsynApp.tsx
index 2dd103c52..a07f33f6d 100644
--- a/src/barnetilsyn/BarnetilsynApp.tsx
+++ b/src/barnetilsyn/BarnetilsynApp.tsx
@@ -10,7 +10,6 @@ import {
import { useBarnetilsynSøknad } from './BarnetilsynContext';
import { useToggles } from '../context/TogglesContext';
import { Barn, PersonData } from '../models/søknad/person';
-import { Helmet } from 'react-helmet';
import SøknadsdialogBarnetilsyn from './Søknadsdialog';
import { ESkjemanavn } from '../utils/skjemanavn';
import { useLokalIntlContext } from '../context/LokalIntlContext';
@@ -83,11 +82,9 @@ const BarnetilsynApp = () => {
if (!error) {
return (
<>
-
-
- {intl.formatMessage({ id: 'banner.tittel.barnetilsyn' })}
-
-
+
+ {intl.formatMessage({ id: 'banner.tittel.barnetilsyn' })}
+
diff --git a/src/skolepenger/SkolepengerApp.tsx b/src/skolepenger/SkolepengerApp.tsx
index a3d7b2360..c634f50fc 100644
--- a/src/skolepenger/SkolepengerApp.tsx
+++ b/src/skolepenger/SkolepengerApp.tsx
@@ -10,7 +10,6 @@ import {
import { useSkolepengerSøknad } from './SkolepengerContext';
import { useToggles } from '../context/TogglesContext';
import { Barn, PersonData } from '../models/søknad/person';
-import { Helmet } from 'react-helmet';
import SøknadsdialogSkolepenger from './Søknadsdialog';
import { ESkjemanavn } from '../utils/skjemanavn';
import { useLokalIntlContext } from '../context/LokalIntlContext';
@@ -64,9 +63,7 @@ const SkolepengerApp = () => {
if (!error) {
return (
<>
-
- {hentTekst('skolepenger.sidetittel', intl)}
-
+ {hentTekst('skolepenger.sidetittel', intl)}