Fix last test

vercel · Feb 27, 2020 · 85ab1f6 · 85ab1f6
1 parent 9a86fec
commit 85ab1f6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts
@@ -1088,7 +1088,13 @@ export default class Server {
       // `getStaticPaths`
       (isProduction || !staticPaths || !staticPaths.includes(urlPathname))
     ) {
-      if (!hasStaticFallback) {
+      if (
+        // In development, fall through to render to handle missing
+        // getStaticPaths.
+        (isProduction || staticPaths) &&
+        // When fallback isn't present, abort this render so we 404
+        !hasStaticFallback
+      ) {
         return false
       }
 

diff --git a/test/integration/prerender/test/index.test.js b/test/integration/prerender/test/index.test.js
@@ -753,7 +753,7 @@ const runTests = (dev = false, looseMode = false) => {
         '/catchall-explicit/[...slug]': {
           dataRoute: `/_next/data/${buildId}/catchall-explicit/[...slug].json`,
           dataRouteRegex: normalizeRegEx(
-            `^\\/_next\\/data\\/${buildId}\\/catchall\\-explicit\\/(.+?)\\.json$`
+            `^\\/_next\\/data\\/${escapedBuildId}\\/catchall\\-explicit\\/(.+?)\\.json$`
           ),
           fallback: false,
           routeRegex: normalizeRegEx(