Skip to content

Commit

Permalink
Merge branch 'main' into ung-refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@frodehansen2
frodehansen2 committed Feb 3, 2025
2 parents 4587c62 + 3252dab commit 4b900af
Show file tree
Hide file tree
Showing 27 changed files with 311 additions and 281 deletions.
12 changes: 6 additions & 6 deletions apps/dine-pleiepenger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"test-w": "vitest"
},
"dependencies": {
"@grafana/faro-web-sdk": "1.12.3",
"@grafana/faro-web-tracing": "1.12.3",
"@grafana/faro-web-sdk": "1.13.0",
"@grafana/faro-web-tracing": "1.13.0",
"@navikt/appstatus-react-ds": "*",
"@navikt/nav-dekoratoren-moduler": "3.2.0",
"@navikt/nav-dekoratoren-moduler": "3.2.1",
"@navikt/next-logger": "1.35.0",
"@navikt/oasis": "3.6.0",
"@navikt/sif-app-register": "*",
Expand All @@ -47,10 +47,10 @@
},
"devDependencies": {
"@axe-core/playwright": "4.10.1",
"@navikt/ds-css": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-tailwind": "7.10.0",
"@navikt/ds-react": "7.11.0",
"@navikt/ds-tailwind": "7.11.0",
"@playwright/test": "1.50.1",
"@sif/eslint-config": "*",
"@storybook/addon-essentials": "8.5.3",
Expand Down
6 changes: 3 additions & 3 deletions apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
"chromatic": "npx chromatic --project-token=chpt_7e1abb37d98312a"
},
"dependencies": {
"@navikt/ds-css": "7.10.0",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-tailwind": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-react": "7.11.0",
"@navikt/ds-tailwind": "7.11.0",
"@navikt/sif-app-register": "*",
"@navikt/sif-common-amplitude": "*",
"@navikt/sif-common-core-ds": "*",
Expand Down
10 changes: 5 additions & 5 deletions apps/endringsmelding-pleiepenger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"version": "2.37.1",
"private": true,
"dependencies": {
"@navikt/ds-css": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-tailwind": "7.10.0",
"@navikt/ds-react": "7.11.0",
"@navikt/ds-tailwind": "7.11.0",
"@navikt/sif-common-amplitude": "*",
"@navikt/sif-common-core-ds": "*",
"@navikt/sif-common-env": "*",
Expand Down Expand Up @@ -48,8 +48,8 @@
"@babel/preset-react": "7.26.3",
"@babel/preset-typescript": "7.26.0",
"@mswjs/data": "0.16.2",
"@navikt/ds-tailwind": "7.10.0",
"@navikt/nav-dekoratoren-moduler": "3.2.0",
"@navikt/ds-tailwind": "7.11.0",
"@navikt/nav-dekoratoren-moduler": "3.2.1",
"@playwright/test": "1.50.1",
"@sentry/vite-plugin": "3.1.1",
"@sif/eslint-config": "*",
Expand Down
6 changes: 3 additions & 3 deletions apps/omsorgsdager-aleneomsorg-dialog/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"chromatic": "npx chromatic --project-token="
},
"dependencies": {
"@navikt/ds-css": "7.10.0",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-tailwind": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-react": "7.11.0",
"@navikt/ds-tailwind": "7.11.0",
"@navikt/sif-app-register": "*",
"@navikt/sif-common-amplitude": "*",
"@navikt/sif-common-core-ds": "*",
Expand Down
8 changes: 4 additions & 4 deletions apps/omsorgsdager-kalkulator/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
"test": "jest"
},
"dependencies": {
"@navikt/ds-css": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-tailwind": "7.10.0",
"@navikt/nav-dekoratoren-moduler": "3.2.0",
"@navikt/ds-react": "7.11.0",
"@navikt/ds-tailwind": "7.11.0",
"@navikt/nav-dekoratoren-moduler": "3.2.1",
"classnames": "2.5.1",
"csp-header": "6.0.0",
"date-fns": "3.6.0",
Expand Down
6 changes: 3 additions & 3 deletions apps/omsorgspengerutbetaling-arbeidstaker-soknad/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"private": true,
"type": "module",
"dependencies": {
"@navikt/ds-css": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-tailwind": "7.10.0",
"@navikt/ds-react": "7.11.0",
"@navikt/ds-tailwind": "7.11.0",
"@navikt/sif-app-register": "*",
"@navikt/sif-common-amplitude": "*",
"@navikt/sif-common-api": "*",
Expand Down
6 changes: 3 additions & 3 deletions apps/omsorgspengerutbetaling-soknad/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"private": true,
"type": "module",
"dependencies": {
"@navikt/ds-css": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-tailwind": "7.10.0",
"@navikt/ds-react": "7.11.0",
"@navikt/ds-tailwind": "7.11.0",
"@navikt/sif-app-register": "*",
"@navikt/sif-common-amplitude": "*",
"@navikt/sif-common-api": "*",
Expand Down
6 changes: 3 additions & 3 deletions apps/omsorgspengesoknad/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
"private": true,
"type": "module",
"dependencies": {
"@navikt/ds-css": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-tailwind": "7.10.0",
"@navikt/ds-react": "7.11.0",
"@navikt/ds-tailwind": "7.11.0",
"@navikt/sif-app-register": "*",
"@navikt/sif-common-amplitude": "*",
"@navikt/sif-common-core-ds": "*",
Expand Down
6 changes: 3 additions & 3 deletions apps/opplaringspenger-soknad/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"private": true,
"type": "module",
"dependencies": {
"@navikt/ds-css": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-tailwind": "7.10.0",
"@navikt/ds-react": "7.11.0",
"@navikt/ds-tailwind": "7.11.0",
"@navikt/sif-app-register": "*",
"@navikt/sif-common-amplitude": "*",
"@navikt/sif-common-core-ds": "*",
Expand Down
6 changes: 3 additions & 3 deletions apps/pleiepenger-i-livets-sluttfase-soknad/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"private": true,
"type": "module",
"dependencies": {
"@navikt/ds-css": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-tailwind": "7.10.0",
"@navikt/ds-react": "7.11.0",
"@navikt/ds-tailwind": "7.11.0",
"@navikt/sif-app-register": "*",
"@navikt/sif-common-amplitude": "*",
"@navikt/sif-common-api": "*",
Expand Down
6 changes: 3 additions & 3 deletions apps/pleiepenger-sykt-barn/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"type": "module",
"dependencies": {
"@navikt/appstatus-react-ds": "*",
"@navikt/ds-css": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.10.0",
"@navikt/nav-dekoratoren-moduler": "3.2.0",
"@navikt/ds-react": "7.11.0",
"@navikt/nav-dekoratoren-moduler": "3.2.1",
"@navikt/sif-app-register": "*",
"@navikt/sif-common-amplitude": "*",
"@navikt/sif-common-core-ds": "*",
Expand Down
12 changes: 6 additions & 6 deletions apps/sif-demo-app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
},
"dependencies": {
"@hookform/resolvers": "3.10.0",
"@navikt/aksel-icons": "7.10.0",
"@navikt/ds-css": "7.10.0",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-tailwind": "7.10.0",
"@navikt/nav-dekoratoren-moduler": "3.2.0",
"@navikt/aksel-icons": "7.11.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-react": "7.11.0",
"@navikt/ds-tailwind": "7.11.0",
"@navikt/nav-dekoratoren-moduler": "3.2.1",
"@navikt/sif-common-api": "*",
"@navikt/sif-common-core-ds": "*",
"@navikt/sif-common-env": "*",
Expand All @@ -40,7 +40,7 @@
"devDependencies": {
"@eslint/eslintrc": "3.2.0",
"@eslint/js": "9.19.0",
"@navikt/nav-dekoratoren-moduler": "3.2.0",
"@navikt/nav-dekoratoren-moduler": "3.2.1",
"@types/node": "22.13.0",
"@types/react": "19.0.8",
"@types/react-dom": "19.0.3",
Expand Down
8 changes: 4 additions & 4 deletions apps/sif-ettersending/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
"private": true,
"type": "module",
"dependencies": {
"@navikt/ds-css": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-tailwind": "7.10.0",
"@navikt/nav-dekoratoren-moduler": "3.2.0",
"@navikt/ds-react": "7.11.0",
"@navikt/ds-tailwind": "7.11.0",
"@navikt/nav-dekoratoren-moduler": "3.2.1",
"@navikt/sif-app-register": "*",
"@navikt/sif-common-amplitude": "*",
"@navikt/sif-common-core-ds": "*",
Expand Down
14 changes: 7 additions & 7 deletions apps/ungdomsytelse-deltaker/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
"lint:fix": "eslint --fix"
},
"dependencies": {
"@navikt/aksel-icons": "7.10.0",
"@navikt/ds-css": "7.10.0",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-tailwind": "7.10.0",
"@navikt/nav-dekoratoren-moduler": "3.2.0",
"@navikt/aksel-icons": "7.11.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-react": "7.11.0",
"@navikt/ds-tailwind": "7.11.0",
"@navikt/nav-dekoratoren-moduler": "3.2.1",
"@navikt/sif-common-api": "*",
"@navikt/sif-common-core-ds": "*",
"@navikt/sif-common-env": "*",
"@navikt/sif-common-forms-ds": "*",
"@navikt/sif-common-soknad-ds": "*",
"@navikt/sif-common-ui": "*",
"@tanstack/react-query": "5.64.2",
"@tanstack/react-query": "5.66.0",
"@trpc/client": "10.45.2",
"@trpc/react-query": "10.45.2",
"@trpc/server": "10.45.2",
Expand All @@ -52,7 +52,7 @@
"devDependencies": {
"@eslint/eslintrc": "3.2.0",
"@eslint/js": "9.19.0",
"@navikt/nav-dekoratoren-moduler": "3.2.0",
"@navikt/nav-dekoratoren-moduler": "3.2.1",
"@storybook/addon-essentials": "8.5.3",
"@storybook/addon-interactions": "8.5.3",
"@storybook/addon-links": "8.5.3",
Expand Down
12 changes: 6 additions & 6 deletions apps/ungdomsytelse-veileder/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"lint:fix": "eslint --fix"
},
"dependencies": {
"@navikt/aksel-icons": "7.10.0",
"@navikt/ds-css": "7.10.0",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-tailwind": "7.10.0",
"@navikt/nav-dekoratoren-moduler": "3.2.0",
"@navikt/aksel-icons": "7.11.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-react": "7.11.0",
"@navikt/ds-tailwind": "7.11.0",
"@navikt/nav-dekoratoren-moduler": "3.2.1",
"@navikt/sif-common-api": "*",
"@navikt/sif-common-core-ds": "*",
"@navikt/sif-common-env": "*",
Expand All @@ -43,7 +43,7 @@
"devDependencies": {
"@eslint/eslintrc": "3.2.0",
"@eslint/js": "9.19.0",
"@navikt/nav-dekoratoren-moduler": "3.2.0",
"@navikt/nav-dekoratoren-moduler": "3.2.1",
"@types/node": "22.13.0",
"@types/react": "19.0.8",
"@types/react-dom": "19.0.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/appstatus-react-ds/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"@sanity/client": "6.27.2"
},
"devDependencies": {
"@navikt/ds-css": "7.10.0",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-react": "7.11.0",
"@sif/eslint-config": "*",
"@types/node": "22.13.0",
"@types/react": "19.0.8",
Expand Down
4 changes: 2 additions & 2 deletions packages/sif-common-api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"private": true,
"type": "module",
"dependencies": {
"@navikt/ds-css": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-react": "7.11.0",
"@navikt/sif-common-formik-ds": "*",
"@navikt/sif-common-sentry": "*",
"@navikt/sif-common-utils": "*",
Expand Down
8 changes: 4 additions & 4 deletions packages/sif-common-core-ds/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"private": true,
"type": "module",
"dependencies": {
"@grafana/faro-web-sdk": "1.12.3",
"@grafana/faro-web-sdk": "1.13.0",
"@navikt/sif-common-api": "*",
"@navikt/sif-common-env": "*",
"@navikt/sif-common-utils": "*",
Expand All @@ -25,10 +25,10 @@
"@babel/preset-react": "7.26.3",
"@babel/preset-typescript": "7.26.0",
"@navikt/appstatus-react-ds": "*",
"@navikt/ds-css": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-tailwind": "7.10.0",
"@navikt/ds-react": "7.11.0",
"@navikt/ds-tailwind": "7.11.0",
"@navikt/sif-common-formik-ds": "*",
"@originjs/vite-plugin-commonjs": "1.0.3",
"@sif/eslint-config": "*",
Expand Down
2 changes: 1 addition & 1 deletion packages/sif-common-faro/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"type": "module",
"dependencies": {
"@grafana/faro-web-sdk": "1.12.3",
"@grafana/faro-web-sdk": "1.13.0",
"constate": "3.3.2",
"react": "19.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/sif-common-formik-ds/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"@babel/preset-env": "7.26.7",
"@babel/preset-react": "7.26.3",
"@babel/preset-typescript": "7.26.0",
"@navikt/ds-css": "7.10.0",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-react": "7.11.0",
"@navikt/fnrvalidator": "2.1.5",
"@originjs/vite-plugin-commonjs": "1.0.3",
"@sif/eslint-config": "*",
Expand Down
4 changes: 2 additions & 2 deletions packages/sif-common-forms-ds/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"@babel/preset-react": "7.26.3",
"@babel/preset-typescript": "7.26.0",
"@formatjs/intl-pluralrules": "5.4.2",
"@navikt/ds-css": "7.10.0",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-react": "7.11.0",
"@navikt/sif-common-core-ds": "*",
"@navikt/sif-common-formik-ds": "*",
"@navikt/sif-common-utils": "*",
Expand Down
1 change: 1 addition & 0 deletions packages/sif-common-forms-ds/src/forms/bosted-utland/BostedUtlandForm.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ const BostedUtlandForm = ({ maxDate, minDate, bosted, alleBosteder = [], onSubmi
maxDate={maxDate}
allowRangesToStartAndStopOnSameDate={false}
disabledDateRanges={andreBosteder}
dropdownCaption={true}
fromInputProps={{
name: BostedUtlandFormFields.fom,
label: text('@forms.bostedUtland.form.tidsperiode.fraDato'),
Expand Down
6 changes: 3 additions & 3 deletions packages/sif-common-sentry/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"url": "https://github.com/navikt/sif-common-sentry/issues"
},
"dependencies": {
"@sentry/browser": "8.53.0",
"@sentry/react": "8.53.0",
"@sentry/types": "8.53.0"
"@sentry/browser": "8.54.0",
"@sentry/react": "8.54.0",
"@sentry/types": "8.54.0"
},
"devDependencies": {
"@sif/eslint-config": "*",
Expand Down
6 changes: 3 additions & 3 deletions packages/sif-common-soknad-ds/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@navikt/sif-common-utils": "*"
},
"dependencies": {
"@navikt/nav-dekoratoren-moduler": "3.2.0",
"@navikt/nav-dekoratoren-moduler": "3.2.1",
"classnames": "2.5.1",
"csp-header": "6.0.0",
"date-fns": "3.6.0",
Expand All @@ -37,8 +37,8 @@
"@devexperts/remote-data-ts": "2.1.1",
"@formatjs/intl-pluralrules": "5.4.2",
"@navikt/appstatus-react-ds": "*",
"@navikt/ds-css": "7.10.0",
"@navikt/ds-react": "7.10.0",
"@navikt/ds-css": "7.11.0",
"@navikt/ds-react": "7.11.0",
"@navikt/sif-common-core-ds": "*",
"@navikt/sif-common-formik-ds": "*",
"@navikt/sif-common-hooks": "*",
Expand Down
Loading

0 comments on commit 4b900af

Please sign in to comment.