Skip to content

Commit

Permalink
Merge branch 'main' into feat-add-unique-header-to-app-development
Browse files Browse the repository at this point in the history
  • Loading branch information
wrt95 authored Oct 7, 2024
2 parents 25e7286 + 349507e commit b51cf9c
Show file tree
Hide file tree
Showing 12 changed files with 382 additions and 404 deletions.
Empty file modified .yarn/releases/yarn-4.5.0.cjs
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion charts/altinn-loadbalancer/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ environment: development

image:
repository: nginx
tag: 1.27.1-alpine
tag: 1.27.2-alpine
pullPolicy: IfNotPresent
containerPorts:
http: 80
Expand Down
2 changes: 1 addition & 1 deletion development/azure-devops-mock/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dependencies": {
"axios": "1.7.7",
"cors": "2.8.5",
"express": "4.20.0",
"express": "4.21.0",
"morgan": "1.10.0",
"nodemon": "3.1.7",
"p-queue": "8.0.1"
Expand Down
14 changes: 7 additions & 7 deletions frontend/libs/studio-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
},
"devDependencies": {
"@chromatic-com/storybook": "2.0.2",
"@storybook/addon-essentials": "8.3.3",
"@storybook/addon-interactions": "8.3.3",
"@storybook/addon-links": "8.3.3",
"@storybook/addon-essentials": "8.3.4",
"@storybook/addon-interactions": "8.3.4",
"@storybook/addon-links": "8.3.4",
"@storybook/addon-webpack5-compiler-swc": "1.0.5",
"@storybook/blocks": "8.3.3",
"@storybook/react": "8.3.3",
"@storybook/react-webpack5": "8.3.3",
"@storybook/test": "8.3.3",
"@storybook/blocks": "8.3.4",
"@storybook/react": "8.3.4",
"@storybook/react-webpack5": "8.3.4",
"@storybook/test": "8.3.4",
"@testing-library/jest-dom": "6.5.0",
"@testing-library/react": "16.0.1",
"@types/jest": "^29.5.5",
Expand Down
2 changes: 1 addition & 1 deletion frontend/libs/studio-content-library/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@studio/content-library",
"packageManager": "yarn@4.4.0",
"packageManager": "yarn@4.5.0",
"version": "0.1.0",
"main": "./src/index.ts",
"dependencies": {
Expand Down
4 changes: 2 additions & 2 deletions frontend/packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"author": "Altinn",
"dependencies": {
"@mui/material": "6.1.1",
"@mui/material": "6.1.2",
"classnames": "2.5.1",
"qs": "6.13.0",
"react": "18.3.1",
Expand All @@ -14,7 +14,7 @@
"react-router-dom": "6.26.2"
},
"devDependencies": {
"@types/react": "18.3.9",
"@types/react": "18.3.11",
"jest": "29.7.0",
"typescript": "5.6.2"
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/ux-editor-v3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "1.0.1",
"author": "Altinn",
"dependencies": {
"@mui/material": "6.1.1",
"@mui/material": "6.1.2",
"@reduxjs/toolkit": "1.9.7",
"@studio/icons": "workspace:^",
"classnames": "2.5.1",
Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/ux-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "1.0.1",
"author": "Altinn",
"dependencies": {
"@mui/material": "6.1.1",
"@mui/material": "6.1.2",
"@studio/icons": "workspace:^",
"classnames": "2.5.1",
"react": "18.3.1",
Expand Down
2 changes: 1 addition & 1 deletion frontend/scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0",
"eslint": "8.57.1",
"eslint-plugin-import": "2.30.0",
"eslint-plugin-import": "2.31.0",
"glob": "11.0.0",
"husky": "9.1.6",
"jsonpointer": "5.0.1",
Expand Down
23 changes: 12 additions & 11 deletions frontend/scripts/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ __metadata:
"@typescript-eslint/parser": "npm:7.18.0"
axios: "npm:1.7.7"
eslint: "npm:8.57.1"
eslint-plugin-import: "npm:2.30.0"
eslint-plugin-import: "npm:2.31.0"
glob: "npm:11.0.0"
husky: "npm:9.1.6"
jsonpointer: "npm:5.0.1"
Expand Down Expand Up @@ -1124,21 +1124,21 @@ __metadata:
languageName: node
linkType: hard

"eslint-module-utils@npm:^2.9.0":
version: 2.11.0
resolution: "eslint-module-utils@npm:2.11.0"
"eslint-module-utils@npm:^2.12.0":
version: 2.12.0
resolution: "eslint-module-utils@npm:2.12.0"
dependencies:
debug: "npm:^3.2.7"
peerDependenciesMeta:
eslint:
optional: true
checksum: 10/1ba42cf48c5f9ec3b76dfa42c16f1c24c10508313689425c05ccb1d0eaa34bdc5c5b9c0c033cd402e9c429666bd3eb8c6d0c66565b0c00949fae743ad3643c95
checksum: 10/dd27791147eca17366afcb83f47d6825b6ce164abb256681e5de4ec1d7e87d8605641eb869298a0dbc70665e2446dbcc2f40d3e1631a9475dd64dd23d4ca5dee
languageName: node
linkType: hard

"eslint-plugin-import@npm:2.30.0":
version: 2.30.0
resolution: "eslint-plugin-import@npm:2.30.0"
"eslint-plugin-import@npm:2.31.0":
version: 2.31.0
resolution: "eslint-plugin-import@npm:2.31.0"
dependencies:
"@rtsao/scc": "npm:^1.1.0"
array-includes: "npm:^3.1.8"
Expand All @@ -1148,7 +1148,7 @@ __metadata:
debug: "npm:^3.2.7"
doctrine: "npm:^2.1.0"
eslint-import-resolver-node: "npm:^0.3.9"
eslint-module-utils: "npm:^2.9.0"
eslint-module-utils: "npm:^2.12.0"
hasown: "npm:^2.0.2"
is-core-module: "npm:^2.15.1"
is-glob: "npm:^4.0.3"
Expand All @@ -1157,10 +1157,11 @@ __metadata:
object.groupby: "npm:^1.0.3"
object.values: "npm:^1.2.0"
semver: "npm:^6.3.1"
string.prototype.trimend: "npm:^1.0.8"
tsconfig-paths: "npm:^3.15.0"
peerDependencies:
eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
checksum: 10/a5f85dfe76e27286c28a01d137769726ce3f758bcc03aa6b6f9e18700a40a08f57239f82e07efcab763c4b03a02d425edcc29fbecf40aad0124286978c6bc63c
eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9
checksum: 10/6b76bd009ac2db0615d9019699d18e2a51a86cb8c1d0855a35fb1b418be23b40239e6debdc6e8c92c59f1468ed0ea8d7b85c817117a113d5cc225be8a02ad31c
languageName: node
linkType: hard

Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
"@digdir/designsystemet-css": "0.10.0",
"@digdir/designsystemet-react": "0.63.0",
"@digdir/designsystemet-theme": "0.15.3",
"@microsoft/applicationinsights-react-js": "17.3.2",
"@microsoft/applicationinsights-react-js": "17.3.3",
"@microsoft/applicationinsights-web": "3.3.3",
"@microsoft/signalr": "8.0.7",
"@tanstack/react-query": "5.56.2",
"@tanstack/react-query-devtools": "5.58.0",
"@tanstack/react-query": "5.59.0",
"@tanstack/react-query-devtools": "5.59.0",
"ajv": "8.17.1",
"ajv-formats": "3.0.1",
"i18next": "23.15.1",
Expand All @@ -35,24 +35,24 @@
"@testing-library/user-event": "14.5.2",
"@types/css-modules": "1.0.5",
"@types/jest": "29.5.13",
"@types/react": "18.3.9",
"@types/react": "18.3.11",
"@types/react-dom": "18.3.0",
"@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0",
"cross-env": "7.0.3",
"css-loader": "7.1.2",
"css-minimizer-webpack-plugin": "^7.0.0",
"eslint": "8.57.1",
"eslint-plugin-import": "2.30.0",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-jsx-a11y": "6.10.0",
"eslint-plugin-react": "7.37.0",
"eslint-plugin-react": "7.37.1",
"eslint-plugin-react-hooks": "4.6.2",
"eslint-plugin-testing-library": "6.3.0",
"glob": "11.0.0",
"husky": "9.1.6",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-fail-on-console": "3.3.0",
"jest-fail-on-console": "3.3.1",
"jest-junit": "16.0.0",
"lint-staged": "15.2.10",
"mini-css-extract-plugin": "2.9.1",
Expand All @@ -69,7 +69,7 @@
},
"resolutions": {
"@testing-library/dom": "10.4.0",
"@babel/traverse": "7.25.6"
"@babel/traverse": "7.25.7"
},
"lint-staged": {
"*{js,jsx,tsx,ts,css,md}": "prettier -w",
Expand Down
Loading

0 comments on commit b51cf9c

Please sign in to comment.