Skip to content

Commit cf4d4ef

Browse files
frodehansen2frodehansen2
committed
Merge branch 'main' into innsyn-status-i-sak
2 parents 176619b + ea85fed commit cf4d4ef

File tree

109 files changed

+3319
-1836
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+3319
-1836
lines changed

‎apps/dine-pleiepenger/CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# @navikt/dine-pleiepenger
22

3+
## 0.5.15
4+
5+
### Patch Changes
6+
7+
- Pakkeoppdateringer minor/patch
8+
- Updated dependencies
9+
- @navikt/sif-common-amplitude@2.24.20
10+
- @navikt/appstatus-react-ds@2.17.23
11+
- @navikt/sif-common-core-ds@9.15.5
12+
- @navikt/sif-common-sentry@0.25.18
13+
314
## 0.5.14
415

516
### Patch Changes

‎apps/dine-pleiepenger/package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@navikt/dine-pleiepenger",
3-
"version": "0.5.14",
3+
"version": "0.5.15",
44
"private": true,
55
"scripts": {
66
"build-storybook": "storybook build",
@@ -36,22 +36,22 @@
3636
"zod": "3.22.4"
3737
},
3838
"devDependencies": {
39-
"@axe-core/playwright": "4.8.4",
39+
"@axe-core/playwright": "4.8.5",
4040
"@navikt/ds-css": "5.18.1",
4141
"@navikt/ds-icons": "3.4.3",
4242
"@navikt/ds-react": "5.18.1",
4343
"@navikt/ds-tailwind": "5.18.1",
4444
"@next/bundle-analyzer": "14.1.0",
4545
"@playwright/test": "1.41.2",
46-
"@storybook/addon-essentials": "7.6.14",
47-
"@storybook/addon-interactions": "7.6.14",
48-
"@storybook/addon-links": "7.6.14",
46+
"@storybook/addon-essentials": "7.6.15",
47+
"@storybook/addon-interactions": "7.6.15",
48+
"@storybook/addon-links": "7.6.15",
4949
"@storybook/addon-onboarding": "1.0.11",
50-
"@storybook/blocks": "7.6.14",
51-
"@storybook/nextjs": "7.6.14",
52-
"@storybook/react": "7.6.14",
53-
"@storybook/test": "7.6.14",
54-
"chromatic": "10.9.3",
50+
"@storybook/blocks": "7.6.15",
51+
"@storybook/nextjs": "7.6.15",
52+
"@storybook/react": "7.6.15",
53+
"@storybook/test": "7.6.15",
54+
"chromatic": "10.9.5",
5555
"classnames": "2.5.1",
5656
"dayjs": "1.11.10",
5757
"eslint-plugin-storybook": "0.6.15",
@@ -64,7 +64,7 @@
6464
"react-day-picker": "8.10.0",
6565
"react-dom": "18.2.0",
6666
"react-intl": "6.6.2",
67-
"storybook": "7.6.14",
67+
"storybook": "7.6.15",
6868
"tailwindcss": "3.4.1",
6969
"uuid": "9.0.1"
7070
},

‎apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# @navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn
22

3+
## 1.21.26
4+
5+
### Patch Changes
6+
7+
- Pakkeoppdateringer minor/patch
8+
- Updated dependencies
9+
- @navikt/sif-common-amplitude@2.24.20
10+
- @navikt/sif-common-formik-ds@1.7.14
11+
- @navikt/sif-common-soknad-ds@10.13.14
12+
- @navikt/sif-common-core-ds@9.15.5
13+
- @navikt/sif-common-sentry@0.25.18
14+
315
## 1.21.25
416

517
### Patch Changes

‎apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Søknad om ekstra omsorgsdager når den andre forelderen ikke kan ha tilsyn med barn",
44
"license": "MIT",
55
"name": "@navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn",
6-
"version": "1.21.25",
6+
"version": "1.21.26",
77
"repository": "https://github.com/navikt/sif-brukerdialog",
88
"private": true,
99
"type": "module",
@@ -39,7 +39,7 @@
3939
"compression": "1.7.4",
4040
"cookie-parser": "1.4.6",
4141
"dayjs": "1.11.10",
42-
"dotenv": "16.4.2",
42+
"dotenv": "16.4.4",
4343
"express": "4.18.2",
4444
"formik": "2.4.5",
4545
"helmet": "7.1.0",
@@ -53,18 +53,18 @@
5353
"react-fast-compare": "3.2.2",
5454
"react-intl": "6.6.2",
5555
"react-router-dom": "6.22.0",
56-
"vite": "5.1.1",
56+
"vite": "5.1.2",
5757
"vite-plugin-checker": "0.6.4"
5858
},
5959
"devDependencies": {
60-
"@axe-core/playwright": "4.8.4",
60+
"@axe-core/playwright": "4.8.5",
6161
"@babel/core": "7.23.9",
6262
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
6363
"@babel/plugin-transform-modules-commonjs": "7.23.3",
6464
"@babel/preset-env": "7.23.9",
6565
"@babel/preset-react": "7.23.3",
6666
"@playwright/test": "1.41.2",
67-
"@storybook/react-vite": "7.6.14",
67+
"@storybook/react-vite": "7.6.15",
6868
"@testing-library/react": "14.2.1",
6969
"@types/object-hash": "3.0.6",
7070
"@types/react": "18.2.55",

‎apps/endringsmelding-pleiepenger/CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# @navikt/endringsmelding-pleiepenger
22

3+
## 2.25.7
4+
5+
### Patch Changes
6+
7+
- Pakkeoppdateringer minor/patch
8+
- Updated dependencies
9+
- @navikt/sif-common-amplitude@2.24.20
10+
- @navikt/sif-common-formik-ds@1.7.14
11+
- @navikt/sif-common-soknad-ds@10.13.14
12+
- @navikt/sif-common-forms-ds@8.19.3
13+
- @navikt/sif-common-core-ds@9.15.5
14+
- @navikt/sif-common-sentry@0.25.18
15+
316
## 2.25.6
417

518
### Patch Changes

‎apps/endringsmelding-pleiepenger/package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"license": "MIT",
66
"name": "@navikt/endringsmelding-pleiepenger",
77
"repository": "https://github.com/navikt/sif-brukerdialog",
8-
"version": "2.25.6",
8+
"version": "2.25.7",
99
"private": true,
1010
"dependencies": {
1111
"@navikt/ds-css": "5.18.1",
@@ -25,7 +25,7 @@
2525
"compression": "1.7.4",
2626
"cookie-parser": "1.4.6",
2727
"dayjs": "1.11.10",
28-
"dotenv": "16.4.2",
28+
"dotenv": "16.4.4",
2929
"express": "4.18.2",
3030
"express-rate-limit": "7.1.5",
3131
"flat": "6.0.1",
@@ -54,13 +54,13 @@
5454
"@mswjs/data": "0.16.1",
5555
"@navikt/ds-tailwind": "5.18.1",
5656
"@sentry/vite-plugin": "2.14.0",
57-
"@storybook/addon-actions": "7.6.14",
58-
"@storybook/addon-essentials": "7.6.14",
59-
"@storybook/addon-interactions": "7.6.14",
60-
"@storybook/addon-links": "7.6.14",
61-
"@storybook/node-logger": "7.6.14",
62-
"@storybook/preset-create-react-app": "7.6.14",
63-
"@storybook/react": "7.6.14",
57+
"@storybook/addon-actions": "7.6.15",
58+
"@storybook/addon-essentials": "7.6.15",
59+
"@storybook/addon-interactions": "7.6.15",
60+
"@storybook/addon-links": "7.6.15",
61+
"@storybook/node-logger": "7.6.15",
62+
"@storybook/preset-create-react-app": "7.6.15",
63+
"@storybook/react": "7.6.15",
6464
"@storybook/testing-library": "0.2.2",
6565
"@types/flat": "5.0.5",
6666
"@types/intl": "1.2.2",
@@ -79,13 +79,13 @@
7979
"cypress-axe": "1.5.0",
8080
"cypress-file-upload": "5.0.8",
8181
"jsdom": "24.0.0",
82-
"msw": "2.1.7",
82+
"msw": "2.2.0",
8383
"postcss": "8.4.35",
84-
"postcss-import": "16.0.0",
85-
"storybook": "7.6.14",
84+
"postcss-import": "16.0.1",
85+
"storybook": "7.6.15",
8686
"tailwindcss": "3.4.1",
8787
"typescript": "5.3.3",
88-
"vite": "5.1.1",
88+
"vite": "5.1.2",
8989
"vite-plugin-checker": "0.6.4",
9090
"vitest": "1.2.2"
9191
},

‎apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# @navikt/omsorgsdager-aleneomsorg-dialog
22

3+
## 2.14.29
4+
5+
### Patch Changes
6+
7+
- Pakkeoppdateringer minor/patch
8+
- Updated dependencies
9+
- @navikt/sif-common-amplitude@2.24.20
10+
- @navikt/sif-common-formik-ds@1.7.14
11+
- @navikt/sif-common-soknad-ds@10.13.14
12+
- @navikt/sif-common-forms-ds@8.19.3
13+
- @navikt/sif-common-core-ds@9.15.5
14+
- @navikt/sif-common-sentry@0.25.18
15+
316
## 2.14.28
417

518
### Patch Changes

‎apps/omsorgsdager-aleneomsorg-dialog/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"license": "MIT",
55
"name": "@navikt/omsorgsdager-aleneomsorg-dialog",
66
"repository": "https://github.com/navikt/sif-brukerdialog",
7-
"version": "2.14.28",
7+
"version": "2.14.29",
88
"private": true,
99
"type": "module",
1010
"scripts": {
@@ -56,7 +56,7 @@
5656
"uuid": "9.0.1"
5757
},
5858
"devDependencies": {
59-
"@axe-core/playwright": "4.8.4",
59+
"@axe-core/playwright": "4.8.5",
6060
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
6161
"@babel/plugin-transform-modules-commonjs": "7.23.3",
6262
"@babel/preset-env": "7.23.9",
@@ -69,11 +69,11 @@
6969
"@vitejs/plugin-react": "4.2.1",
7070
"babel-polyfill": "6.26.0",
7171
"cross-env": "7.0.3",
72-
"dotenv": "16.4.2",
72+
"dotenv": "16.4.4",
7373
"jsdom": "24.0.0",
7474
"less": "4.2.0",
7575
"mini-css-extract-plugin": "2.8.0",
76-
"vite": "5.1.1",
76+
"vite": "5.1.2",
7777
"vite-plugin-checker": "0.6.4"
7878
},
7979
"eslintConfig": {

‎apps/omsorgsdager-kalkulator/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# @navikt/omsorgsdager-kalkulator
22

3+
## 3.5.20
4+
5+
### Patch Changes
6+
7+
- Pakkeoppdateringer minor/patch
8+
39
## 3.5.19
410

511
### Patch Changes

‎apps/omsorgsdager-kalkulator/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "En kalkulator for beregning av omsorgsdager.",
44
"license": "MIT",
55
"name": "@navikt/omsorgsdager-kalkulator",
6-
"version": "3.5.19",
6+
"version": "3.5.20",
77
"private": true,
88
"scripts": {
99
"dev": "next dev -p 8080",
@@ -33,7 +33,7 @@
3333
"uuid": "9.0.1"
3434
},
3535
"devDependencies": {
36-
"@axe-core/playwright": "4.8.4",
36+
"@axe-core/playwright": "4.8.5",
3737
"@playwright/test": "1.41.2",
3838
"@types/node": "20.11.17",
3939
"@types/react": "18.2.55",

‎apps/omsorgspengerutbetaling-arbeidstaker-soknad/CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# @navikt/omsorgspengerutbetaling-arbeidstaker-soknad
22

3+
## 1.0.11
4+
5+
### Patch Changes
6+
7+
- Pakkeoppdateringer minor/patch
8+
- Updated dependencies
9+
- @navikt/sif-common-amplitude@2.24.20
10+
- @navikt/sif-common-formik-ds@1.7.14
11+
- @navikt/sif-common-soknad-ds@10.13.14
12+
- @navikt/sif-common-forms-ds@8.19.3
13+
- @navikt/sif-common-core-ds@9.15.5
14+
- @navikt/sif-common-sentry@0.25.18
15+
316
## 1.0.10
417

518
### Patch Changes

‎apps/omsorgspengerutbetaling-arbeidstaker-soknad/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"license": "MIT",
55
"name": "@navikt/omsorgspengerutbetaling-arbeidstaker-soknad",
66
"repository": "https://github.com/navikt/sif-brukerdialog",
7-
"version": "1.0.10",
7+
"version": "1.0.11",
88
"private": true,
99
"dependencies": {
1010
"@navikt/ds-css": "5.18.1",
@@ -27,7 +27,7 @@
2727
"compression": "1.7.4",
2828
"cookie-parser": "1.4.6",
2929
"dayjs": "1.11.10",
30-
"dotenv": "16.4.2",
30+
"dotenv": "16.4.4",
3131
"express": "4.18.2",
3232
"helmet": "7.1.0",
3333
"history": "5.3.0",
@@ -44,7 +44,7 @@
4444
"react-router-dom": "6.22.0",
4545
"ulid": "^2.3.0",
4646
"uuid": "^9.0.1",
47-
"vite": "5.1.1",
47+
"vite": "5.1.2",
4848
"vite-plugin-checker": "0.6.4"
4949
},
5050
"devDependencies": {

‎apps/omsorgspengerutbetaling-soknad/.eslintrc.cjs

+3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
module.exports = {
22
...require('config/eslint'),
3+
34
parserOptions: {
45
root: true,
56
tsconfigRootDir: __dirname,
67
},
8+
9+
extends: ['plugin:storybook/recommended']
710
};

‎apps/omsorgspengerutbetaling-soknad/.storybook/main.ts

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
const config = {
2+
stories: ['../src/storybook/**/*.stories.tsx'],
3+
addons: ['@storybook/addon-essentials', '@storybook/addon-a11y', 'storybook-formik/register'],
4+
framework: {
5+
name: '@storybook/react-vite',
6+
options: {},
7+
},
8+
docs: {
9+
autodocs: false,
10+
},
11+
typescript: {
12+
reactDocgen: 'react-docgen-typescript-plugin',
13+
},
14+
};
15+
16+
export default config;

‎apps/omsorgspengerutbetaling-soknad/.storybook/preview-head.html

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<script>
2+
window.appSettings = {
3+
DEKORATOR_URL: 'https://www.nav.no/dekoratoren/?simple=true&chatbot=false',
4+
LOGIN_URL: 'http://localhost:8089/login',
5+
API_URL: 'http://localhost:8089',
6+
PUBLIC_PATH: '/familie/sykdom-i-familien/soknad/{SIF_SOKNAD_TEMPLATE}',
7+
APPSTATUS_PROJECT_ID: 'ryujtq87',
8+
APPSTATUS_DATASET: 'staging',
9+
APP_VERSION: 'dev',
10+
};
11+
</script>

‎apps/omsorgspengerutbetaling-soknad/.storybook/preview.ts

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import '@navikt/ds-css';
2+
3+
export const parameters = {
4+
actions: { argTypesRegex: '^on[A-Z].*' },
5+
options: {
6+
storySort: {
7+
method: 'alphabetical',
8+
},
9+
},
10+
controls: {
11+
matchers: {
12+
color: /(background|color)$/i,
13+
date: /Date$/,
14+
},
15+
},
16+
};

0 commit comments

Comments
 (0)