Serve public/ folder when page routes are disabled (#10169)

Co-authored-by: JJ Kasper <jj@jjsweb.site> Co-authored-by: Joe Haddad <timer150@gmail.com>
vercel · Jan 20, 2020 · 7a728d6 · 7a728d6
1 parent b95214e
commit 7a728d6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts
@@ -520,12 +520,12 @@ export default class Server {
       )
     }
 
-    const catchAllRoute: Route = {
+    const catchPublicDirectoryRoute: Route = {
       match: route('/:path*'),
       type: 'route',
-      name: 'Catchall render',
+      name: 'Catch public directory route',
       fn: async (req, res, params, parsedUrl) => {
-        const { pathname, query } = parsedUrl
+        const { pathname } = parsedUrl
         if (!pathname) {
           throw new Error('pathname is undefined')
         }
@@ -537,6 +537,24 @@ export default class Server {
           }
         }
 
+        return {
+          finished: false,
+        }
+      },
+    }
+
+    routes.push(catchPublicDirectoryRoute)
+
+    const catchAllRoute: Route = {
+      match: route('/:path*'),
+      type: 'route',
+      name: 'Catchall render',
+      fn: async (req, res, params, parsedUrl) => {
+        const { pathname, query } = parsedUrl
+        if (!pathname) {
+          throw new Error('pathname is undefined')
+        }
+
         if (params?.path?.[0] === 'api') {
           const handled = await this.handleApiRequest(
             req as NextApiRequest,

diff --git a/test/integration/filesystempublicroutes/public/hello.txt b/test/integration/filesystempublicroutes/public/hello.txt
@@ -0,0 +1 @@
+hello
diff --git a/test/integration/filesystempublicroutes/test/index.test.js b/test/integration/filesystempublicroutes/test/index.test.js
@@ -54,4 +54,11 @@ describe('FileSystemPublicRoutes', () => {
     const body = await res.text()
     expect(body).toMatch(/exportpathmap was here/)
   })
+
+  it('should route to public folder files', async () => {
+    const res = await fetch('/hello.txt')
+    expect(res.status).toBe(200)
+    const body = await res.text()
+    expect(body).toMatch(/hello/)
+  })
 })