Fix page checking failing with trailingSlash

ijjk · ijjk · commit 2da380a9e6f6 · 2020-08-19T13:11:32.000-05:00
diff --git a/packages/next/next-server/server/router.ts b/packages/next/next-server/server/router.ts
@@ -132,11 +132,13 @@ export default class Router {
               requireBasePath: false,
               match: route('/:path*'),
               fn: async (checkerReq, checkerRes, params, parsedCheckerUrl) => {
-                const { pathname } = parsedCheckerUrl
+                let { pathname } = parsedCheckerUrl
+                pathname = pathname?.replace(/\/$/, '') || '/'
 
                 if (!pathname) {
                   return { finished: false }
                 }
+
                 if (await memoizedPageChecker(pathname)) {
                   return this.catchAllRoute.fn(
                     checkerReq,
diff --git a/test/integration/trailing-slashes-rewrite/next.config.js b/test/integration/trailing-slashes-rewrite/next.config.js
@@ -0,0 +1,16 @@
+module.exports = {
+  trailingSlash: true,
+
+  async rewrites() {
+    return [
+      {
+        source: '/:path*/',
+        destination: '/:path*/',
+      },
+      {
+        source: '/:path*/',
+        destination: 'http://localhost:__EXTERNAL_PORT__/:path*',
+      },
+    ]
+  },
+}
diff --git a/test/integration/trailing-slashes-rewrite/pages/catch-all/[...slug].js b/test/integration/trailing-slashes-rewrite/pages/catch-all/[...slug].js
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <p>catch-all</p>
+}
diff --git a/test/integration/trailing-slashes-rewrite/pages/index.js b/test/integration/trailing-slashes-rewrite/pages/index.js
@@ -0,0 +1,3 @@
+export default function Index() {
+  return <p>index page</p>
+}
diff --git a/test/integration/trailing-slashes-rewrite/pages/products/[product].js b/test/integration/trailing-slashes-rewrite/pages/products/[product].js
@@ -0,0 +1,3 @@
+export default function Products() {
+  return <p>a product</p>
+}
diff --git a/test/integration/trailing-slashes-rewrite/pages/products/index.js b/test/integration/trailing-slashes-rewrite/pages/products/index.js
@@ -0,0 +1,3 @@
+export default function Products() {
+  return <p>some products</p>
+}
diff --git a/test/integration/trailing-slashes-rewrite/server.js b/test/integration/trailing-slashes-rewrite/server.js
@@ -0,0 +1,10 @@
+const http = require('http')
+const server = http.createServer((req, res) => {
+  console.log('got request', req.url)
+  res.end(req.url)
+})
+const port = process.env.PORT || 3000
+
+server.listen(port, () => {
+  console.log('Ready on http://localhost:' + port)
+})
diff --git a/test/integration/trailing-slashes-rewrite/test/index.test.js b/test/integration/trailing-slashes-rewrite/test/index.test.js
@@ -0,0 +1,103 @@
+/* eslint-env jest */
+import { join } from 'path'
+import {
+  findPort,
+  killApp,
+  nextBuild,
+  nextStart,
+  File,
+  initNextServerScript,
+  renderViaHTTP,
+  launchApp,
+} from 'next-test-utils'
+
+jest.setTimeout(1000 * 60 * 2)
+
+let app
+let appPort
+let proxyPort
+let proxyServer
+const appDir = join(__dirname, '../')
+const nextConfig = new File(join(appDir, 'next.config.js'))
+
+const runTests = () => {
+  it('should resolve index page correctly', async () => {
+    const html = await renderViaHTTP(appPort, '/')
+    expect(html).toContain('index page')
+  })
+
+  it('should resolve products page correctly', async () => {
+    const html = await renderViaHTTP(appPort, '/products')
+    expect(html).toContain('some products')
+  })
+
+  it('should resolve a dynamic page correctly', async () => {
+    const html = await renderViaHTTP(appPort, '/products/first')
+    expect(html).toContain('a product')
+  })
+
+  it('should resolve a catch-all page correctly', async () => {
+    const html = await renderViaHTTP(appPort, '/catch-all/hello')
+    expect(html).toContain('catch-all')
+  })
+
+  it('should proxy non-existent page correctly', async () => {
+    const html = await renderViaHTTP(appPort, '/non-existent')
+    expect(html).toBe('/non-existent')
+  })
+}
+
+describe('Trailing Slash Rewrite Proxying', () => {
+  describe('production mode', () => {
+    beforeAll(async () => {
+      proxyPort = await findPort()
+      proxyServer = await initNextServerScript(
+        join(appDir, 'server.js'),
+        /ready on/i,
+        {
+          ...process.env,
+          PORT: proxyPort,
+        }
+      )
+
+      nextConfig.replace('__EXTERNAL_PORT__', proxyPort)
+
+      await nextBuild(appDir)
+      appPort = await findPort()
+      app = await nextStart(appDir, appPort)
+    })
+    afterAll(async () => {
+      nextConfig.restore()
+      await killApp(app)
+      await killApp(proxyServer)
+    })
+
+    runTests()
+  })
+
+  describe('dev mode', () => {
+    beforeAll(async () => {
+      proxyPort = await findPort()
+      proxyServer = await initNextServerScript(
+        join(appDir, 'server.js'),
+        /ready on/i,
+        {
+          ...process.env,
+          PORT: proxyPort,
+        }
+      )
+
+      nextConfig.replace('__EXTERNAL_PORT__', proxyPort)
+
+      appPort = await findPort()
+      app = await launchApp(appDir, appPort)
+    })
+    afterAll(async () => {
+      nextConfig.restore()
+      await killApp(app)
+      await killApp(proxyServer)
+    })
+
+    runTests()
+  })
+})
