Merge pull request #38869 from github/repo-sync

Repo sync

Author: docs-bot

package-lock.json

@@ -269,7 +269,7 @@
     "dereference-json-schema": "^0.2.1",
     "dotenv": "^16.4.7",
     "escape-string-regexp": "5.0.0",
-    "express": "4.21.2",
+    "express": "^5.1.0",
     "fastest-levenshtein": "1.0.16",
     "file-type": "21.0.0",
     "flat": "^6.0.1",
@@ -349,7 +349,7 @@
     "@types/cookie": "0.6.0",
     "@types/cookie-parser": "1.4.8",
     "@types/event-to-promise": "^0.7.5",
-    "@types/express": "4.17.21",
+    "@types/express": "^5.0.3",
     "@types/imurmurhash": "^0.1.4",
     "@types/js-cookie": "^3.0.6",
     "@types/js-yaml": "^4.0.9",

package.json

@@ -65,10 +65,15 @@ router.get('/cookies', (req, res) => {
   const cookies = {
     isStaff: Boolean(req.cookies?.staffonly?.startsWith('yes')) || false,
   }
-  return res.json(cookies)
+  res.json(cookies)
 })
 
-router.get('*', (req, res) => {
+// Handle root /api requests
+router.get('/', (req, res) => {
+  res.status(404).json({ error: `${req.path} not found` })
+})
+
+router.get('/*path', (req, res) => {
   res.status(404).json({ error: `${req.path} not found` })
 })
 

src/frame/middleware/api.ts

@@ -8,7 +8,8 @@ export default function buildInfo(req: Request, res: Response) {
   res.type('text/plain')
   noCacheControl(res)
   if (!BUILD_SHA) {
-    return res.status(404).send('Not known')
+    res.status(404).send('Not known')
+    return
   }
-  return res.send(`${BUILD_SHA}`)
+  res.send(`${BUILD_SHA}`)
 }

src/frame/middleware/build-info.ts

@@ -12,7 +12,8 @@ export default function fastHead(req: ExtendedRequest, res: Response, next: Next
     // this and allow the CDN to hold on to it.
     defaultCacheControl(res)
 
-    return res.status(200).send('')
+    res.status(200).send('')
+    return
   }
   next()
 }

src/frame/middleware/fast-head.ts

@@ -12,7 +12,7 @@ import crypto from 'crypto'
 
 const router = express.Router()
 
-router.get('/*', function (req, res) {
+router.get('/*path', function (req, res) {
   // If X-CacheTest-Error is set, simulate the site being down (regardless of URL)
   if (req.get('X-CacheTest-Error')) {
     res.status(parseInt(req.get('X-CacheTest-Error') as string)).end()

src/frame/middleware/fastly-cache-test.ts

@@ -250,7 +250,7 @@ export default function (app: Express) {
 
   // Specifically deal with HEAD requests before doing the slower
   // full page rendering.
-  app.head('/*', fastHead)
+  app.head('/*path', fastHead)
 
   // *** Preparation for render-page: contextualizers ***
   app.use(asyncMiddleware(secretScanning))
@@ -282,7 +282,7 @@ export default function (app: Express) {
   app.use(haltOnDroppedConnection)
 
   // *** Rendering, must go almost last ***
-  app.get('/*', asyncMiddleware(renderPage))
+  app.get('/*path', asyncMiddleware(renderPage))
 
   // *** Error handling, must go last ***
   app.use(handleErrors)

src/frame/middleware/index.ts

@@ -58,7 +58,8 @@ export default function mockVaPortal(req: ExtendedRequest, res: Response, next:
 
   if (req.url.startsWith('/iframe/docs_va')) {
     res.removeHeader('content-security-policy')
-    return res.status(200).type('text/html').send(HTML)
+    res.status(200).type('text/html').send(HTML)
+    return
   }
 
   next()

src/frame/middleware/mock-va-portal.ts

@@ -108,7 +108,7 @@ export default async function renderPage(req: ExtendedRequest, res: Response) {
     // It's important to not use `src/pages/404.txt` (or `/404` as the path)
     // here because then it will set the wrong Cache-Control header.
     tempReq.url = '/_notfound'
-    tempReq.path = '/_notfound'
+    Object.defineProperty(tempReq, 'path', { value: '/_notfound', writable: true })
     tempReq.cookies = {}
     tempReq.headers = {}
     // By default, since the lookup for a `src/pages/*.tsx` file will work,

src/frame/middleware/render-page.ts

@@ -23,8 +23,9 @@ export default function robots(req: ExtendedRequest, res: Response, next: NextFu
     req.hostname === 'docs.github.com' ||
     req.hostname === '127.0.0.1'
   ) {
-    return res.send(defaultResponse)
+    res.send(defaultResponse)
+    return
   }
 
-  return res.send(disallowAll)
+  res.send(disallowAll)
 }