Merge branch 'master' of github.com:backstage/backstage into seant-splunk/awsS3_readTree_processor

Signed-off-by: Sean Tan <seant@splunk.com>

microsite/package.json

@@ -19,7 +19,7 @@
     "@spotify/prettier-config": "^11.0.0",
     "docusaurus": "^2.0.0-alpha.70",
     "js-yaml": "^4.1.0",
-    "prettier": "^2.3.2",
+    "prettier": "^2.4.0",
     "yarn-lock-check": "^1.0.5"
   },
   "prettier": "@spotify/prettier-config"

microsite/scripts/verify-sidebars.js

@@ -28,15 +28,18 @@ try {
 }
 
 const errors = [];
-const ids = Object.keys(metadata);
-for (let id of ids) {
+
+// reference/index is generated, so make sure this goes through even if it's not there
+const knownIds = new Set([...Object.keys(metadata), 'reference/index']);
+
+for (const id in metadata) {
   const { next, previous } = metadata[id];
 
-  if (next && !ids.includes(next)) {
+  if (next && !knownIds.has(next)) {
     errors.push(`Next ${next} does not exist in ${id}.`);
   }
 
-  if (previous && !ids.includes(previous)) {
+  if (previous && !knownIds.has(previous)) {
     errors.push(`Previous ${previous} does not exist in ${id}.`);
   }
 }

microsite/sidebars.json

@@ -237,21 +237,16 @@
       "dls/contributing-to-storybook",
       "dls/figma"
     ],
-    "API references": [
+    "API Reference": [
       {
         "type": "subcategory",
-        "label": "TypeScript API",
-        "ids": [
-          "api/utility-apis",
-          "reference/utility-apis/README",
-          "reference/createPlugin",
-          "reference/createPlugin-feature-flags"
-        ]
+        "label": "Guides",
+        "ids": ["api/utility-apis"]
       },
       {
         "type": "subcategory",
-        "label": "Backend APIs",
-        "ids": ["api/backend"]
+        "label": "API Reference",
+        "ids": ["reference/index"]
       }
     ],
     "Tutorials": [

microsite/yarn.lock

@@ -5207,10 +5207,10 @@ prepend-http@^2.0.0:
   resolved "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
   integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
 
-prettier@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d"
-  integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==
+prettier@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz#85bdfe0f70c3e777cf13a4ffff39713ca6f64cba"
+  integrity sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==
 
 prismjs@^1.22.0:
   version "1.23.0"