Merge remote-tracking branch 'origin/master' into reconfigure

# Conflicts:
#	packages/app/package.json

plugins/user-settings/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @backstage/plugin-user-settings
 
+## 0.4.6
+
+### Patch Changes
+
+- a70869e775: Updated dependency `msw` to `^0.43.0`.
+- 8006d0f9bf: Updated dependency `msw` to `^0.44.0`.
+- Updated dependencies
+  - @backstage/core-components@0.10.0
+  - @backstage/core-plugin-api@1.0.4
+  - @backstage/theme@0.2.16
+
 ## 0.4.6-next.3
 
 ### 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.4.6-next.3",
+  "version": "0.4.6",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -34,9 +34,9 @@
     "clean": "backstage-cli package clean"
   },
   "dependencies": {
-    "@backstage/core-components": "^0.10.0-next.3",
-    "@backstage/core-plugin-api": "^1.0.4-next.0",
-    "@backstage/theme": "^0.2.16-next.1",
+    "@backstage/core-components": "^0.10.0",
+    "@backstage/core-plugin-api": "^1.0.4",
+    "@backstage/theme": "^0.2.16",
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.57",
@@ -48,10 +48,10 @@
     "react": "^16.13.1 || ^17.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.18.0-next.3",
-    "@backstage/core-app-api": "^1.0.4-next.1",
-    "@backstage/dev-utils": "^1.0.4-next.3",
-    "@backstage/test-utils": "^1.1.2-next.2",
+    "@backstage/cli": "^0.18.0",
+    "@backstage/core-app-api": "^1.0.4",
+    "@backstage/dev-utils": "^1.0.4",
+    "@backstage/test-utils": "^1.1.2",
     "@testing-library/jest-dom": "^5.10.1",
     "@testing-library/react": "^12.1.3",
     "@testing-library/user-event": "^14.0.0",