[not for merge] Fix our route matching

packages/next/next-server/server/next-server.ts

@@ -581,9 +581,14 @@ export default class Server {
       // this should not occur now that we check this during build
       if (!this.pagesManifest![unixPath]) {
         routes.push({
-          match: route(unixPath),
+          match: (pathname: string | undefined) => {
+            if (pathname === unixPath) {
+              return {}
+            }
+            return false
+          },
           type: 'route',
-          name: 'public catchall',
+          name: 'public individual',
           fn: async (req, res, _params, parsedUrl) => {
             const p = join(this.publicDir, unixPath)
             await this.serveStatic(req, res, p, parsedUrl)

test/integration/public-dir/next.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  onDemandEntries: {
+    // Make sure entries are not getting disposed.
+    maxInactiveAge: 1000 * 60 * 60,
+  },
+}

test/integration/public-dir/pages/index.js

@@ -0,0 +1 @@
+export default () => <div>Hello World</div>

test/integration/public-dir/public/test space.txt

@@ -0,0 +1 @@
+i have a space

test/integration/public-dir/public/test+this.txt

@@ -0,0 +1 @@
+i have a plus

test/integration/public-dir/public/test:this.txt

@@ -0,0 +1 @@
+i have a :

test/integration/public-dir/test/index.test.js

@@ -0,0 +1,86 @@
+/* eslint-env jest */
+/* global jasmine */
+import { join } from 'path'
+import {
+  nextServer,
+  nextBuild,
+  startApp,
+  stopApp,
+  renderViaHTTP,
+  fetchViaHTTP,
+} from 'next-test-utils'
+
+const appDir = join(__dirname, '../')
+let appPort
+let server
+let app
+jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 60 * 2
+
+describe('Public Files', () => {
+  describe('Production', () => {
+    beforeAll(async () => {
+      await nextBuild(appDir)
+      app = nextServer({
+        dir: join(__dirname, '../'),
+        dev: false,
+        quiet: true,
+      })
+
+      server = await startApp(app)
+      appPort = server.address().port
+    })
+    afterAll(() => stopApp(server))
+
+    describe('With basic usage', () => {
+      it('should render the page', async () => {
+        const html = await renderViaHTTP(appPort, '/')
+        expect(html).toMatch(/Hello World/)
+      })
+
+      it('should stream the file +', async () => {
+        const html = await renderViaHTTP(appPort, '/test+this.txt')
+        expect(html).toMatch(/i have a plus/)
+      })
+
+      it('should not stream the file + with trailing slash', async () => {
+        const res = await fetchViaHTTP(appPort, `/test+this.txt/`)
+        expect(res.status).toBe(404)
+      })
+
+      it('should not stream the file + encoded', async () => {
+        const res = await fetchViaHTTP(
+          appPort,
+          `/test${encodeURIComponent('+')}this.txt`
+        )
+        expect(res.status).toBe(404)
+      })
+
+      it('should stream the file :', async () => {
+        const html = await renderViaHTTP(appPort, '/test:this.txt')
+        expect(html).toMatch(/i have a :/)
+      })
+
+      it('should not stream the file : encoded', async () => {
+        const res = await fetchViaHTTP(
+          appPort,
+          `/test${encodeURIComponent(':')}this.txt`
+        )
+        expect(res.status).toBe(404)
+      })
+
+      xit('should stream the file space', async () => {
+        const html = await renderViaHTTP(appPort, '/test space.txt')
+        expect(html).toMatch(/i have a space/)
+      })
+
+      // Why is this one different? %20 is `encodeURI`.
+      xit('should stream the file space encoded', async () => {
+        const html = await renderViaHTTP(
+          appPort,
+          `/test${encodeURIComponent(' ')}space.txt`
+        )
+        expect(html).toMatch(/i have a space/)
+      })
+    })
+  })
+})