Merge branch 'main' into mdavies888-patch-1

Author: sophietheking

components/context/ArticleContext.tsx

@@ -8,7 +8,7 @@ export type LearningTrack = {
 }
 
 export type MiniTocItem = {
-  platform: string
+  platform?: string
   contents: {
     href: string
     title: string

lib/get-mini-toc-items.js

@@ -1,12 +1,7 @@
 import cheerio from 'cheerio'
 import { range } from 'lodash-es'
 
-export default function getMiniTocItems(
-  html,
-  maxHeadingLevel = 2,
-  headingScope = '',
-  isRestPage = false
-) {
+export default function getMiniTocItems(html, maxHeadingLevel = 2, headingScope = '') {
   const $ = cheerio.load(html, { xmlMode: true })
 
   // eg `h2, h3` or `h2, h3, h4` depending on maxHeadingLevel
@@ -67,7 +62,7 @@ export default function getMiniTocItems(
   // convert the flatToc to a nested structure to simplify semantic rendering on the client
   const nestedToc = buildNestedToc(flatToc)
 
-  return nestedToc
+  return minimalMiniToc(nestedToc)
 }
 
 // Recursively build a tree from the list of allItems
@@ -116,3 +111,15 @@ function buildNestedToc(allItems, startIndex = 0) {
 
   return currentLevel
 }
+
+// Strip the bits and pieces from each object in the array that are
+// not needed in the React component rendering.
+function minimalMiniToc(toc) {
+  return toc.map(({ platform, contents, items }) => {
+    const minimal = { contents }
+    const subItems = minimalMiniToc(items)
+    if (subItems.length) minimal.items = subItems
+    if (platform) minimal.platform = platform
+    return minimal
+  })
+}

lib/rest/static/decorated/api.github.com.json

@@ -482706,7 +482706,7 @@
           }
         ],
         "previews": [],
-        "descriptionHTML": "<p>Shows whether dependency alerts are enabled or disabled for a repository. The authenticated user must have admin access to the repository. For more information, see \"<a href=\"https://docs.github.com/en/articles/about-security-alerts-for-vulnerable-dependencies\">About security alerts for vulnerable dependencies</a>\".</p>",
+        "descriptionHTML": "<p>Shows whether dependency alerts are enabled or disabled for a repository. The authenticated user must have admin read access to the repository. For more information, see \"<a href=\"https://docs.github.com/en/articles/about-security-alerts-for-vulnerable-dependencies\">About security alerts for vulnerable dependencies</a>\".</p>",
         "statusCodes": [
           {
             "httpStatusCode": "204",

lib/rest/static/dereferenced/api.github.com.deref.json

@@ -454419,7 +454419,7 @@
     "/repos/{owner}/{repo}/vulnerability-alerts": {
       "get": {
         "summary": "Check if vulnerability alerts are enabled for a repository",
-        "description": "Shows whether dependency alerts are enabled or disabled for a repository. The authenticated user must have admin access to the repository. For more information, see \"[About security alerts for vulnerable dependencies](https://docs.github.com/en/articles/about-security-alerts-for-vulnerable-dependencies)\".",
+        "description": "Shows whether dependency alerts are enabled or disabled for a repository. The authenticated user must have admin read access to the repository. For more information, see \"[About security alerts for vulnerable dependencies](https://docs.github.com/en/articles/about-security-alerts-for-vulnerable-dependencies)\".",
         "tags": [
           "repos"
         ],

lib/search/indexes/github-docs-3.1-cn-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3bc57d42d97c8e6ab4050ef860e62db918a91140ed4ade9a2c5428243f52a261
-size 741056
+oid sha256:0ff91e9452ead332260706bad6c6ece601c5cd73a04588ecb60bd7e2f8be818f
+size 740986

lib/search/indexes/github-docs-3.1-cn.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0bb7ffa22392d3b59d9f67a9819d0b96381d8b55aa59d47350db58ce8d0b1b11
-size 1564155
+oid sha256:bc6ebcdee0f6514e6081bdba170fb579b914eebb9545362e6776ebcb7b190ea6
+size 1564538

lib/search/indexes/github-docs-3.1-en-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3a2fdb0249b314f7266b3efba48687be0bc248033435b13290a110998552166
-size 998340
+oid sha256:2460adf9a6b5114a353cd1d5e6b2033ff5e90ed03c63201688361a88a940ea1b
+size 998199

lib/search/indexes/github-docs-3.1-en.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7532e2a4ac438636410f83b86acbc011e879a78d8e54f09666d334d48c0c846
-size 4001080
+oid sha256:976ae8ad67ffca1cd859edd91b1db89c2882d93158d9b3ae3d9a9d800ded472c
+size 4001148

lib/search/indexes/github-docs-3.1-es-records.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8206756b6cc27e37e2388c27f077c4a4b23eac7d7a09e45ba562bc8b27372672
-size 684017
+oid sha256:e32c9339ccd8dd27b7d3f30668514fdb39195521b849c920c687aeb1f3bab33c
+size 684045

lib/search/indexes/github-docs-3.1-es.json.br

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5df1bbe2fe6ceb39763e30244a594a6524344e3135af9e896e03acd9f5d16a1
-size 2973063
+oid sha256:4fd822b12403c4c4f24d53822296b0d9662a0c01bc05095c70b2fe93173755fd
+size 2973767