Skip to content

Commit

Permalink
Merge branch 'main' into sn-fl-10-dager
Browse files Browse the repository at this point in the history
  • Loading branch information
frodehansen2 committed Jan 8, 2024
2 parents e5c4e1e + 311c353 commit 66d87e3
Show file tree
Hide file tree
Showing 43 changed files with 730 additions and 447 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/.deploy-app-to-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}

- name: Deploy to dev
uses: nais/deploy/actions/deploy@v1
uses: nais/deploy/actions/deploy@v2
env:
CLUSTER: dev-gcp
RESOURCE: nais-config/nais.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/.deploy-app-to-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}

- name: Deploy to prod
uses: nais/deploy/actions/deploy@v1
uses: nais/deploy/actions/deploy@v2
env:
CLUSTER: prod-gcp
RESOURCE: nais-config/nais.yml
Expand Down
11 changes: 11 additions & 0 deletions apps/dine-pleiepenger/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @navikt/dine-pleiepenger

## 0.5.2

### Patch Changes

- Pakkeoppdateringer patch og noe minor
- Updated dependencies
- @navikt/appstatus-react-ds@2.17.11
- @navikt/sif-common-core-ds@9.13.2
- @navikt/sif-common-sentry@0.25.9
- @navikt/sif-common-utils@3.43.10

## 0.5.1

### Patch Changes
Expand Down
12 changes: 6 additions & 6 deletions apps/dine-pleiepenger/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@navikt/dine-pleiepenger",
"version": "0.5.1",
"version": "0.5.2",
"private": true,
"scripts": {
"build-storybook": "storybook build",
Expand All @@ -20,7 +20,7 @@
"@navikt/sif-common-core-ds": "workspace: *",
"@navikt/sif-common-sentry": "workspace: *",
"@navikt/sif-common-utils": "workspace: *",
"axios": "1.6.4",
"axios": "1.6.5",
"jsonwebtoken": "9.0.2",
"next": "14.0.4",
"next-logger": "3.0.2",
Expand All @@ -34,10 +34,10 @@
},
"devDependencies": {
"@axe-core/playwright": "4.8.2",
"@navikt/ds-css": "5.12.2",
"@navikt/ds-css": "5.12.4",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "5.12.2",
"@navikt/ds-tailwind": "5.12.2",
"@navikt/ds-react": "5.12.4",
"@navikt/ds-tailwind": "5.12.4",
"@next/bundle-analyzer": "14.0.4",
"@playwright/test": "^1.40.1",
"@storybook/addon-essentials": "7.6.7",
Expand All @@ -62,7 +62,7 @@
"react-dom": "18.2.0",
"react-intl": "6.5.5",
"storybook": "7.6.7",
"tailwindcss": "3.4.0",
"tailwindcss": "3.4.1",
"uuid": "9.0.1"
},
"eslintConfig": {
Expand Down
13 changes: 13 additions & 0 deletions apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# @navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn

## 1.21.11

### Patch Changes

- Pakkeoppdateringer patch og noe minor
- Updated dependencies
- @navikt/sif-common-amplitude@2.24.9
- @navikt/sif-common-formik-ds@1.7.2
- @navikt/sif-common-soknad-ds@10.13.2
- @navikt/sif-common-core-ds@9.13.2
- @navikt/sif-common-sentry@0.25.9
- @navikt/sif-common-utils@3.43.10

## 1.21.10

### Patch Changes
Expand Down
20 changes: 10 additions & 10 deletions apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Søknad om ekstra omsorgsdager når den andre forelderen ikke kan ha tilsyn med barn",
"license": "MIT",
"name": "@navikt/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn",
"version": "1.21.10",
"version": "1.21.11",
"repository": "https://github.com/navikt/sif-brukerdialog",
"private": true,
"type": "module",
Expand All @@ -23,9 +23,9 @@
"test": "vitest run"
},
"dependencies": {
"@navikt/ds-css": "5.12.2",
"@navikt/ds-react": "5.12.2",
"@navikt/ds-tailwind": "5.12.2",
"@navikt/ds-css": "5.12.4",
"@navikt/ds-react": "5.12.4",
"@navikt/ds-tailwind": "5.12.4",
"@navikt/sif-app-register": "workspace:*",
"@navikt/sif-common-amplitude": "workspace:*",
"@navikt/sif-common-core-ds": "workspace:*",
Expand All @@ -35,7 +35,7 @@
"@navikt/sif-common-soknad-ds": "workspace:*",
"@navikt/sif-common-utils": "workspace:*",
"@testing-library/react": "14.1.2",
"axios": "1.6.4",
"axios": "1.6.5",
"compression": "1.7.4",
"cookie-parser": "1.4.6",
"dayjs": "1.11.10",
Expand All @@ -47,13 +47,13 @@
"jose": "5.2.0",
"mustache-express": "1.3.2",
"object-hash": "3.0.0",
"openid-client": "5.6.2",
"openid-client": "5.6.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-fast-compare": "3.2.2",
"react-intl": "6.5.5",
"react-router-dom": "6.21.1",
"vite": "5.0.10",
"vite": "5.0.11",
"vite-plugin-checker": "0.6.2"
},
"devDependencies": {
Expand All @@ -67,16 +67,16 @@
"@storybook/react-vite": "7.6.7",
"@testing-library/react": "14.1.2",
"@types/object-hash": "3.0.6",
"@types/react": "18.2.46",
"@types/react": "18.2.47",
"@types/react-dom": "18.2.18",
"@types/react-router-dom": "5.3.3",
"babel-polyfill": "6.26.0",
"cross-env": "7.0.3",
"express-rate-limit": "7.1.5",
"jsdom": "23.0.1",
"jsdom": "23.2.0",
"rimraf": "5.0.5",
"typescript": "5.3.3",
"vitest": "1.1.2"
"vitest": "1.1.3"
},
"eslintConfig": {
"overrides": [
Expand Down
14 changes: 14 additions & 0 deletions apps/endringsmelding-pleiepenger/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# @navikt/endringsmelding-pleiepenger

## 2.24.12

### Patch Changes

- Pakkeoppdateringer patch og noe minor
- Updated dependencies
- @navikt/sif-common-amplitude@2.24.9
- @navikt/sif-common-formik-ds@1.7.2
- @navikt/sif-common-soknad-ds@10.13.2
- @navikt/sif-common-forms-ds@8.17.2
- @navikt/sif-common-core-ds@9.13.2
- @navikt/sif-common-sentry@0.25.9
- @navikt/sif-common-utils@3.43.10

## 2.24.11

### Patch Changes
Expand Down
26 changes: 13 additions & 13 deletions apps/endringsmelding-pleiepenger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"license": "MIT",
"name": "@navikt/endringsmelding-pleiepenger",
"repository": "https://github.com/navikt/sif-brukerdialog",
"version": "2.24.11",
"version": "2.24.12",
"private": true,
"dependencies": {
"@navikt/ds-css": "5.12.2",
"@navikt/ds-css": "5.12.4",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "5.12.2",
"@navikt/ds-tailwind": "5.12.2",
"@navikt/ds-react": "5.12.4",
"@navikt/ds-tailwind": "5.12.4",
"@navikt/sif-common-amplitude": "workspace:*",
"@navikt/sif-common-core-ds": "workspace:*",
"@navikt/sif-common-formik-ds": "workspace:*",
Expand All @@ -21,7 +21,7 @@
"@navikt/sif-common-soknad-ds": "workspace:*",
"@navikt/sif-common-utils": "workspace:*",
"@testing-library/react": "14.1.2",
"axios": "1.6.4",
"axios": "1.6.5",
"compression": "1.7.4",
"cookie-parser": "1.4.6",
"dayjs": "1.11.10",
Expand All @@ -36,7 +36,7 @@
"lodash": "4.17.21",
"mustache-express": "1.3.2",
"object-hash": "3.0.0",
"openid-client": "5.6.2",
"openid-client": "5.6.4",
"react": "18.2.0",
"react-day-picker": "8.10.0",
"react-dom": "18.2.0",
Expand All @@ -52,7 +52,7 @@
"@babel/preset-react": "7.23.3",
"@babel/preset-typescript": "7.23.3",
"@mswjs/data": "0.16.1",
"@navikt/ds-tailwind": "5.12.2",
"@navikt/ds-tailwind": "5.12.4",
"@sentry/vite-plugin": "2.10.2",
"@storybook/addon-actions": "7.6.7",
"@storybook/addon-essentials": "7.6.7",
Expand All @@ -66,7 +66,7 @@
"@types/intl": "1.2.2",
"@types/js-cookie": "3.0.6",
"@types/object-hash": "3.0.6",
"@types/react": "18.2.46",
"@types/react": "18.2.47",
"@types/react-document-title": "2.0.9",
"@types/react-dom": "18.2.18",
"@types/react-modal": "3.16.3",
Expand All @@ -78,16 +78,16 @@
"cypress": "13.6.2",
"cypress-axe": "1.5.0",
"cypress-file-upload": "5.0.8",
"jsdom": "23.0.1",
"msw": "2.0.11",
"jsdom": "23.2.0",
"msw": "2.0.12",
"postcss": "8.4.33",
"postcss-import": "16.0.0",
"storybook": "7.6.7",
"tailwindcss": "3.4.0",
"tailwindcss": "3.4.1",
"typescript": "5.3.3",
"vite": "5.0.10",
"vite": "5.0.11",
"vite-plugin-checker": "0.6.2",
"vitest": "1.1.2"
"vitest": "1.1.3"
},
"scripts": {
"build": "vite build --base=/familie/sykdom-i-familien/soknad/endringsmelding-pleiepenger",
Expand Down
14 changes: 14 additions & 0 deletions apps/omsorgsdager-aleneomsorg-dialog/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# @navikt/omsorgsdager-aleneomsorg-dialog

## 2.14.11

### Patch Changes

- Pakkeoppdateringer patch og noe minor
- Updated dependencies
- @navikt/sif-common-amplitude@2.24.9
- @navikt/sif-common-formik-ds@1.7.2
- @navikt/sif-common-soknad-ds@10.13.2
- @navikt/sif-common-forms-ds@8.17.2
- @navikt/sif-common-core-ds@9.13.2
- @navikt/sif-common-sentry@0.25.9
- @navikt/sif-common-utils@3.43.10

## 2.14.10

### Patch Changes
Expand Down
18 changes: 9 additions & 9 deletions apps/omsorgsdager-aleneomsorg-dialog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"license": "MIT",
"name": "@navikt/omsorgsdager-aleneomsorg-dialog",
"repository": "https://github.com/navikt/sif-brukerdialog",
"version": "2.14.10",
"version": "2.14.11",
"private": true,
"type": "module",
"scripts": {
Expand All @@ -23,9 +23,9 @@
"storybook": "storybook dev -p 6006 -s public"
},
"dependencies": {
"@navikt/ds-css": "5.12.2",
"@navikt/ds-react": "5.12.2",
"@navikt/ds-tailwind": "5.12.2",
"@navikt/ds-css": "5.12.4",
"@navikt/ds-react": "5.12.4",
"@navikt/ds-tailwind": "5.12.4",
"@navikt/sif-app-register": "workspace:*",
"@navikt/sif-common-amplitude": "workspace:*",
"@navikt/sif-common-core-ds": "workspace:*",
Expand All @@ -36,7 +36,7 @@
"@navikt/sif-common-soknad-ds": "workspace:*",
"@navikt/sif-common-utils": "workspace:*",
"@testing-library/react": "14.1.2",
"axios": "1.6.4",
"axios": "1.6.5",
"compression": "1.7.4",
"cookie-parser": "1.4.6",
"dayjs": "1.11.10",
Expand All @@ -47,7 +47,7 @@
"jose": "5.2.0",
"mustache-express": "1.3.2",
"object-hash": "3.0.0",
"openid-client": "5.6.2",
"openid-client": "5.6.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-fast-compare": "3.2.2",
Expand All @@ -63,17 +63,17 @@
"@babel/preset-react": "7.23.3",
"@playwright/test": "1.40.1",
"@types/object-hash": "3.0.6",
"@types/react": "18.2.46",
"@types/react": "18.2.47",
"@types/react-dom": "18.2.18",
"@types/react-router-dom": "5.3.3",
"@vitejs/plugin-react": "4.2.1",
"babel-polyfill": "6.26.0",
"cross-env": "7.0.3",
"dotenv": "16.3.1",
"jsdom": "23.0.1",
"jsdom": "23.2.0",
"less": "4.2.0",
"mini-css-extract-plugin": "2.7.6",
"vite": "5.0.10",
"vite": "5.0.11",
"vite-plugin-checker": "0.6.2"
},
"eslintConfig": {
Expand Down
6 changes: 6 additions & 0 deletions apps/omsorgsdager-kalkulator/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @navikt/omsorgsdager-kalkulator

## 3.5.8

### Patch Changes

- Pakkeoppdateringer patch og noe minor

## 3.5.7

### Patch Changes
Expand Down
14 changes: 7 additions & 7 deletions apps/omsorgsdager-kalkulator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "En kalkulator for beregning av omsorgsdager.",
"license": "MIT",
"name": "@navikt/omsorgsdager-kalkulator",
"version": "3.5.7",
"version": "3.5.8",
"private": true,
"scripts": {
"dev": "next dev -p 8080",
Expand All @@ -14,10 +14,10 @@
"playwright-test": "playwright test"
},
"dependencies": {
"@navikt/ds-css": "5.12.2",
"@navikt/ds-css": "5.12.4",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "5.12.2",
"@navikt/ds-tailwind": "5.12.2",
"@navikt/ds-react": "5.12.4",
"@navikt/ds-tailwind": "5.12.4",
"@navikt/nav-dekoratoren-moduler": "2.1.5",
"classnames": "2.5.1",
"dayjs": "1.11.10",
Expand All @@ -35,14 +35,14 @@
"devDependencies": {
"@axe-core/playwright": "4.8.2",
"@playwright/test": "1.40.1",
"@types/node": "20.10.6",
"@types/react": "18.2.46",
"@types/node": "20.10.7",
"@types/react": "18.2.47",
"@types/react-dom": "18.2.18",
"@types/uuid": "9.0.7",
"eslint": "8.56.0",
"eslint-config-next": "14.0.4",
"postcss": "8.4.33",
"tailwindcss": "3.4.0",
"tailwindcss": "3.4.1",
"typescript": "5.3.3"
}
}
Loading

0 comments on commit 66d87e3

Please sign in to comment.