Skip to content

Commit

Permalink
Merge branch 'main' into endringsmelding-flere-arbeidsforhold
Browse files Browse the repository at this point in the history
  • Loading branch information
@frodehansen2
frodehansen2 committed Jan 22, 2025
2 parents 8ac0986 + 68a9683 commit cf697ba
Show file tree
Hide file tree
Showing 146 changed files with 4,721 additions and 4,495 deletions.
5 changes: 5 additions & 0 deletions .changeset/green-cows-tease.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@navikt/sif-common-utils': minor
---

getDateRangesBetweenDateRangesWithinDateRange
5 changes: 5 additions & 0 deletions .changeset/tender-dolphins-relax.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@navikt/sif-common-formik-ds': minor
---

modalDescription i ModalFormAndList
5 changes: 5 additions & 0 deletions .changeset/wet-zebras-complain.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@navikt/sif-common-forms-ds': minor
---

EnkeltdatoListAndDialog
26 changes: 13 additions & 13 deletions .github/workflows/dispatch.deploy-opplaringspenger-soknad-to-prod.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ jobs:
uses: ./.github/workflows/test.opplaringspenger-soknad.yml
secrets: inherit

deploy-to-prod:
name: Deploy opplaringspenger-soknad to prod
needs: [run-tests]
uses: ./.github/workflows/.deploy-app-to-prod.yml
secrets: inherit
permissions:
contents: write
security-events: write
id-token: write
actions: read
with:
app-name: 'opplaringspenger-soknad'
working-directory: 'apps/opplaringspenger-soknad'
# deploy-to-prod:
# name: Deploy opplaringspenger-soknad to prod
# needs: [run-tests]
# uses: ./.github/workflows/.deploy-app-to-prod.yml
# secrets: inherit
# permissions:
# contents: write
# security-events: write
# id-token: write
# actions: read
# with:
# app-name: 'opplaringspenger-soknad'
# working-directory: 'apps/opplaringspenger-soknad'
36 changes: 18 additions & 18 deletions apps/dine-pleiepenger/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"test-w": "vitest"
},
"dependencies": {
"@grafana/faro-web-sdk": "1.12.2",
"@grafana/faro-web-tracing": "1.12.2",
"@grafana/faro-web-sdk": "1.12.3",
"@grafana/faro-web-tracing": "1.12.3",
"@navikt/appstatus-react-ds": "*",
"@navikt/nav-dekoratoren-moduler": "3.1.3",
"@navikt/next-logger": "1.35.0",
Expand All @@ -35,7 +35,7 @@
"jsdom": "26.0.0",
"lodash.sortby": "4.7.0",
"lodash.uniq": "4.5.0",
"next": "15.1.4",
"next": "15.1.5",
"next-logger": "5.0.1",
"pino": "9.6.0",
"react": "19.0.0",
Expand All @@ -47,20 +47,20 @@
},
"devDependencies": {
"@axe-core/playwright": "4.10.1",
"@navikt/ds-css": "7.9.1",
"@navikt/ds-css": "7.9.2",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.9.1",
"@navikt/ds-tailwind": "7.9.1",
"@navikt/ds-react": "7.9.2",
"@navikt/ds-tailwind": "7.9.2",
"@playwright/test": "1.49.1",
"@sif/eslint-config": "*",
"@storybook/addon-essentials": "8.4.7",
"@storybook/addon-interactions": "8.4.7",
"@storybook/addon-links": "8.4.7",
"@storybook/addon-onboarding": "8.4.7",
"@storybook/blocks": "8.4.7",
"@storybook/nextjs": "8.4.7",
"@storybook/react": "8.4.7",
"@storybook/test": "8.4.7",
"@storybook/addon-essentials": "8.5.0",
"@storybook/addon-interactions": "8.5.0",
"@storybook/addon-links": "8.5.0",
"@storybook/addon-onboarding": "8.5.0",
"@storybook/blocks": "8.5.0",
"@storybook/nextjs": "8.5.0",
"@storybook/react": "8.5.0",
"@storybook/test": "8.5.0",
"@types/react": "19.0.7",
"classnames": "2.5.1",
"dayjs": "1.11.13",
Expand All @@ -69,20 +69,20 @@
"formik": "2.4.6",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"next": "15.1.4",
"next": "15.1.5",
"node-fetch": "3.3.2",
"playwright-core": "1.49.1",
"postcss": "8.5.1",
"postcss-import": "16.1.0",
"react": "19.0.0",
"react-day-picker": "8.10.1",
"react-dom": "19.0.0",
"react-intl": "7.1.0",
"storybook": "8.4.7",
"react-intl": "7.1.4",
"storybook": "8.5.0",
"tailwindcss": "3.4.17",
"typescript": "5.7.3",
"uuid": "11.0.5",
"vitest": "2.1.8",
"vitest": "3.0.3",
"webpack": "5.97.1"
},
"_id": "@navikt/[email protected]"
Expand Down
24 changes: 12 additions & 12 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.9.1",
"@navikt/ds-react": "7.9.1",
"@navikt/ds-tailwind": "7.9.1",
"@navikt/ds-css": "7.9.2",
"@navikt/ds-react": "7.9.2",
"@navikt/ds-tailwind": "7.9.2",
"@navikt/sif-app-register": "*",
"@navikt/sif-common-amplitude": "*",
"@navikt/sif-common-core-ds": "*",
Expand All @@ -46,7 +46,7 @@
"@navikt/sif-common-soknad-ds": "*",
"@navikt/sif-common-ui": "*",
"@navikt/sif-common-utils": "*",
"@testing-library/react": "16.1.0",
"@testing-library/react": "16.2.0",
"axios": "1.7.9",
"csp-header": "6.0.0",
"dayjs": "1.11.13",
Expand All @@ -57,8 +57,8 @@
"react": "19.0.0",
"react-dom": "19.0.0",
"react-fast-compare": "3.2.2",
"react-intl": "7.1.0",
"react-router-dom": "7.1.1"
"react-intl": "7.1.4",
"react-router-dom": "7.1.3"
},
"devDependencies": {
"@axe-core/playwright": "4.10.1",
Expand All @@ -69,15 +69,15 @@
"@babel/preset-react": "7.26.3",
"@playwright/test": "1.49.1",
"@sif/eslint-config": "*",
"@storybook/react-vite": "8.4.7",
"@storybook/react-vite": "8.5.0",
"@testing-library/dom": "10.4.0",
"@testing-library/react": "16.1.0",
"@testing-library/react": "16.2.0",
"@types/object-hash": "3.0.6",
"@types/react": "19.0.7",
"@types/react-dom": "19.0.3",
"@types/react-router-dom": "5.3.3",
"babel-polyfill": "6.26.0",
"chromatic": "11.23.0",
"chromatic": "11.25.0",
"compression": "1.7.5",
"cross-env": "7.0.3",
"dotenv": "16.4.7",
Expand All @@ -87,11 +87,11 @@
"mustache-express": "1.3.2",
"playwright-core": "1.49.1",
"rimraf": "6.0.1",
"storybook": "8.4.7",
"storybook": "8.5.0",
"typescript": "5.7.3",
"vite": "6.0.7",
"vite": "6.0.11",
"vite-plugin-checker": "0.8.0",
"vitest": "2.1.8"
"vitest": "3.0.3"
},
"eslintConfig": {
"overrides": [
Expand Down
34 changes: 17 additions & 17 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.36.0",
"private": true,
"dependencies": {
"@navikt/ds-css": "7.9.1",
"@navikt/ds-css": "7.9.2",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.9.1",
"@navikt/ds-tailwind": "7.9.1",
"@navikt/ds-react": "7.9.2",
"@navikt/ds-tailwind": "7.9.2",
"@navikt/sif-common-amplitude": "*",
"@navikt/sif-common-core-ds": "*",
"@navikt/sif-common-env": "*",
Expand All @@ -36,8 +36,8 @@
"react": "19.0.0",
"react-day-picker": "8.10.1",
"react-dom": "19.0.0",
"react-intl": "7.1.0",
"react-router-dom": "7.1.1"
"react-intl": "7.1.4",
"react-router-dom": "7.1.3"
},
"devDependencies": {
"@axe-core/playwright": "4.10.1",
Expand All @@ -48,20 +48,20 @@
"@babel/preset-react": "7.26.3",
"@babel/preset-typescript": "7.26.0",
"@mswjs/data": "0.16.2",
"@navikt/ds-tailwind": "7.9.1",
"@navikt/ds-tailwind": "7.9.2",
"@navikt/nav-dekoratoren-moduler": "3.1.3",
"@playwright/test": "1.49.1",
"@sentry/vite-plugin": "2.23.0",
"@sentry/vite-plugin": "3.0.0",
"@sif/eslint-config": "*",
"@storybook/addon-actions": "8.4.7",
"@storybook/addon-essentials": "8.4.7",
"@storybook/addon-interactions": "8.4.7",
"@storybook/addon-links": "8.4.7",
"@storybook/node-logger": "8.4.7",
"@storybook/react": "8.4.7",
"@storybook/addon-actions": "8.5.0",
"@storybook/addon-essentials": "8.5.0",
"@storybook/addon-interactions": "8.5.0",
"@storybook/addon-links": "8.5.0",
"@storybook/node-logger": "8.5.0",
"@storybook/react": "8.5.0",
"@storybook/testing-library": "0.2.2",
"@testing-library/dom": "10.4.0",
"@testing-library/react": "16.1.0",
"@testing-library/react": "16.2.0",
"@types/flat": "5.0.5",
"@types/intl": "1.2.2",
"@types/js-cookie": "3.0.6",
Expand All @@ -85,13 +85,13 @@
"postcss": "8.5.1",
"postcss-import": "16.1.0",
"react-responsive": "10.0.0",
"storybook": "8.4.7",
"storybook": "8.5.0",
"storybook-addon-mock": "5.0.0",
"tailwindcss": "3.4.17",
"typescript": "5.7.3",
"vite": "6.0.7",
"vite": "6.0.11",
"vite-plugin-checker": "0.8.0",
"vitest": "2.1.8"
"vitest": "3.0.3"
},
"scripts": {
"build-storybook": "storybook build",
Expand Down
36 changes: 18 additions & 18 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.9.1",
"@navikt/ds-react": "7.9.1",
"@navikt/ds-tailwind": "7.9.1",
"@navikt/ds-css": "7.9.2",
"@navikt/ds-react": "7.9.2",
"@navikt/ds-tailwind": "7.9.2",
"@navikt/sif-app-register": "*",
"@navikt/sif-common-amplitude": "*",
"@navikt/sif-common-core-ds": "*",
Expand All @@ -44,7 +44,7 @@
"@navikt/sif-common-soknad-ds": "*",
"@navikt/sif-common-ui": "*",
"@navikt/sif-common-utils": "*",
"@testing-library/react": "16.1.0",
"@testing-library/react": "16.2.0",
"axios": "1.7.9",
"csp-header": "6.0.0",
"dayjs": "1.11.13",
Expand All @@ -55,8 +55,8 @@
"react": "19.0.0",
"react-dom": "19.0.0",
"react-fast-compare": "3.2.2",
"react-intl": "7.1.0",
"react-router-dom": "7.1.1",
"react-intl": "7.1.4",
"react-router-dom": "7.1.3",
"uuid": "11.0.5"
},
"devDependencies": {
Expand All @@ -66,37 +66,37 @@
"@babel/plugin-transform-modules-commonjs": "7.26.3",
"@babel/preset-env": "7.26.0",
"@babel/preset-react": "7.26.3",
"@chromatic-com/storybook": "^3.2.3",
"@chromatic-com/storybook": "3.2.4",
"@playwright/test": "1.49.1",
"@sif/eslint-config": "*",
"@storybook/addon-essentials": "^8.4.7",
"@storybook/addon-interactions": "^8.4.7",
"@storybook/addon-onboarding": "^8.4.7",
"@storybook/blocks": "^8.4.7",
"@storybook/react": "^8.4.7",
"@storybook/react-vite": "^8.4.7",
"@storybook/test": "^8.4.7",
"@storybook/addon-essentials": "8.5.0",
"@storybook/addon-interactions": "8.5.0",
"@storybook/addon-onboarding": "8.5.0",
"@storybook/blocks": "8.5.0",
"@storybook/react": "8.5.0",
"@storybook/react-vite": "8.5.0",
"@storybook/test": "8.5.0",
"@testing-library/dom": "10.4.0",
"@types/object-hash": "3.0.6",
"@types/react": "19.0.7",
"@types/react-dom": "19.0.3",
"@types/react-router-dom": "5.3.3",
"@vitejs/plugin-react": "4.3.4",
"babel-polyfill": "6.26.0",
"chromatic": "11.23.0",
"chromatic": "11.25.0",
"compression": "1.7.5",
"cors": "2.8.5",
"cross-env": "7.0.3",
"dotenv": "16.4.7",
"express": "4.21.2",
"helmet": "8.0.0",
"http-proxy-middleware": "3.0.3",
"less": "4.2.1",
"less": "4.2.2",
"mustache-express": "1.3.2",
"playwright-core": "1.49.1",
"storybook": "^8.4.7",
"storybook": "8.5.0",
"typescript": "5.7.3",
"vite": "6.0.7",
"vite": "6.0.11",
"vite-plugin-checker": "0.8.0"
},
"bugs": {
Expand Down
14 changes: 7 additions & 7 deletions apps/omsorgsdager-kalkulator/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"test": "jest"
},
"dependencies": {
"@navikt/ds-css": "7.9.1",
"@navikt/ds-css": "7.9.2",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "7.9.1",
"@navikt/ds-tailwind": "7.9.1",
"@navikt/ds-react": "7.9.2",
"@navikt/ds-tailwind": "7.9.2",
"@navikt/nav-dekoratoren-moduler": "3.1.3",
"classnames": "2.5.1",
"csp-header": "6.0.0",
Expand All @@ -28,24 +28,24 @@
"formik": "2.4.6",
"html-react-parser": "5.2.2",
"jsdom": "26.0.0",
"next": "15.1.4",
"next": "15.1.5",
"node-fetch": "3.3.2",
"react": "19.0.0",
"react-day-picker": "8.10.1",
"react-dom": "19.0.0",
"react-intl": "7.1.0",
"react-intl": "7.1.4",
"uuid": "11.0.5"
},
"devDependencies": {
"@axe-core/playwright": "4.10.1",
"@playwright/test": "1.49.1",
"@types/node": "22.10.6",
"@types/node": "22.10.7",
"@types/react": "19.0.7",
"@types/react-dom": "19.0.3",
"@types/uuid": "10.0.0",
"config": "*",
"eslint": "9.18.0",
"eslint-config-next": "15.1.4",
"eslint-config-next": "15.1.5",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"playwright-core": "1.49.1",
Expand Down
Loading

0 comments on commit cf697ba

Please sign in to comment.