Skip to content

Commit

Permalink
Merge branch 'master' into prosess-vilkar-alder-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
@hallvardastark
hallvardastark committed Oct 31, 2024
2 parents 20be630 + 4031e2c commit a13a42e
Show file tree
Hide file tree
Showing 105 changed files with 929 additions and 981 deletions.
22 changes: 11 additions & 11 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
],
"dependencies": {
"@hookform/error-message": "^2.0.1",
"@navikt/aksel-icons": "7.2.1",
"@navikt/ds-css": "7.2.1",
"@navikt/ds-react": "7.2.1",
"@navikt/ds-tailwind": "^7.2.1",
"@navikt/aksel-icons": "7.4.0",
"@navikt/ds-css": "7.4.0",
"@navikt/ds-react": "7.4.0",
"@navikt/ds-tailwind": "^7.4.0",
"@navikt/familie-endringslogg": "13.1.4",
"@navikt/ft-plattform-komponenter": "5.0.1",
"@navikt/ft-plattform-komponenter": "5.0.3",
"@popperjs/core": "2.11.8",
"@sentry/browser": "8.35.0",
"@sentry/react": "^8.35.0",
Expand All @@ -66,8 +66,8 @@
"vite-plugin-svgr": "4.2.0"
},
"devDependencies": {
"@playwright/test": "^1.48.1",
"@sentry/cli": "2.38.0",
"@playwright/test": "^1.48.2",
"@sentry/cli": "2.38.1",
"@storybook/addon-a11y": "^8.3.6",
"@storybook/addon-actions": "^8.3.6",
"@storybook/addon-docs": "^8.3.6",
Expand All @@ -85,7 +85,7 @@
"@testing-library/user-event": "14.5.2",
"@types/history": "5.0.0",
"@types/prop-types": "15.7.13",
"@types/react": "18.3.11",
"@types/react": "18.3.12",
"@types/react-collapse": "5.0.4",
"@types/react-router-dom": "5.3.3",
"@types/redux-form": "8.3.11",
Expand All @@ -95,14 +95,14 @@
"cross-env": "7.0.3",
"eslint": "9.13.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-jsx-a11y": "6.10.1",
"eslint-plugin-jsx-a11y": "6.10.2",
"eslint-plugin-react": "7.37.2",
"eslint-plugin-vitest": "~0.5.4",
"globals": "^15.11.0",
"husky": "9.1.6",
"jsdom": "25.0.1",
"lint-staged": "15.2.10",
"msw": "2.5.0",
"msw": "2.6.0",
"msw-storybook-addon": "^2.0.3",
"postcss": "^8.4.47",
"prettier": "3.3.3",
Expand All @@ -117,7 +117,7 @@
"typescript-eslint": "^7.18.0",
"vite": "^5.4.10",
"vite-plugin-html": "^3.2.2",
"vitest": "2.1.3",
"vitest": "2.1.4",
"vitest-axe": "0.1.0"
},
"resolutions": {
Expand Down
2 changes: 1 addition & 1 deletion packages/behandling-anke/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"react": "18.3.1",
"react-intl": "6.8.0"
"react-intl": "6.8.2"
}
}
4 changes: 2 additions & 2 deletions packages/behandling-felles/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
"@k9-sak-web/modal-sett-pa-vent": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-plattform-komponenter": "5.0.1",
"@navikt/ft-plattform-komponenter": "5.0.3",
"classnames": "2.5.1",
"react": "18.3.1",
"react-intl": "6.8.0",
"react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux-form": "8.3.10"
}
Expand Down
6 changes: 3 additions & 3 deletions packages/behandling-frisinn/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "6.0.2",
"@navikt/ft-prosess-beregningsgrunnlag": "6.6.13",
"@navikt/ft-fakta-beregning": "7.0.2",
"@navikt/ft-prosess-beregningsgrunnlag": "7.0.1",
"react": "18.3.1",
"react-intl": "6.8.0"
"react-intl": "6.8.2"
}
}
2 changes: 1 addition & 1 deletion packages/behandling-klage/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"react": "18.3.1",
"react-intl": "6.8.0"
"react-intl": "6.8.2"
}
}
8 changes: 4 additions & 4 deletions packages/behandling-omsorgspenger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "6.0.2",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.6.10",
"@navikt/ft-prosess-beregningsgrunnlag": "6.6.13",
"@navikt/ft-fakta-beregning": "7.0.2",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "8.0.2",
"@navikt/ft-prosess-beregningsgrunnlag": "7.0.1",
"react": "18.3.1",
"react-intl": "6.8.0"
"react-intl": "6.8.2"
}
}
8 changes: 4 additions & 4 deletions packages/behandling-opplaeringspenger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "6.0.2",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.6.10",
"@navikt/ft-prosess-beregningsgrunnlag": "6.6.13",
"@navikt/ft-fakta-beregning": "7.0.2",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "8.0.2",
"@navikt/ft-prosess-beregningsgrunnlag": "7.0.1",
"axios": "1.7.7",
"react": "18.3.1",
"react-intl": "6.8.0"
"react-intl": "6.8.2"
}
}
8 changes: 4 additions & 4 deletions packages/behandling-pleiepenger-sluttfase/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "6.0.2",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.6.10",
"@navikt/ft-prosess-beregningsgrunnlag": "6.6.13",
"@navikt/ft-fakta-beregning": "7.0.2",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "8.0.2",
"@navikt/ft-prosess-beregningsgrunnlag": "7.0.1",
"axios": "1.7.7",
"react": "18.3.1",
"react-intl": "6.8.0"
"react-intl": "6.8.2"
}
}
8 changes: 4 additions & 4 deletions packages/behandling-pleiepenger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/diagnosekoder": "^1.2024.1",
"@navikt/ft-fakta-beregning": "6.0.2",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.6.10",
"@navikt/ft-prosess-beregningsgrunnlag": "6.6.13",
"@navikt/ft-fakta-beregning": "7.0.2",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "8.0.2",
"@navikt/ft-prosess-beregningsgrunnlag": "7.0.1",
"axios": "1.7.7",
"react": "18.3.1",
"react-intl": "6.8.0"
"react-intl": "6.8.2"
}
}
2 changes: 0 additions & 2 deletions ...ges/behandling-pleiepenger/src/panelDefinisjoner/faktaPaneler/FordelBeregningPanelDef.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import React from 'react';

import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType';
import { konverterKodeverkTilKode, transformBeregningValues } from '@fpsak-frontend/utils';
Expand Down
6 changes: 3 additions & 3 deletions packages/behandling-tilbakekreving/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-kodeverk": "^2.5.4",
"@navikt/ft-prosess-tilbakekreving-foreldelse": "3.4.10",
"@navikt/ft-kodeverk": "^2.5.5",
"@navikt/ft-prosess-tilbakekreving-foreldelse": "3.4.11",
"react": "18.3.1",
"react-intl": "6.8.0"
"react-intl": "6.8.2"
}
}
2 changes: 1 addition & 1 deletion packages/behandling-ungdomsytelse/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
"@k9-sak-web/types": "1.0.0",
"axios": "1.7.7",
"react": "18.3.1",
"react-intl": "6.8.0"
"react-intl": "6.8.2"
}
}
2 changes: 1 addition & 1 deletion packages/behandling-unntak/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"react": "18.3.1",
"react-intl": "6.8.0",
"react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux": "5.0.1",
"redux-form": "8.3.10",
Expand Down
2 changes: 1 addition & 1 deletion packages/fakta-arbeidsforhold/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@k9-sak-web/types": "1.0.0",
"moment": "2.30.1",
"react": "18.3.1",
"react-intl": "6.8.0",
"react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux": "5.0.1",
"redux-form": "8.3.10",
Expand Down
2 changes: 1 addition & 1 deletion packages/fakta-barn-og-overfoeringsdager/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"just-is-empty": "3.4.1",
"moment": "2.30.1",
"react": "18.3.1",
"react-intl": "6.8.0",
"react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux-form": "8.3.10"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/fakta-barn-oms/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@k9-sak-web/types": "1.0.0",
"moment": "2.30.1",
"react": "18.3.1",
"react-intl": "6.8.0",
"react-intl": "6.8.2",
"uuid": "10.0.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/fakta-direkte-overgang/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dayjs": "1.11.13",
"formik": "2.4.6",
"react": "18.3.1",
"react-intl": "6.8.0",
"react-intl": "6.8.2",
"yup": "1.4.0"
},
"peerDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/fakta-etablert-tilsyn/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
"vite-plugin-node-polyfills": "^0.22.0"
},
"dependencies": {
"@navikt/ds-css": "7.2.1",
"@navikt/ds-css": "7.4.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.2.1",
"@navikt/ft-plattform-komponenter": "5.0.1",
"@navikt/ds-react": "7.4.0",
"@navikt/ft-plattform-komponenter": "5.0.3",
"@popperjs/core": "2.11.8",
"classnames": "2.5.1",
"dayjs": "1.11.13",
"lodash": "4.17.21",
"react": "18.3.1",
"react-collapse": "5.1.1",
"react-dom": "18.3.1",
"react-hook-form": "7.53.0",
"react-hook-form": "7.53.1",
"react-popper": "2.3.0"
},
"msw": {
Expand Down
2 changes: 1 addition & 1 deletion packages/fakta-feilutbetaling/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"moment": "2.30.1",
"prop-types": "15.8.1",
"react": "18.3.1",
"react-intl": "6.8.0",
"react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux": "5.0.1",
"redux-form": "8.3.10",
Expand Down
2 changes: 1 addition & 1 deletion packages/fakta-felles/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@fpsak-frontend/utils": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"react": "18.3.1",
"react-intl": "6.8.0",
"react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux": "5.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/fakta-inntekt-og-ytelser/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
"@fpsak-frontend/utils": "1.0.0",
"moment": "2.30.1",
"react": "18.3.1",
"react-intl": "6.8.0"
"react-intl": "6.8.2"
}
}
12 changes: 6 additions & 6 deletions packages/fakta-inntektsmelding/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@
"author": "NAV IT",
"license": "MIT",
"devDependencies": {
"msw": "2.5.0",
"msw": "2.6.0",
"vite": "^5.4.10",
"vite-plugin-node-polyfills": "^0.22.0"
},
"dependencies": {
"@navikt/ds-css": "7.2.1",
"@navikt/ds-css": "7.4.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.2.1",
"@navikt/ft-form-hooks": "5.1.9",
"@navikt/ft-plattform-komponenter": "5.0.1",
"@navikt/ds-react": "7.4.0",
"@navikt/ft-form-hooks": "5.1.10",
"@navikt/ft-plattform-komponenter": "5.0.3",
"@popperjs/core": "2.11.8",
"classnames": "2.5.1",
"dayjs": "1.11.13",
"react": "18.3.1",
"react-collapse": "5.1.1",
"react-dom": "18.3.1",
"react-hook-form": "7.53.0",
"react-hook-form": "7.53.1",
"react-popper": "2.3.0"
},
"msw": {
Expand Down
2 changes: 1 addition & 1 deletion packages/fakta-institusjon/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"@fpsak-frontend/form": "*",
"@k9-sak-web/types": "*",
"@navikt/ft-plattform-komponenter": "5.0.1",
"@navikt/ft-plattform-komponenter": "5.0.3",
"formik": "2.4.6"
}
}
12 changes: 6 additions & 6 deletions packages/fakta-medisinsk-vilkår/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,26 @@
},
"devDependencies": {
"cors": "^2.8.5",
"msw": "2.5.0",
"msw": "2.6.0",
"vite": "^5.4.10",
"vite-plugin-node-polyfills": "^0.22.0"
},
"dependencies": {
"@fpsak-frontend/form": "1.0.0",
"@navikt/diagnosekoder": "^1.2024.1",
"@navikt/ds-css": "7.2.1",
"@navikt/ds-css": "7.4.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.2.1",
"@navikt/ft-plattform-komponenter": "5.0.1",
"@navikt/ds-react": "7.4.0",
"@navikt/ft-plattform-komponenter": "5.0.3",
"@popperjs/core": "2.11.8",
"@tanstack/react-query": "^5.59.15",
"@tanstack/react-query": "^5.59.16",
"axios": "1.7.7",
"classnames": "2.5.1",
"dayjs": "1.11.13",
"react": "18.3.1",
"react-collapse": "5.1.1",
"react-dom": "18.3.1",
"react-hook-form": "7.53.0",
"react-hook-form": "7.53.1",
"react-outside-click-handler": "1.3.0",
"react-popper": "2.3.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/fakta-medlemskap/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
"@k9-sak-web/fakta-felles": "1.0.0",
"@navikt/ft-form-hooks": "5.1.9",
"@navikt/ft-plattform-komponenter": "5.0.1",
"@navikt/ft-form-hooks": "5.1.10",
"@navikt/ft-plattform-komponenter": "5.0.3",
"i18n-iso-countries": "7.12.0",
"moment": "2.30.1",
"prop-types": "15.8.1",
"react": "18.3.1",
"react-intl": "6.8.0",
"react-intl": "6.8.2",
"react-redux": "9.1.2",
"redux": "5.0.1",
"redux-form": "8.3.10",
Expand Down
Loading

0 comments on commit a13a42e

Please sign in to comment.