Merge branch 'master' of https://github.com/backstage/backstage into bazaar-workflow-changes

plugins/bazaar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-bazaar",
-  "version": "0.1.3",
+  "version": "0.1.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -21,13 +21,12 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/catalog-client": "^0.5.2",
-    "@backstage/catalog-model": "^0.9.5",
-    "@backstage/cli": "^0.8.2",
-    "@backstage/core-components": "^0.7.3",
-    "@backstage/core-plugin-api": "^0.1.13",
-    "@backstage/plugin-catalog": "^0.7.2",
-    "@backstage/plugin-catalog-react": "^0.6.3",
+    "@backstage/catalog-model": "^0.9.7",
+    "@backstage/cli": "^0.10.1",
+    "@backstage/core-components": "^0.8.0",
+    "@backstage/core-plugin-api": "^0.3.0",
+    "@backstage/plugin-catalog": "^0.7.4",
+    "@backstage/plugin-catalog-react": "^0.6.5",
     "@date-io/luxon": "1.x",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
@@ -42,9 +41,12 @@
     "react-router-dom": "6.0.0-beta.0",
     "react-use": "^17.2.4"
   },
+  "peerDependencies": {
+    "react": "^16.13.1 || ^17.0.0"
+  },
   "devDependencies": {
-    "@backstage/cli": "^0.8.2",
-    "@backstage/dev-utils": "^0.2.12",
+    "@backstage/cli": "^0.10.1",
+    "@backstage/dev-utils": "^0.2.14",
     "@testing-library/jest-dom": "^5.10.1",
     "cross-fetch": "^3.0.6"
   },