diff --git a/packages/app/package.json b/packages/app/package.json index 46769e7dfb..e924d9bc04 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -21,12 +21,13 @@ "@backstage/theme": "^0.1.1-alpha.12", "@material-ui/core": "^4.9.1", "@material-ui/icons": "^4.9.1", + "history": "^5.0.0", "prop-types": "^15.7.2", "react": "^16.12.0", "react-dom": "^16.12.0", "react-hot-loader": "^4.12.21", - "react-router": "6.0.0-alpha.5", - "react-router-dom": "6.0.0-alpha.5", + "react-router": "6.0.0-beta.0", + "react-router-dom": "6.0.0-beta.0", "react-use": "^14.2.0", "zen-observable": "^0.8.15" }, diff --git a/packages/cli/templates/default-app/packages/app/package.json.hbs b/packages/cli/templates/default-app/packages/app/package.json.hbs index 31e6baa63e..26cce2c5e6 100644 --- a/packages/cli/templates/default-app/packages/app/package.json.hbs +++ b/packages/cli/templates/default-app/packages/app/package.json.hbs @@ -10,11 +10,12 @@ "@backstage/core": "^{{version}}", "@backstage/test-utils": "^{{version}}", "@backstage/theme": "^{{version}}", + "history": "^5.0.0", "plugin-welcome": "0.0.0", "react": "^16.13.1", "react-dom": "^16.13.1", - "react-router": "6.0.0-alpha.5", - "react-router-dom": "6.0.0-alpha.5", + "react-router": "6.0.0-beta.0", + "react-router-dom": "6.0.0-beta.0", "react-use": "^14.2.0" }, "devDependencies": { diff --git a/packages/cli/templates/default-app/plugins/welcome/package.json.hbs b/packages/cli/templates/default-app/plugins/welcome/package.json.hbs index b686abab9a..52e7a04f72 100644 --- a/packages/cli/templates/default-app/plugins/welcome/package.json.hbs +++ b/packages/cli/templates/default-app/plugins/welcome/package.json.hbs @@ -26,7 +26,7 @@ "react": "^16.13.1", "react-dom": "^16.13.1", "react-use": "^14.2.0", - "react-router-dom": "6.0.0-alpha.5" + "react-router-dom": "6.0.0-beta.0" }, "devDependencies": { "@backstage/cli": "^{{version}}", diff --git a/packages/core-api/package.json b/packages/core-api/package.json index f9f206daf5..4e488206f1 100644 --- a/packages/core-api/package.json +++ b/packages/core-api/package.json @@ -36,7 +36,7 @@ "@types/react": "^16.9", "prop-types": "^15.7.2", "react": "^16.12.0", - "react-router-dom": "6.0.0-alpha.5", + "react-router-dom": "6.0.0-beta.0", "react-use": "^14.2.0", "zen-observable": "^0.8.15" }, diff --git a/packages/core/package.json b/packages/core/package.json index e49e4616ae..562f3894fa 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -47,8 +47,8 @@ "react-dom": "^16.12.0", "react-helmet": "6.1.0", "react-hook-form": "^5.7.2", - "react-router": "6.0.0-alpha.5", - "react-router-dom": "6.0.0-alpha.5", + "react-router": "6.0.0-beta.0", + "react-router-dom": "6.0.0-beta.0", "react-sparklines": "^1.7.0", "react-syntax-highlighter": "^12.2.1", "react-use": "^14.2.0" diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index fce1340386..1a08f0fb22 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -42,8 +42,8 @@ "react": "^16.12.0", "react-dom": "^16.12.0", "react-hot-loader": "^4.12.21", - "react-router": "^6.0.0-alpha.5", - "react-router-dom": "^6.0.0-alpha.5" + "react-router": "6.0.0-beta.0", + "react-router-dom": "6.0.0-beta.0" }, "devDependencies": { "@types/jest": "^25.2.2", diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index f0ed4905d5..08214b285a 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -40,8 +40,8 @@ "@types/react": "^16.9", "react": "^16.12.0", "react-dom": "^16.12.0", - "react-router": "^6.0.0-alpha.5", - "react-router-dom": "^6.0.0-alpha.5", + "react-router": "6.0.0-beta.0", + "react-router-dom": "6.0.0-beta.0", "zen-observable": "^0.8.15" }, "devDependencies": { diff --git a/plugins/catalog/package.json b/plugins/catalog/package.json index 818a8c4bc6..06c83136f5 100644 --- a/plugins/catalog/package.json +++ b/plugins/catalog/package.json @@ -32,8 +32,8 @@ "moment": "^2.26.0", "react": "^16.13.1", "react-dom": "^16.13.1", - "react-router": "^6.0.0-alpha.5", - "react-router-dom": "^6.0.0-alpha.5", + "react-router": "6.0.0-beta.0", + "react-router-dom": "6.0.0-beta.0", "react-use": "^14.2.0", "swr": "^0.2.2" }, diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json index 8eede54580..89f6335dcc 100644 --- a/plugins/circleci/package.json +++ b/plugins/circleci/package.json @@ -40,8 +40,8 @@ "react": "^16.13.1", "react-dom": "^16.13.1", "react-lazylog": "^4.5.2", - "react-router": "^6.0.0-alpha.5", - "react-router-dom": "^6.0.0-alpha.5", + "react-router": "6.0.0-beta.0", + "react-router-dom": "6.0.0-beta.0", "react-use": "^14.2.0" }, "devDependencies": { diff --git a/plugins/gitops-profiles/package.json b/plugins/gitops-profiles/package.json index 67a76ef872..b96843d412 100644 --- a/plugins/gitops-profiles/package.json +++ b/plugins/gitops-profiles/package.json @@ -28,7 +28,7 @@ "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", "react-dom": "^16.13.1", - "react-router-dom": "6.0.0-alpha.5", + "react-router-dom": "6.0.0-beta.0", "react-use": "^14.2.0" }, "devDependencies": { diff --git a/plugins/graphiql/package.json b/plugins/graphiql/package.json index af971f9160..45cad52ac8 100644 --- a/plugins/graphiql/package.json +++ b/plugins/graphiql/package.json @@ -53,7 +53,7 @@ "@types/jest": "^25.2.2", "@types/node": "^12.0.0", "jest-fetch-mock": "^3.0.3", - "react-router-dom": "6.0.0-alpha.5" + "react-router-dom": "6.0.0-beta.0" }, "files": [ "dist" diff --git a/plugins/lighthouse/package.json b/plugins/lighthouse/package.json index bb79e57179..6f3a67ef64 100644 --- a/plugins/lighthouse/package.json +++ b/plugins/lighthouse/package.json @@ -29,7 +29,7 @@ "react": "^16.13.1", "react-dom": "^16.13.1", "react-markdown": "^4.3.1", - "react-router-dom": "6.0.0-alpha.5", + "react-router-dom": "6.0.0-beta.0", "react-use": "^14.2.0" }, "devDependencies": { diff --git a/plugins/register-component/package.json b/plugins/register-component/package.json index 738cabea4b..de57e8a233 100644 --- a/plugins/register-component/package.json +++ b/plugins/register-component/package.json @@ -31,8 +31,8 @@ "react": "^16.13.1", "react-dom": "^16.13.1", "react-hook-form": "^5.7.2", - "react-router": "^6.0.0-alpha.5", - "react-router-dom": "^6.0.0-alpha.5", + "react-router": "6.0.0-beta.0", + "react-router-dom": "6.0.0-beta.0", "react-use": "^14.2.0" }, "devDependencies": { diff --git a/plugins/scaffolder/package.json b/plugins/scaffolder/package.json index 1bccd6a738..83a80aef56 100644 --- a/plugins/scaffolder/package.json +++ b/plugins/scaffolder/package.json @@ -30,7 +30,7 @@ "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", "react-dom": "^16.13.1", - "react-router-dom": "6.0.0-alpha.5", + "react-router-dom": "6.0.0-beta.0", "react-use": "^14.2.0", "swr": "^0.2.2" }, diff --git a/plugins/techdocs/package.json b/plugins/techdocs/package.json index ca8e957a46..6b879a2d78 100644 --- a/plugins/techdocs/package.json +++ b/plugins/techdocs/package.json @@ -29,8 +29,8 @@ "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", "react-dom": "^16.13.1", - "react-router": "^6.0.0-alpha.5", - "react-router-dom": "^6.0.0-alpha.5", + "react-router": "6.0.0-beta.0", + "react-router-dom": "6.0.0-beta.0", "react-use": "^14.2.0" }, "devDependencies": { diff --git a/plugins/welcome/package.json b/plugins/welcome/package.json index c4b9b5e5bd..df33c222f4 100644 --- a/plugins/welcome/package.json +++ b/plugins/welcome/package.json @@ -28,7 +28,7 @@ "@material-ui/lab": "4.0.0-alpha.45", "react": "^16.13.1", "react-dom": "^16.13.1", - "react-router-dom": "6.0.0-alpha.5", + "react-router-dom": "6.0.0-beta.0", "react-use": "^14.2.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 3e45dc74a4..986b54791f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9754,10 +9754,10 @@ highlight.js@~9.15.0, highlight.js@~9.15.1: resolved "https://registry.npmjs.org/highlight.js/-/highlight.js-9.15.10.tgz#7b18ed75c90348c045eef9ed08ca1319a2219ad2" integrity sha512-RoV7OkQm0T3os3Dd2VHLNMoaoDVx77Wygln3n9l5YV172XonWG6rgQD3XnF/BuFFZw9A0TJgmMSO8FEWQgvcXw== -history@5.0.0-beta.9: - version "5.0.0-beta.9" - resolved "https://registry.npmjs.org/history/-/history-5.0.0-beta.9.tgz#fe230706c18c5f7f132001e55215e71b4aaab6d6" - integrity sha512-iLpu0fzu3iM041KDMNsawyB6YZjPLB+Bn+Pvq2lMnY7xxpxDIYvEz7r4et3Na8FthWzbYeukjl74ZKGWXcLhIA== +history@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/history/-/history-5.0.0.tgz#0cabbb6c4bbf835addb874f8259f6d25101efd08" + integrity sha512-3NyRMKIiFSJmIPdq7FxkNMJkQ7ZEtVblOQ38VtKaA0zZMW1Eo6Q6W8oDKEflr1kNNTItSnk4JMCO1deeSgbLLg== dependencies: "@babel/runtime" "^7.7.6" @@ -15443,20 +15443,19 @@ react-redux@^7.1.1: prop-types "^15.7.2" react-is "^16.9.0" -react-router-dom@6.0.0-alpha.5, react-router-dom@^6.0.0-alpha.5: - version "6.0.0-alpha.5" - resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.0.0-alpha.5.tgz#3c3e22226ee610eb91042a351741ce3f53596323" - integrity sha512-xo3VM55aE563uyZBPoUplfCPOYKJmTP2oA8wamm0k4K07e/6T4x4DDunS5Gu2VIy+m2+5mZp8n0rT6S+tYCb6Q== +react-router-dom@6.0.0-beta.0: + version "6.0.0-beta.0" + resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.0.0-beta.0.tgz#9dcc8555365f22f7fbd09f26b6b82543f3eb97d6" + integrity sha512-36yNNGMT8RB9FRPL9nKJi6HKDkgOakU+o/2hHpSzR6e37gN70MpOU6QQlmif4oAWWBwjyGc3ZNOMFCsFuHUY5w== dependencies: - history "5.0.0-beta.9" prop-types "^15.7.2" + react-router "6.0.0-beta.0" -react-router@6.0.0-alpha.5, react-router@^6.0.0-alpha.5: - version "6.0.0-alpha.5" - resolved "https://registry.npmjs.org/react-router/-/react-router-6.0.0-alpha.5.tgz#c98805e50dc0e64787aa8aa4fa6753b435f2496b" - integrity sha512-cDj70bTUAgcfx6b5Fx1+wVlBSDVZGo8N+GUDk/yNFDCyGLfAsFlRpS3BhQqx8c49w2cCW+OrXxFhB4cbLZxWJw== +react-router@6.0.0-beta.0: + version "6.0.0-beta.0" + resolved "https://registry.npmjs.org/react-router/-/react-router-6.0.0-beta.0.tgz#3e11f39b6ded4412c2fed9e4f989dd4c8156724d" + integrity sha512-VgMdfpVcmFQki/LZuLh8E/MNACekDetz4xqft+a6fBZvvJnVqKbLqebF7hyoawGrV1HcO5tVaUang2Og4W2j1Q== dependencies: - history "5.0.0-beta.9" prop-types "^15.7.2" react-side-effect@^2.1.0: