From eda70d5f5ff389bc407d0289e370aa1f2fa62ebf Mon Sep 17 00:00:00 2001
From: frodehansen2
Date: Thu, 2 Nov 2023 20:07:56 +0100
Subject: [PATCH 1/9] Playwright livets slutt (#1315)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Utfylling av enkel søknad
---
....pleiepenger-i-livets-sluttfase-soknad.yml | 34 ++--
.../e2e/playwright/files/navlogopng.png | Bin 0 -> 2366 bytes
.../mock-data/playwrightApiMockData.ts | 17 ++
.../fyll-ut-s\303\270knad-med-fnr.spec.ts" | 182 ++++++++++++++++++
.../package.json | 17 +-
.../playwright.config.ts | 36 ++++
.../ArbeidssituasjonStep.tsx" | 3 -
.../form-parts/ArbeidssituasjonAnsatt.tsx" | 3 -
.../ArbeidssituasjonArbeidsgivere.tsx" | 2 +-
.../form-parts/ArbeidssituasjonFrilans.tsx" | 5 -
.../form-parts/ArbeidssituasjonSN.tsx" | 3 -
.../steps/medlemskap/MedlemskapStep.tsx" | 86 ++++-----
.../OpplysningerOmPleietrengendeStep.tsx" | 8 -
.../steps/tidsrom/TidsromStep.tsx" | 3 -
yarn.lock | 120 +++++++++++-
15 files changed, 414 insertions(+), 105 deletions(-)
create mode 100644 apps/pleiepenger-i-livets-sluttfase-soknad/e2e/playwright/files/navlogopng.png
create mode 100644 apps/pleiepenger-i-livets-sluttfase-soknad/e2e/playwright/mock-data/playwrightApiMockData.ts
create mode 100644 "apps/pleiepenger-i-livets-sluttfase-soknad/e2e/playwright/tests/fyll-ut-s\303\270knad-med-fnr.spec.ts"
create mode 100644 apps/pleiepenger-i-livets-sluttfase-soknad/playwright.config.ts
diff --git a/.github/workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml b/.github/workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml
index c9983ccfdc..7d8b0585e2 100644
--- a/.github/workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml
+++ b/.github/workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml
@@ -34,7 +34,8 @@ jobs:
- name: Run code tests
run: yarn test --filter=pleiepenger-i-livets-sluttfase-soknad
- run-cypress-test:
+ run-playwright-test:
+ timeout-minutes: 60
runs-on: ubuntu-latest
steps:
- name: Checkout
@@ -46,25 +47,14 @@ jobs:
node-version: 18
cache: 'yarn'
- - name: Build and start e2e server
- uses: cypress-io/github-action@v6.5.0
- env:
- DEKORATOR_URL: https://www.nav.no/dekoratoren/?simple=true&chatbot=false
- PUBLIC_PATH: /familie/sykdom-i-familien/soknad/pleiepenger-i-livets-sluttfase
- FRONTEND_API_PATH: http://localhost:8089/
- CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- APPSTATUS_PROJECT_ID: ryujtq87
- APPSTATUS_DATASET: staging
- with:
- project: ./apps/pleiepenger-i-livets-sluttfase-soknad/e2e
- build: yarn build-pleiepenger-i-livets-sluttfase-soknad
- start: yarn turbo start-e2e-server --filter=pleiepenger-i-livets-sluttfase-soknad
- wait-on: 'http://localhost:8080/familie/sykdom-i-familien/soknad/pleiepenger-i-livets-sluttfase/alive'
- wait-on-timeout: 60
- runTests: false
+ - name: Install dependencies
+ run: yarn
+
+ - name: Install Playwright Browsers
+ run: npx playwright install chromium
+
+ - name: Build application
+ run: yarn build-app --filter=pleiepenger-i-livets-sluttfase-soknad
- - name: Run cypress tests
- run: yarn turbo cypress-run --filter=pleiepenger-i-livets-sluttfase-soknad
- env:
- CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
\ No newline at end of file
+ - name: Run tests
+ run: yarn turbo playwright-test --filter=pleiepenger-i-livets-sluttfase-soknad
diff --git a/apps/pleiepenger-i-livets-sluttfase-soknad/e2e/playwright/files/navlogopng.png b/apps/pleiepenger-i-livets-sluttfase-soknad/e2e/playwright/files/navlogopng.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ee2ed86f87bcb62688e7c50c2abedcb78c4800b
GIT binary patch
literal 2366
zcmV-E3BmS>P)FNCP^6cwpZ^(STv4KlaQCMOpD3W?;6kV*hvae*F_}v`{wb*Z?Gj<^0Dm
zB$Vg&54g!Vd;CnQFcdCdW8(e*Ax;iG@V#lG7kKvR?hUjo`T&07u%hKer+|yLXJ?
z)jbZ5WaAu|FT`!!FmMa5@MMj^xX&UyK}E-j-PD6v%NPhEzygrtzV3%i9v<4lUPm
zI2@cMnKK-FXECph;NdFfT5N{I!I5ko0Z9kc5CP=wNK5izad0Go6CBCF45>mcCtlHc
z^llPcJHX*Gz3n16I{+Xv7e0DhdfM=L~PIWqipaNl@}?l6a&{Bcv}U&L<$EAn#VmHEB;IFz1^
zHrS2;db3y7(bb5*;|;KP0tc>gn!WOsp_~L}$i4`eZxpIvqF?hTs(n7+mpZ7ft6A6d6*|DDMOk
zwLoZq=+}Q>w2?~&85ZxdX8@`BWWB0#GF!ra{BXeZ@Kov(9JF=xx`51Xiic0~nMUR`
zAfj#yH#2a_0hYwTy%0l|atN2S=z9ZZyt3LufvY|m;mQsXi>z5V>M@dLm~NEFs+1)r
zjyOX|I=O4LPq7LC(W23S8I@)p@>B7v=Zik)rBSUz)Fmmiq&@NBU39djRUYXuh~wKKqm0HA
zDOqOyalxp6BdXp`T7@W}Nm88Hgy?OZbIkyMPWVJ1^0-762LTbH0Z+4P$5ox0&kQl7
zEmx|b@w1u+{hsu6I%#}dGqPbImY-M=)cJ{n#z^cnS!!L215k?`oe_{$W>pvu`SG~*
z(bBE9M@~Lv4E`lOi=#-?MyzQ(P|XkSSZxAq?^{8YeHWJPUM@1M)2rVQOI1EnO{zpH
z5HNY1txKAcCX~f*tAG&k;PZxDL#F0|+~iUQ+eTa;zd#du@&YtYLewPzQtMMkt;17R
z0(bGR8QmXTJ%MDjxZ?%=ArcY}FGDXw(7JGN`HI-5&gR9iWJG8^Q8`G40Je(V4T${A
zLbP{4?bH4(5Sj_7DP22(zzq!~OiOawZ)=x&CGgo*o$jNokg8KNgJteJKsYO*3&;b@
z?i1M@tm>EnQs0>AZMmw`;0t?odcp=5vF$**YR!knY*8T92#%ZaIZ<-DrhRcN*2J=6
zNdZ(vL!41*E(~oed=E&REf0dQ&h2l9!`+q~2_h{ot%ytiZ`q5>7(7S-k0-0g$^K6{
zQXNBKso~u7dp&J#iEE(S6w?KRfggaxS&?AU8thd51U#*ZNjTK{s|CMjgMM6NJMXztRSS-SrssxWs%8@7Y~|Ok5R$h+FhiYYCZu{
z=(Uxopg?@+2sg;~aT|-SWV~p4^_06LvTQz5^@lB0Rc%fm0O6in)3Oz#KsmeIi*(G?Jo2)eWz{ga4|!
zc%-%l?}3Q22s@)pGJQ}W>SJ2}W$Y1#s8&F~Q`G@z@U>;_zC>47dL3`U<{c0@2yhOX
zTSK;5HC`>7CiV1mW9$9o#LOC6RUD_&J#H0Ux;l&Mc3F64zM>`?fLl8lG_2z(aNz~M
zf7(_~V|!9hdlpmH)tT&HvBcsj?x-5<;!
z?jE6uT$M1P%PS^xoyc@9c$vy*u4p1xNelYU<=*ViUhXX@`S`l^%U`~3y`qU+
kfG=qh|B|4gk^V` __DateNow() + __DateNowOffset;
+
+ console.log(new Date());
+ }
+`;
+
+test.beforeEach(async ({ page }) => {
+ // Update the Date accordingly in your test pages
+ await page.addInitScript(initScript);
+
+ await page.route('https://login.nav.no/**', async (route) => {
+ await route.fulfill({ status: 200 });
+ });
+ await page.route('https://www.nav.no/person/nav-dekoratoren-api/auth', async (route) => {
+ await route.fulfill({ status: 200 });
+ });
+ await page.route('**/mellomlagring/PLEIEPENGER_LIVETS_SLUTTFASE', async (route) => {
+ await route.fulfill({ status: 200, body: '{}' });
+ });
+ await page.route('**/oppslag/soker', async (route) => {
+ await route.fulfill({ status: 200, body: JSON.stringify(playwrightApiMockData.søkerMock) });
+ });
+ await page.route('**/oppslag/arbeidsgiver**', async (route) => {
+ await route.fulfill({ status: 200, body: JSON.stringify(playwrightApiMockData.arbeidsgiverMock) });
+ });
+ await page.route('**/innsending', async (route) => {
+ await route.fulfill({ status: 200 });
+ });
+});
+
+test('Søknad med fnr', async ({ page }) => {
+ // await page.addInitScript(initScript);
+
+ await page.goto(startUrl);
+
+ /** Velkommen side */
+ await page.getByRole('heading', { level: 1, name: 'Hei PRESENTABEL' });
+ await page.getByLabel('Jeg bekrefter at jeg har forstått mitt ansvar som søker').click();
+ await page.getByRole('button', { name: 'Start søknad' }).click();
+
+ /** Pleietrengende side */
+ await page.getByRole('heading', { level: 1, name: 'Om personen du pleier' });
+ await page.getByLabel('Navn på den du skal pleie').fill('Test Testesen');
+ await page.getByRole('textbox', { name: 'Fødselsnummer/D-nummer' }).fill('27857798800');
+ await page.getByRole('group', { name: 'Er dere flere som skal dele på pleiepengene?' }).getByLabel('Ja').check();
+ await page.getByRole('button', { name: 'Neste', exact: true }).click();
+
+ /** Tidsrom side */
+ await page.getByRole('heading', { level: 1, name: 'Dager du må være hjemme fra jobb for å gi pleie' });
+ await page.getByRole('button', { name: 'Gå til forrige måned' }).click({ clickCount: 2 });
+ await page
+ .getByRole('group', { name: 'Hvilke dager skal du være hjemme fra jobb for å gi pleie?' })
+ .getByRole('button', { name: '33' })
+ .click();
+ await page.getByRole('button', { name: 'Gå til neste måned' }).click();
+ await page.getByLabel('4. september (mandag)').click();
+ await page.getByLabel('11. september (mandag)').click();
+ await page.getByLabel('18. september (mandag)').click();
+ await page.getByLabel('25. september (mandag)').click();
+ await page.getByRole('group', { name: 'Skal du pleie personen hjemme?' }).getByLabel('Ja').check();
+ await page.getByRole('group', { name: 'Skal du gi pleie og jobbe på samme dag?' }).getByLabel('Ja').check();
+ await page
+ .getByRole('group', { name: 'Oppholder du deg i utlandet i noen av dagene du søker for?' })
+ .getByLabel('Nei')
+ .check();
+ await page.getByRole('button', { name: 'Neste', exact: true }).click();
+
+ /** Jobb i søknadsperioden */
+ await page.getByRole('heading', { level: 1, name: 'Arbeidssituasjon' });
+ await page
+ .getByRole('group', {
+ name: 'Stemmer det at du er ansatt hos Arbeids- og velferdsetaten i perioden du søker for?',
+ })
+ .getByLabel('Ja')
+ .check();
+ await page
+ .getByLabel('Hvor mange timer jobber du normalt per uke hos Arbeids- og velferdsetaten når du ikke har fravær?')
+ .click();
+ await page
+ .getByLabel('Hvor mange timer jobber du normalt per uke hos Arbeids- og velferdsetaten når du ikke har fravær?')
+ .fill('37,5');
+ await page.getByRole('group', { name: 'Er du frilanser i perioden du søker for?' }).getByLabel('Nei').check();
+ await page
+ .getByRole('group', { name: 'Er du selvstendig næringsdrivende i perioden du søker for?' })
+ .getByLabel('Nei')
+ .check();
+ await page
+ .getByRole('group', {
+ name: 'Har du jobbet som arbeidstaker eller frilanser i et annet EØS-land i løpet av de 3 siste månedene før perioden du søker om?',
+ })
+ .getByLabel('Nei')
+ .check();
+ await page
+ .getByRole('group', {
+ name: 'Har du jobbet som selvstendig næringsdrivende i et annet EØS-land i løpet av de 3 siste årene før perioden du søker om?',
+ })
+ .getByLabel('Nei')
+ .check();
+ await page.getByRole('button', { name: 'Neste', exact: true }).click();
+
+ /** Jobb i søknadsperioden */
+ await page.getByRole('heading', { level: 1, name: 'Jobb i søknadsperioden' });
+ await page.getByRole('group', { name: 'mandag 14. august' }).getByLabel('TimerTimer').fill('3');
+ await page.getByRole('group', { name: 'mandag 14. august' }).getByLabel('MinutterMin.').fill('30');
+ await page.getByRole('group', { name: 'onsdag 16. august' }).getByLabel('TimerTimer').fill('3');
+ await page.getByRole('group', { name: 'onsdag 16. august' }).getByLabel('MinutterMin.').fill('30');
+ await page.getByRole('group', { name: 'Uke 36' }).getByLabel('TimerTimer').click();
+ await page.getByRole('group', { name: 'Uke 36' }).getByLabel('TimerTimer').fill('3');
+ await page.getByRole('group', { name: 'Uke 36' }).getByLabel('MinutterMin.').fill('30');
+ await page.getByRole('group', { name: 'mandag 18. september' }).click();
+ await page.getByRole('group', { name: 'Uke 38' }).getByLabel('TimerTimer').click();
+ await page.getByRole('group', { name: 'Uke 38' }).getByLabel('TimerTimer').fill('3');
+ await page.getByRole('group', { name: 'Uke 38' }).getByLabel('MinutterMin.').fill('30');
+ await page.getByRole('button', { name: 'Neste', exact: true }).click();
+
+ /** Medlemsskap */
+ await page.getByRole('heading', { level: 1, name: 'Medlemsskap' });
+ await page
+ .getByRole('group', { name: 'Har du bodd i utlandet i hele eller deler av de siste 12 månedene?' })
+ .getByLabel('Nei')
+ .click();
+ await page
+ .getByRole('group', { name: 'Planlegger du å bo i utlandet i hele eller deler av de neste 12 månedene?' })
+ .getByLabel('Nei')
+ .click();
+ await page.getByRole('button', { name: 'Neste', exact: true }).click();
+
+ /** Legeerklæring */
+ await page.getByRole('heading', { level: 1, name: 'Legeerklæring' });
+ await page.getByRole('button', { name: 'Last opp legeerklæringen' }).click();
+ await page
+ .getByLabel('OpplastingsikonLast opp legeerklæringen')
+ .setInputFiles('./e2e/playwright/files/navlogopng.png');
+ await page.getByRole('button', { name: 'Neste', exact: true }).click();
+
+ /** Oppsummering */
+ await page.getByRole('heading', { level: 1, name: 'Oppsummering' });
+ await page
+ .getByLabel(
+ 'Jeg bekrefter at opplysningene jeg har gitt er riktige, og at jeg ikke har holdt tilbake opplysninger som har betydning for min rett til pleiepenger.',
+ )
+ .check();
+ await page.getByRole('button', { name: 'Send søknad', exact: true }).click();
+
+ /** Kvittering */
+ const heading = await page.getByRole('heading', {
+ level: 1,
+ name: 'Vi har mottatt søknad om pleiepenger i livets sluttfase',
+ });
+ await expect(heading).toBeVisible();
+});
diff --git a/apps/pleiepenger-i-livets-sluttfase-soknad/package.json b/apps/pleiepenger-i-livets-sluttfase-soknad/package.json
index 08ac9caa64..d42ec18141 100644
--- a/apps/pleiepenger-i-livets-sluttfase-soknad/package.json
+++ b/apps/pleiepenger-i-livets-sluttfase-soknad/package.json
@@ -49,10 +49,12 @@
"uuid": "^9.0.1"
},
"devDependencies": {
+ "@axe-core/playwright": "4.8.1",
"@babel/core": "7.23.2",
"@babel/preset-env": "7.23.2",
"@babel/preset-react": "7.22.15",
"@babel/preset-typescript": "7.23.2",
+ "@playwright/test": "^1.39.0",
"@storybook/react-vite": "7.5.2",
"@testing-library/react": "14.0.0",
"@types/jest": "29.5.7",
@@ -64,8 +66,6 @@
"cross-env": "7.0.3",
"css-loader": "6.8.1",
"css-minimizer-webpack-plugin": "5.0.1",
- "cypress": "13.4.0",
- "cypress-file-upload": "5.0.8",
"express-rate-limit": "7.1.3",
"lint-staged": "15.0.2",
"postcss": "8.4.31",
@@ -73,6 +73,7 @@
"react-scripts": "5.0.1",
"sass": "1.69.5",
"sass-loader": "13.3.2",
+ "sinon": "17.0.1",
"source-map-loader": "4.0.1",
"start-server-and-test": "2.0.1",
"style-loader": "3.3.3",
@@ -88,17 +89,19 @@
},
"scripts": {
"build-app": "vite build --base=/familie/sykdom-i-familien/soknad/pleiepenger-i-livets-sluttfase",
- "clean": "rm -rf node_modules .dist",
- "cypress-open": "cypress open --project $PWD/e2e",
- "cypress-run": "cypress run --project $PWD/e2e",
"build-storybook": "storybook build",
+ "clean": "rm -rf node_modules .dist",
+ "codegen": "playwright codegen",
"dev-api": "PORT=8089 node ./api-mock/mock-server.cjs",
+ "playwright-test": "playwright test",
+ "e2e": "playwright test",
+ "e2e-ui": "playwright test --ui",
"snd": "cross-env NODE_ENV=development node ./server.cjs",
"start-e2e-server": "node ./server-e2e.cjs",
"start-express": "node ./server.cjs",
"storybook": "storybook dev -p 6006 -s public",
- "test": "react-scripts test --watchAll=false --env=jsdom",
- "test-watch": "react-scripts test --watchAll=true --env=jsdom"
+ "test-watch": "react-scripts test --watchAll=true --env=jsdom",
+ "test": "react-scripts test --watchAll=false --env=jsdom"
},
"eslintConfig": {
"overrides": [
diff --git a/apps/pleiepenger-i-livets-sluttfase-soknad/playwright.config.ts b/apps/pleiepenger-i-livets-sluttfase-soknad/playwright.config.ts
new file mode 100644
index 0000000000..3a860176d8
--- /dev/null
+++ b/apps/pleiepenger-i-livets-sluttfase-soknad/playwright.config.ts
@@ -0,0 +1,36 @@
+import { defineConfig, devices } from '@playwright/test';
+
+export default defineConfig({
+ testDir: './e2e/playwright/tests',
+ fullyParallel: true,
+ forbidOnly: !!process.env.CI,
+ retries: process.env.CI ? 2 : 0,
+ workers: process.env.CI ? 1 : undefined,
+ reporter: 'html',
+ use: {
+ trace: 'on-first-retry',
+ launchOptions: {
+ slowMo: 100,
+ },
+ },
+ projects: [
+ {
+ name: 'chromium',
+ use: { ...devices['Desktop Chrome'] },
+ },
+ ],
+ webServer: {
+ command: 'yarn start-e2e-server',
+ url: 'http://localhost:8080',
+ env: {
+ DEKORATOR_URL: 'https://www.nav.no/dekoratoren/?simple=true&chatbot=false',
+ PUBLIC_PATH: '/familie/sykdom-i-familien/soknad/pleiepenger-i-livets-sluttfase',
+ API_URL: 'http://localhost:8089',
+ FRONTEND_API_PATH: 'http://localhost:8089',
+ FRONTEND_VEDLEGG_URL: 'http://localhost:8089',
+ VEDLEGG_API_URL: 'http://localhost:8089',
+ APPSTATUS_PROJECT_ID: 'ryujtq87',
+ APPSTATUS_DATASET: 'staging',
+ },
+ },
+});
diff --git "a/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/arbeidssituasjon/ArbeidssituasjonStep.tsx" "b/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/arbeidssituasjon/ArbeidssituasjonStep.tsx"
index 1db22406a2..a04fb224ed 100644
--- "a/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/arbeidssituasjon/ArbeidssituasjonStep.tsx"
+++ "b/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/arbeidssituasjon/ArbeidssituasjonStep.tsx"
@@ -207,7 +207,6 @@ const ArbeidssituasjonStep = () => {
legend={intlHelper(intl, 'steg.arbeidssituasjon.opptjeningUtland.spm')}
name={ArbeidssituasjonFormFields.harOpptjeningUtland}
validate={getYesOrNoValidator()}
- data-testid="opptjeningUtland.spm"
/>
{harOpptjeningUtland === YesOrNo.YES && (
@@ -229,7 +228,6 @@ const ArbeidssituasjonStep = () => {
legend={intlHelper(intl, 'steg.arbeidssituasjon.utenlandskNæring.spm')}
name={ArbeidssituasjonFormFields.harUtenlandskNæring}
validate={getYesOrNoValidator()}
- data-testid="utenlandskNæring.spm"
/>
{harUtenlandskNæring === YesOrNo.YES && (
@@ -288,7 +286,6 @@ const ArbeidssituasjonStep = () => {
}
- data-testid="harVærtEllerErVernepliktig"
/>
diff --git "a/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/arbeidssituasjon/form-parts/ArbeidssituasjonAnsatt.tsx" "b/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/arbeidssituasjon/form-parts/ArbeidssituasjonAnsatt.tsx"
index 6809092083..2e8e6d055e 100644
--- "a/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/arbeidssituasjon/form-parts/ArbeidssituasjonAnsatt.tsx"
+++ "b/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/arbeidssituasjon/form-parts/ArbeidssituasjonAnsatt.tsx"
@@ -70,7 +70,6 @@ const ArbeidssituasjonAnsatt = ({ arbeidsforhold, parentFieldName, søknadsperio
}
: undefined;
}}
- data-testid="erAnsatt.spm"
/>
@@ -101,7 +100,6 @@ const ArbeidssituasjonAnsatt = ({ arbeidsforhold, parentFieldName, søknadsperio
}
: undefined;
}}
- data-testid="ansatt.sluttetFørSøknadsperiode.spm"
/>
@@ -122,7 +120,6 @@ const ArbeidssituasjonAnsatt = ({ arbeidsforhold, parentFieldName, søknadsperio
description={}
validate={getJobberNormaltTimerValidator(intlValues)}
value={arbeidsforhold ? arbeidsforhold.jobberNormaltTimer || '' : ''}
- data-testid="ansatt.jobberNormaltTimer"
/>
>
)}
diff --git "a/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/arbeidssituasjon/form-parts/ArbeidssituasjonArbeidsgivere.tsx" "b/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/arbeidssituasjon/form-parts/ArbeidssituasjonArbeidsgivere.tsx"
index e576032e2e..0f269effb1 100644
--- "a/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/arbeidssituasjon/form-parts/ArbeidssituasjonArbeidsgivere.tsx"
+++ "b/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/arbeidssituasjon/form-parts/ArbeidssituasjonArbeidsgivere.tsx"
@@ -37,7 +37,7 @@ const ArbeidssituasjonArbeidsgivere = ({ ansatt_arbeidsforhold, søknadsperiode,
{ansatt_arbeidsforhold.length > 0 && (
<>
{ansatt_arbeidsforhold.map((forhold, index) => (
-
+
)
}
- data-testid="harHattInntektSomFrilanser"
/>
)}
@@ -127,14 +126,12 @@ const ArbeidssituasjonFrilans = ({
minDate={dayjs().subtract(50, 'years').toDate()}
maxDate={søknadsdato}
validate={getFrilanserStartdatoValidator(formValues, søknadsperiode, søknadsdato)}
- data-testid="frilanser.nårStartet"
/>
{jobberFortsattSomFrilans === YesOrNo.NO && (
@@ -151,7 +148,6 @@ const ArbeidssituasjonFrilans = ({
søknadsdato,
søkerHarFrilansoppdrag,
)}
- data-testid="frilanser.nårSluttet"
/>
)}
@@ -169,7 +165,6 @@ const ArbeidssituasjonFrilans = ({
description={}
validate={getJobberNormaltTimerValidator(intlValues)}
value={jobberNormaltTimer ? jobberNormaltTimer || '' : ''}
- data-testid="frilanser.jobberNormaltTimer"
/>
>
diff --git "a/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/arbeidssituasjon/form-parts/ArbeidssituasjonSN.tsx" "b/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/arbeidssituasjon/form-parts/ArbeidssituasjonSN.tsx"
index 0bc2b66e31..9d3b02ab2a 100644
--- "a/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/arbeidssituasjon/form-parts/ArbeidssituasjonSN.tsx"
+++ "b/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/arbeidssituasjon/form-parts/ArbeidssituasjonSN.tsx"
@@ -68,7 +68,6 @@ const ArbeidssituasjonSN = ({ formValues, urlSkatteetatenSN, søknadsperiode }:
>
}
- data-testid="harHattInntektSomSN"
/>
{harHattInntektSomSN === YesOrNo.YES && (
@@ -77,7 +76,6 @@ const ArbeidssituasjonSN = ({ formValues, urlSkatteetatenSN, søknadsperiode }:
name={SelvstendigFormFields.harFlereVirksomheter}
legend={intlHelper(intl, 'selvstendig.harFlereVirksomheter.spm')}
validate={getYesOrNoValidator()}
- data-testid="selvstendig.harFlereVirksomheter"
/>
{søkerHarFlereVirksomheter && (
@@ -122,7 +120,6 @@ const ArbeidssituasjonSN = ({ formValues, urlSkatteetatenSN, søknadsperiode }:
description={}
validate={getJobberNormaltTimerValidator(intlValues)}
value={jobberNormaltTimer ? jobberNormaltTimer || '' : ''}
- data-testid="Selvstendig.jobberNormaltTimer"
/>
diff --git "a/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/medlemskap/MedlemskapStep.tsx" "b/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/medlemskap/MedlemskapStep.tsx"
index b37c637841..fb42bc896f 100644
--- "a/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/medlemskap/MedlemskapStep.tsx"
+++ "b/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/medlemskap/MedlemskapStep.tsx"
@@ -113,33 +113,30 @@ const MedlemskapStep = () => {
{intlHelper(intl, 'step.medlemskap.annetLandSiste12.hjelp')}
}
- data-testid="medlemskap-annetLandSiste12"
/>
{harBoddUtenforNorgeSiste12Mnd === YesOrNo.YES && (
-
-
- name={MedlemskapFormFields.utenlandsoppholdSiste12Mnd}
- minDate={siste12Måneder.from}
- maxDate={siste12Måneder.to}
- labels={{
- addLabel: intlHelper(
- intl,
- 'step.medlemskap.utenlandsopphold.leggTilLabel',
- ),
- listTitle: intlHelper(
- intl,
- 'step.medlemskap.annetLandSiste12.listeTittel',
- ),
- modalTitle: intlHelper(
- intl,
- 'step.medlemskap.annetLandSiste12.listeTittel',
- ),
- }}
- validate={validateUtenlandsoppholdSiste12Mnd}
- />
-
+
+ name={MedlemskapFormFields.utenlandsoppholdSiste12Mnd}
+ minDate={siste12Måneder.from}
+ maxDate={siste12Måneder.to}
+ labels={{
+ addLabel: intlHelper(
+ intl,
+ 'step.medlemskap.utenlandsopphold.leggTilLabel',
+ ),
+ listTitle: intlHelper(
+ intl,
+ 'step.medlemskap.annetLandSiste12.listeTittel',
+ ),
+ modalTitle: intlHelper(
+ intl,
+ 'step.medlemskap.annetLandSiste12.listeTittel',
+ ),
+ }}
+ validate={validateUtenlandsoppholdSiste12Mnd}
+ />
)}
@@ -152,33 +149,30 @@ const MedlemskapStep = () => {
{intlHelper(intl, 'step.medlemskap.annetLandNeste12.hjelp')}
}
- data-testid="medlemskap-annetLandNeste12"
/>
{skalBoUtenforNorgeNeste12Mnd === YesOrNo.YES && (
-
-
- name={MedlemskapFormFields.utenlandsoppholdNeste12Mnd}
- minDate={neste12Måneder.from}
- maxDate={neste12Måneder.to}
- labels={{
- addLabel: intlHelper(
- intl,
- 'step.medlemskap.utenlandsopphold.leggTilLabel',
- ),
- listTitle: intlHelper(
- intl,
- 'step.medlemskap.annetLandNeste12.listeTittel',
- ),
- modalTitle: intlHelper(
- intl,
- 'step.medlemskap.annetLandNeste12.listeTittel',
- ),
- }}
- validate={validateUtenlandsoppholdNeste12Mnd}
- />
-
+
+ name={MedlemskapFormFields.utenlandsoppholdNeste12Mnd}
+ minDate={neste12Måneder.from}
+ maxDate={neste12Måneder.to}
+ labels={{
+ addLabel: intlHelper(
+ intl,
+ 'step.medlemskap.utenlandsopphold.leggTilLabel',
+ ),
+ listTitle: intlHelper(
+ intl,
+ 'step.medlemskap.annetLandNeste12.listeTittel',
+ ),
+ modalTitle: intlHelper(
+ intl,
+ 'step.medlemskap.annetLandNeste12.listeTittel',
+ ),
+ }}
+ validate={validateUtenlandsoppholdNeste12Mnd}
+ />
)}
diff --git "a/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/opplysninger-om-pleietrengende/OpplysningerOmPleietrengendeStep.tsx" "b/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/opplysninger-om-pleietrengende/OpplysningerOmPleietrengendeStep.tsx"
index 8ee5c38d5c..3f22b275f2 100644
--- "a/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/opplysninger-om-pleietrengende/OpplysningerOmPleietrengendeStep.tsx"
+++ "b/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/opplysninger-om-pleietrengende/OpplysningerOmPleietrengendeStep.tsx"
@@ -128,7 +128,6 @@ const OpplysningerOmPleietrengendeStep = () => {
label={intlHelper(intl, 'step.opplysningerOmPleietrengende.spm.navn')}
validate={getStringValidator({ required: true, maxLength: 50 })}
style={{ maxWidth: '20rem' }}
- data-testid="opplysningerOmPleietrengende.spm.navn"
/>
{
minLength={11}
style={{ maxWidth: '20rem' }}
disabled={harIkkeFnr}
- data-testid="opplysningerOmPleietrengende.spm.fnr"
/>
{
);
}
}}
- data-testid="opplysningerOmPleietrengende.fnr.harIkkeFnr"
/>
@@ -201,7 +198,6 @@ const OpplysningerOmPleietrengendeStep = () => {
maxDate={dateToday}
minDate={new Date('01.01.1900')}
dropdownCaption={true}
- data-testid="opplysningerOmPleietrengende.fødselsdato"
/>
@@ -219,7 +215,6 @@ const OpplysningerOmPleietrengendeStep = () => {
`step.opplysningerOmPleietrengende.årsakManglerIdentitetsnummer.${årsak}`,
),
value: årsak,
- 'data-testid': `årsakManglerIdentitetsnummer.${årsak}`,
}))}
validate={getRequiredFieldValidator()}>
@@ -257,17 +252,14 @@ const OpplysningerOmPleietrengendeStep = () => {
{
label: intlHelper(intl, `step.tidsrom.flereSokere.ja`),
value: YesOrNoDontKnow.YES,
- 'data-testid': `steg.opplysningerOmPleietrengende.flereSokere.spm_yes`,
},
{
label: intlHelper(intl, `step.tidsrom.flereSokere.nei`),
value: YesOrNoDontKnow.NO,
- 'data-testid': `steg.opplysningerOmPleietrengende.flereSokere.spm_no`,
},
{
label: intlHelper(intl, `step.tidsrom.flereSokere.usikker`),
value: YesOrNoDontKnow.DO_NOT_KNOW,
- 'data-testid': `steg.opplysningerOmPleietrengende.flereSokere.spm_usikker`,
},
]}
/>
diff --git "a/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/tidsrom/TidsromStep.tsx" "b/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/tidsrom/TidsromStep.tsx"
index d2e1c4a649..ab78891b6e 100644
--- "a/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/tidsrom/TidsromStep.tsx"
+++ "b/apps/pleiepenger-i-livets-sluttfase-soknad/src/app/s\303\270knad/steps/tidsrom/TidsromStep.tsx"
@@ -156,7 +156,6 @@ const TidsromStep = () => {
}
- data-testid="pleierDuDenSykeHjemme.spm"
/>
{pleierDuDenSykeHjemme === YesOrNo.NO && (
@@ -174,7 +173,6 @@ const TidsromStep = () => {
legend={intlHelper(intl, 'steg.tidsrom.skalJobbeIPerioden.spm')}
name={TidsromFormFields.skalJobbeOgPleieSammeDag}
validate={getYesOrNoValidator()}
- data-testid="skalJobbeIPerioden.spm"
description={
{
legend={intlHelper(intl, 'steg.tidsrom.iUtlandetIPerioden.spm')}
name={TidsromFormFields.skalOppholdeSegIUtlandetIPerioden}
validate={getYesOrNoValidator()}
- data-testid="iUtlandetIPerioden.spm"
/>
{skalOppholdeSegIUtlandetIPerioden === YesOrNo.YES && (
diff --git a/yarn.lock b/yarn.lock
index e47d05e069..49762bc003 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3993,6 +3993,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@navikt/pleiepenger-i-livets-sluttfase-soknad@workspace:apps/pleiepenger-i-livets-sluttfase-soknad"
dependencies:
+ "@axe-core/playwright": 4.8.1
"@babel/core": 7.23.2
"@babel/preset-env": 7.23.2
"@babel/preset-react": 7.22.15
@@ -4011,6 +4012,7 @@ __metadata:
"@navikt/sif-common-soknad-ds": "workspace:*"
"@navikt/sif-common-ui": "workspace:*"
"@navikt/sif-common-utils": "workspace:*"
+ "@playwright/test": ^1.39.0
"@storybook/react-vite": 7.5.2
"@testing-library/react": 14.0.0
"@types/jest": 29.5.7
@@ -4026,8 +4028,6 @@ __metadata:
cross-env: 7.0.3
css-loader: 6.8.1
css-minimizer-webpack-plugin: 5.0.1
- cypress: 13.4.0
- cypress-file-upload: 5.0.8
dayjs: 1.11.10
dotenv: 16.3.1
express: 4.18.2
@@ -4054,6 +4054,7 @@ __metadata:
request: 2.88.2
sass: 1.69.5
sass-loader: 13.3.2
+ sinon: 17.0.1
source-map-loader: 4.0.1
start-server-and-test: 2.0.1
style-loader: 3.3.3
@@ -5963,6 +5964,42 @@ __metadata:
languageName: node
linkType: hard
+"@sinonjs/commons@npm:^2.0.0":
+ version: 2.0.0
+ resolution: "@sinonjs/commons@npm:2.0.0"
+ dependencies:
+ type-detect: 4.0.8
+ checksum: 5023ba17edf2b85ed58262313b8e9b59e23c6860681a9af0200f239fe939e2b79736d04a260e8270ddd57196851dde3ba754d7230be5c5234e777ae2ca8af137
+ languageName: node
+ linkType: hard
+
+"@sinonjs/commons@npm:^3.0.0":
+ version: 3.0.0
+ resolution: "@sinonjs/commons@npm:3.0.0"
+ dependencies:
+ type-detect: 4.0.8
+ checksum: b4b5b73d4df4560fb8c0c7b38c7ad4aeabedd362f3373859d804c988c725889cde33550e4bcc7cd316a30f5152a2d1d43db71b6d0c38f5feef71fd8d016763f8
+ languageName: node
+ linkType: hard
+
+"@sinonjs/fake-timers@npm:^10.0.2":
+ version: 10.3.0
+ resolution: "@sinonjs/fake-timers@npm:10.3.0"
+ dependencies:
+ "@sinonjs/commons": ^3.0.0
+ checksum: 614d30cb4d5201550c940945d44c9e0b6d64a888ff2cd5b357f95ad6721070d6b8839cd10e15b76bf5e14af0bcc1d8f9ec00d49a46318f1f669a4bec1d7f3148
+ languageName: node
+ linkType: hard
+
+"@sinonjs/fake-timers@npm:^11.2.2":
+ version: 11.2.2
+ resolution: "@sinonjs/fake-timers@npm:11.2.2"
+ dependencies:
+ "@sinonjs/commons": ^3.0.0
+ checksum: 68c29b0e1856fdc280df03ddbf57c726420b78e9f943a241b471edc018fb14ff36fdc1daafd6026cba08c3c7f50c976fb7ae11b88ff44cd7f609692ca7d25158
+ languageName: node
+ linkType: hard
+
"@sinonjs/fake-timers@npm:^8.0.1":
version: 8.1.0
resolution: "@sinonjs/fake-timers@npm:8.1.0"
@@ -5981,6 +6018,24 @@ __metadata:
languageName: node
linkType: hard
+"@sinonjs/samsam@npm:^8.0.0":
+ version: 8.0.0
+ resolution: "@sinonjs/samsam@npm:8.0.0"
+ dependencies:
+ "@sinonjs/commons": ^2.0.0
+ lodash.get: ^4.4.2
+ type-detect: ^4.0.8
+ checksum: 95e40d0bb9f7288e27c379bee1b03c3dc51e7e78b9d5ea6aef66a690da7e81efc4715145b561b449cefc5361a171791e3ce30fb1a46ab247d4c0766024c60a60
+ languageName: node
+ linkType: hard
+
+"@sinonjs/text-encoding@npm:^0.7.1":
+ version: 0.7.2
+ resolution: "@sinonjs/text-encoding@npm:0.7.2"
+ checksum: fe690002a32ba06906cf87e2e8fe84d1590294586f2a7fd180a65355b53660c155c3273d8011a5f2b77209b819aa7306678ae6e4aea0df014bd7ffd4bbbcf1ab
+ languageName: node
+ linkType: hard
+
"@storybook/addon-a11y@npm:7.5.2":
version: 7.5.2
resolution: "@storybook/addon-a11y@npm:7.5.2"
@@ -13594,6 +13649,13 @@ __metadata:
languageName: node
linkType: hard
+"diff@npm:^5.1.0":
+ version: 5.1.0
+ resolution: "diff@npm:5.1.0"
+ checksum: c7bf0df7c9bfbe1cf8a678fd1b2137c4fb11be117a67bc18a0e03ae75105e8533dbfb1cda6b46beb3586ef5aed22143ef9d70713977d5fb1f9114e21455fba90
+ languageName: node
+ linkType: hard
+
"diffable-html@npm:^4.1.0":
version: 4.1.0
resolution: "diffable-html@npm:4.1.0"
@@ -20187,6 +20249,13 @@ __metadata:
languageName: node
linkType: hard
+"just-extend@npm:^4.0.2":
+ version: 4.2.1
+ resolution: "just-extend@npm:4.2.1"
+ checksum: ff9fdede240fad313efeeeb68a660b942e5586d99c0058064c78884894a2690dc09bba44c994ad4e077e45d913fef01a9240c14a72c657b53687ac58de53b39c
+ languageName: node
+ linkType: hard
+
"keyv@npm:^4.5.3":
version: 4.5.4
resolution: "keyv@npm:4.5.4"
@@ -20572,6 +20641,13 @@ __metadata:
languageName: node
linkType: hard
+"lodash.get@npm:^4.4.2":
+ version: 4.4.2
+ resolution: "lodash.get@npm:4.4.2"
+ checksum: e403047ddb03181c9d0e92df9556570e2b67e0f0a930fcbbbd779370972368f5568e914f913e93f3b08f6d492abc71e14d4e9b7a18916c31fa04bd2306efe545
+ languageName: node
+ linkType: hard
+
"lodash.groupby@npm:4.6.0":
version: 4.6.0
resolution: "lodash.groupby@npm:4.6.0"
@@ -21694,6 +21770,19 @@ __metadata:
languageName: node
linkType: hard
+"nise@npm:^5.1.5":
+ version: 5.1.5
+ resolution: "nise@npm:5.1.5"
+ dependencies:
+ "@sinonjs/commons": ^2.0.0
+ "@sinonjs/fake-timers": ^10.0.2
+ "@sinonjs/text-encoding": ^0.7.1
+ just-extend: ^4.0.2
+ path-to-regexp: ^1.7.0
+ checksum: c763dc62c5796cafa5c9268e14a5b34db6e6fa2f1dbc57a891fe5d7ea632a87868e22b5bb34965006f984630793ea11368351e94971163228d9e20b2e88edce8
+ languageName: node
+ linkType: hard
+
"no-case@npm:^3.0.4":
version: 3.0.4
resolution: "no-case@npm:3.0.4"
@@ -22792,6 +22881,15 @@ __metadata:
languageName: node
linkType: hard
+"path-to-regexp@npm:^1.7.0":
+ version: 1.8.0
+ resolution: "path-to-regexp@npm:1.8.0"
+ dependencies:
+ isarray: 0.0.1
+ checksum: 709f6f083c0552514ef4780cb2e7e4cf49b0cc89a97439f2b7cc69a608982b7690fb5d1720a7473a59806508fc2dae0be751ba49f495ecf89fd8fbc62abccbcd
+ languageName: node
+ linkType: hard
+
"path-to-regexp@npm:^6.2.0":
version: 6.2.1
resolution: "path-to-regexp@npm:6.2.1"
@@ -26600,6 +26698,20 @@ __metadata:
languageName: node
linkType: hard
+"sinon@npm:17.0.1":
+ version: 17.0.1
+ resolution: "sinon@npm:17.0.1"
+ dependencies:
+ "@sinonjs/commons": ^3.0.0
+ "@sinonjs/fake-timers": ^11.2.2
+ "@sinonjs/samsam": ^8.0.0
+ diff: ^5.1.0
+ nise: ^5.1.5
+ supports-color: ^7.2.0
+ checksum: a807c2997d6eabdcaa4409df9fd9816a3e839f96d7e5d76610a33f5e1b60cf37616c6288f0f580262da17ea4ee626c6d1600325bf423e30c5a7f0d9a203e26c0
+ languageName: node
+ linkType: hard
+
"sisteransi@npm:^1.0.5":
version: 1.0.5
resolution: "sisteransi@npm:1.0.5"
@@ -27596,7 +27708,7 @@ __metadata:
languageName: node
linkType: hard
-"supports-color@npm:^7.0.0, supports-color@npm:^7.1.0":
+"supports-color@npm:^7.0.0, supports-color@npm:^7.1.0, supports-color@npm:^7.2.0":
version: 7.2.0
resolution: "supports-color@npm:7.2.0"
dependencies:
@@ -28504,7 +28616,7 @@ __metadata:
languageName: node
linkType: hard
-"type-detect@npm:4.0.8":
+"type-detect@npm:4.0.8, type-detect@npm:^4.0.8":
version: 4.0.8
resolution: "type-detect@npm:4.0.8"
checksum: 62b5628bff67c0eb0b66afa371bd73e230399a8d2ad30d852716efcc4656a7516904570cd8631a49a3ce57c10225adf5d0cbdcb47f6b0255fe6557c453925a15
From 085ea0a18f42ab126fe6d8cab8c8d22ea3a022c1 Mon Sep 17 00:00:00 2001
From: frodehansen2
Date: Thu, 2 Nov 2023 20:21:36 +0100
Subject: [PATCH 2/9] Legge til manglende USE_AMPLITUDE (#1312)
* Legge til manglende USE_AMPLITUDE
* changeset
---
.changeset/rude-kings-cheer.md | 5 +++++
apps/omsorgspengerutbetaling-soknad/nais/dev-gcp.json | 1 +
apps/omsorgspengerutbetaling-soknad/nais/prod-gcp.json | 1 +
.../src/build/scripts/decorator.cjs | 1 +
4 files changed, 8 insertions(+)
create mode 100644 .changeset/rude-kings-cheer.md
diff --git a/.changeset/rude-kings-cheer.md b/.changeset/rude-kings-cheer.md
new file mode 100644
index 0000000000..c3107dc3a8
--- /dev/null
+++ b/.changeset/rude-kings-cheer.md
@@ -0,0 +1,5 @@
+---
+'@navikt/omsorgspengerutbetaling-soknad': patch
+---
+
+Legge til manglende env variable USE_AMPLITUDE
diff --git a/apps/omsorgspengerutbetaling-soknad/nais/dev-gcp.json b/apps/omsorgspengerutbetaling-soknad/nais/dev-gcp.json
index a9559713c1..d63c5fa8b6 100644
--- a/apps/omsorgspengerutbetaling-soknad/nais/dev-gcp.json
+++ b/apps/omsorgspengerutbetaling-soknad/nais/dev-gcp.json
@@ -23,6 +23,7 @@
"NYNORSK": "off",
"PUBLIC_PATH": "/familie/sykdom-i-familien/soknad/omsorgspengerutbetaling",
"SKIP_ORGNUM_VALIDATION": "true",
+ "USE_AMPLITUDE": "true",
"VEDLEGG_API_URL": "https://k9-brukerdialog-api"
}
}
diff --git a/apps/omsorgspengerutbetaling-soknad/nais/prod-gcp.json b/apps/omsorgspengerutbetaling-soknad/nais/prod-gcp.json
index 95a4592db5..9730951313 100644
--- a/apps/omsorgspengerutbetaling-soknad/nais/prod-gcp.json
+++ b/apps/omsorgspengerutbetaling-soknad/nais/prod-gcp.json
@@ -22,6 +22,7 @@
"NODE_ENV": "production",
"NYNORSK": "off",
"PUBLIC_PATH": "/familie/sykdom-i-familien/soknad/omsorgspengerutbetaling",
+ "USE_AMPLITUDE": "true",
"VEDLEGG_API_URL": "https://k9-brukerdialog-api"
}
}
diff --git a/apps/omsorgspengerutbetaling-soknad/src/build/scripts/decorator.cjs b/apps/omsorgspengerutbetaling-soknad/src/build/scripts/decorator.cjs
index d845ee1892..4650d51e72 100644
--- a/apps/omsorgspengerutbetaling-soknad/src/build/scripts/decorator.cjs
+++ b/apps/omsorgspengerutbetaling-soknad/src/build/scripts/decorator.cjs
@@ -30,6 +30,7 @@ const extractDecoratorFragments = (html) => {
NYNORSK: `${process.env.NYNORSK}`,
PUBLIC_PATH: `${process.env.PUBLIC_PATH}`,
SKIP_ORGNUM_VALIDATION: `${process.env.SKIP_ORGNUM_VALIDATION}`,
+ USE_AMPLITUDE: `${process.env.USE_AMPLITUDE}`,
VEDLEGG_API_URL: `${process.env.VEDLEGG_API_URL}`,
}),
};
From 5c44f78b5b30dd934176ec8cfd482235f0b334c7 Mon Sep 17 00:00:00 2001
From: frodehansen2
Date: Thu, 2 Nov 2023 20:23:06 +0100
Subject: [PATCH 3/9] =?UTF-8?q?Ekstra=20validering=20p=C3=A5=20telefonnumm?=
=?UTF-8?q?er=20til=20regnskapsf.=20(#1307)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Ekstra validering på telefonnummer til regnskapsf.
* Changeset
---
.changeset/clean-camels-run.md | 5 ++++
.changeset/curvy-cooks-relax.md | 5 ++++
.changeset/three-bees-repeat.md | 5 ++++
apps/pleiepenger-sykt-barn/src/app/i18n/nb.ts | 2 --
.../src/validation/validationMessages.ts | 2 ++
.../src/forms/virksomhet/VirksomhetForm.tsx | 4 ++-
.../forms/virksomhet/virksomhetMessages.ts | 2 ++
.../storybook/decorators/AppIntlProvider.tsx | 4 +--
.../storybook/decorators/messages.ts | 27 +++----------------
9 files changed, 28 insertions(+), 28 deletions(-)
create mode 100644 .changeset/clean-camels-run.md
create mode 100644 .changeset/curvy-cooks-relax.md
create mode 100644 .changeset/three-bees-repeat.md
diff --git a/.changeset/clean-camels-run.md b/.changeset/clean-camels-run.md
new file mode 100644
index 0000000000..e824b80f9a
--- /dev/null
+++ b/.changeset/clean-camels-run.md
@@ -0,0 +1,5 @@
+---
+'@navikt/sif-common-forms-ds': minor
+---
+
+Bytte regexp på telefonnummer til regnskapsfører, som nå tillater kun + space og tall. Noen tekstendringer.
diff --git a/.changeset/curvy-cooks-relax.md b/.changeset/curvy-cooks-relax.md
new file mode 100644
index 0000000000..6f98500b5c
--- /dev/null
+++ b/.changeset/curvy-cooks-relax.md
@@ -0,0 +1,5 @@
+---
+'@navikt/sif-common-formik-ds': patch
+---
+
+Legge til manglende default valideringstekst når tekst har ugyldig format
diff --git a/.changeset/three-bees-repeat.md b/.changeset/three-bees-repeat.md
new file mode 100644
index 0000000000..577ffe021a
--- /dev/null
+++ b/.changeset/three-bees-repeat.md
@@ -0,0 +1,5 @@
+---
+'@navikt/pleiepenger-sykt-barn': patch
+---
+
+Fjerne ubrukt tekst
diff --git a/apps/pleiepenger-sykt-barn/src/app/i18n/nb.ts b/apps/pleiepenger-sykt-barn/src/app/i18n/nb.ts
index e7d47fbb73..3c9a33fb39 100644
--- a/apps/pleiepenger-sykt-barn/src/app/i18n/nb.ts
+++ b/apps/pleiepenger-sykt-barn/src/app/i18n/nb.ts
@@ -9,8 +9,6 @@ export const appMessagesNb = {
'common.varighet.separator--full': ' og ',
'common.varighet.separator--normal': ', ',
- 'common.fieldvalidation.ugyldigTall': 'Feltet må inneholde et gyldig tall',
-
'application.title': 'Søknad om pleiepenger for sykt barn',
Ja: 'Ja',
diff --git a/packages/sif-common-formik-ds/src/validation/validationMessages.ts b/packages/sif-common-formik-ds/src/validation/validationMessages.ts
index 12ceef1ff9..c075cba7eb 100644
--- a/packages/sif-common-formik-ds/src/validation/validationMessages.ts
+++ b/packages/sif-common-formik-ds/src/validation/validationMessages.ts
@@ -76,5 +76,7 @@ export const validationMessages = {
`${hva} må inneholde minst ${minLengde} tegn.`,
[ValidateStringError.stringIsTooLong]: ({ hva, maksLengde }: { hva: string; maksLengde: number }) =>
`${hva} kan ikke inneholde flere enn ${maksLengde} tegn.`,
+ [ValidateStringError.stringHasInvalidFormat]: () =>
+ `Du har oppgitt en ugyldig tekst. Hvis du har limt inn tekst kan det være at du har fått med tegn som ikke vises. Prøv derfor å skrive det inn selv, i stedet for å lime det inn.`,
[ValidateYesOrNoError.yesOrNoIsUnanswered]: ({ hva }: { hva: string }) => `Du må svare ja eller nei på ${hva}.`,
};
diff --git a/packages/sif-common-forms-ds/src/forms/virksomhet/VirksomhetForm.tsx b/packages/sif-common-forms-ds/src/forms/virksomhet/VirksomhetForm.tsx
index 26be8ba031..64762c2568 100644
--- a/packages/sif-common-forms-ds/src/forms/virksomhet/VirksomhetForm.tsx
+++ b/packages/sif-common-forms-ds/src/forms/virksomhet/VirksomhetForm.tsx
@@ -150,6 +150,7 @@ export const VirksomhetFormErrors = {
[ValidateStringError.stringIsTooShort]: 'virksomhetForm.regnskapsfører_telefon.stringIsTooShort',
[ValidateStringError.stringContainsUnicodeChacters]:
'virksomhetForm.regnskapsfører_telefon.stringContainsUnicodeChacters',
+ [ValidateStringError.stringHasInvalidFormat]: 'virksomhetForm.regnskapsfører_telefon.stringHasInvalidFormat',
},
};
@@ -587,6 +588,7 @@ const VirksomhetForm = ({ virksomhet, harFlereVirksomheter, onSubmit, onCancel,
name={VirksomhetFormField.harRegnskapsfører}
legend={getText('sifForms.virksomhet.regnskapsfører_spm')}
validate={getYesOrNoValidator()}
+ description={getText('sifForms.virksomhet.regnskapsfører_telefon_info')}
/>
{values.harRegnskapsfører === YesOrNo.YES && (
@@ -627,7 +629,7 @@ const VirksomhetForm = ({ virksomhet, harFlereVirksomheter, onSubmit, onCancel,
required: true,
minLength: 5,
maxLength: 15,
- formatRegExp: /^[0-9\s\+]+$/,
+ formatRegExp: /^[0-9+ ]+$/,
disallowUnicodeCharacters: true,
})(value);
diff --git a/packages/sif-common-forms-ds/src/forms/virksomhet/virksomhetMessages.ts b/packages/sif-common-forms-ds/src/forms/virksomhet/virksomhetMessages.ts
index 6e1b783c78..9799f873f0 100644
--- a/packages/sif-common-forms-ds/src/forms/virksomhet/virksomhetMessages.ts
+++ b/packages/sif-common-forms-ds/src/forms/virksomhet/virksomhetMessages.ts
@@ -227,6 +227,8 @@ const virksomhetMessages = {
'sifForms.virksomhet.regnskapsfører_spm': 'Har du rekneskapsførar?',
'sifForms.virksomhet.regnskapsfører_navn': 'Gi opp namnet til rekneskapsføraren',
'sifForms.virksomhet.regnskapsfører_telefon': 'Gi opp telefonnummeret til rekneskapsføraren',
+ 'sifForms.virksomhet.regnskapsfører_telefon_info':
+ 'Skriv inn telefonnummeret i stedet for å kopiere og lime det inn fra et annet sted.',
'sifForms.virksomhet.veileder_innhenter_info.1':
'Vi hentar inn opplysningar om verksemda og inntekta di frå offentlege register.',
'sifForms.virksomhet.veileder_innhenter_info.2': 'Vi tek kontakt med deg dersom vi treng fleire opplysningar',
diff --git a/packages/sif-common-forms-ds/storybook/decorators/AppIntlProvider.tsx b/packages/sif-common-forms-ds/storybook/decorators/AppIntlProvider.tsx
index f991035e36..1f6ffe572b 100644
--- a/packages/sif-common-forms-ds/storybook/decorators/AppIntlProvider.tsx
+++ b/packages/sif-common-forms-ds/storybook/decorators/AppIntlProvider.tsx
@@ -10,8 +10,8 @@ import { appMessages } from './messages';
import '@navikt/ds-css';
import '@navikt/sif-common-core-ds/lib/styles/sif-ds-theme.css';
-require('dayjs/locale/nb');
-require('dayjs/locale/nn');
+import 'dayjs/locale/nb';
+import 'dayjs/locale/nn';
export interface IntlProviderProps {
locale: Locale;
children: React.ReactNode;
diff --git a/packages/sif-common-forms-ds/storybook/decorators/messages.ts b/packages/sif-common-forms-ds/storybook/decorators/messages.ts
index 29fb4cb930..a73e244df1 100644
--- a/packages/sif-common-forms-ds/storybook/decorators/messages.ts
+++ b/packages/sif-common-forms-ds/storybook/decorators/messages.ts
@@ -9,14 +9,11 @@ import annetBarnMessages from '../../src/forms/annet-barn/annetBarnMessages';
import utenlandskNæringMessages from '../../src/forms/utenlandsk-næring/utenlandskNæringMessages';
import opptjeningUtlandMessages from '../../src/forms/opptjening-utland/opptjeningUtlandMessages';
-const commonNb = require('@navikt/sif-common-core-ds/lib/i18n/common.nb.json');
-const commonNn = require('@navikt/sif-common-core-ds/lib/i18n/common.nn.json');
-const validationNb = require('@navikt/sif-common-core-ds/lib/i18n/validationErrors.nb.json');
-const validationNn = require('@navikt/sif-common-core-ds/lib/i18n/validationErrors.nn.json');
-
+import { commonMessagesNb } from '@navikt/sif-common-core-ds/lib/i18n/common.nb';
+import { validationErrorsNb } from '@navikt/sif-common-core-ds/lib/i18n/validationErrors.nb';
const bokmålstekster = {
- ...commonNb,
- ...validationNb,
+ ...commonMessagesNb,
+ ...validationErrorsNb,
...bostedUtlandMessages.nb,
...fraværMessages.nb,
...ferieuttakMessages.nb,
@@ -27,24 +24,8 @@ const bokmålstekster = {
...annetBarnMessages.nb,
...utenlandskNæringMessages.nb,
...opptjeningUtlandMessages.nb,
- 'common.fieldvalidation.ugyldigTall': 'Ugyldig tall',
-};
-
-const nynorsktekster = {
- ...commonNn,
- ...validationNn,
- ...bostedUtlandMessages.nn,
- ...fraværMessages.nn,
- ...ferieuttakMessages.nn,
- ...fosterbarnMessages.nn,
- ...utenlandsoppholdMessages.nn,
- ...tidsperiodeMessages.nn,
- ...virksomhetMessages.nn,
- ...annetBarnMessages.nn,
- 'common.fieldvalidation.ugyldigTall': 'Ugyldig tall',
};
export const appMessages = {
nb: bokmålstekster,
- nn: nynorsktekster,
};
From f7911749743a1a26bf90e2ef14d994066066ac5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 20:34:51 +0100
Subject: [PATCH 4/9] Bump the designsystemet group with 3 updates (#1309)
Bumps the designsystemet group with 3 updates: [@navikt/ds-css](https://github.com/navikt/aksel), [@navikt/ds-react](https://github.com/navikt/aksel) and [@navikt/ds-tailwind](https://github.com/navikt/aksel/tree/HEAD/@navikt/core/tailwind).
Updates `@navikt/ds-css` from 5.8.0 to 5.9.0
- [Release notes](https://github.com/navikt/aksel/releases)
- [Changelog](https://github.com/navikt/aksel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/navikt/aksel/compare/@navikt/ds-css@5.8.0...@navikt/ds-css@5.9.0)
Updates `@navikt/ds-react` from 5.8.0 to 5.9.0
- [Release notes](https://github.com/navikt/aksel/releases)
- [Changelog](https://github.com/navikt/aksel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/navikt/aksel/compare/@navikt/ds-react@5.8.0...@navikt/ds-react@5.9.0)
Updates `@navikt/ds-tailwind` from 5.8.0 to 5.9.0
- [Release notes](https://github.com/navikt/aksel/releases)
- [Changelog](https://github.com/navikt/aksel/blob/main/@navikt/core/tailwind/CHANGELOG.md)
- [Commits](https://github.com/navikt/aksel/commits/@navikt/ds-tailwind@5.9.0/@navikt/core/tailwind)
---
updated-dependencies:
- dependency-name: "@navikt/ds-css"
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: designsystemet
- dependency-name: "@navikt/ds-react"
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: designsystemet
- dependency-name: "@navikt/ds-tailwind"
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: designsystemet
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Frode Hansen
---
.../package.json | 6 +-
apps/endringsmelding-pleiepenger/package.json | 8 +-
.../package.json | 6 +-
.../package.json | 6 +-
apps/omsorgspengesoknad/package.json | 6 +-
.../package.json | 6 +-
apps/pleiepenger-sykt-barn/package.json | 4 +-
apps/sif-ettersending/package.json | 6 +-
packages/appstatus-react-ds/package.json | 4 +-
packages/sif-common-core-ds/package.json | 6 +-
packages/sif-common-formik-ds/package.json | 4 +-
packages/sif-common-forms-ds/package.json | 4 +-
packages/sif-common-soknad-ds/package.json | 4 +-
packages/sif-common-ui/package.json | 4 +-
yarn.lock | 116 +++++++++---------
15 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json
index e757c93af1..a588b0b471 100644
--- a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json
+++ b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json
@@ -22,9 +22,9 @@
"test": "react-scripts test --watchAll=false --env=jsdom"
},
"dependencies": {
- "@navikt/ds-css": "5.8.0",
- "@navikt/ds-react": "5.8.0",
- "@navikt/ds-tailwind": "5.8.0",
+ "@navikt/ds-css": "5.9.0",
+ "@navikt/ds-react": "5.9.0",
+ "@navikt/ds-tailwind": "5.9.0",
"@navikt/sif-app-register": "workspace:*",
"@navikt/sif-common-amplitude": "workspace:*",
"@navikt/sif-common-core-ds": "workspace:*",
diff --git a/apps/endringsmelding-pleiepenger/package.json b/apps/endringsmelding-pleiepenger/package.json
index 1765fc862a..5e8a13b684 100644
--- a/apps/endringsmelding-pleiepenger/package.json
+++ b/apps/endringsmelding-pleiepenger/package.json
@@ -9,10 +9,10 @@
"private": true,
"dependencies": {
"@formatjs/intl-pluralrules": "5.2.7",
- "@navikt/ds-css": "5.8.0",
+ "@navikt/ds-css": "5.9.0",
"@navikt/ds-icons": "3.4.3",
- "@navikt/ds-react": "5.8.0",
- "@navikt/ds-tailwind": "5.8.0",
+ "@navikt/ds-react": "5.9.0",
+ "@navikt/ds-tailwind": "5.9.0",
"@navikt/fnrvalidator": "1.3.0",
"@navikt/sif-common-amplitude": "workspace:*",
"@navikt/sif-common-core-ds": "workspace:*",
@@ -57,7 +57,7 @@
"@babel/preset-react": "7.22.15",
"@babel/preset-typescript": "7.23.2",
"@mswjs/data": "0.15.0",
- "@navikt/ds-tailwind": "5.8.0",
+ "@navikt/ds-tailwind": "5.9.0",
"@sentry/vite-plugin": "2.9.0",
"@storybook/addon-actions": "7.5.2",
"@storybook/addon-essentials": "7.5.2",
diff --git a/apps/omsorgsdager-aleneomsorg-dialog/package.json b/apps/omsorgsdager-aleneomsorg-dialog/package.json
index 17f8673abe..1edb18abbe 100644
--- a/apps/omsorgsdager-aleneomsorg-dialog/package.json
+++ b/apps/omsorgsdager-aleneomsorg-dialog/package.json
@@ -23,9 +23,9 @@
"lint": "eslint ./src --ext ts,tsx"
},
"dependencies": {
- "@navikt/ds-css": "5.8.0",
- "@navikt/ds-react": "5.8.0",
- "@navikt/ds-tailwind": "5.8.0",
+ "@navikt/ds-css": "5.9.0",
+ "@navikt/ds-react": "5.9.0",
+ "@navikt/ds-tailwind": "5.9.0",
"@navikt/sif-app-register": "workspace:*",
"@navikt/sif-common-amplitude": "workspace:*",
"@navikt/sif-common-core-ds": "workspace:*",
diff --git a/apps/omsorgspengerutbetaling-soknad/package.json b/apps/omsorgspengerutbetaling-soknad/package.json
index 20431d728b..55b17f519a 100644
--- a/apps/omsorgspengerutbetaling-soknad/package.json
+++ b/apps/omsorgspengerutbetaling-soknad/package.json
@@ -8,10 +8,10 @@
"private": true,
"type": "module",
"dependencies": {
- "@navikt/ds-css": "5.8.0",
+ "@navikt/ds-css": "5.9.0",
"@navikt/ds-icons": "3.4.3",
- "@navikt/ds-react": "5.8.0",
- "@navikt/ds-tailwind": "5.8.0",
+ "@navikt/ds-react": "5.9.0",
+ "@navikt/ds-tailwind": "5.9.0",
"@navikt/sif-app-register": "workspace:*",
"@navikt/sif-common-amplitude": "workspace:*",
"@navikt/sif-common-core-ds": "workspace:*",
diff --git a/apps/omsorgspengesoknad/package.json b/apps/omsorgspengesoknad/package.json
index 42bea10179..1b84c34056 100644
--- a/apps/omsorgspengesoknad/package.json
+++ b/apps/omsorgspengesoknad/package.json
@@ -8,10 +8,10 @@
"private": true,
"type": "module",
"dependencies": {
- "@navikt/ds-css": "5.8.0",
+ "@navikt/ds-css": "5.9.0",
"@navikt/ds-icons": "3.4.3",
- "@navikt/ds-react": "5.8.0",
- "@navikt/ds-tailwind": "5.8.0",
+ "@navikt/ds-react": "5.9.0",
+ "@navikt/ds-tailwind": "5.9.0",
"@navikt/sif-app-register": "workspace:*",
"@navikt/sif-common-amplitude": "workspace:*",
"@navikt/sif-common-core-ds": "workspace:*",
diff --git a/apps/pleiepenger-i-livets-sluttfase-soknad/package.json b/apps/pleiepenger-i-livets-sluttfase-soknad/package.json
index d42ec18141..c404ccaf03 100644
--- a/apps/pleiepenger-i-livets-sluttfase-soknad/package.json
+++ b/apps/pleiepenger-i-livets-sluttfase-soknad/package.json
@@ -8,10 +8,10 @@
"private": true,
"type": "module",
"dependencies": {
- "@navikt/ds-css": "5.8.0",
+ "@navikt/ds-css": "5.9.0",
"@navikt/ds-icons": "3.4.3",
- "@navikt/ds-react": "5.8.0",
- "@navikt/ds-tailwind": "5.8.0",
+ "@navikt/ds-react": "5.9.0",
+ "@navikt/ds-tailwind": "5.9.0",
"@navikt/sif-app-register": "workspace:*",
"@navikt/sif-common-amplitude": "workspace:*",
"@navikt/sif-common-core-ds": "workspace:*",
diff --git a/apps/pleiepenger-sykt-barn/package.json b/apps/pleiepenger-sykt-barn/package.json
index 239303208f..6cc89bb407 100644
--- a/apps/pleiepenger-sykt-barn/package.json
+++ b/apps/pleiepenger-sykt-barn/package.json
@@ -25,9 +25,9 @@
"dependencies": {
"@formatjs/intl-pluralrules": "5.2.7",
"@navikt/appstatus-react-ds": "workspace:*",
- "@navikt/ds-css": "5.8.0",
+ "@navikt/ds-css": "5.9.0",
"@navikt/ds-icons": "3.4.3",
- "@navikt/ds-react": "5.8.0",
+ "@navikt/ds-react": "5.9.0",
"@navikt/fnrvalidator": "1.3.0",
"@navikt/sif-app-register": "workspace:*",
"@navikt/sif-common-amplitude": "workspace:*",
diff --git a/apps/sif-ettersending/package.json b/apps/sif-ettersending/package.json
index f8ece74396..ffe26e5075 100644
--- a/apps/sif-ettersending/package.json
+++ b/apps/sif-ettersending/package.json
@@ -9,10 +9,10 @@
"type": "module",
"dependencies": {
"@formatjs/intl-pluralrules": "5.2.7",
- "@navikt/ds-css": "5.8.0",
+ "@navikt/ds-css": "5.9.0",
"@navikt/ds-icons": "3.4.3",
- "@navikt/ds-react": "5.8.0",
- "@navikt/ds-tailwind": "5.8.0",
+ "@navikt/ds-react": "5.9.0",
+ "@navikt/ds-tailwind": "5.9.0",
"@navikt/nav-dekoratoren-moduler": "1.6.9",
"@navikt/sif-app-register": "workspace:*",
"@navikt/sif-common-amplitude": "workspace:*",
diff --git a/packages/appstatus-react-ds/package.json b/packages/appstatus-react-ds/package.json
index 0c984404bb..4bb58883d2 100644
--- a/packages/appstatus-react-ds/package.json
+++ b/packages/appstatus-react-ds/package.json
@@ -13,8 +13,8 @@
"@sanity/client": "6.7.0"
},
"devDependencies": {
- "@navikt/ds-css": "5.8.0",
- "@navikt/ds-react": "5.8.0",
+ "@navikt/ds-css": "5.9.0",
+ "@navikt/ds-react": "5.9.0",
"@types/node": "20.8.10",
"@types/react": "18.2.33",
"@types/react-dom": "18.2.14",
diff --git a/packages/sif-common-core-ds/package.json b/packages/sif-common-core-ds/package.json
index c74d10d5f0..e73f2f188b 100644
--- a/packages/sif-common-core-ds/package.json
+++ b/packages/sif-common-core-ds/package.json
@@ -24,10 +24,10 @@
"@babel/preset-typescript": "7.23.2",
"@formatjs/intl-pluralrules": "5.2.7",
"@navikt/appstatus-react-ds": "workspace:*",
- "@navikt/ds-css": "5.8.0",
+ "@navikt/ds-css": "5.9.0",
"@navikt/ds-icons": "3.4.3",
- "@navikt/ds-react": "5.8.0",
- "@navikt/ds-tailwind": "5.8.0",
+ "@navikt/ds-react": "5.9.0",
+ "@navikt/ds-tailwind": "5.9.0",
"@navikt/fnrvalidator": "1.3.0",
"@navikt/sif-common-formik-ds": "workspace:*",
"@originjs/vite-plugin-commonjs": "1.0.3",
diff --git a/packages/sif-common-formik-ds/package.json b/packages/sif-common-formik-ds/package.json
index 817d74b56a..83d1a5bc37 100644
--- a/packages/sif-common-formik-ds/package.json
+++ b/packages/sif-common-formik-ds/package.json
@@ -24,8 +24,8 @@
"@babel/preset-react": "7.22.15",
"@babel/preset-typescript": "7.23.2",
"@formatjs/intl-pluralrules": "5.2.7",
- "@navikt/ds-css": "5.8.0",
- "@navikt/ds-react": "5.8.0",
+ "@navikt/ds-css": "5.9.0",
+ "@navikt/ds-react": "5.9.0",
"@navikt/fnrvalidator": "1.3.0",
"@originjs/vite-plugin-commonjs": "1.0.3",
"@storybook/addon-a11y": "7.5.2",
diff --git a/packages/sif-common-forms-ds/package.json b/packages/sif-common-forms-ds/package.json
index 2817c2a55a..48cd69edf5 100644
--- a/packages/sif-common-forms-ds/package.json
+++ b/packages/sif-common-forms-ds/package.json
@@ -15,8 +15,8 @@
"@babel/preset-react": "7.22.15",
"@babel/preset-typescript": "7.23.2",
"@formatjs/intl-pluralrules": "5.2.7",
- "@navikt/ds-css": "5.8.0",
- "@navikt/ds-react": "5.8.0",
+ "@navikt/ds-css": "5.9.0",
+ "@navikt/ds-react": "5.9.0",
"@navikt/sif-common-core-ds": "workspace:*",
"@navikt/sif-common-formik-ds": "workspace:*",
"@navikt/sif-common-utils": "workspace:*",
diff --git a/packages/sif-common-soknad-ds/package.json b/packages/sif-common-soknad-ds/package.json
index 521882a09e..10eae36e10 100644
--- a/packages/sif-common-soknad-ds/package.json
+++ b/packages/sif-common-soknad-ds/package.json
@@ -19,8 +19,8 @@
"@devexperts/remote-data-ts": "2.1.1",
"@formatjs/intl-pluralrules": "5.2.7",
"@navikt/appstatus-react-ds": "workspace:*",
- "@navikt/ds-css": "5.8.0",
- "@navikt/ds-react": "5.8.0",
+ "@navikt/ds-css": "5.9.0",
+ "@navikt/ds-react": "5.9.0",
"@navikt/sif-common-core-ds": "workspace:*",
"@navikt/sif-common-formik-ds": "workspace:*",
"@navikt/sif-common-hooks": "workspace:*",
diff --git a/packages/sif-common-ui/package.json b/packages/sif-common-ui/package.json
index 3fdc0a8962..2c051e73e0 100644
--- a/packages/sif-common-ui/package.json
+++ b/packages/sif-common-ui/package.json
@@ -5,9 +5,9 @@
"version": "0.0.11",
"private": true,
"dependencies": {
- "@navikt/ds-css": "5.8.0",
+ "@navikt/ds-css": "5.9.0",
"@navikt/ds-icons": "3.4.3",
- "@navikt/ds-react": "5.8.0",
+ "@navikt/ds-react": "5.9.0",
"@navikt/sif-common-core-ds": "workspace:*",
"@navikt/sif-common-formik-ds": "workspace:*",
"@navikt/sif-common-utils": "workspace:*",
diff --git a/yarn.lock b/yarn.lock
index 49762bc003..2d3d5db377 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3476,10 +3476,10 @@ __metadata:
languageName: node
linkType: hard
-"@navikt/aksel-icons@npm:^5.8.0":
- version: 5.8.0
- resolution: "@navikt/aksel-icons@npm:5.8.0"
- checksum: cf78ef4d3fc902deb5d8314dcca3227b9cc66118741c263cb7644daa4816043cd6df31b4982620662063beaa596f9e42fa783ccdbb0474521c6832a1ae334ddf
+"@navikt/aksel-icons@npm:^5.9.0":
+ version: 5.9.0
+ resolution: "@navikt/aksel-icons@npm:5.9.0"
+ checksum: f58a54e79b8cbd63d49fb13c374bd1c01baf15ca0656d2bb31f5b4a3ad3aa5c866d64d986b021113cb03b68ea99c347774cb3a70898ebb16ec522891c13a5b1b
languageName: node
linkType: hard
@@ -3487,8 +3487,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "@navikt/appstatus-react-ds@workspace:packages/appstatus-react-ds"
dependencies:
- "@navikt/ds-css": 5.8.0
- "@navikt/ds-react": 5.8.0
+ "@navikt/ds-css": 5.9.0
+ "@navikt/ds-react": 5.9.0
"@navikt/sif-common-hooks": "workspace:*"
"@portabletext/react": 3.0.11
"@sanity/client": 6.7.0
@@ -3506,10 +3506,10 @@ __metadata:
languageName: unknown
linkType: soft
-"@navikt/ds-css@npm:5.8.0":
- version: 5.8.0
- resolution: "@navikt/ds-css@npm:5.8.0"
- checksum: b52dc1d22e605a4e21173f28ad95af03f5bd1e277fe1ded68d100db68ad6e44a343ff283ccf7af00be467474e8844afff00cab8252a5a8b7236b444e7d426c48
+"@navikt/ds-css@npm:5.9.0":
+ version: 5.9.0
+ resolution: "@navikt/ds-css@npm:5.9.0"
+ checksum: 6565f73c3bc11652fb145b05cf82df599668c27c4daf8a817d32f231e7fe82a998a722f9a097ab09b2b0f6b60c0d9a86233cc15a152ffc1d7f42c6487cdfd813
languageName: node
linkType: hard
@@ -3526,13 +3526,13 @@ __metadata:
languageName: node
linkType: hard
-"@navikt/ds-react@npm:5.8.0":
- version: 5.8.0
- resolution: "@navikt/ds-react@npm:5.8.0"
+"@navikt/ds-react@npm:5.9.0":
+ version: 5.9.0
+ resolution: "@navikt/ds-react@npm:5.9.0"
dependencies:
"@floating-ui/react": 0.25.4
- "@navikt/aksel-icons": ^5.8.0
- "@navikt/ds-tokens": ^5.8.0
+ "@navikt/aksel-icons": ^5.9.0
+ "@navikt/ds-tokens": ^5.9.0
"@radix-ui/react-tabs": 1.0.0
"@radix-ui/react-toggle-group": 1.0.0
clsx: ^1.2.1
@@ -3544,21 +3544,21 @@ __metadata:
peerDependenciesMeta:
"@types/react":
optional: true
- checksum: 88fdba3b7c5c42e7a7b3b9507b510ce167783da759deec374453296069acebaad66440df00d6b1ab0cff9e954b939d0e4ef08ef91b970db1c4aa8ec623c87bf2
+ checksum: a726ddb0938f7bc6100748ba957fe4c28b85b83b7ed8a3ee6204277d8a111f9d721c3b0ff48e5f7289b091760f87d8de755ed34e851fe38f73db075ac775d4d9
languageName: node
linkType: hard
-"@navikt/ds-tailwind@npm:5.8.0":
- version: 5.8.0
- resolution: "@navikt/ds-tailwind@npm:5.8.0"
- checksum: 52fe5e273a944d8cd60c084f32cfe83f6c9bb79dc45ea66a9aef5593f393581fc0c9bd641b1295c23402f83e5f525bfedd000cbe2dfd50af234f27388b98bc01
+"@navikt/ds-tailwind@npm:5.9.0":
+ version: 5.9.0
+ resolution: "@navikt/ds-tailwind@npm:5.9.0"
+ checksum: 2cde17af05aef5f3d373a8bae37fe3cd77384542e579b658bf02c028ae8844da43446ea8d3c46b2a6858b306000475325b21d33e07bbaf884a84cc845876851d
languageName: node
linkType: hard
-"@navikt/ds-tokens@npm:^5.8.0":
- version: 5.8.0
- resolution: "@navikt/ds-tokens@npm:5.8.0"
- checksum: c41601dc2007a74c01f94fdf1b2e73b319ce54ab27774bcfd4ecdc1a6ea46580564b35193cd677cc1ac0a7b29a60862e7964c9a43eb57622993d0aca0aae771d
+"@navikt/ds-tokens@npm:^5.9.0":
+ version: 5.9.0
+ resolution: "@navikt/ds-tokens@npm:5.9.0"
+ checksum: 9f8f7a34a9bc5fa2011060bcb683603fcf7e88107258ecd9a5405601ffef80a8be31e1d9d04f219f7df140f905ba9fa4032b4a8dfbe406fe1eface5a0d3e79ff
languageName: node
linkType: hard
@@ -3571,9 +3571,9 @@ __metadata:
"@babel/plugin-transform-modules-commonjs": 7.23.0
"@babel/preset-env": 7.23.2
"@babel/preset-react": 7.22.15
- "@navikt/ds-css": 5.8.0
- "@navikt/ds-react": 5.8.0
- "@navikt/ds-tailwind": 5.8.0
+ "@navikt/ds-css": 5.9.0
+ "@navikt/ds-react": 5.9.0
+ "@navikt/ds-tailwind": 5.9.0
"@navikt/sif-app-register": "workspace:*"
"@navikt/sif-common-amplitude": "workspace:*"
"@navikt/sif-common-core-ds": "workspace:*"
@@ -3644,10 +3644,10 @@ __metadata:
"@babel/preset-typescript": 7.23.2
"@formatjs/intl-pluralrules": 5.2.7
"@mswjs/data": 0.15.0
- "@navikt/ds-css": 5.8.0
+ "@navikt/ds-css": 5.9.0
"@navikt/ds-icons": 3.4.3
- "@navikt/ds-react": 5.8.0
- "@navikt/ds-tailwind": 5.8.0
+ "@navikt/ds-react": 5.9.0
+ "@navikt/ds-tailwind": 5.9.0
"@navikt/fnrvalidator": 1.3.0
"@navikt/sif-common-amplitude": "workspace:*"
"@navikt/sif-common-core-ds": "workspace:*"
@@ -3762,9 +3762,9 @@ __metadata:
"@babel/plugin-transform-modules-commonjs": 7.23.0
"@babel/preset-env": 7.23.2
"@babel/preset-react": 7.22.15
- "@navikt/ds-css": 5.8.0
- "@navikt/ds-react": 5.8.0
- "@navikt/ds-tailwind": 5.8.0
+ "@navikt/ds-css": 5.9.0
+ "@navikt/ds-react": 5.9.0
+ "@navikt/ds-tailwind": 5.9.0
"@navikt/sif-app-register": "workspace:*"
"@navikt/sif-common-amplitude": "workspace:*"
"@navikt/sif-common-core-ds": "workspace:*"
@@ -3830,10 +3830,10 @@ __metadata:
"@babel/preset-env": 7.23.2
"@babel/preset-react": 7.22.15
"@babel/preset-typescript": 7.23.2
- "@navikt/ds-css": 5.8.0
+ "@navikt/ds-css": 5.9.0
"@navikt/ds-icons": 3.4.3
- "@navikt/ds-react": 5.8.0
- "@navikt/ds-tailwind": 5.8.0
+ "@navikt/ds-react": 5.9.0
+ "@navikt/ds-tailwind": 5.9.0
"@navikt/sif-app-register": "workspace:*"
"@navikt/sif-common-amplitude": "workspace:*"
"@navikt/sif-common-core-ds": "workspace:*"
@@ -3906,10 +3906,10 @@ __metadata:
"@babel/preset-env": 7.23.2
"@babel/preset-react": 7.22.15
"@babel/preset-typescript": 7.23.2
- "@navikt/ds-css": 5.8.0
+ "@navikt/ds-css": 5.9.0
"@navikt/ds-icons": 3.4.3
- "@navikt/ds-react": 5.8.0
- "@navikt/ds-tailwind": 5.8.0
+ "@navikt/ds-react": 5.9.0
+ "@navikt/ds-tailwind": 5.9.0
"@navikt/sif-app-register": "workspace:*"
"@navikt/sif-common-amplitude": "workspace:*"
"@navikt/sif-common-core-ds": "workspace:*"
@@ -3998,10 +3998,10 @@ __metadata:
"@babel/preset-env": 7.23.2
"@babel/preset-react": 7.22.15
"@babel/preset-typescript": 7.23.2
- "@navikt/ds-css": 5.8.0
+ "@navikt/ds-css": 5.9.0
"@navikt/ds-icons": 3.4.3
- "@navikt/ds-react": 5.8.0
- "@navikt/ds-tailwind": 5.8.0
+ "@navikt/ds-react": 5.9.0
+ "@navikt/ds-tailwind": 5.9.0
"@navikt/sif-app-register": "workspace:*"
"@navikt/sif-common-amplitude": "workspace:*"
"@navikt/sif-common-core-ds": "workspace:*"
@@ -4076,9 +4076,9 @@ __metadata:
"@babel/preset-react": 7.22.15
"@formatjs/intl-pluralrules": 5.2.7
"@navikt/appstatus-react-ds": "workspace:*"
- "@navikt/ds-css": 5.8.0
+ "@navikt/ds-css": 5.9.0
"@navikt/ds-icons": 3.4.3
- "@navikt/ds-react": 5.8.0
+ "@navikt/ds-react": 5.9.0
"@navikt/fnrvalidator": 1.3.0
"@navikt/sif-app-register": "workspace:*"
"@navikt/sif-common-amplitude": "workspace:*"
@@ -4221,10 +4221,10 @@ __metadata:
"@babel/preset-typescript": 7.23.2
"@formatjs/intl-pluralrules": 5.2.7
"@navikt/appstatus-react-ds": "workspace:*"
- "@navikt/ds-css": 5.8.0
+ "@navikt/ds-css": 5.9.0
"@navikt/ds-icons": 3.4.3
- "@navikt/ds-react": 5.8.0
- "@navikt/ds-tailwind": 5.8.0
+ "@navikt/ds-react": 5.9.0
+ "@navikt/ds-tailwind": 5.9.0
"@navikt/fnrvalidator": 1.3.0
"@navikt/sif-common-formik-ds": "workspace:*"
"@navikt/sif-common-utils": "workspace:*"
@@ -4289,9 +4289,9 @@ __metadata:
"@babel/preset-react": 7.22.15
"@babel/preset-typescript": 7.23.2
"@formatjs/intl-pluralrules": 5.2.7
- "@navikt/ds-css": 5.8.0
+ "@navikt/ds-css": 5.9.0
"@navikt/ds-icons": 3.4.3
- "@navikt/ds-react": 5.8.0
+ "@navikt/ds-react": 5.9.0
"@navikt/fnrvalidator": 1.3.0
"@originjs/vite-plugin-commonjs": 1.0.3
"@storybook/addon-a11y": 7.5.2
@@ -4357,8 +4357,8 @@ __metadata:
"@babel/preset-react": 7.22.15
"@babel/preset-typescript": 7.23.2
"@formatjs/intl-pluralrules": 5.2.7
- "@navikt/ds-css": 5.8.0
- "@navikt/ds-react": 5.8.0
+ "@navikt/ds-css": 5.9.0
+ "@navikt/ds-react": 5.9.0
"@navikt/sif-common-core-ds": "workspace:*"
"@navikt/sif-common-formik-ds": "workspace:*"
"@navikt/sif-common-utils": "workspace:*"
@@ -4453,8 +4453,8 @@ __metadata:
"@devexperts/remote-data-ts": 2.1.1
"@formatjs/intl-pluralrules": 5.2.7
"@navikt/appstatus-react-ds": "workspace:*"
- "@navikt/ds-css": 5.8.0
- "@navikt/ds-react": 5.8.0
+ "@navikt/ds-css": 5.9.0
+ "@navikt/ds-react": 5.9.0
"@navikt/nav-dekoratoren-moduler": 1.6.9
"@navikt/sif-common-core-ds": "workspace:*"
"@navikt/sif-common-formik-ds": "workspace:*"
@@ -4514,9 +4514,9 @@ __metadata:
version: 0.0.0-use.local
resolution: "@navikt/sif-common-ui@workspace:packages/sif-common-ui"
dependencies:
- "@navikt/ds-css": 5.8.0
+ "@navikt/ds-css": 5.9.0
"@navikt/ds-icons": 3.4.3
- "@navikt/ds-react": 5.8.0
+ "@navikt/ds-react": 5.9.0
"@navikt/sif-common-core-ds": "workspace:*"
"@navikt/sif-common-formik-ds": "workspace:*"
"@navikt/sif-common-utils": "workspace:*"
@@ -4575,10 +4575,10 @@ __metadata:
"@babel/preset-env": 7.23.2
"@babel/preset-react": 7.22.15
"@formatjs/intl-pluralrules": 5.2.7
- "@navikt/ds-css": 5.8.0
+ "@navikt/ds-css": 5.9.0
"@navikt/ds-icons": 3.4.3
- "@navikt/ds-react": 5.8.0
- "@navikt/ds-tailwind": 5.8.0
+ "@navikt/ds-react": 5.9.0
+ "@navikt/ds-tailwind": 5.9.0
"@navikt/nav-dekoratoren-moduler": 1.6.9
"@navikt/sif-app-register": "workspace:*"
"@navikt/sif-common-amplitude": "workspace:*"
From 7bf54521b82f8c379ea6762b9abccd5f07081347 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 20:38:00 +0100
Subject: [PATCH 5/9] Bump eslint-plugin-jsx-a11y from 6.7.1 to 6.8.0 (#1310)
Bumps [eslint-plugin-jsx-a11y](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y) from 6.7.1 to 6.8.0.
- [Release notes](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/compare/v6.7.1...v6.8.0)
---
updated-dependencies:
- dependency-name: eslint-plugin-jsx-a11y
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Frode Hansen
---
apps/pleiepenger-sykt-barn/package.json | 2 +-
packages/config/package.json | 2 +-
yarn.lock | 69 +++++++++++++++++++++----
3 files changed, 61 insertions(+), 12 deletions(-)
diff --git a/apps/pleiepenger-sykt-barn/package.json b/apps/pleiepenger-sykt-barn/package.json
index 6cc89bb407..d96e3b5534 100644
--- a/apps/pleiepenger-sykt-barn/package.json
+++ b/apps/pleiepenger-sykt-barn/package.json
@@ -94,7 +94,7 @@
"cypress-file-upload": "5.0.8",
"dayjs": "1.11.10",
"eslint-config-prettier": "9.0.0",
- "eslint-plugin-jsx-a11y": "6.7.1",
+ "eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-prettier": "5.0.1",
"eslint-plugin-react": "7.33.2",
"eslint-plugin-react-hooks": "4.6.0",
diff --git a/packages/config/package.json b/packages/config/package.json
index d50d32129d..390e6a7f46 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -9,7 +9,7 @@
"autoprefixer": "10.4.16",
"eslint": "8.52.0",
"eslint-config-prettier": "9.0.0",
- "eslint-plugin-jsx-a11y": "6.7.1",
+ "eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-prettier": "5.0.1",
"eslint-plugin-react": "7.33.2",
"eslint-plugin-storybook": "0.6.15",
diff --git a/yarn.lock b/yarn.lock
index 2d3d5db377..f8d179e511 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1743,7 +1743,7 @@ __metadata:
languageName: node
linkType: hard
-"@babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
version: 7.23.2
resolution: "@babel/runtime@npm:7.23.2"
dependencies:
@@ -4120,7 +4120,7 @@ __metadata:
dayjs: 1.11.10
dotenv: 16.3.1
eslint-config-prettier: 9.0.0
- eslint-plugin-jsx-a11y: 6.7.1
+ eslint-plugin-jsx-a11y: 6.8.0
eslint-plugin-prettier: 5.0.1
eslint-plugin-react: 7.33.2
eslint-plugin-react-hooks: 4.6.0
@@ -10139,7 +10139,7 @@ __metadata:
languageName: node
linkType: hard
-"aria-query@npm:^5.0.0, aria-query@npm:^5.1.3":
+"aria-query@npm:^5.0.0, aria-query@npm:^5.1.3, aria-query@npm:^5.3.0":
version: 5.3.0
resolution: "aria-query@npm:5.3.0"
dependencies:
@@ -10406,6 +10406,13 @@ __metadata:
languageName: node
linkType: hard
+"ast-types-flow@npm:^0.0.8":
+ version: 0.0.8
+ resolution: "ast-types-flow@npm:0.0.8"
+ checksum: 0a64706609a179233aac23817837abab614f3548c252a2d3d79ea1e10c74aa28a0846e11f466cf72771b6ed8713abc094dcf8c40c3ec4207da163efa525a94a8
+ languageName: node
+ linkType: hard
+
"ast-types@npm:0.15.2":
version: 0.15.2
resolution: "ast-types@npm:0.15.2"
@@ -10546,6 +10553,13 @@ __metadata:
languageName: node
linkType: hard
+"axe-core@npm:=4.7.0":
+ version: 4.7.0
+ resolution: "axe-core@npm:4.7.0"
+ checksum: f086bcab42be1761ba2b0b127dec350087f4c3a853bba8dd58f69d898cefaac31a1561da23146f6f3c07954c76171d1f2ce460e555e052d2b02cd79af628fa4a
+ languageName: node
+ linkType: hard
+
"axios-mock-adapter@npm:1.22.0":
version: 1.22.0
resolution: "axios-mock-adapter@npm:1.22.0"
@@ -10588,7 +10602,7 @@ __metadata:
languageName: node
linkType: hard
-"axobject-query@npm:^3.1.1":
+"axobject-query@npm:^3.1.1, axobject-query@npm:^3.2.1":
version: 3.2.1
resolution: "axobject-query@npm:3.2.1"
dependencies:
@@ -12232,7 +12246,7 @@ __metadata:
autoprefixer: 10.4.16
eslint: 8.52.0
eslint-config-prettier: 9.0.0
- eslint-plugin-jsx-a11y: 6.7.1
+ eslint-plugin-jsx-a11y: 6.8.0
eslint-plugin-prettier: 5.0.1
eslint-plugin-react: 7.33.2
eslint-plugin-storybook: 0.6.15
@@ -14267,7 +14281,7 @@ __metadata:
languageName: node
linkType: hard
-"es-iterator-helpers@npm:^1.0.12":
+"es-iterator-helpers@npm:^1.0.12, es-iterator-helpers@npm:^1.0.15":
version: 1.0.15
resolution: "es-iterator-helpers@npm:1.0.15"
dependencies:
@@ -14852,7 +14866,33 @@ __metadata:
languageName: node
linkType: hard
-"eslint-plugin-jsx-a11y@npm:6.7.1, eslint-plugin-jsx-a11y@npm:^6.5.1":
+"eslint-plugin-jsx-a11y@npm:6.8.0":
+ version: 6.8.0
+ resolution: "eslint-plugin-jsx-a11y@npm:6.8.0"
+ dependencies:
+ "@babel/runtime": ^7.23.2
+ aria-query: ^5.3.0
+ array-includes: ^3.1.7
+ array.prototype.flatmap: ^1.3.2
+ ast-types-flow: ^0.0.8
+ axe-core: =4.7.0
+ axobject-query: ^3.2.1
+ damerau-levenshtein: ^1.0.8
+ emoji-regex: ^9.2.2
+ es-iterator-helpers: ^1.0.15
+ hasown: ^2.0.0
+ jsx-ast-utils: ^3.3.5
+ language-tags: ^1.0.9
+ minimatch: ^3.1.2
+ object.entries: ^1.1.7
+ object.fromentries: ^2.0.7
+ peerDependencies:
+ eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
+ checksum: 3dec00e2a3089c4c61ac062e4196a70985fb7eda1fd67fe035363d92578debde92fdb8ed2e472321fc0d71e75f4a1e8888c6a3218c14dd93c8e8d19eb6f51554
+ languageName: node
+ linkType: hard
+
+"eslint-plugin-jsx-a11y@npm:^6.5.1":
version: 6.7.1
resolution: "eslint-plugin-jsx-a11y@npm:6.7.1"
dependencies:
@@ -20237,7 +20277,7 @@ __metadata:
languageName: node
linkType: hard
-"jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.3.3":
+"jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.3.3, jsx-ast-utils@npm:^3.3.5":
version: 3.3.5
resolution: "jsx-ast-utils@npm:3.3.5"
dependencies:
@@ -20311,7 +20351,7 @@ __metadata:
languageName: node
linkType: hard
-"language-subtag-registry@npm:~0.3.2":
+"language-subtag-registry@npm:^0.3.20, language-subtag-registry@npm:~0.3.2":
version: 0.3.22
resolution: "language-subtag-registry@npm:0.3.22"
checksum: 8ab70a7e0e055fe977ac16ea4c261faec7205ac43db5e806f72e5b59606939a3b972c4bd1e10e323b35d6ffa97c3e1c4c99f6553069dad2dfdd22020fa3eb56a
@@ -20327,6 +20367,15 @@ __metadata:
languageName: node
linkType: hard
+"language-tags@npm:^1.0.9":
+ version: 1.0.9
+ resolution: "language-tags@npm:1.0.9"
+ dependencies:
+ language-subtag-registry: ^0.3.20
+ checksum: 57c530796dc7179914dee71bc94f3747fd694612480241d0453a063777265dfe3a951037f7acb48f456bf167d6eb419d4c00263745326b3ba1cdcf4657070e78
+ languageName: node
+ linkType: hard
+
"launch-editor@npm:^2.6.0":
version: 2.6.1
resolution: "launch-editor@npm:2.6.1"
@@ -22230,7 +22279,7 @@ __metadata:
languageName: node
linkType: hard
-"object.entries@npm:^1.1.0, object.entries@npm:^1.1.6":
+"object.entries@npm:^1.1.0, object.entries@npm:^1.1.6, object.entries@npm:^1.1.7":
version: 1.1.7
resolution: "object.entries@npm:1.1.7"
dependencies:
From ff720a05aefc8d91405ceed791abbb8692357773 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 20:43:10 +0100
Subject: [PATCH 6/9] Bump the github group with 1 update (#1306)
Bumps the github group with 1 update: [cypress-io/github-action](https://github.com/cypress-io/github-action).
- [Release notes](https://github.com/cypress-io/github-action/releases)
- [Changelog](https://github.com/cypress-io/github-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/github-action/compare/v6.5.0...v6.6.0)
---
updated-dependencies:
- dependency-name: cypress-io/github-action
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: github
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
.../workflows/dispatch.deploy-pleiepenger-sykt-barn-to-prod.yml | 2 +-
.../test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml | 2 +-
.github/workflows/test.endringsmelding-pleiepenger.yml | 2 +-
.github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml | 2 +-
".github/workflows/test.omsorgspenges\303\270knad.yml" | 2 +-
.github/workflows/test.pleiepenger-sykt-barn.yml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/dispatch.deploy-pleiepenger-sykt-barn-to-prod.yml b/.github/workflows/dispatch.deploy-pleiepenger-sykt-barn-to-prod.yml
index 5412216e92..f3abd233e7 100644
--- a/.github/workflows/dispatch.deploy-pleiepenger-sykt-barn-to-prod.yml
+++ b/.github/workflows/dispatch.deploy-pleiepenger-sykt-barn-to-prod.yml
@@ -30,7 +30,7 @@ jobs:
run: yarn test --filter=pleiepenger-sykt-barn
- name: Build and start e2e server
- uses: cypress-io/github-action@v6.5.0
+ uses: cypress-io/github-action@v6.6.0
env:
DEKORATOR_URL: https://www.nav.no/dekoratoren/?simple=true&chatbot=false
PUBLIC_PATH: /familie/sykdom-i-familien/soknad/pleiepenger
diff --git a/.github/workflows/test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml b/.github/workflows/test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml
index 1f3c3e2968..0a655a237d 100644
--- a/.github/workflows/test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml
+++ b/.github/workflows/test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml
@@ -47,7 +47,7 @@ jobs:
cache: 'yarn'
- name: Build and start e2e server
- uses: cypress-io/github-action@v6.5.0
+ uses: cypress-io/github-action@v6.6.0
env:
DEKORATOR_URL: https://www.nav.no/dekoratoren/?simple=true&chatbot=false
PUBLIC_PATH: /familie/sykdom-i-familien/soknad/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn
diff --git a/.github/workflows/test.endringsmelding-pleiepenger.yml b/.github/workflows/test.endringsmelding-pleiepenger.yml
index 1575822aaf..cfccb698fe 100644
--- a/.github/workflows/test.endringsmelding-pleiepenger.yml
+++ b/.github/workflows/test.endringsmelding-pleiepenger.yml
@@ -47,7 +47,7 @@ jobs:
cache: 'yarn'
- name: Build and start e2e server
- uses: cypress-io/github-action@v6.5.0
+ uses: cypress-io/github-action@v6.6.0
env:
API_URL_INNSYN: http://localhost:8099
API_URL: http://localhost:8099
diff --git a/.github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml b/.github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml
index 72d981ac39..2072ae7d5a 100644
--- a/.github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml
+++ b/.github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml
@@ -47,7 +47,7 @@ jobs:
cache: 'yarn'
- name: Build and start e2e server
- uses: cypress-io/github-action@v6.5.0
+ uses: cypress-io/github-action@v6.6.0
env:
DEKORATOR_URL: https://www.nav.no/dekoratoren/?simple=true&chatbot=false
PUBLIC_PATH: /familie/sykdom-i-familien/soknad/omsorgsdager-aleneomsorg
diff --git "a/.github/workflows/test.omsorgspenges\303\270knad.yml" "b/.github/workflows/test.omsorgspenges\303\270knad.yml"
index 2592eca5f6..ea0e42189d 100644
--- "a/.github/workflows/test.omsorgspenges\303\270knad.yml"
+++ "b/.github/workflows/test.omsorgspenges\303\270knad.yml"
@@ -47,7 +47,7 @@ jobs:
cache: 'yarn'
- name: Build and start e2e server
- uses: cypress-io/github-action@v6.5.0
+ uses: cypress-io/github-action@v6.6.0
env:
DEKORATOR_URL: https://www.nav.no/dekoratoren/?simple=true&chatbot=false
PUBLIC_PATH: /familie/sykdom-i-familien/soknad/omsorgspenger
diff --git a/.github/workflows/test.pleiepenger-sykt-barn.yml b/.github/workflows/test.pleiepenger-sykt-barn.yml
index 3e5245a0de..af8c1e0d66 100644
--- a/.github/workflows/test.pleiepenger-sykt-barn.yml
+++ b/.github/workflows/test.pleiepenger-sykt-barn.yml
@@ -44,7 +44,7 @@ jobs:
cache: 'yarn'
- name: Build and start e2e server
- uses: cypress-io/github-action@v6.5.0
+ uses: cypress-io/github-action@v6.6.0
env:
DEKORATOR_URL: https://www.nav.no/dekoratoren/?simple=true&chatbot=false
PUBLIC_PATH: /familie/sykdom-i-familien/soknad/pleiepenger
From a9e0249c39e4d0f567413dd8bf12601fb3c1af1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 20:44:26 +0100
Subject: [PATCH 7/9] Bump chromatic from 7.5.4 to 7.6.0 (#1304)
Bumps [chromatic](https://github.com/chromaui/chromatic-cli) from 7.5.4 to 7.6.0.
- [Release notes](https://github.com/chromaui/chromatic-cli/releases)
- [Changelog](https://github.com/chromaui/chromatic-cli/blob/main/CHANGELOG.md)
- [Commits](https://github.com/chromaui/chromatic-cli/compare/v7.5.4...v7.6.0)
---
updated-dependencies:
- dependency-name: chromatic
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Frode Hansen
---
packages/sif-common-ui/package.json | 2 +-
yarn.lock | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/packages/sif-common-ui/package.json b/packages/sif-common-ui/package.json
index 2c051e73e0..dda6a8f597 100644
--- a/packages/sif-common-ui/package.json
+++ b/packages/sif-common-ui/package.json
@@ -25,7 +25,7 @@
"@storybook/react": "7.5.2",
"@storybook/react-webpack5": "7.5.2",
"@storybook/testing-library": "0.2.2",
- "chromatic": "7.5.4",
+ "chromatic": "7.6.0",
"copyfiles": "2.4.1",
"dayjs": "1.11.10",
"npm-run-all": "4.1.5",
diff --git a/yarn.lock b/yarn.lock
index f8d179e511..50405552bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4531,7 +4531,7 @@ __metadata:
"@storybook/react": 7.5.2
"@storybook/react-webpack5": 7.5.2
"@storybook/testing-library": 0.2.2
- chromatic: 7.5.4
+ chromatic: 7.6.0
copyfiles: 2.4.1
dayjs: 1.11.10
npm-run-all: 4.1.5
@@ -11763,14 +11763,14 @@ __metadata:
languageName: node
linkType: hard
-"chromatic@npm:7.5.4":
- version: 7.5.4
- resolution: "chromatic@npm:7.5.4"
+"chromatic@npm:7.6.0":
+ version: 7.6.0
+ resolution: "chromatic@npm:7.6.0"
bin:
chroma: dist/bin.js
chromatic: dist/bin.js
chromatic-cli: dist/bin.js
- checksum: 0df9f24dff12fd0bb3846925f5a94e5bfd5c6acdaced214bccdd209ec9dda45c07b057c8394a4c5f933ae80069536c706dbe17626634967337ee146b1dca6d34
+ checksum: 5f473385cc2c152b43487646803a213f0dc3fcf9f7755a051040e31b5f8e67486b8a80fff3bbe0752bdb0e41851ff965b587f122938b35acf5c5eba1d3d1b9e4
languageName: node
linkType: hard
From c205a623a7ee6e6c8647a86f50ae9f373500cada Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 20:45:47 +0100
Subject: [PATCH 8/9] Bump the sentry group with 3 updates (#1303)
Bumps the sentry group with 3 updates: [@sentry/browser](https://github.com/getsentry/sentry-javascript), [@sentry/react](https://github.com/getsentry/sentry-javascript) and [@sentry/types](https://github.com/getsentry/sentry-javascript).
Updates `@sentry/browser` from 7.76.0 to 7.77.0
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/7.76.0...7.77.0)
Updates `@sentry/react` from 7.76.0 to 7.77.0
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/7.76.0...7.77.0)
Updates `@sentry/types` from 7.76.0 to 7.77.0
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/7.76.0...7.77.0)
---
updated-dependencies:
- dependency-name: "@sentry/browser"
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: sentry
- dependency-name: "@sentry/react"
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: sentry
- dependency-name: "@sentry/types"
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: sentry
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Frode Hansen
---
packages/sif-common-sentry/package.json | 6 +-
yarn.lock | 91 ++++++++-----------------
2 files changed, 30 insertions(+), 67 deletions(-)
diff --git a/packages/sif-common-sentry/package.json b/packages/sif-common-sentry/package.json
index 397ad39910..f0d8b5c981 100644
--- a/packages/sif-common-sentry/package.json
+++ b/packages/sif-common-sentry/package.json
@@ -11,9 +11,9 @@
"url": "https://github.com/navikt/sif-common-sentry/issues"
},
"dependencies": {
- "@sentry/browser": "7.76.0",
- "@sentry/react": "7.76.0",
- "@sentry/types": "7.76.0"
+ "@sentry/browser": "7.77.0",
+ "@sentry/react": "7.77.0",
+ "@sentry/types": "7.77.0"
},
"devDependencies": {
"@types/node": "20.8.10",
diff --git a/yarn.lock b/yarn.lock
index 50405552bc..605e04fc43 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4425,9 +4425,9 @@ __metadata:
version: 0.0.0-use.local
resolution: "@navikt/sif-common-sentry@workspace:packages/sif-common-sentry"
dependencies:
- "@sentry/browser": 7.76.0
- "@sentry/react": 7.76.0
- "@sentry/types": 7.76.0
+ "@sentry/browser": 7.77.0
+ "@sentry/react": 7.77.0
+ "@sentry/types": 7.77.0
"@types/node": 20.8.10
axios: 1.6.0
config: "*"
@@ -5751,17 +5751,6 @@ __metadata:
languageName: node
linkType: hard
-"@sentry-internal/tracing@npm:7.76.0":
- version: 7.76.0
- resolution: "@sentry-internal/tracing@npm:7.76.0"
- dependencies:
- "@sentry/core": 7.76.0
- "@sentry/types": 7.76.0
- "@sentry/utils": 7.76.0
- checksum: b64ea35aa315f3a81c0866715459359173e6a07f3b5973cde4607e56b21dbd67e8ffb5e12a66fa838119bf1983f4893c8cd7573adc8877834261012aa67dc60c
- languageName: node
- linkType: hard
-
"@sentry-internal/tracing@npm:7.77.0":
version: 7.77.0
resolution: "@sentry-internal/tracing@npm:7.77.0"
@@ -5773,16 +5762,16 @@ __metadata:
languageName: node
linkType: hard
-"@sentry/browser@npm:7.76.0":
- version: 7.76.0
- resolution: "@sentry/browser@npm:7.76.0"
+"@sentry/browser@npm:7.77.0":
+ version: 7.77.0
+ resolution: "@sentry/browser@npm:7.77.0"
dependencies:
- "@sentry-internal/tracing": 7.76.0
- "@sentry/core": 7.76.0
- "@sentry/replay": 7.76.0
- "@sentry/types": 7.76.0
- "@sentry/utils": 7.76.0
- checksum: c3c9cee50912245112f804aa1419f90fb2cde456e1c0bb61b83b98d42cd61b04dd423aeff069c66b5e677f6b2a54ace0c30b5f763112c341ddaf0dc326ec6032
+ "@sentry-internal/tracing": 7.77.0
+ "@sentry/core": 7.77.0
+ "@sentry/replay": 7.77.0
+ "@sentry/types": 7.77.0
+ "@sentry/utils": 7.77.0
+ checksum: b3c4ecbf27e8d940c42bc151fc39e9e3659889c0091e69a39f3b8f0e316caa9cdd17aa2c00b151ff9976eff459f023e69cb51f8efa96a840191afd4091cc7573
languageName: node
linkType: hard
@@ -5817,16 +5806,6 @@ __metadata:
languageName: node
linkType: hard
-"@sentry/core@npm:7.76.0":
- version: 7.76.0
- resolution: "@sentry/core@npm:7.76.0"
- dependencies:
- "@sentry/types": 7.76.0
- "@sentry/utils": 7.76.0
- checksum: 76b4fedd76f31e5b0e7eef53aa557b4fb17ad89f50bf9078916983dbab33e7a0ab3fc679a47fcf53119f04e0abbb186617beef58ae733971c0dc007d6cf5b275
- languageName: node
- linkType: hard
-
"@sentry/core@npm:7.77.0":
version: 7.77.0
resolution: "@sentry/core@npm:7.77.0"
@@ -5850,36 +5829,29 @@ __metadata:
languageName: node
linkType: hard
-"@sentry/react@npm:7.76.0":
- version: 7.76.0
- resolution: "@sentry/react@npm:7.76.0"
+"@sentry/react@npm:7.77.0":
+ version: 7.77.0
+ resolution: "@sentry/react@npm:7.77.0"
dependencies:
- "@sentry/browser": 7.76.0
- "@sentry/types": 7.76.0
- "@sentry/utils": 7.76.0
+ "@sentry/browser": 7.77.0
+ "@sentry/types": 7.77.0
+ "@sentry/utils": 7.77.0
hoist-non-react-statics: ^3.3.2
peerDependencies:
react: 15.x || 16.x || 17.x || 18.x
- checksum: ce9c67ec64ee9fad08ba10a689fa5d1ce4cec893e00c14f00bc55a5546aeca5107dea89d67f0433cb90d76612d76b50183e225b273e71126866d907b35c13a75
+ checksum: 18af780c76b6b0c52ea476963b8ef0b7a346796c5d0e04dd7c4cb73eb3e52b2fd00b8c1cd5529c29983398a57e325d0d45a689bc8b9822d7c9b10339870869f9
languageName: node
linkType: hard
-"@sentry/replay@npm:7.76.0":
- version: 7.76.0
- resolution: "@sentry/replay@npm:7.76.0"
+"@sentry/replay@npm:7.77.0":
+ version: 7.77.0
+ resolution: "@sentry/replay@npm:7.77.0"
dependencies:
- "@sentry-internal/tracing": 7.76.0
- "@sentry/core": 7.76.0
- "@sentry/types": 7.76.0
- "@sentry/utils": 7.76.0
- checksum: e695889812fdf754f201f63d7ec2d27f5f93232cb2e078c12dfbeffdf2d29af7b7b82fbabb22747f76e68312ebbdd2479dab9e8a0f76f7a175d832a77d3ce9d2
- languageName: node
- linkType: hard
-
-"@sentry/types@npm:7.76.0":
- version: 7.76.0
- resolution: "@sentry/types@npm:7.76.0"
- checksum: 8978b0b1e680cabc0f9f04881452832e53d636e37bfd0599a8c988ee8bbd244539a286102eba322b4b2019428ceb9c662edb69e3ec88255c8cb217e0ba84f9ce
+ "@sentry-internal/tracing": 7.77.0
+ "@sentry/core": 7.77.0
+ "@sentry/types": 7.77.0
+ "@sentry/utils": 7.77.0
+ checksum: 95bbd554a33a17273501fffadd7a51050787ef5a0ec26de5cccba35f6bfd5d88b2c13f735beaf74274cdb5f77d3a310fa2699d9629220de4b79e4d4c27a14e20
languageName: node
linkType: hard
@@ -5890,15 +5862,6 @@ __metadata:
languageName: node
linkType: hard
-"@sentry/utils@npm:7.76.0":
- version: 7.76.0
- resolution: "@sentry/utils@npm:7.76.0"
- dependencies:
- "@sentry/types": 7.76.0
- checksum: 6a9e796835da6daa04893817b57af180cf1b04fb6c61d7523635cf7c41f616be6fb8ba485b6f6bdd626006398dc3491b3e4c981219e4874772b7e59f545b206f
- languageName: node
- linkType: hard
-
"@sentry/utils@npm:7.77.0, @sentry/utils@npm:^7.60.0":
version: 7.77.0
resolution: "@sentry/utils@npm:7.77.0"
From 0bd37b508cea02d295ebdbbd496b1babafbb7558 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 20:46:43 +0100
Subject: [PATCH 9/9] Bump react-router-dom from 6.17.0 to 6.18.0 (#1305)
Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 6.17.0 to 6.18.0.
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@6.18.0/packages/react-router-dom)
---
updated-dependencies:
- dependency-name: react-router-dom
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Frode Hansen
---
.../package.json | 2 +-
apps/endringsmelding-pleiepenger/package.json | 2 +-
.../package.json | 2 +-
.../package.json | 2 +-
apps/omsorgspengesoknad/package.json | 2 +-
.../package.json | 2 +-
apps/pleiepenger-sykt-barn/package.json | 2 +-
apps/sif-ettersending/package.json | 2 +-
packages/sif-common-forms-ds/package.json | 2 +-
packages/sif-common-soknad-ds/package.json | 2 +-
yarn.lock | 50 +++++++++----------
11 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json
index a588b0b471..80dd7eb14e 100644
--- a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json
+++ b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json
@@ -53,7 +53,7 @@
"react-dom": "18.2.0",
"react-fast-compare": "3.2.2",
"react-intl": "6.5.1",
- "react-router-dom": "6.17.0",
+ "react-router-dom": "6.18.0",
"request": "2.88.2",
"vite": "4.5.0",
"vite-plugin-checker": "0.6.2"
diff --git a/apps/endringsmelding-pleiepenger/package.json b/apps/endringsmelding-pleiepenger/package.json
index 5e8a13b684..6000ec0873 100644
--- a/apps/endringsmelding-pleiepenger/package.json
+++ b/apps/endringsmelding-pleiepenger/package.json
@@ -46,7 +46,7 @@
"react-dom": "18.2.0",
"react-intl": "6.5.1",
"react-modal": "3.16.1",
- "react-router-dom": "6.17.0",
+ "react-router-dom": "6.18.0",
"request": "2.88.2"
},
"devDependencies": {
diff --git a/apps/omsorgsdager-aleneomsorg-dialog/package.json b/apps/omsorgsdager-aleneomsorg-dialog/package.json
index 1edb18abbe..62d4216e1c 100644
--- a/apps/omsorgsdager-aleneomsorg-dialog/package.json
+++ b/apps/omsorgsdager-aleneomsorg-dialog/package.json
@@ -54,7 +54,7 @@
"react-dom": "18.2.0",
"react-fast-compare": "3.2.2",
"react-intl": "6.5.1",
- "react-router-dom": "6.17.0",
+ "react-router-dom": "6.18.0",
"ulid": "2.3.0",
"uuid": "9.0.1"
},
diff --git a/apps/omsorgspengerutbetaling-soknad/package.json b/apps/omsorgspengerutbetaling-soknad/package.json
index 55b17f519a..fd204bc128 100644
--- a/apps/omsorgspengerutbetaling-soknad/package.json
+++ b/apps/omsorgspengerutbetaling-soknad/package.json
@@ -43,7 +43,7 @@
"react-dom": "18.2.0",
"react-fast-compare": "3.2.2",
"react-intl": "6.5.1",
- "react-router-dom": "6.17.0",
+ "react-router-dom": "6.18.0",
"request": "2.88.2",
"ulid": "2.3.0",
"uuid": "9.0.1",
diff --git a/apps/omsorgspengesoknad/package.json b/apps/omsorgspengesoknad/package.json
index 1b84c34056..e7e0818cb8 100644
--- a/apps/omsorgspengesoknad/package.json
+++ b/apps/omsorgspengesoknad/package.json
@@ -44,7 +44,7 @@
"react-dom": "18.2.0",
"react-fast-compare": "3.2.2",
"react-intl": "6.5.1",
- "react-router-dom": "6.17.0",
+ "react-router-dom": "6.18.0",
"request": "2.88.2",
"vite": "4.5.0",
"vite-plugin-checker": "0.6.2"
diff --git a/apps/pleiepenger-i-livets-sluttfase-soknad/package.json b/apps/pleiepenger-i-livets-sluttfase-soknad/package.json
index c404ccaf03..6c96a64253 100644
--- a/apps/pleiepenger-i-livets-sluttfase-soknad/package.json
+++ b/apps/pleiepenger-i-livets-sluttfase-soknad/package.json
@@ -44,7 +44,7 @@
"react-dom": "18.2.0",
"react-fast-compare": "3.2.2",
"react-intl": "6.5.1",
- "react-router-dom": "6.17.0",
+ "react-router-dom": "6.18.0",
"request": "2.88.2",
"uuid": "^9.0.1"
},
diff --git a/apps/pleiepenger-sykt-barn/package.json b/apps/pleiepenger-sykt-barn/package.json
index d96e3b5534..266f62a6b1 100644
--- a/apps/pleiepenger-sykt-barn/package.json
+++ b/apps/pleiepenger-sykt-barn/package.json
@@ -61,7 +61,7 @@
"react": "18.2.0",
"react-day-picker": "8.9.1",
"react-responsive": "9.0.2",
- "react-router-dom": "6.17.0",
+ "react-router-dom": "6.18.0",
"ts-loader": "9.5.0",
"uuid": "9.0.1"
},
diff --git a/apps/sif-ettersending/package.json b/apps/sif-ettersending/package.json
index ffe26e5075..5d0c0550d1 100644
--- a/apps/sif-ettersending/package.json
+++ b/apps/sif-ettersending/package.json
@@ -46,7 +46,7 @@
"react-collapse": "5.1.1",
"react-day-picker": "8.9.1",
"react-intl": "6.5.1",
- "react-router-dom": "6.17.0"
+ "react-router-dom": "6.18.0"
},
"devDependencies": {
"@axe-core/playwright": "4.8.1",
diff --git a/packages/sif-common-forms-ds/package.json b/packages/sif-common-forms-ds/package.json
index 48cd69edf5..d378e30967 100644
--- a/packages/sif-common-forms-ds/package.json
+++ b/packages/sif-common-forms-ds/package.json
@@ -57,7 +57,7 @@
"react-intl": "6.5.1",
"react-modal": "3.16.1",
"react-responsive": "9.0.2",
- "react-router-dom": "6.17.0",
+ "react-router-dom": "6.18.0",
"react-scripts": "5.0.1",
"rimraf": "5.0.5",
"storybook": "7.5.2",
diff --git a/packages/sif-common-soknad-ds/package.json b/packages/sif-common-soknad-ds/package.json
index 10eae36e10..b517669878 100644
--- a/packages/sif-common-soknad-ds/package.json
+++ b/packages/sif-common-soknad-ds/package.json
@@ -60,7 +60,7 @@
"react-day-picker": "8.9.1",
"react-dom": "18.2.0",
"react-intl": "6.5.1",
- "react-router-dom": "6.17.0",
+ "react-router-dom": "6.18.0",
"react-scripts": "5.0.1",
"rimraf": "5.0.5",
"sass": "1.69.5",
diff --git a/yarn.lock b/yarn.lock
index 605e04fc43..634f25a9d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3616,7 +3616,7 @@ __metadata:
react-dom: 18.2.0
react-fast-compare: 3.2.2
react-intl: 6.5.1
- react-router-dom: 6.17.0
+ react-router-dom: 6.18.0
react-scripts: 5.0.1
request: 2.88.2
rimraf: 5.0.5
@@ -3716,7 +3716,7 @@ __metadata:
react-dom: 18.2.0
react-intl: 6.5.1
react-modal: 3.16.1
- react-router-dom: 6.17.0
+ react-router-dom: 6.18.0
react-scripts: 5.0.1
regenerator-runtime: 0.14.0
request: 2.88.2
@@ -3808,7 +3808,7 @@ __metadata:
react-dom: 18.2.0
react-fast-compare: 3.2.2
react-intl: 6.5.1
- react-router-dom: 6.17.0
+ react-router-dom: 6.18.0
react-scripts: 5.0.1
rimraf: 5.0.5
source-map-loader: 4.0.1
@@ -3881,7 +3881,7 @@ __metadata:
react-dom: 18.2.0
react-fast-compare: 3.2.2
react-intl: 6.5.1
- react-router-dom: 6.17.0
+ react-router-dom: 6.18.0
react-scripts: 5.0.1
request: 2.88.2
sass: 1.69.5
@@ -3971,7 +3971,7 @@ __metadata:
react-dom: 18.2.0
react-fast-compare: 3.2.2
react-intl: 6.5.1
- react-router-dom: 6.17.0
+ react-router-dom: 6.18.0
react-scripts: 5.0.1
request: 2.88.2
sass: 1.69.5
@@ -4049,7 +4049,7 @@ __metadata:
react-dom: 18.2.0
react-fast-compare: 3.2.2
react-intl: 6.5.1
- react-router-dom: 6.17.0
+ react-router-dom: 6.18.0
react-scripts: 5.0.1
request: 2.88.2
sass: 1.69.5
@@ -4148,7 +4148,7 @@ __metadata:
react-dom: 18.2.0
react-intl: 6.5.1
react-responsive: 9.0.2
- react-router-dom: 6.17.0
+ react-router-dom: 6.18.0
react-scripts: 5.0.1
request: 2.88.2
sass: 1.69.5
@@ -4400,7 +4400,7 @@ __metadata:
react-intl: 6.5.1
react-modal: 3.16.1
react-responsive: 9.0.2
- react-router-dom: 6.17.0
+ react-router-dom: 6.18.0
react-scripts: 5.0.1
rimraf: 5.0.5
storybook: 7.5.2
@@ -4498,7 +4498,7 @@ __metadata:
react-day-picker: 8.9.1
react-dom: 18.2.0
react-intl: 6.5.1
- react-router-dom: 6.17.0
+ react-router-dom: 6.18.0
react-scripts: 5.0.1
rimraf: 5.0.5
sass: 1.69.5
@@ -4629,7 +4629,7 @@ __metadata:
react-day-picker: 8.9.1
react-dom: 18.2.0
react-intl: 6.5.1
- react-router-dom: 6.17.0
+ react-router-dom: 6.18.0
react-scripts: 5.0.1
request: 2.88.2
sass: 1.69.5
@@ -5640,10 +5640,10 @@ __metadata:
languageName: node
linkType: hard
-"@remix-run/router@npm:1.10.0":
- version: 1.10.0
- resolution: "@remix-run/router@npm:1.10.0"
- checksum: f8f9fcd5f08465a7e0a05378398ff6df2c5c5ef5766df3490a134d64260b3b16f1bd490bb0c3f5925c2671a0c1d8d1fa01dfbdc7ecc3b2447dc6eafe6b73bcc2
+"@remix-run/router@npm:1.11.0":
+ version: 1.11.0
+ resolution: "@remix-run/router@npm:1.11.0"
+ checksum: 1966436ab3ab982862195e4871790644ce21e01511aa3f4350436296224e4dec2e6ee35f1f4cb83db69f7aa0e8ad4a0a01928b05359ae654edc8e2aa82bf754b
languageName: node
linkType: hard
@@ -25262,27 +25262,27 @@ __metadata:
languageName: node
linkType: hard
-"react-router-dom@npm:6.17.0":
- version: 6.17.0
- resolution: "react-router-dom@npm:6.17.0"
+"react-router-dom@npm:6.18.0":
+ version: 6.18.0
+ resolution: "react-router-dom@npm:6.18.0"
dependencies:
- "@remix-run/router": 1.10.0
- react-router: 6.17.0
+ "@remix-run/router": 1.11.0
+ react-router: 6.18.0
peerDependencies:
react: ">=16.8"
react-dom: ">=16.8"
- checksum: e0ba4f4c507681e2ffdecdf2e67edf7ec0e2bf4be35222e29d013afdb03866a5e6ecacc8b452bd55797b9672785d02f81bd6dbf6b05ac93a59e48e774b0060de
+ checksum: ca5c9a9f748f4ff9677d25762970fc59cb216568aad0ebc668b22398222a940f767680bc9a3e65a92e940d3fe05731eda8a4b352ccbf1054904b3b785a9f5e6f
languageName: node
linkType: hard
-"react-router@npm:6.17.0":
- version: 6.17.0
- resolution: "react-router@npm:6.17.0"
+"react-router@npm:6.18.0":
+ version: 6.18.0
+ resolution: "react-router@npm:6.18.0"
dependencies:
- "@remix-run/router": 1.10.0
+ "@remix-run/router": 1.11.0
peerDependencies:
react: ">=16.8"
- checksum: 99c30d94fbb34657e4c8c3ef1aaae33b143167d3869b442e06c83b4006f35200fde810029180e209654bef2f47f0b27a928f77cc2d859a358a2722cc9d494f03
+ checksum: 03e9a23c5b75d8813720745e2952bb9e62ec310d238cde4f19e0ce73582701fa5e04cf609ff9ced978e9e6c531b5e333b9aee35371e6c4743afc2829e32e926a
languageName: node
linkType: hard