Make sure to parse query values for SSG page after hydration (#9545)

* Make sure to parse query values for SSG page after hydration

* Update to re-use __NEXT_SPR

packages/next/client/index.js

@@ -101,8 +101,9 @@ class Container extends React.Component {
     // If page was exported and has a querystring
     // If it's a dynamic route or has a querystring
     if (
-      data.nextExport &&
-      (isDynamicRoute(router.pathname) || location.search)
+      (data.nextExport &&
+        (isDynamicRoute(router.pathname) || location.search)) ||
+      (Component.__NEXT_SPR && location.search)
     ) {
       // update query on mount for exported pages
       router.replace(

test/integration/prerender/pages/blog/[post]/index.js

 import React from 'react'
 import Link from 'next/link'
+import { useRouter } from 'next/router'
 
 // eslint-disable-next-line camelcase
 export async function unstable_getStaticPaths() {
@@ -37,6 +38,7 @@ export default ({ post, time }) => {
     <>
       <p>Post: {post}</p>
       <span>time: {time}</span>
+      <div id="query">{JSON.stringify(useRouter().query)}</div>
       <Link href="/">
         <a id="home">to home</a>
       </Link>

test/integration/prerender/test/index.test.js

@@ -213,6 +213,14 @@ const runTests = (dev = false) => {
     expect(text).toMatch(/a normal page/)
   })
 
+  it('should parse query values on mount correctly', async () => {
+    const browser = await webdriver(appPort, '/blog/post-1?another=value')
+    await waitFor(2000)
+    const text = await browser.elementByCss('#query').text()
+    expect(text).toMatch(/another.*?value/)
+    expect(text).toMatch(/post.*?post-1/)
+  })
+
   if (dev) {
     it('should always call getStaticProps without caching in dev', async () => {
       const initialRes = await fetchViaHTTP(appPort, '/something')