Merge remote-tracking branch 'origin/master' into erikengervall/plugin-release-manager-as-a-service

microsite/package.json

@@ -15,9 +15,9 @@
     "verify:sidebars": "node ./scripts/verify-sidebars"
   },
   "devDependencies": {
-    "@spotify/prettier-config": "^9.0.0",
+    "@spotify/prettier-config": "^10.0.0",
     "docusaurus": "^2.0.0-alpha.70",
-    "js-yaml": "^4.0.0",
+    "js-yaml": "^4.1.0",
     "prettier": "^2.2.1"
   },
   "prettier": "@spotify/prettier-config"

microsite/sidebars.json

@@ -22,16 +22,6 @@
           "getting-started/app-custom-theme"
         ]
       },
-      {
-        "type": "subcategory",
-        "label": "Deployment",
-        "ids": [
-          "getting-started/deployment-docker",
-          "getting-started/deployment-k8s",
-          "getting-started/deployment-helm",
-          "getting-started/deployment-other"
-        ]
-      },
       "getting-started/keeping-backstage-updated",
       "getting-started/concepts",
       "getting-started/contributors"
@@ -211,6 +201,12 @@
       "auth/auth-backend-classes",
       "auth/glossary"
     ],
+    "Deployment": [
+      "deployment/index",
+      "deployment/k8s",
+      "deployment/helm",
+      "deployment/heroku"
+    ],
     "Designing for Backstage": [
       "dls/design",
       "dls/contributing-to-storybook",

microsite/yarn.lock

@@ -909,10 +909,10 @@
   resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
   integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
-"@spotify/prettier-config@^9.0.0":
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/@spotify/prettier-config/-/prettier-config-9.0.0.tgz#7b562d56573c6fc0094446fbc92b22bc318945dc"
-  integrity sha512-In1q0tIiqTYKAGe3KOHDcFDdZRFISyQeSeipeTHGfki23ebHRZcjxvqj5SSdBkw65D4VpSREMi0s9i5iJiMcTw==
+"@spotify/prettier-config@^10.0.0":
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/@spotify/prettier-config/-/prettier-config-10.0.0.tgz#fa076d98d2e7e6c53dd3d86a696307a7010bd056"
+  integrity sha512-VYOdo8P7lIScAkl02nB9KpUAuOYMManryBIBuKJkAw5D3aVtLobfmdIKvdV6MqEmGMEQPbn7w/UpnjJYhUH+IA==
 
 "@types/cheerio@^0.22.8":
   version "0.22.23"
@@ -3862,10 +3862,10 @@ js-yaml@^3.13.1, js-yaml@^3.8.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
-  integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
   dependencies:
     argparse "^2.0.1"