Merge branch 'master' into mobile-sidebar

Signed-off-by: Philipp Hugenroth <philipph@spotify.com>

plugins/user-settings/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @backstage/plugin-user-settings
 
+## 0.3.13
+
+### Patch Changes
+
+- cd450844f6: Moved React dependencies to `peerDependencies` and allow both React v16 and v17 to be used.
+- Updated dependencies
+  - @backstage/core-components@0.8.0
+  - @backstage/core-plugin-api@0.3.0
+
 ## 0.3.12
 
 ### Patch Changes

plugins/user-settings/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@backstage/plugin-user-settings",
   "description": "A Backstage plugin that provides a settings page",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -31,22 +31,23 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.7.6",
-    "@backstage/core-plugin-api": "^0.2.2",
+    "@backstage/core-components": "^0.8.0",
+    "@backstage/core-plugin-api": "^0.3.0",
     "@backstage/theme": "^0.2.14",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
-    "react": "^16.13.1",
-    "react-dom": "^16.13.1",
     "react-router": "6.0.0-beta.0",
     "react-use": "^17.2.4"
   },
+  "peerDependencies": {
+    "react": "^16.13.1 || ^17.0.0"
+  },
   "devDependencies": {
-    "@backstage/cli": "^0.10.0",
-    "@backstage/core-app-api": "^0.1.24",
-    "@backstage/dev-utils": "^0.2.13",
-    "@backstage/test-utils": "^0.1.23",
+    "@backstage/cli": "^0.10.1",
+    "@backstage/core-app-api": "^0.2.0",
+    "@backstage/dev-utils": "^0.2.14",
+    "@backstage/test-utils": "^0.1.24",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^11.2.5",
     "@testing-library/user-event": "^13.1.8",