diff --git a/packages/app-defaults/package.json b/packages/app-defaults/package.json index 89d83ae91f3b7..107e987bd5322 100644 --- a/packages/app-defaults/package.json +++ b/packages/app-defaults/package.json @@ -36,7 +36,7 @@ "@backstage/theme": "^0.2.14", "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", - "react-router-dom": "6.0.0-beta.0" + "react-router-dom": "7.0.1" }, "peerDependencies": { "react": "^16.13.1 || ^17.0.0" diff --git a/packages/app/package.json b/packages/app/package.json index bbfd903484b85..37931326f5e26 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -62,7 +62,7 @@ "react-dom": "^16.13.1", "react-hot-loader": "^4.12.21", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4", "zen-observable": "^0.8.15" }, diff --git a/packages/core-app-api/package.json b/packages/core-app-api/package.json index de7477771f511..824dcb943f001 100644 --- a/packages/core-app-api/package.json +++ b/packages/core-app-api/package.json @@ -35,7 +35,7 @@ "@backstage/version-bridge": "^0.1.1", "@types/prop-types": "^15.7.3", "prop-types": "^15.7.2", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4", "zen-observable": "^0.8.15", "zod": "^3.11.6" diff --git a/packages/core-components/package.json b/packages/core-components/package.json index 337a759da8cb5..411a17f273a12 100644 --- a/packages/core-components/package.json +++ b/packages/core-components/package.json @@ -56,7 +56,7 @@ "react-hook-form": "^7.12.2", "react-markdown": "^7.0.1", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-sparklines": "^1.7.0", "react-syntax-highlighter": "^15.4.3", "react-text-truncate": "^0.16.0", diff --git a/packages/core-plugin-api/package.json b/packages/core-plugin-api/package.json index d284d60c6bbe3..6c0e4f8807c3d 100644 --- a/packages/core-plugin-api/package.json +++ b/packages/core-plugin-api/package.json @@ -34,7 +34,7 @@ "@backstage/version-bridge": "^0.1.1", "history": "^5.0.0", "prop-types": "^15.7.2", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4", "zen-observable": "^0.8.15" }, diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 75b34baf32e12..e782001b4295e 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -46,7 +46,7 @@ "react-use": "^17.2.4", "react-hot-loader": "^4.12.21", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "zen-observable": "^0.8.15" }, "peerDependencies": { diff --git a/packages/embedded-techdocs-app/package.json b/packages/embedded-techdocs-app/package.json index a1ffd9f858811..3b0188b327805 100644 --- a/packages/embedded-techdocs-app/package.json +++ b/packages/embedded-techdocs-app/package.json @@ -22,7 +22,7 @@ "react": "^16.13.1", "react-dom": "^16.13.1", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4" }, "devDependencies": { diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 48745f706866d..1d8f5ddb6a35b 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -40,7 +40,7 @@ "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "zen-observable": "^0.8.15" }, "peerDependencies": { diff --git a/plugins/allure/package.json b/plugins/allure/package.json index 54ac6ea65949f..db4623504adc9 100644 --- a/plugins/allure/package.json +++ b/plugins/allure/package.json @@ -30,7 +30,7 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json index ed862d6f35f86..04410d6acbc3c 100644 --- a/plugins/api-docs/package.json +++ b/plugins/api-docs/package.json @@ -44,7 +44,7 @@ "graphql": "^16.0.0", "isomorphic-form-data": "^2.0.0", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4", "swagger-client": "3.16.1", "swagger-ui-react": "^4.0.0-rc.3" diff --git a/plugins/bazaar/package.json b/plugins/bazaar/package.json index 144569885d138..5c81b969b105a 100644 --- a/plugins/bazaar/package.json +++ b/plugins/bazaar/package.json @@ -36,7 +36,7 @@ "luxon": "^2.0.2", "material-ui-search-bar": "^1.0.0", "react-hook-form": "^7.13.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json index a7e05511db60f..393c6a88487c7 100644 --- a/plugins/circleci/package.json +++ b/plugins/circleci/package.json @@ -45,7 +45,7 @@ "lodash": "^4.17.21", "luxon": "^2.0.2", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json index d0075d683ecbb..94c0c75bb5f4d 100644 --- a/plugins/cloudbuild/package.json +++ b/plugins/cloudbuild/package.json @@ -42,7 +42,7 @@ "luxon": "^2.0.2", "qs": "^6.9.4", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/code-coverage/package.json b/plugins/code-coverage/package.json index e6ddcdb5f1b0d..a06eeaeaa18aa 100644 --- a/plugins/code-coverage/package.json +++ b/plugins/code-coverage/package.json @@ -35,7 +35,7 @@ "highlight.js": "^10.6.0", "luxon": "^2.0.2", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4", "recharts": "^1.8.5" }, diff --git a/plugins/cost-insights/package.json b/plugins/cost-insights/package.json index 4f9c3f55eca41..bfd8520a1397c 100644 --- a/plugins/cost-insights/package.json +++ b/plugins/cost-insights/package.json @@ -45,7 +45,7 @@ "luxon": "^2.0.2", "pluralize": "^8.0.0", "qs": "^6.9.4", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4", "recharts": "^1.8.5", "regression": "^2.0.1", diff --git a/plugins/explore/package.json b/plugins/explore/package.json index 424eb84eac608..c0bffd61a0d40 100644 --- a/plugins/explore/package.json +++ b/plugins/explore/package.json @@ -42,7 +42,7 @@ "@material-ui/lab": "4.0.0-alpha.57", "classnames": "^2.2.6", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/gcp-projects/package.json b/plugins/gcp-projects/package.json index 1b36c4a1120a6..1ea5fb9755d4a 100644 --- a/plugins/gcp-projects/package.json +++ b/plugins/gcp-projects/package.json @@ -37,7 +37,7 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", - "react-router-dom": "^6.0.0-beta.0", + "react-router-dom": "^7.0.1", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json index e65ed5a989a95..f1380a1816264 100644 --- a/plugins/github-actions/package.json +++ b/plugins/github-actions/package.json @@ -45,7 +45,7 @@ "@octokit/rest": "^18.5.3", "luxon": "^2.0.2", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json index 345d2a812e7e8..1dece369c3167 100644 --- a/plugins/gitops-profiles/package.json +++ b/plugins/gitops-profiles/package.json @@ -38,7 +38,7 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json index 593be20c6e09b..3fce591739fd1 100644 --- a/plugins/graphiql/package.json +++ b/plugins/graphiql/package.json @@ -57,7 +57,7 @@ "@types/node": "^14.14.32", "cross-fetch": "^3.0.6", "msw": "^0.35.0", - "react-router-dom": "6.0.0-beta.0" + "react-router-dom": "7.0.1" }, "files": [ "dist" diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json index 14ff0fd2e7582..5adc9cb49a9e2 100644 --- a/plugins/jenkins/package.json +++ b/plugins/jenkins/package.json @@ -43,7 +43,7 @@ "@material-ui/lab": "4.0.0-alpha.57", "luxon": "^2.0.2", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json index 2d152c739082c..124d049ebf6d5 100644 --- a/plugins/kubernetes/package.json +++ b/plugins/kubernetes/package.json @@ -46,7 +46,7 @@ "js-yaml": "^4.0.0", "lodash": "^4.17.21", "luxon": "^2.0.2", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json index 4dcf72452eaa1..2c6ec8301737d 100644 --- a/plugins/lighthouse/package.json +++ b/plugins/lighthouse/package.json @@ -41,7 +41,7 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/org/package.json b/plugins/org/package.json index fadca4442a1c6..bf53a5c556f9a 100644 --- a/plugins/org/package.json +++ b/plugins/org/package.json @@ -32,7 +32,7 @@ "pluralize": "^8.0.0", "qs": "^6.10.1", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/pagerduty/package.json b/plugins/pagerduty/package.json index 6a3ea7ebb9239..b53ca7f879954 100644 --- a/plugins/pagerduty/package.json +++ b/plugins/pagerduty/package.json @@ -41,7 +41,7 @@ "@material-ui/lab": "4.0.0-alpha.57", "classnames": "^2.2.6", "luxon": "2.0.2", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json index baae7233189e4..70324408b4192 100644 --- a/plugins/rollbar/package.json +++ b/plugins/rollbar/package.json @@ -42,7 +42,7 @@ "@material-ui/lab": "4.0.0-alpha.57", "lodash": "^4.17.21", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-sparklines": "^1.7.0", "react-use": "^17.2.4" }, diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index 6c76010bec7e8..1e395ab90354b 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -57,7 +57,7 @@ "luxon": "^2.0.2", "qs": "^6.9.4", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4", "use-immer": "^0.6.0", "zen-observable": "^0.8.15" diff --git a/plugins/search/package.json b/plugins/search/package.json index f4880f86b3a6f..daf4602bf87d1 100644 --- a/plugins/search/package.json +++ b/plugins/search/package.json @@ -44,7 +44,7 @@ "@material-ui/lab": "4.0.0-alpha.57", "qs": "^6.9.4", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/splunk-on-call/package.json b/plugins/splunk-on-call/package.json index 7f18330d7d4dc..0c55f74adf954 100644 --- a/plugins/splunk-on-call/package.json +++ b/plugins/splunk-on-call/package.json @@ -41,7 +41,7 @@ "@material-ui/lab": "4.0.0-alpha.57", "classnames": "^2.2.6", "luxon": "^2.0.2", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/tech-insights/package.json b/plugins/tech-insights/package.json index e6bf9d3947228..741acb9ba997b 100644 --- a/plugins/tech-insights/package.json +++ b/plugins/tech-insights/package.json @@ -31,7 +31,7 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json index 300c662225c73..3750bef66190e 100644 --- a/plugins/techdocs/package.json +++ b/plugins/techdocs/package.json @@ -52,7 +52,7 @@ "git-url-parse": "^11.6.0", "lodash": "^4.17.21", "react-router": "6.0.0-beta.0", - "react-router-dom": "6.0.0-beta.0", + "react-router-dom": "7.0.1", "react-text-truncate": "^0.16.0", "react-use": "^17.2.4" }, diff --git a/yarn.lock b/yarn.lock index 9f6bf3d5d85b0..0c34466e3a549 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7192,6 +7192,11 @@ resolved "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d" integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q== +"@types/cookie@^0.6.0": + version "0.6.0" + resolved "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz#eac397f28bf1d6ae0ae081363eca2f425bedf0d5" + integrity sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA== + "@types/cookiejar@*": version "2.1.1" resolved "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.1.tgz#90b68446364baf9efd8e8349bb36bd3852b75b80" @@ -12001,6 +12006,11 @@ cookie@0.4.1, cookie@^0.4.1, cookie@~0.4.1: resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== +cookie@^1.0.1: + version "1.0.2" + resolved "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz#27360701532116bd3f1f9416929d176afe1e4610" + integrity sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA== + cookiejar@^2.1.2: version "2.1.2" resolved "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c" @@ -24285,7 +24295,14 @@ react-router-dom@6.0.0-beta.0: prop-types "^15.7.2" react-router "6.0.0-beta.0" -react-router-dom@^6.0.0, react-router-dom@^6.0.0-beta.0: +react-router-dom@7.0.1, react-router-dom@^7.0.1: + version "7.0.1" + resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.0.1.tgz#b1438100800313e1b4c48da0c5fdb498f81c7f96" + integrity sha512-duBzwAAiIabhFPZfDjcYpJ+f08TMbPMETgq254GWne2NW1ZwRHhZLj7tpSp8KGb7JvZzlLcjGUnqLxpZQVEPng== + dependencies: + react-router "7.0.1" + +react-router-dom@^6.0.0: version "6.2.1" resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.2.1.tgz#32ec81829152fbb8a7b045bf593a22eadf019bec" integrity sha512-I6Zax+/TH/cZMDpj3/4Fl2eaNdcvoxxHoH1tYOREsQ22OKDYofGebrNm6CTPUcvLvZm63NL/vzCYdjf9CUhqmA== @@ -24307,6 +24324,16 @@ react-router@6.2.1, react-router@^6.0.0, react-router@^6.0.0-beta.0: dependencies: history "^5.2.0" +react-router@7.0.1: + version "7.0.1" + resolved "https://registry.npmjs.org/react-router/-/react-router-7.0.1.tgz#a171e35a5c6463f76b23353c4ce57b53c8b7b1b9" + integrity sha512-WVAhv9oWCNsja5AkK6KLpXJDSJCQizOIyOd4vvB/+eHGbYx5vkhcmcmwWjQ9yqkRClogi+xjEg9fNEOd5EX/tw== + dependencies: + "@types/cookie" "^0.6.0" + cookie "^1.0.1" + set-cookie-parser "^2.6.0" + turbo-stream "2.4.0" + react-side-effect@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.0.tgz#1ce4a8b4445168c487ed24dab886421f74d380d3" @@ -25757,6 +25784,11 @@ set-cookie-parser@^2.4.6: resolved "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.4.8.tgz#d0da0ed388bc8f24e706a391f9c9e252a13c58b2" integrity sha512-edRH8mBKEWNVIVMKejNnuJxleqYE/ZSdcT8/Nem9/mmosx12pctd80s2Oy00KNZzrogMZS5mauK2/ymL1bvlvg== +set-cookie-parser@^2.6.0: + version "2.7.1" + resolved "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz#3016f150072202dfbe90fadee053573cc89d2943" + integrity sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ== + set-harmonic-interval@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/set-harmonic-interval/-/set-harmonic-interval-1.0.1.tgz#e1773705539cdfb80ce1c3d99e7f298bb3995249" @@ -27855,6 +27887,11 @@ tunnel@0.0.6, tunnel@^0.0.6: resolved "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== +turbo-stream@2.4.0: + version "2.4.0" + resolved "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz#1e4fca6725e90fa14ac4adb782f2d3759a5695f0" + integrity sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g== + tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"