Merge pull request #33723 from github/repo-sync

Repo sync

src/frame/middleware/index.ts

@@ -58,7 +58,7 @@ import favicons from './favicons'
 import setStaticAssetCaching from '@/assets/middleware/static-asset-caching'
 import fastHead from './fast-head'
 import fastlyCacheTest from './fastly-cache-test'
-import trailingSlashes from './trailing-slashes.js'
+import trailingSlashes from './trailing-slashes'
 import fastlyBehavior from './fastly-behavior.js'
 import mockVaPortal from './mock-va-portal.js'
 import dynamicAssets from '@/assets/middleware/dynamic-assets.js'

src/frame/middleware/trailing-slashes.js → src/frame/middleware/trailing-slashes.ts

@@ -1,10 +1,13 @@
+import type { Response, NextFunction } from 'express'
+
+import type { ExtendedRequest } from '@/types'
 import { defaultCacheControl } from './cache-control.js'
 
-export default function trailingSlashes(req, res, next) {
+export default function trailingSlashes(req: ExtendedRequest, res: Response, next: NextFunction) {
   if (req.method === 'GET' || req.method === 'HEAD' || req.method === 'OPTIONS') {
     const split = req.url.split('?')
     let pathname = split.shift()
-    if (pathname !== '/' && pathname.endsWith('/')) {
+    if (pathname && pathname !== '/' && pathname.endsWith('/')) {
       while (pathname.endsWith('/')) {
         pathname = pathname.slice(0, pathname.length - 1)
       }