Add additional file serving tests (#12479)

* Test `static/` file name encoding * Fix `static/` file name encoding * Add additional file-serving tests * bump Co-authored-by: Joe Haddad <joe.haddad@zeit.co>
vercel · May 4, 2020 · 00d930aae82e59dd2d4facd25af249c31c9933c5 · 00d930a
1 parent 3af0fe5
commit 00d930aae82e59dd2d4facd25af249c31c9933c5
diff --git a/packages/next/server/next-dev-server.ts b/packages/next/server/next-dev-server.ts
@@ -272,9 +272,21 @@ export default class DevServer extends Server {
   }
 
   protected async hasPage(pathname: string): Promise<boolean> {
+    let normalizedPath: string
+
+    try {
+      normalizedPath = normalizePagePath(pathname)
+    } catch (err) {
+      console.error(err)
+      // if normalizing the page fails it means it isn't valid
+      // so it doesn't exist so don't throw and return false
+      // to ensure we return 404 instead of 500
+      return false
+    }
+
     const pageFile = await findPageFile(
       this.pagesDir!,
-      normalizePagePath(pathname),
+      normalizedPath,
       this.nextConfig.pageExtensions
     )
     return !!pageFile

diff --git a/test-file.txt b/test-file.txt
@@ -0,0 +1 @@
+this is used for traverse testing
diff --git a/test/integration/file-serving/pages/index.js b/test/integration/file-serving/pages/index.js
@@ -0,0 +1 @@
+export default () => 'hi'
diff --git a/test/integration/file-serving/public/hello world.txt b/test/integration/file-serving/public/hello world.txt
@@ -0,0 +1 @@
+hi
diff --git a/test/integration/file-serving/static/hello world.txt b/test/integration/file-serving/static/hello world.txt
@@ -0,0 +1 @@
+hi
diff --git a/test/integration/file-serving/test-file.txt b/test/integration/file-serving/test-file.txt
@@ -0,0 +1 @@
+this is used for traverse testing