Fix the page-loader-normalization issue on '/index' page. (vercel#1882)

arunoda · rauchg · commit 0edee47d0778 · 2017-05-04T13:05:47.000-07:00
diff --git a/lib/page-loader.js b/lib/page-loader.js
@@ -18,9 +18,10 @@ export default class PageLoader {
     if (route[0] !== '/') {
       throw new Error('Route name should start with a "/"')
     }
+    route = route.replace(/index$/, '')
 
     if (route === '/') return route
-    return route.replace(/index$/, '').replace(/\/$/, '')
+    return route.replace(/\/$/, '')
   }
 
   loadPage (route) {
diff --git a/test/integration/basic/pages/index.js b/test/integration/basic/pages/index.js
@@ -0,0 +1,2 @@
+import CDM from '../lib/cdm'
+export default CDM
diff --git a/test/integration/basic/test/client-navigation.js b/test/integration/basic/test/client-navigation.js
@@ -323,29 +323,45 @@ export default (context, render) => {
     })
 
     describe('with different types of urls', () => {
-      it('on normal page', async () => {
+      it('should work with normal page', async () => {
         const browser = await webdriver(context.appPort, '/with-cdm')
         const text = await browser.elementByCss('p').text()
 
         expect(text).toBe('ComponentDidMount executed on client.')
         browser.close()
       })
 
-      it('on dir/index page ', async () => {
+      it('should work with dir/index page ', async () => {
         const browser = await webdriver(context.appPort, '/nested-cdm/index')
         const text = await browser.elementByCss('p').text()
 
         expect(text).toBe('ComponentDidMount executed on client.')
         browser.close()
       })
 
-      it('on dir/ page ', async () => {
+      it('should work with dir/ page ', async () => {
         const browser = await webdriver(context.appPort, '/nested-cdm/')
         const text = await browser.elementByCss('p').text()
 
         expect(text).toBe('ComponentDidMount executed on client.')
         browser.close()
       })
+
+      it('should work with /index page', async () => {
+        const browser = await webdriver(context.appPort, '/index')
+        const text = await browser.elementByCss('p').text()
+
+        expect(text).toBe('ComponentDidMount executed on client.')
+        browser.close()
+      })
+
+      it('should work with / page', async () => {
+        const browser = await webdriver(context.appPort, '/')
+        const text = await browser.elementByCss('p').text()
+
+        expect(text).toBe('ComponentDidMount executed on client.')
+        browser.close()
+      })
     })
 
     describe('with asPath', () => {

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,10 @@ export default class PageLoader {`
`18`	`18`	`if (route[0] !== '/') {`
`19`	`19`	`throw new Error('Route name should start with a "/"')`
`20`	`20`	`}`
	`21`	`+ route = route.replace(/index$/, '')`
`21`	`22`
`22`	`23`	`if (route === '/') return route`
`23`		`- return route.replace(/index$/, '').replace(/\/$/, '')`
	`24`	`+ return route.replace(/\/$/, '')`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`loadPage (route) {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+import CDM from '../lib/cdm'`
	`2`	`+export default CDM`