Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/frontend/types/nod…
Browse files Browse the repository at this point in the history
…e-22.10.2
  • Loading branch information
RichardPeltonen authored Dec 17, 2024
2 parents 37f98b6 + 71a89d7 commit bed43fa
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 32 deletions.
6 changes: 3 additions & 3 deletions api-gateway/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
"passport-local": "^1.0.0",
"pino": "^9.5.0",
"pino-http": "^10.2.0",
"pino-pretty": "^11.2.1",
"pino-pretty": "^13.0.0",
"query-string": "^9.1.0",
"redis": "^4.7.0",
"source-map-support": "^0.5.21",
"zod": "^3.23.0"
"zod": "^3.24.1"
},
"devDependencies": {
"@types/cookie-parser": "^1.4.3",
Expand All @@ -57,7 +57,7 @@
"@typescript-eslint/eslint-plugin": "^8.18.0",
"@typescript-eslint/parser": "^8.18.0",
"concurrently": "^9.1.0",
"eslint": "^9.16.0",
"eslint": "^9.17.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.2",
"nodemon": "^3.1.0",
Expand Down
61 changes: 42 additions & 19 deletions api-gateway/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ __metadata:
languageName: node
linkType: hard

"@eslint/js@npm:9.16.0":
version: 9.16.0
resolution: "@eslint/js@npm:9.16.0"
checksum: 10/122da09b6a2c6a92d68be26146af1da17d9d4e03cf9435a874d341f18519122eef9ed229e52a1b781dc5987239754954e80a0b11bbe8f65df96e9ef8f3b438ad
"@eslint/js@npm:9.17.0":
version: 9.17.0
resolution: "@eslint/js@npm:9.17.0"
checksum: 10/1a89e62f5c50e75d44565b7f3b91701455a999132c991e10bac59c118fbb54bdd54be22b9bda1ac730f78a2e64604403d65ce5dd7726d80b2632982cfc3d84ac
languageName: node
linkType: hard

Expand Down Expand Up @@ -1330,7 +1330,7 @@ __metadata:
languageName: node
linkType: hard

"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.5":
"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.6":
version: 7.0.6
resolution: "cross-spawn@npm:7.0.6"
dependencies:
Expand Down Expand Up @@ -1671,16 +1671,16 @@ __metadata:
languageName: node
linkType: hard

"eslint@npm:^9.16.0":
version: 9.16.0
resolution: "eslint@npm:9.16.0"
"eslint@npm:^9.17.0":
version: 9.17.0
resolution: "eslint@npm:9.17.0"
dependencies:
"@eslint-community/eslint-utils": "npm:^4.2.0"
"@eslint-community/regexpp": "npm:^4.12.1"
"@eslint/config-array": "npm:^0.19.0"
"@eslint/core": "npm:^0.9.0"
"@eslint/eslintrc": "npm:^3.2.0"
"@eslint/js": "npm:9.16.0"
"@eslint/js": "npm:9.17.0"
"@eslint/plugin-kit": "npm:^0.2.3"
"@humanfs/node": "npm:^0.16.6"
"@humanwhocodes/module-importer": "npm:^1.0.1"
Expand All @@ -1689,7 +1689,7 @@ __metadata:
"@types/json-schema": "npm:^7.0.15"
ajv: "npm:^6.12.4"
chalk: "npm:^4.0.0"
cross-spawn: "npm:^7.0.5"
cross-spawn: "npm:^7.0.6"
debug: "npm:^4.3.2"
escape-string-regexp: "npm:^4.0.0"
eslint-scope: "npm:^8.2.0"
Expand All @@ -1716,7 +1716,7 @@ __metadata:
optional: true
bin:
eslint: bin/eslint.js
checksum: 10/b47a34392a55bc08594ee2fed2777d7aff96f38b584791ccded44d88b72795acfe15b18643fd4046f680734a1f16244d554f34a485f660fa723e25d609fb12ba
checksum: 10/a48ee67dd4e737974bbb49ca5d12d0ce35bcd874507807599e3655bb398320ab27c9deed1aad508a963967815e626c21208f52158c2fc0796d0cc8186528efeb
languageName: node
linkType: hard

Expand Down Expand Up @@ -2695,7 +2695,7 @@ __metadata:
cookie-parser: "npm:^1.4.6"
csurf: "npm:^1.11.0"
date-fns: "npm:^4.1.0"
eslint: "npm:^9.16.0"
eslint: "npm:^9.17.0"
eslint-config-prettier: "npm:^9.1.0"
eslint-plugin-prettier: "npm:^5.1.2"
express: "npm:^5.0.1"
Expand All @@ -2712,14 +2712,14 @@ __metadata:
passport-local: "npm:^1.0.0"
pino: "npm:^9.5.0"
pino-http: "npm:^10.2.0"
pino-pretty: "npm:^11.2.1"
pino-pretty: "npm:^13.0.0"
prettier: "npm:^3.4.2"
query-string: "npm:^9.1.0"
redis: "npm:^4.7.0"
source-map-support: "npm:^0.5.21"
ts-node: "npm:^10.9.1"
typescript: "npm:^5.7.2"
zod: "npm:^3.23.0"
zod: "npm:^3.24.1"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -3267,7 +3267,7 @@ __metadata:
languageName: node
linkType: hard

"pino-pretty@npm:*, pino-pretty@npm:^11.2.1":
"pino-pretty@npm:*":
version: 11.2.2
resolution: "pino-pretty@npm:11.2.2"
dependencies:
Expand All @@ -3291,6 +3291,29 @@ __metadata:
languageName: node
linkType: hard

"pino-pretty@npm:^13.0.0":
version: 13.0.0
resolution: "pino-pretty@npm:13.0.0"
dependencies:
colorette: "npm:^2.0.7"
dateformat: "npm:^4.6.3"
fast-copy: "npm:^3.0.2"
fast-safe-stringify: "npm:^2.1.1"
help-me: "npm:^5.0.0"
joycon: "npm:^3.1.1"
minimist: "npm:^1.2.6"
on-exit-leak-free: "npm:^2.1.0"
pino-abstract-transport: "npm:^2.0.0"
pump: "npm:^3.0.0"
secure-json-parse: "npm:^2.4.0"
sonic-boom: "npm:^4.0.1"
strip-json-comments: "npm:^3.1.1"
bin:
pino-pretty: bin.js
checksum: 10/9861fdbe88db000e3b0fe959f0fb7b5913e8d16af70373155d48854c5d509629e7e1ba09ed3fac24a9bd2729451567a698938b9741d84de63eb549843450e71c
languageName: node
linkType: hard

"pino-std-serializers@npm:*, pino-std-serializers@npm:^7.0.0":
version: 7.0.0
resolution: "pino-std-serializers@npm:7.0.0"
Expand Down Expand Up @@ -4417,9 +4440,9 @@ __metadata:
languageName: node
linkType: hard

"zod@npm:^3.23.0":
version: 3.23.8
resolution: "zod@npm:3.23.8"
checksum: 10/846fd73e1af0def79c19d510ea9e4a795544a67d5b34b7e1c4d0425bf6bfd1c719446d94cdfa1721c1987d891321d61f779e8236fde517dc0e524aa851a6eff1
"zod@npm:^3.24.1":
version: 3.24.1
resolution: "zod@npm:3.24.1"
checksum: 10/54e25956495dec22acb9399c168c6ba657ff279801a7fcd0530c414d867f1dcca279335e160af9b138dd70c332e17d548be4bc4d2f7eaf627dead50d914fec27
languageName: node
linkType: hard
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"react-tag-autocomplete": "7.4.0",
"react-textarea-autosize": "^8.5.3",
"styled-components": "6.1.0",
"uuid": "^10.0.0"
"uuid": "^11.0.3"
},
"devDependencies": {
"@babel/core": "^7.25.7",
Expand Down
12 changes: 6 additions & 6 deletions frontend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5056,7 +5056,7 @@ __metadata:
ts-node: "npm:^10.9.1"
typescript: "npm:~5.7.2"
typescript-eslint: "npm:^8.18.0"
uuid: "npm:^10.0.0"
uuid: "npm:^11.0.3"
yargs: "npm:^17.7.2"
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -7112,12 +7112,12 @@ __metadata:
languageName: node
linkType: hard

"uuid@npm:^10.0.0":
version: 10.0.0
resolution: "uuid@npm:10.0.0"
"uuid@npm:^11.0.3":
version: 11.0.3
resolution: "uuid@npm:11.0.3"
bin:
uuid: dist/bin/uuid
checksum: 10/35aa60614811a201ff90f8ca5e9ecb7076a75c3821e17f0f5ff72d44e36c2d35fcbc2ceee9c4ac7317f4cc41895da30e74f3885e30313bee48fda6338f250538
uuid: dist/esm/bin/uuid
checksum: 10/251385563195709eb0697c74a834764eef28e1656d61174e35edbd129288acb4d95a43f4ce8a77b8c2fc128e2b55924296a0945f964b05b9173469d045625ff2
languageName: node
linkType: hard

Expand Down
6 changes: 3 additions & 3 deletions service/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
id("io.spring.dependency-management") version "1.1.5"
kotlin("jvm") version "2.1.0"
kotlin("plugin.spring") version "2.0.20"
id("org.flywaydb.flyway") version "11.0.0"
id("org.flywaydb.flyway") version "11.1.0"
id("org.jlleitschuh.gradle.ktlint") version "12.1.2"

idea
Expand Down Expand Up @@ -56,7 +56,7 @@ dependencies {
implementation("org.springframework.ws:spring-ws-security")

implementation("org.geotools:gt-geopkg:32.1")
implementation("org.geotools:gt-epsg-hsql:32.0")
implementation("org.geotools:gt-epsg-hsql:32.1")

implementation("com.zaxxer:HikariCP:6.2.1")
implementation("org.flywaydb:flyway-core:11.0.0")
Expand Down Expand Up @@ -90,7 +90,7 @@ dependencies {
api(platform("org.junit:junit-bom:5.11.3"))
testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("com.microsoft.playwright:playwright:1.47.0")
testImplementation("com.microsoft.playwright:playwright:1.49.0")

implementation("org.bouncycastle:bcprov-jdk18on:1.79")

Expand Down

0 comments on commit bed43fa

Please sign in to comment.