Merge branch 'canary' into hotfix/defer-async

vercel · Jan 17, 2020 · 9dd708c · 9dd708c
2 parents 32c390a + 53d5bd8
commit 9dd708c
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 10 deletions.
diff --git a/lerna.json b/lerna.json
@@ -12,5 +12,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "9.2.0"
+  "version": "9.2.1-canary.0"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "9.2.0",
+  "version": "9.2.1-canary.0",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "9.2.0",
+  "version": "9.2.1-canary.0",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "9.2.0",
+  "version": "9.2.1-canary.0",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-google-analytics/package.json b/packages/next-plugin-google-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-google-analytics",
-  "version": "9.2.0",
+  "version": "9.2.1-canary.0",
   "nextjs": {
     "name": "Google Analytics",
     "required-env": [

diff --git a/packages/next-plugin-material-ui/package.json b/packages/next-plugin-material-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-material-ui",
-  "version": "9.2.0",
+  "version": "9.2.1-canary.0",
   "nextjs": {
     "name": "Material UI",
     "required-env": []

diff --git a/packages/next-plugin-sentry/package.json b/packages/next-plugin-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-sentry",
-  "version": "9.2.0",
+  "version": "9.2.1-canary.0",
   "nextjs": {
     "name": "Sentry",
     "required-env": [

diff --git a/packages/next/next-server/lib/router/router.ts b/packages/next/next-server/lib/router/router.ts
@@ -666,7 +666,7 @@ export default class Router implements BaseRouter {
 
   _getStaticData = (asPath: string, _cachedData?: object): Promise<object> => {
     let pathname = parse(asPath).pathname
-    pathname = !pathname || pathname === '/' ? '/index' : pathname
+    pathname = toRoute(!pathname || pathname === '/' ? '/index' : pathname)
 
     return process.env.NODE_ENV === 'production' &&
       (_cachedData = this.sdc[pathname])

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "9.2.0",
+  "version": "9.2.1-canary.0",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",

diff --git a/test/integration/prerender/pages/index.js b/test/integration/prerender/pages/index.js
@@ -14,7 +14,7 @@ const Page = ({ world, time }) => {
     <>
       <p>hello {world}</p>
       <span>time: {time}</span>
-      <Link href="/another">
+      <Link href="/another?hello=world" as="/another/?hello=world">
         <a id="another">to another</a>
       </Link>
       <br />

diff --git a/test/integration/prerender/test/index.test.js b/test/integration/prerender/test/index.test.js
@@ -134,9 +134,11 @@ const navigateTest = (dev = false) => {
 
     // go to /another
     async function goFromHomeToAnother() {
+      await browser.eval('window.beforeAnother = true')
       await browser.elementByCss('#another').click()
       await browser.waitForElementByCss('#home')
       text = await browser.elementByCss('p').text()
+      expect(await browser.eval('window.beforeAnother')).toBe(true)
       expect(text).toMatch(/hello.*?world/)
     }
     await goFromHomeToAnother()