@@ -53,6 +53,8 @@ describe('redirects', () => {
     ['/zh-Hans', '/zh'],
     ['/zh-hant/get-started', '/zh/get-started'],
     ['/kr', '/ko'],
+    ['/jp/search?query=actions', '/ja/search?query=actions'],
+    ['/cn/rest?apiVersion=2022-11-28', '/zh/rest?apiVersion=2022-11-28'],
   ])('redirects %s to %s', async (from, to_) => {
     const res = await get(from)
     expect(res.statusCode).toBe(301)
 
@@ -36,7 +36,10 @@ export default function languageCodeRedirects(
     const [code, pattern] = matched
     if (code && pattern) {
       defaultCacheControl(res)
-      return res.safeRedirect(301, req.path.replace(pattern, `/${code}`))
+      // Keep the query string so search terms and selectors such as apiVersion survive.
+      const queryIndex = req.url.indexOf('?')
+      const query = queryIndex === -1 ? '' : req.url.slice(queryIndex)
+      return res.safeRedirect(301, req.path.replace(pattern, `/${code}`) + query)
     }
   }
   return next()
 
@@ -10,8 +10,8 @@ vi.mock('@/languages/lib/languages-server', async () => {
   return { default: languages }
 })
 
-function run(path: string) {
-  const req = { path } as ExtendedRequest
+function run(url: string) {
+  const req = { url, path: url.split('?')[0] } as ExtendedRequest
   const res = { hasHeader: () => false, set: vi.fn(), safeRedirect: vi.fn() }
   const next = vi.fn()
   languageCodeRedirects(req, res as unknown as Response, next as NextFunction)
@@ -22,21 +22,28 @@ describe('languageCodeRedirects', () => {
   test.each([
     ['/jp', '/ja'],
     ['/cn/get-started', '/zh/get-started'],
+    ['/cn/rest/repos', '/zh/rest/repos'],
     ['/zh-CN', '/zh'],
     ['/zh-TW/get-started', '/zh/get-started'],
     ['/zh-Hans', '/zh'],
     ['/zh-Hans/get-started', '/zh/get-started'],
     ['/zh-hant/get-started', '/zh/get-started'],
     ['/zh-Hans-CN/get-started', '/zh/get-started'],
+    ['/jp/search?query=actions', '/ja/search?query=actions'],
+    ['/cn/rest/repos?apiVersion=2022-11-28', '/zh/rest/repos?apiVersion=2022-11-28'],
+    ['/zh-TW/actions?tool=cli&platform=mac', '/zh/actions?tool=cli&platform=mac'],
   ])('redirects %s to %s', (from, to) => {
     const { res, next } = run(from)
     expect(res.safeRedirect).toHaveBeenCalledWith(301, to)
     expect(next).not.toHaveBeenCalled()
   })
 
-  test.each(['/zh', '/zh/get-started', '/en/zh-Hans'])('passes %s through', (path) => {
-    const { res, next } = run(path)
-    expect(res.safeRedirect).not.toHaveBeenCalled()
-    expect(next).toHaveBeenCalled()
-  })
+  test.each(['/zh', '/zh/get-started', '/en/zh-Hans', '/ja/search?query=jp'])(
+    'passes %s through',
+    (url) => {
+      const { res, next } = run(url)
+      expect(res.safeRedirect).not.toHaveBeenCalled()
+      expect(next).toHaveBeenCalledOnce()
+    },
+  )
 })
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,10 @@ export default function languageCodeRedirects(`
`36`	`36`	`const [code, pattern] = matched`
`37`	`37`	`if (code && pattern) {`
`38`	`38`	`defaultCacheControl(res)`
`39`		- return res.safeRedirect(301, req.path.replace(pattern, `/${code}`))
	`39`	`+ // Keep the query string so search terms and selectors such as apiVersion survive.`
	`40`	`+ const queryIndex = req.url.indexOf('?')`
	`41`	`+ const query = queryIndex === -1 ? '' : req.url.slice(queryIndex)`
	`42`	+ return res.safeRedirect(301, req.path.replace(pattern, `/${code}`) + query)
`40`	`43`	`}`
`41`	`44`	`}`
`42`	`45`	`return next()`