Rename query to searchParams for getServerSideProps in new Router

packages/next/server/app-render.tsx

@@ -651,7 +651,7 @@ export async function renderToHTML(
     }
 
     type getServerSidePropsContextPage = GetServerSidePropsContext & {
-      query: URLSearchParams
+      searchParams: URLSearchParams
       pathname: string
     }
 
@@ -668,7 +668,7 @@ export async function renderToHTML(
         cookies,
         layoutSegments: segmentPath,
         // TODO-APP: change pathname to actual pathname, it holds the dynamic parameter currently
-        ...(isPage ? { query, pathname } : {}),
+        ...(isPage ? { searchParams: query, pathname } : {}),
         ...(pageIsDynamic ? { params: currentParams } : undefined),
         ...(isPreview
           ? { preview: true, previewData: previewData }
@@ -729,7 +729,7 @@ export async function renderToHTML(
             // If you have a `/dashboard/[team]/layout.js` it will provide `team` as a param but not anything further down.
             params={currentParams}
             // Query is only provided to page
-            {...(isPage ? { query } : {})}
+            {...(isPage ? { searchParams: query } : {})}
           />
         )
       },

test/e2e/app-dir/app/app/param-and-query/[slug]/page.client.js

@@ -1,7 +1,11 @@
-export default function Page({ params, query }) {
+export default function Page({ params, searchParams }) {
   return (
-    <h1 id="params-and-query" data-params={params.slug} data-query={query.slug}>
-      hello from /param-and-query/{params.slug}?slug={query.slug}
+    <h1
+      id="params-and-query"
+      data-params={params.slug}
+      data-query={searchParams.slug}
+    >
+      hello from /param-and-query/{params.slug}?slug={searchParams.slug}
     </h1>
   )
 }

test/e2e/app-dir/rsc-basic/app/next-api/link/page.server.js

@@ -18,10 +18,10 @@ export default function LinkPage({ queryId }) {
 
 export function getServerSideProps(ctx) {
   // FIXME: query is missing
-  const { query } = ctx
+  const { searchParams } = ctx
   return {
     props: {
-      queryId: query.id || '0',
+      queryId: searchParams.id || '0',
     },
   }
 }