Skip to content

Commit

Permalink
Oppgradere til react 19. Fjernet react-helmet (innebygd støtte i Reac…
Browse files Browse the repository at this point in the history
…t 19) og ubrukt react-modal fra avhengighetene våre
  • Loading branch information
charliemidtlyng committed Jan 2, 2025
1 parent 51bc67e commit 0a687c9
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 106 deletions.
84 changes: 0 additions & 84 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 11 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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"
}
}
}
9 changes: 3 additions & 6 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -67,11 +66,9 @@ const App = () => {
if (!error) {
return (
<>
<Helmet>
<title>
{intl.formatMessage({ id: 'banner.tittel.overgangsstønad' })}
</title>
</Helmet>
<title>
{intl.formatMessage({ id: 'banner.tittel.overgangsstønad' })}
</title>

{toggles[ToggleName.feilsituasjon] && (
<Alert size="small" variant="error">
Expand Down
9 changes: 3 additions & 6 deletions src/barnetilsyn/BarnetilsynApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -83,11 +82,9 @@ const BarnetilsynApp = () => {
if (!error) {
return (
<>
<Helmet>
<title>
{intl.formatMessage({ id: 'banner.tittel.barnetilsyn' })}
</title>
</Helmet>
<title>
{intl.formatMessage({ id: 'banner.tittel.barnetilsyn' })}
</title>

<SøknadsdialogBarnetilsyn />
</>
Expand Down
5 changes: 1 addition & 4 deletions src/skolepenger/SkolepengerApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -64,9 +63,7 @@ const SkolepengerApp = () => {
if (!error) {
return (
<>
<Helmet>
<title>{hentTekst('skolepenger.sidetittel', intl)}</title>
</Helmet>
<title>{hentTekst('skolepenger.sidetittel', intl)}</title>

<SøknadsdialogSkolepenger />
</>
Expand Down

0 comments on commit 0a687c9

Please sign in to comment.