Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/npm_and_yarn/ui/develop/develo…
Browse files Browse the repository at this point in the history
…pment-dependencies-8fd77f25af
  • Loading branch information
nimdanitro authored Oct 14, 2024
2 parents 7fb9b44 + 4930297 commit 5445ab8
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 17 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

### ⚙️ Other

- *(deps)* Bump react-router-dom from 6.26.2 to 6.27.0 in /ui ([#465](https://github.com/f-eld-ch/sitrep/issues/465)) - ([6c052ba](https://github.com/f-eld-ch/sitrep/commit/6c052bada15c5279db80c8a9cb13afd84585be21))
- *(deps)* Bump oauth2-proxy/oauth2-proxy from v7.6.0 to v7.7.1 ([#463](https://github.com/f-eld-ch/sitrep/issues/463)) - ([f15203a](https://github.com/f-eld-ch/sitrep/commit/f15203a97b5c5569ebe49e9c97eacdcc64e16beb))
- *(deps)* Bump i18next from 23.15.1 to 23.15.2 in /ui ([#457](https://github.com/f-eld-ch/sitrep/issues/457)) - ([1a46b1b](https://github.com/f-eld-ch/sitrep/commit/1a46b1bbd9a0a74625968b8e4abb442091ad3cf0))
- *(deps)* Bump ytanikin/PRConventionalCommits from 1.1.0 to 1.3.0 ([#450](https://github.com/f-eld-ch/sitrep/issues/450)) - ([c8ed466](https://github.com/f-eld-ch/sitrep/commit/c8ed466fea65fda46f15826a8aae3332b6f0bb8a))
Expand Down
2 changes: 1 addition & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"react-i18next": "^15.0.2",
"react-map-gl": "~7.1.7",
"react-markdown": "^9.0.1",
"react-router-dom": "^6.26.2",
"react-router-dom": "^6.27.0",
"usehooks-ts": "^3.1.0",
"uuid": "^10.0.0",
"web-vitals": "^4.2.3"
Expand Down
32 changes: 16 additions & 16 deletions ui/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3375,10 +3375,10 @@ __metadata:
languageName: node
linkType: hard

"@remix-run/router@npm:1.19.2":
version: 1.19.2
resolution: "@remix-run/router@npm:1.19.2"
checksum: 10/31b62b66ea68bd62018189047de7b262700113438f62407df019f81a9856a08a705b2b77454be9293518e2f5f3bbf3f8b858ac19f48cb7d89f8ab56b7b630c19
"@remix-run/router@npm:1.20.0":
version: 1.20.0
resolution: "@remix-run/router@npm:1.20.0"
checksum: 10/e1d2420db94a1855b97f1784898d0ae389cf3b77129b8f419e51d4833b77ca2c92ac09e2cb558015324d64580a138fd6faa31e52fcc3ba90e3cc382a1a324d4a
languageName: node
linkType: hard

Expand Down Expand Up @@ -11664,27 +11664,27 @@ __metadata:
languageName: node
linkType: hard

"react-router-dom@npm:^6.26.2":
version: 6.26.2
resolution: "react-router-dom@npm:6.26.2"
"react-router-dom@npm:^6.27.0":
version: 6.27.0
resolution: "react-router-dom@npm:6.27.0"
dependencies:
"@remix-run/router": "npm:1.19.2"
react-router: "npm:6.26.2"
"@remix-run/router": "npm:1.20.0"
react-router: "npm:6.27.0"
peerDependencies:
react: ">=16.8"
react-dom: ">=16.8"
checksum: 10/4eee37839bd1a660807c090b4d272e4aa9b95d8a9a932cdcdf7c5b10735f39b6db73bad79b08a3012386a7e225ff6bf60435e2741fb7c68e137ac5a6295d4308
checksum: 10/cfbcbc1d387d3341a335e3a075e487cc09dcbb62f1b83bc827fc3eec937523d5647a2c4488c804dc61581e65561823d0166d17b5dbc8579998c25b5a0bcabad6
languageName: node
linkType: hard

"react-router@npm:6.26.2":
version: 6.26.2
resolution: "react-router@npm:6.26.2"
"react-router@npm:6.27.0":
version: 6.27.0
resolution: "react-router@npm:6.27.0"
dependencies:
"@remix-run/router": "npm:1.19.2"
"@remix-run/router": "npm:1.20.0"
peerDependencies:
react: ">=16.8"
checksum: 10/496e855b53e61066c1791e354f5d79eab56a128d9722fdc6486c3ecd3b3a0bf9968e927028f429893b157f3cc10fc09e890a055847723ee242663e7995fedc9d
checksum: 10/352e3af2075cdccf9d114b7e06d94a1b46a2147ba9d6e8643787a92464f5fd9ead950252a98d551f99f21860288bcf3a4f088cb5f46b28d1274a4e2ba24cc0f9
languageName: node
linkType: hard

Expand Down Expand Up @@ -12666,7 +12666,7 @@ __metadata:
react-i18next: "npm:^15.0.2"
react-map-gl: "npm:~7.1.7"
react-markdown: "npm:^9.0.1"
react-router-dom: "npm:^6.26.2"
react-router-dom: "npm:^6.27.0"
rollup-plugin-visualizer: "npm:^5.12.0"
sass: "npm:^1.79.5"
semver: "npm:^7.6.3"
Expand Down

0 comments on commit 5445ab8

Please sign in to comment.