Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into 14103-components-with…
Browse files Browse the repository at this point in the history
…-multiple-data-model-bindings-eg-address-are-missing
  • Loading branch information
JamalAlabdullah committed Dec 24, 2024
2 parents 6fa35ea + 7738e18 commit 2f3d307
Show file tree
Hide file tree
Showing 10 changed files with 111 additions and 63 deletions.
2 changes: 1 addition & 1 deletion backend/packagegroups/NuGet.props
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<PackageReference Update="Testcontainers.PostgreSql" Version="3.10.0" />
<PackageReference Update="Microsoft.AspNetCore.SignalR.Client" Version="9.0.0" />
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="9.0.0" />
<PackageReference Update="WireMock.Net" Version="1.6.9" />
<PackageReference Update="WireMock.Net" Version="1.6.10" />
<PackageReference Update="DistributedLock.FileSystem" Version="1.0.3" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion development/azure-devops-mock/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"cors": "2.8.5",
"express": "4.21.2",
"morgan": "1.10.0",
"nodemon": "3.1.7",
"nodemon": "3.1.9",
"p-queue": "8.0.1"
},
"license": "MIT",
Expand Down
4 changes: 2 additions & 2 deletions eidlogger/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.0</version>
<version>3.4.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>no.altinn</groupId>
Expand All @@ -17,7 +17,7 @@
<java.version>21</java.version>
<springdoc.version>2.7.0</springdoc.version>
<log-event.version>1.2.2</log-event.version>
<spring-cloud-azure.version>5.18.0</spring-cloud-azure.version>
<spring-cloud-azure.version>5.19.0</spring-cloud-azure.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion frontend/libs/studio-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"uuid": "10.0.0"
},
"devDependencies": {
"@chromatic-com/storybook": "3.2.2",
"@chromatic-com/storybook": "3.2.3",
"@storybook/addon-essentials": "8.4.7",
"@storybook/addon-interactions": "8.4.7",
"@storybook/addon-links": "8.4.7",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@
border-radius: var(--border-radius);
}

.range::-moz-range-track {
aspect-ratio: 12;
background: var(--background);
border-radius: var(--border-radius);
}

.range::-webkit-slider-thumb {
-webkit-appearance: none;
appearance: none;
width: var(--thumb-width);
}

.range::-moz-range-track {
height: 100%;
background: var(--background);
border-radius: var(--border-radius);
}

.range::-moz-range-thumb {
visibility: hidden;
width: var(--thumb-width);
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"react-router-dom": "6.28.0"
},
"devDependencies": {
"@types/react": "18.3.16",
"@types/react": "18.3.18",
"jest": "29.7.0",
"typescript": "5.7.2"
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/testing/cypress/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"devDependencies": {
"@testing-library/cypress": "10.0.2",
"axe-core": "4.10.2",
"cypress": "13.16.1",
"cypress": "13.17.0",
"cypress-axe": "1.5.0",
"cypress-plugin-tab": "1.0.5",
"eslint": "8.57.1"
Expand Down
2 changes: 1 addition & 1 deletion gitea/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ RUN node ./merge.js ./base/locale_en-US.ini ./custom/locale_en-US.ini ./locale/l
RUN node ./merge.js ./base/locale_nb-NO.ini ./custom/locale_nb-NO.ini ./locale/locale_nb-NO.ini

# Ensure to update the locales, templates, and configuration when upgrading Gitea
FROM gitea/gitea:1.22.5-rootless
FROM gitea/gitea:1.22.6-rootless
USER 0:0
RUN apk --no-cache upgrade expat git libxml2 libcurl curl
USER 1000:1000
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"@microsoft/applicationinsights-react-js": "17.3.4",
"@microsoft/applicationinsights-web": "3.3.4",
"@microsoft/signalr": "8.0.7",
"@tanstack/react-query": "5.62.7",
"@tanstack/react-query-devtools": "5.62.7",
"@tanstack/react-query": "5.62.8",
"@tanstack/react-query-devtools": "5.62.8",
"ajv": "8.17.1",
"ajv-formats": "3.0.1",
"i18next": "23.16.8",
Expand All @@ -33,7 +33,7 @@
"@testing-library/user-event": "14.5.2",
"@types/css-modules": "1.0.5",
"@types/jest": "29.5.14",
"@types/react": "18.3.16",
"@types/react": "18.3.18",
"@types/react-dom": "18.3.5",
"@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0",
Expand All @@ -57,7 +57,7 @@
"prettier": "3.4.2",
"source-map-loader": "5.0.0",
"swc-loader": "0.2.6",
"terser-webpack-plugin": "5.3.10",
"terser-webpack-plugin": "5.3.11",
"typescript": "5.7.2",
"typescript-plugin-css-modules": "5.1.0",
"webpack": "5.97.1",
Expand All @@ -68,7 +68,7 @@
"resolutions": {
"@testing-library/dom": "10.4.0",
"@babel/traverse": "7.26.4",
"caniuse-lite": "1.0.30001688"
"caniuse-lite": "1.0.30001690"
},
"lint-staged": {
"*{js,jsx,tsx,ts,css,md}": "prettier -w",
Expand Down
Loading

0 comments on commit 2f3d307

Please sign in to comment.