Merge branch 'canary' into canary

package.json

@@ -122,6 +122,7 @@
     "tree-kill": "1.2.1",
     "typescript": "3.8.3",
     "wait-port": "0.2.2",
+    "web-streams-polyfill": "2.1.1",
     "webpack-bundle-analyzer": "3.6.1",
     "worker-loader": "2.0.0"
   },

packages/next/next-server/lib/router/utils/search-params-to-url-query.ts

@@ -4,7 +4,7 @@ export function searchParamsToUrlQuery(
   searchParams: URLSearchParams
 ): ParsedUrlQuery {
   const query: ParsedUrlQuery = {}
-  Array.from(searchParams.entries()).forEach(([key, value]) => {
+  searchParams.forEach((value, key) => {
     if (typeof query[key] === 'undefined') {
       query[key] = value
     } else if (Array.isArray(query[key])) {

test/integration/link-with-encoding/pages/index.js

@@ -30,6 +30,10 @@ const Home = () => (
     >
       <a id="single-colon">Single: :</a>
     </Link>
+    <br />
+    <Link href="/query?id=http://example.com/">
+      <a id="url-param">Url query param</a>
+    </Link>
   </div>
 )
 

test/integration/link-with-encoding/pages/query.js

@@ -0,0 +1,7 @@
+export function getServerSideProps({ query }) {
+  return { props: query }
+}
+
+export default function Single(props) {
+  return <pre id="query-content">{JSON.stringify(props)}</pre>
+}

test/integration/link-with-encoding/test/index.test.js

@@ -295,5 +295,19 @@ describe('Link Component with Encoding', () => {
         await browser.close()
       }
     })
+
+    it('should have correct parsing of url query params', async () => {
+      const browser = await webdriver(appPort, '/')
+      try {
+        await browser.waitForElementByCss('#url-param').click()
+        const content = await browser
+          .waitForElementByCss('#query-content')
+          .text()
+        const query = JSON.parse(content)
+        expect(query).toHaveProperty('id', 'http://example.com/')
+      } finally {
+        await browser.close()
+      }
+    })
   })
 })

yarn.lock

@@ -16016,6 +16016,11 @@ wcwidth@^1.0.0, wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
+[email protected]:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-2.1.1.tgz#2c82b6193849ccb9efaa267772c28260ef68d6d2"
+  integrity sha512-dlNpL2aab3g8CKfGz6rl8FNmGaRWLLn2g/DtSc9IjB30mEdE6XxzPfPSig5BwGSzI+oLxHyETrQGKjrVVhbLCg==
+
 [email protected]:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-0.2.1.tgz#60782fa690243fe35613759a0c26431f57ba7b2d"