Merge branch 'main' into patch-1

Author: silky-x0

data/reusables/scim/ghes-beta-note.md

@@ -1,11 +1,11 @@
-{% ifversion scim-for-ghes-public-beta %}
-
->[!NOTE] SCIM for {% data variables.product.prodname_ghe_server %} is currently in {% data variables.release-phases.public_preview %} and subject to change. {% data variables.product.company_short %} recommends testing with a staging instance first. See [AUTOTITLE](/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance).
-
-{% elsif ghes < 3.14 %}
+{% ifversion ghes < 3.14 %}
 
 >[!NOTE] This is an outdated, {% data variables.release-phases.private_preview %} version of SCIM for {% data variables.product.prodname_ghe_server %}. Customers must upgrade to 3.14 or newer and use the SCIM {% data variables.release-phases.public_preview %} in order for their SCIM feedback or bug reports to be considered.
 
 >[!WARNING] The {% data variables.release-phases.public_preview %} is exclusively for testing and feedback, and no support is available. {% data variables.product.company_short %} recommends testing with a staging instance. For more information, see [AUTOTITLE](/admin/installation/setting-up-a-github-enterprise-server-instance/setting-up-a-staging-instance).
 
+{% elsif ghes < 3.17 %}
+
+>[!NOTE] SCIM support is in {% data variables.release-phases.public_preview %} on this version of {% data variables.product.prodname_ghe_server %}. SCIM support is generally available on version 3.17 and later.
+
 {% endif %}

src/dev-toc/generate.js src/dev-toc/generate.tssrc/dev-toc/generate.js renamed to src/dev-toc/generate.ts

@@ -2,10 +2,16 @@ import fs from 'fs'
 import path from 'path'
 import { execSync } from 'child_process'
 import { program } from 'commander'
+import type { NextFunction, Response } from 'express'
+import type { ExtendedRequest } from '@/types'
 import fpt from '#src/versions/lib/non-enterprise-default-version.js'
 import { allVersionKeys } from '#src/versions/lib/all-versions.js'
 import { liquid } from '#src/content-render/index.js'
-import contextualize from '#src/frame/middleware/context/context'
+import contextualize from '#src/frame/middleware/context/context.js'
+
+interface CommandOptions {
+  openSections?: string | string[]
+}
 
 const layoutFilename = path.posix.join(process.cwd(), 'src/dev-toc/layout.html')
 const layout = fs.readFileSync(layoutFilename, 'utf8')
@@ -22,19 +28,30 @@ program
   )
   .parse(process.argv)
 
-const options = program.opts()
+const options = program.opts<CommandOptions>()
 
 const openSections = options.openSections || ''
 const defaultOpenSections = Array.isArray(openSections) ? openSections : [openSections]
 
 main()
 
-async function main() {
-  const next = () => {}
-  const res = {}
-  const req = { language: 'en', cookies: {} }
-
-  async function recurse(tree) {
+async function main(): Promise<void> {
+  const next = (() => {}) as NextFunction
+  const res = {} as Response
+  const req = {
+    language: 'en',
+    cookies: {},
+    headers: {},
+    query: {},
+    path: '',
+    method: 'GET',
+    get: () => '',
+    header: () => '',
+    accepts: () => false,
+    context: {} as any,
+  } as unknown as ExtendedRequest
+
+  async function recurse(tree: any): Promise<void> {
     const { page } = tree
     tree.renderedFullTitle = page.rawTitle.includes('{')
       ? await liquid.parseAndRender(page.rawTitle, req.context)
@@ -58,12 +75,18 @@ async function main() {
     await contextualize(req, res, next)
 
     // Add the tree to the req.context.
-    req.context.currentEnglishTree = req.context.siteTree.en[req.context.currentVersion]
+    if (req.context && req.context.siteTree && req.context.currentVersion) {
+      req.context.currentEnglishTree = req.context.siteTree.en[req.context.currentVersion]
+    }
 
-    await recurse(req.context.currentEnglishTree)
+    if (req.context && req.context.currentEnglishTree) {
+      await recurse(req.context.currentEnglishTree)
+    }
 
     // Add any defaultOpenSections to the context.
-    req.context.defaultOpenSections = defaultOpenSections
+    if (req.context) {
+      req.context.defaultOpenSections = defaultOpenSections
+    }
 
     // Parse the layout in src/dev-toc/layout.html with the context we created above.
     const outputHtml = await liquid.parseAndRender(layout, Object.assign({}, req.context))

src/dev-toc/index.js src/dev-toc/index.tssrc/dev-toc/index.js renamed to src/dev-toc/index.ts

@@ -5,11 +5,11 @@ document.addEventListener('DOMContentLoaded', async () => {
   devToc()
 })
 
-function devToc() {
-  const expandButton = document.querySelector('.js-expand')
+function devToc(): void {
+  const expandButton = document.querySelector('.js-expand') as HTMLButtonElement | null
   if (!expandButton) return
 
-  const detailsElements = document.querySelectorAll('details')
+  const detailsElements = document.querySelectorAll('details') as NodeListOf<HTMLDetailsElement>
 
   expandButton.addEventListener('click', () => {
     // on click, toggle all the details elements open or closed