From 997d2093f8a6eba7bd9e5823542938cb85d27c9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2026 17:24:01 +0000 Subject: [PATCH 1/2] Bump react-router-dom from 7.12.0 to 7.14.1 in /dashboard Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 7.12.0 to 7.14.1. - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@7.14.1/packages/react-router-dom) --- updated-dependencies: - dependency-name: react-router-dom dependency-version: 7.14.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- dashboard/package-lock.json | 24 ++++++++++++------------ dashboard/package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json index d0177909..77c96493 100644 --- a/dashboard/package-lock.json +++ b/dashboard/package-lock.json @@ -27,7 +27,7 @@ "react-dom": "^18.2.0", "react-helmet-async": "^2.0.4", "react-hook-form": "^7.72.1", - "react-router-dom": "^7.12.0", + "react-router-dom": "^7.14.1", "simplebar-react": "^3.3.2", "sql.js": "^1.13.0" }, @@ -2419,9 +2419,9 @@ "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==" }, "node_modules/react-helmet-async": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-3.0.0.tgz", - "integrity": "sha512-nA3IEZfXiclgrz4KLxAhqJqIfFDuvzQwlKwpdmzZIuC1KNSghDEIXmyU0TKtbM+NafnkICcwx8CECFrZ/sL/1w==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/react-helmet-async/-/react-helmet-async-2.0.5.tgz", + "integrity": "sha512-rYUYHeus+i27MvFE+Jaa4WsyBKGkL6qVgbJvSBoX8mbsWoABJXdEO0bZyi0F6i+4f0NuIb8AvqPMj3iXFHkMwg==", "license": "Apache-2.0", "dependencies": { "invariant": "^2.2.4", @@ -2429,7 +2429,7 @@ "shallowequal": "^1.1.0" }, "peerDependencies": { - "react": "^16.6.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" + "react": "^16.6.0 || ^17.0.0 || ^18.0.0" } }, "node_modules/react-hook-form": { @@ -2454,9 +2454,9 @@ "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==" }, "node_modules/react-router": { - "version": "7.12.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.12.0.tgz", - "integrity": "sha512-kTPDYPFzDVGIIGNLS5VJykK0HfHLY5MF3b+xj0/tTyNYL1gF1qs7u67Z9jEhQk2sQ98SUaHxlG31g1JtF7IfVw==", + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.14.1.tgz", + "integrity": "sha512-5BCvFskyAAVumqhEKh/iPhLOIkfxcEUz8WqFIARCkMg8hZZzDYX9CtwxXA0e+qT8zAxmMC0x3Ckb9iMONwc5jg==", "license": "MIT", "dependencies": { "cookie": "^1.0.1", @@ -2476,12 +2476,12 @@ } }, "node_modules/react-router-dom": { - "version": "7.12.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.12.0.tgz", - "integrity": "sha512-pfO9fiBcpEfX4Tx+iTYKDtPbrSLLCbwJ5EqP+SPYQu1VYCXdy79GSj0wttR0U4cikVdlImZuEZ/9ZNCgoaxwBA==", + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.14.1.tgz", + "integrity": "sha512-ZkrQuwwhGibjQLqH1eCdyiZyLWglPxzxdl5tgwgKEyCSGC76vmAjleGocRe3J/MLfzMUIKwaFJWpFVJhK3d2xA==", "license": "MIT", "dependencies": { - "react-router": "7.12.0" + "react-router": "7.14.1" }, "engines": { "node": ">=20.0.0" diff --git a/dashboard/package.json b/dashboard/package.json index 1b11d7ef..ef121dbd 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -39,7 +39,7 @@ "react-dom": "^18.2.0", "react-helmet-async": "^2.0.4", "react-hook-form": "^7.72.1", - "react-router-dom": "^7.12.0", + "react-router-dom": "^7.14.1", "simplebar-react": "^3.3.2", "sql.js": "^1.13.0" }, From 9e7ccbb572e2d22efa9b9793da00c98100a90f1b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 6 Jul 2026 20:02:49 +0000 Subject: [PATCH 2/2] Resolve merge conflicts: use react-router-dom 7.18.1 from main --- dashboard/package-lock.json | 19 ------------------- dashboard/package.json | 4 ---- 2 files changed, 23 deletions(-) diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json index eeb0a2ea..c95d7e25 100644 --- a/dashboard/package-lock.json +++ b/dashboard/package-lock.json @@ -27,11 +27,7 @@ "react-dom": "^18.2.0", "react-helmet-async": "^2.0.4", "react-hook-form": "^7.72.1", -<<<<<<< HEAD - "react-router-dom": "^7.14.1", -======= "react-router-dom": "^7.18.1", ->>>>>>> origin/main "simplebar-react": "^3.3.2", "sql.js": "^1.13.0" }, @@ -2238,15 +2234,9 @@ "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==" }, "node_modules/react-router": { -<<<<<<< HEAD - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.14.1.tgz", - "integrity": "sha512-5BCvFskyAAVumqhEKh/iPhLOIkfxcEUz8WqFIARCkMg8hZZzDYX9CtwxXA0e+qT8zAxmMC0x3Ckb9iMONwc5jg==", -======= "version": "7.18.1", "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.18.1.tgz", "integrity": "sha512-GDLgg3i3uM0aeJO3Fm+TCS+sDQ7gu12T6x0qdTEzcwqEfleci7JwugVNIF3U//0FWKnJT7ptG+20B2jfDqnZAg==", ->>>>>>> origin/main "license": "MIT", "dependencies": { "cookie": "^1.0.1", @@ -2266,21 +2256,12 @@ } }, "node_modules/react-router-dom": { -<<<<<<< HEAD - "version": "7.14.1", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.14.1.tgz", - "integrity": "sha512-ZkrQuwwhGibjQLqH1eCdyiZyLWglPxzxdl5tgwgKEyCSGC76vmAjleGocRe3J/MLfzMUIKwaFJWpFVJhK3d2xA==", - "license": "MIT", - "dependencies": { - "react-router": "7.14.1" -======= "version": "7.18.1", "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.18.1.tgz", "integrity": "sha512-KaZh+X/6UtEp28x51AUYZDMg9NGoz2ja3dNHa+ta/tk40vCzKhQ/RypCWBMLbmDr6//E24Vv5uPsrqXFozdkAg==", "license": "MIT", "dependencies": { "react-router": "7.18.1" ->>>>>>> origin/main }, "engines": { "node": ">=20.0.0" diff --git a/dashboard/package.json b/dashboard/package.json index 89736ef3..43ff37c1 100644 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -39,11 +39,7 @@ "react-dom": "^18.2.0", "react-helmet-async": "^2.0.4", "react-hook-form": "^7.72.1", -<<<<<<< HEAD - "react-router-dom": "^7.14.1", -======= "react-router-dom": "^7.18.1", ->>>>>>> origin/main "simplebar-react": "^3.3.2", "sql.js": "^1.13.0" },