Skip to content

Commit

Permalink
Merge pull request #2972 from navikt/dependabot/npm_and_yarn/major-de…
Browse files Browse the repository at this point in the history
…pendencies-f1d3ed6b12

Bump the major-dependencies group across 1 directory with 5 updates
  • Loading branch information
charliemidtlyng authored Jan 2, 2025
2 parents 78c6bcb + cb40195 commit b26a01a
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 151 deletions.
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"@sentry/core": "^8.40.0",
"@types/express": "^5.0.0",
"@types/file-saver": "^2.0.7",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@types/react": "^19.0.2",
"@types/react-dom": "^19.0.2",
"@types/styled-components": "^5.1.34",
"@types/uuid": "^10.0.0",
"autoprefixer": "^10.4.20",
Expand All @@ -68,8 +68,8 @@
"passport-azure-ad": "^4.3.5",
"prom-client": "^15.1.3",
"quill": "^2.0.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-pdf": "9.1.1",
"react-router-dom": "7.0.2",
"react-select": "^5.8.3",
Expand Down Expand Up @@ -119,13 +119,13 @@
"typescript": "^5.7.2",
"vitest": "^2.1.8",
"webpack": "^5.97.1",
"webpack-cli": "^5.1.4",
"webpack-cli": "^6.0.1",
"webpack-dev-middleware": "^7.4.2",
"webpack-hot-middleware": "^2.26.1",
"webpack-merge": "^6.0.1"
},
"resolutions": {
"@types/react": "^18.x",
"@types/react": "^19.x",
"@types/react-select": "^5.x"
},
"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
Expand Down
48 changes: 0 additions & 48 deletions src/frontend/App/hooks/felles/useEventListener.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/frontend/Felles/DataViewer/DataViewer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const renderChildren = (children: any, response: any): ReactElement => {

function DataViewer<T extends Record<string, unknown>>(
props: DataViewerProps<T>
): JSX.Element | null {
): ReactNode | null {
const { response, children, alertStripeVariant } = props;
const responses = Object.values(response);
if (harNoenRessursMedStatus(responses, RessursStatus.IKKE_TILGANG)) {
Expand Down
6 changes: 3 additions & 3 deletions src/frontend/Felles/Visningskomponenter/ToKolonnerLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { ReactNode } from 'react';
import styled from 'styled-components';

const Container = styled.div<{ $skillelinje?: boolean }>`
Expand Down Expand Up @@ -30,8 +30,8 @@ const Container = styled.div<{ $skillelinje?: boolean }>`
interface Props {
skillelinje?: boolean;
children: {
venstre: JSX.Element;
høyre: JSX.Element;
venstre: ReactNode;
høyre: ReactNode;
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
EAvslagÅrsak,
årsakerTilAvslag,
} from '../../../../../App/typer/vedtak';
import React from 'react';
import React, { ReactNode } from 'react';
import styled from 'styled-components';
import { useBehandling } from '../../../../../App/context/BehandlingContext';
import { VEDTAK_OG_BEREGNING } from '../konstanter';
Expand All @@ -30,7 +30,7 @@ const FeilmeldingTekst = styled(BodyShortSmall)`
color: #ba3a26;
`;

const SelectAvslagÅrsak = (props: Props): JSX.Element => {
const SelectAvslagÅrsak = (props: Props): ReactNode => {
const { behandlingErRedigerbar } = useBehandling();
const { settIkkePersistertKomponent } = useApp();
const { avslagÅrsak, settAvslagÅrsak, feilmelding } = props;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { behandlingResultatTilTekst, EBehandlingResultat } from '../../../../App/typer/vedtak';
import React, { useContext } from 'react';
import React, { ReactNode, useContext } from 'react';
import styled from 'styled-components';
import { useBehandling } from '../../../../App/context/BehandlingContext';
import { Behandling } from '../../../../App/typer/fagsak';
Expand Down Expand Up @@ -39,7 +39,7 @@ const Container = styled.section`
background-color: ${AGray50};
`;

const SelectVedtaksresultat = (props: Props): JSX.Element => {
const SelectVedtaksresultat = (props: Props): ReactNode => {
const { behandlingErRedigerbar } = useBehandling();
const { settIkkePersistertKomponent } = useApp();
const { resultatType, settResultatType, alleVilkårOppfylt, behandling } = props;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,13 @@ describe('skal feile validering av vedtaksperioder', () => {
EPeriodetype.MIDLERTIDIG_OPPHØR,
EAktivitet.FORSØRGER_I_ARBEID,
'2024-07',
'2026-06'
'2096-06'
),
lagVedtaksperiode(
EPeriodetype.HOVEDPERIODE,
EAktivitet.FORSØRGER_I_ARBEID,
'2026-07',
'2026-08'
'2096-07',
'2096-08'
),
];
const vedtaksform = lagForm(vedtaksperioder, []);
Expand All @@ -294,7 +294,7 @@ describe('skal feile validering av vedtaksperioder', () => {
expect(vedtaksvalidering.perioder[0].årMånedFra).toBeUndefined;
expect(vedtaksvalidering.perioder[1].årMånedFra).toBeUndefined;
expect(vedtaksvalidering.perioder[2].årMånedFra).toBe(
'Startdato (2026-07) mer enn 18mnd frem i tid'
'Startdato (2096-07) mer enn 18mnd frem i tid'
);
});
});
Expand Down
Loading

0 comments on commit b26a01a

Please sign in to comment.