Make router UrlIsNew comparing method work as expected (vercel#6383)

* make router UrlIsNew comparing method work as expected

* Remove shallow-equals from router and update urlIsNew check

* Remove shallow-equals test since it is no longer used

* Add integration test for asPath query

packages/next-server/lib/router/router.js

@@ -2,7 +2,6 @@
 
 import { parse } from 'url'
 import mitt from '../mitt'
-import shallowEquals from './shallow-equals'
 import { loadGetInitialProps, getURL, formatWithValidation } from '../utils'
 
 export default class Router {
@@ -363,9 +362,7 @@ export default class Router {
   }
 
   urlIsNew (asPath) {
-    const { pathname, query } = parse(asPath, true)
-    const { pathname: curPathname } = parse(this.asPath, true)
-    return curPathname !== pathname || !shallowEquals(query, this.query)
+    return this.asPath !== asPath
   }
 
   isShallowRoutingPossible (route) {

test/integration/basic/pages/nav/as-path-query.js

@@ -0,0 +1,21 @@
+import Link from 'next/link'
+import { withRouter } from 'next/router'
+
+export default withRouter(({ router: { asPath, query } }) => {
+  return <div
+    id={asPath
+      .replace('/', '').replace('/', '-').replace('?', '-').replace('=', '-')
+    }>
+    <div id='router-query'>{JSON.stringify(query)}</div>
+    <div>
+      <Link href='/nav/as-path-query?something=hello' as='/something/hello?something=hello'>
+        <a id='hello'>hello</a>
+      </Link>
+    </div>
+    <div>
+      <Link href='/nav/as-path-query?something=else' as='/something/hello?something=else'>
+        <a id='hello2'>hello</a>
+      </Link>
+    </div>
+  </div>
+})

test/integration/basic/test/client-navigation.js

@@ -659,6 +659,23 @@ export default (context) => {
             }
           }
         })
+
+        it('should detect asPath query changes correctly', async () => {
+          let browser
+          try {
+            browser = await webdriver(context.appPort, '/nav/as-path-query')
+            await browser.elementByCss('#hello').click().waitForElementByCss('#something-hello-something-hello')
+            const queryOne = JSON.parse(await browser.elementByCss('#router-query').text())
+            expect(queryOne.something).toBe('hello')
+            await browser.elementByCss('#hello2').click().waitForElementByCss('#something-hello-something-else')
+            const queryTwo = JSON.parse(await browser.elementByCss('#router-query').text())
+            expect(queryTwo.something).toBe('else')
+          } finally {
+            if (browser) {
+              browser.close()
+            }
+          }
+        })
       })
     })