Fix normalization of .rsc extension

packages/next/src/shared/lib/router/utils/app-paths.test.ts

@@ -0,0 +1,22 @@
+import { normalizeRscPath } from './app-paths'
+
+describe('normalizeRscPath', () => {
+  describe('enabled', () => {
+    it('should normalize url with .rsc', () => {
+      expect(normalizeRscPath('/test.rsc', true)).toBe('/test')
+    })
+    it('should normalize url with .rsc and querystring', () => {
+      expect(normalizeRscPath('/test.rsc?abc=def', true)).toBe('/test?abc=def')
+    })
+  })
+  describe('disabled', () => {
+    it('should normalize url with .rsc', () => {
+      expect(normalizeRscPath('/test.rsc', false)).toBe('/test.rsc')
+    })
+    it('should normalize url with .rsc and querystring', () => {
+      expect(normalizeRscPath('/test.rsc?abc=def', false)).toBe(
+        '/test.rsc?abc=def'
+      )
+    })
+  })
+})

packages/next/src/shared/lib/router/utils/app-paths.ts

@@ -51,5 +51,11 @@ export function normalizeAppPath(route: string) {
 }
 
 export function normalizeRscPath(pathname: string, enabled?: boolean) {
-  return enabled ? pathname.replace(/\.rsc($|\?)/, '') : pathname
+  return enabled
+    ? pathname.replace(
+        /\.rsc($|\?)/,
+        // $1 ensures `?` is preserved
+        '$1'
+      )
+    : pathname
 }