diff --git a/packages/app/package.json b/packages/app/package.json index bbfd903484b85..7d01fcd5e715e 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -61,7 +61,7 @@ "react": "^16.13.1", "react-dom": "^16.13.1", "react-hot-loader": "^4.12.21", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "react-use": "^17.2.4", "zen-observable": "^0.8.15" diff --git a/packages/core-components/package.json b/packages/core-components/package.json index 337a759da8cb5..2500ef89c5986 100644 --- a/packages/core-components/package.json +++ b/packages/core-components/package.json @@ -55,7 +55,7 @@ "react-helmet": "6.1.0", "react-hook-form": "^7.12.2", "react-markdown": "^7.0.1", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "react-sparklines": "^1.7.0", "react-syntax-highlighter": "^15.4.3", diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 75b34baf32e12..f94f0f740a98b 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -45,7 +45,7 @@ "@testing-library/user-event": "^13.1.8", "react-use": "^17.2.4", "react-hot-loader": "^4.12.21", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "zen-observable": "^0.8.15" }, diff --git a/packages/embedded-techdocs-app/package.json b/packages/embedded-techdocs-app/package.json index a1ffd9f858811..84df9ccbcc99f 100644 --- a/packages/embedded-techdocs-app/package.json +++ b/packages/embedded-techdocs-app/package.json @@ -21,7 +21,7 @@ "history": "^5.0.0", "react": "^16.13.1", "react-dom": "^16.13.1", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "react-use": "^17.2.4" }, diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index 48745f706866d..2a1c2682bc145 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -39,7 +39,7 @@ "@testing-library/jest-dom": "^5.10.1", "@testing-library/react": "^11.2.5", "@testing-library/user-event": "^13.1.8", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "zen-observable": "^0.8.15" }, diff --git a/plugins/airbrake/package.json b/plugins/airbrake/package.json index 7294c97413528..4b6640da7b00f 100644 --- a/plugins/airbrake/package.json +++ b/plugins/airbrake/package.json @@ -46,7 +46,7 @@ "@types/node": "^14.14.32", "msw": "^0.35.0", "cross-fetch": "^3.0.6", - "react-router": "6.0.0-beta.0" + "react-router": "6.27.0" }, "files": [ "dist" diff --git a/plugins/api-docs/package.json b/plugins/api-docs/package.json index ed862d6f35f86..170fb47953e71 100644 --- a/plugins/api-docs/package.json +++ b/plugins/api-docs/package.json @@ -43,7 +43,7 @@ "graphiql": "^1.5.12", "graphql": "^16.0.0", "isomorphic-form-data": "^2.0.0", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "react-use": "^17.2.4", "swagger-client": "3.16.1", diff --git a/plugins/azure-devops/package.json b/plugins/azure-devops/package.json index f8cbcc430a9c4..6c4012dc7bd00 100644 --- a/plugins/azure-devops/package.json +++ b/plugins/azure-devops/package.json @@ -39,7 +39,7 @@ "@material-ui/lab": "4.0.0-alpha.57", "humanize-duration": "^3.27.0", "luxon": "^2.0.2", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/badges/package.json b/plugins/badges/package.json index f9e24f27bfabe..70377ddf001bd 100644 --- a/plugins/badges/package.json +++ b/plugins/badges/package.json @@ -36,7 +36,7 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/catalog-graph/package.json b/plugins/catalog-graph/package.json index 8718172cf4103..2c87de9dfc370 100644 --- a/plugins/catalog-graph/package.json +++ b/plugins/catalog-graph/package.json @@ -34,7 +34,7 @@ "lodash": "^4.17.15", "p-limit": "^3.1.0", "qs": "^6.9.4", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/catalog-import/package.json b/plugins/catalog-import/package.json index 7558ff9445330..202e4fd8ac3a4 100644 --- a/plugins/catalog-import/package.json +++ b/plugins/catalog-import/package.json @@ -47,7 +47,7 @@ "js-base64": "^3.6.0", "lodash": "^4.17.21", "react-hook-form": "^7.12.2", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-use": "^17.2.4", "yaml": "^1.10.0" }, diff --git a/plugins/catalog-react/package.json b/plugins/catalog-react/package.json index 6b76ec3925210..699aa8437c893 100644 --- a/plugins/catalog-react/package.json +++ b/plugins/catalog-react/package.json @@ -43,7 +43,7 @@ "jwt-decode": "^3.1.0", "lodash": "^4.17.21", "qs": "^6.9.4", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-use": "^17.2.4", "zen-observable": "^0.8.15" }, diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json index da7f666b35be2..4c49c369d374d 100644 --- a/plugins/catalog/package.json +++ b/plugins/catalog/package.json @@ -45,7 +45,7 @@ "history": "^5.0.0", "lodash": "^4.17.21", "react-helmet": "6.1.0", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json index a7e05511db60f..777973749d546 100644 --- a/plugins/circleci/package.json +++ b/plugins/circleci/package.json @@ -44,7 +44,7 @@ "humanize-duration": "^3.27.0", "lodash": "^4.17.21", "luxon": "^2.0.2", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "react-use": "^17.2.4" }, diff --git a/plugins/cloudbuild/package.json b/plugins/cloudbuild/package.json index d0075d683ecbb..3e22ae1b30805 100644 --- a/plugins/cloudbuild/package.json +++ b/plugins/cloudbuild/package.json @@ -41,7 +41,7 @@ "@material-ui/lab": "4.0.0-alpha.57", "luxon": "^2.0.2", "qs": "^6.9.4", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "react-use": "^17.2.4" }, diff --git a/plugins/code-coverage/package.json b/plugins/code-coverage/package.json index e6ddcdb5f1b0d..d78adf2406e1c 100644 --- a/plugins/code-coverage/package.json +++ b/plugins/code-coverage/package.json @@ -34,7 +34,7 @@ "@material-ui/styles": "^4.11.0", "highlight.js": "^10.6.0", "luxon": "^2.0.2", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "react-use": "^17.2.4", "recharts": "^1.8.5" diff --git a/plugins/explore/package.json b/plugins/explore/package.json index 424eb84eac608..d4dedb5147639 100644 --- a/plugins/explore/package.json +++ b/plugins/explore/package.json @@ -41,7 +41,7 @@ "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", "classnames": "^2.2.6", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "react-use": "^17.2.4" }, diff --git a/plugins/git-release-manager/package.json b/plugins/git-release-manager/package.json index 444c77fc8abae..545918bed6f0c 100644 --- a/plugins/git-release-manager/package.json +++ b/plugins/git-release-manager/package.json @@ -31,7 +31,7 @@ "@octokit/rest": "^18.5.3", "luxon": "^2.0.2", "qs": "^6.10.1", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-use": "^17.2.4", "recharts": "^1.8.5" }, diff --git a/plugins/github-actions/package.json b/plugins/github-actions/package.json index e65ed5a989a95..7aa827d598da2 100644 --- a/plugins/github-actions/package.json +++ b/plugins/github-actions/package.json @@ -44,7 +44,7 @@ "@material-ui/lab": "4.0.0-alpha.57", "@octokit/rest": "^18.5.3", "luxon": "^2.0.2", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "react-use": "^17.2.4" }, diff --git a/plugins/home/package.json b/plugins/home/package.json index 298b1860e9399..addd8d690f111 100644 --- a/plugins/home/package.json +++ b/plugins/home/package.json @@ -29,7 +29,7 @@ "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", "lodash": "^4.17.21", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/jenkins/package.json b/plugins/jenkins/package.json index 14ff0fd2e7582..dac79bab93494 100644 --- a/plugins/jenkins/package.json +++ b/plugins/jenkins/package.json @@ -42,7 +42,7 @@ "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", "luxon": "^2.0.2", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "react-use": "^17.2.4" }, diff --git a/plugins/kafka/package.json b/plugins/kafka/package.json index 5eab137ca15a7..e89efd90ad83e 100644 --- a/plugins/kafka/package.json +++ b/plugins/kafka/package.json @@ -29,7 +29,7 @@ "@material-ui/core": "^4.12.2", "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/org/package.json b/plugins/org/package.json index fadca4442a1c6..fd9a664760a43 100644 --- a/plugins/org/package.json +++ b/plugins/org/package.json @@ -31,7 +31,7 @@ "@material-ui/lab": "4.0.0-alpha.57", "pluralize": "^8.0.0", "qs": "^6.10.1", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "react-use": "^17.2.4" }, diff --git a/plugins/permission-react/package.json b/plugins/permission-react/package.json index 23225cbf93075..fbdd73037ad71 100644 --- a/plugins/permission-react/package.json +++ b/plugins/permission-react/package.json @@ -31,7 +31,7 @@ "@backstage/core-plugin-api": "^0.4.1", "@backstage/plugin-permission-common": "^0.3.0", "cross-fetch": "^3.0.6", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/plugins/rollbar/package.json b/plugins/rollbar/package.json index baae7233189e4..d820e9e5b7c8c 100644 --- a/plugins/rollbar/package.json +++ b/plugins/rollbar/package.json @@ -41,7 +41,7 @@ "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", "lodash": "^4.17.21", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "react-sparklines": "^1.7.0", "react-use": "^17.2.4" diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index 6c76010bec7e8..6f11048c1f2e9 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -56,7 +56,7 @@ "lodash": "^4.17.21", "luxon": "^2.0.2", "qs": "^6.9.4", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "react-use": "^17.2.4", "use-immer": "^0.6.0", diff --git a/plugins/search/package.json b/plugins/search/package.json index f4880f86b3a6f..17142bf6ed327 100644 --- a/plugins/search/package.json +++ b/plugins/search/package.json @@ -43,7 +43,7 @@ "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", "qs": "^6.9.4", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "react-use": "^17.2.4" }, diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json index 20bfdf22b07c1..d902a8c4e1ffb 100644 --- a/plugins/sentry/package.json +++ b/plugins/sentry/package.json @@ -41,7 +41,7 @@ "@material-ui/icons": "^4.9.1", "@material-ui/lab": "4.0.0-alpha.57", "luxon": "^2.0.2", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-sparklines": "^1.7.0", "react-use": "^17.2.4" }, diff --git a/plugins/shortcuts/package.json b/plugins/shortcuts/package.json index b38d66f6b930c..84d40a402dcd4 100644 --- a/plugins/shortcuts/package.json +++ b/plugins/shortcuts/package.json @@ -30,7 +30,7 @@ "@material-ui/lab": "4.0.0-alpha.57", "@types/zen-observable": "^0.8.2", "react-hook-form": "^7.12.2", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-use": "^17.2.4", "uuid": "^8.3.2", "zen-observable": "^0.8.15" diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json index 300c662225c73..1dce41a7de096 100644 --- a/plugins/techdocs/package.json +++ b/plugins/techdocs/package.json @@ -51,7 +51,7 @@ "event-source-polyfill": "^1.0.25", "git-url-parse": "^11.6.0", "lodash": "^4.17.21", - "react-router": "6.0.0-beta.0", + "react-router": "6.27.0", "react-router-dom": "6.0.0-beta.0", "react-text-truncate": "^0.16.0", "react-use": "^17.2.4" diff --git a/plugins/user-settings/package.json b/plugins/user-settings/package.json index c8fa6d20701d7..58a3d55455fd8 100644 --- a/plugins/user-settings/package.json +++ b/plugins/user-settings/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": "6.0.0-beta.0", + "react-router": "6.27.0", "react-use": "^17.2.4" }, "peerDependencies": { diff --git a/yarn.lock b/yarn.lock index 9f6bf3d5d85b0..1ce51d66b382d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5361,6 +5361,11 @@ prop-types "^15.6.1" react-lifecycles-compat "^3.0.4" +"@remix-run/router@1.20.0": + version "1.20.0" + resolved "https://registry.npmjs.org/@remix-run/router/-/router-1.20.0.tgz#03554155b45d8b529adf635b2f6ad1165d70d8b4" + integrity sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg== + "@rjsf/core@^3.2.1": version "3.2.1" resolved "https://registry.npmjs.org/@rjsf/core/-/core-3.2.1.tgz#8a7b24c9a6f01f0ecb093fdfc777172c12b1b009" @@ -24300,13 +24305,20 @@ react-router@6.0.0-beta.0: dependencies: prop-types "^15.7.2" -react-router@6.2.1, react-router@^6.0.0, react-router@^6.0.0-beta.0: +react-router@6.2.1: version "6.2.1" resolved "https://registry.npmjs.org/react-router/-/react-router-6.2.1.tgz#be2a97a6006ce1d9123c28934e604faef51448a3" integrity sha512-2fG0udBtxou9lXtK97eJeET2ki5//UWfQSl1rlJ7quwe6jrktK9FCCc8dQb5QY6jAv3jua8bBQRhhDOM/kVRsg== dependencies: history "^5.2.0" +react-router@6.27.0, react-router@^6.0.0, react-router@^6.0.0-beta.0: + version "6.27.0" + resolved "https://registry.npmjs.org/react-router/-/react-router-6.27.0.tgz#db292474926c814c996c0ff3ef0162d1f9f60ed4" + integrity sha512-YA+HGZXz4jaAkVoYBE98VQl+nVzI+cVI2Oj/06F5ZM+0u3TgedN9Y9kmMRo2mnkSK2nCpNQn0DVob4HCsY/WLw== + dependencies: + "@remix-run/router" "1.20.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"