Update fix

vercel · Aug 6, 2023 · c0059ed · c0059ed
1 parent d50caae
commit c0059ed
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts
@@ -743,12 +743,6 @@ export default abstract class Server<ServerOptions extends Options = Options> {
           // basePath is already stripped by this point
           if (urlPathname.startsWith(`/_next/data/`)) {
             parsedUrl.query.__nextDataReq = '1'
-
-            // TODO: remove once normalizeNextData is used instead
-            if (pathnameInfo.buildId && pathnameInfo.buildId !== this.buildId) {
-              await this.render404(req, res, parsedUrl)
-              return
-            }
           }
 
           const normalizedUrlPath = this.stripNextDataPath(urlPathname)
@@ -932,6 +926,16 @@ export default abstract class Server<ServerOptions extends Options = Options> {
           }
           parsedUrl.pathname = matchedPath
           url.pathname = parsedUrl.pathname
+
+          const normalizeResult = await this.normalizeNextData(
+            req,
+            res,
+            parsedUrl
+          )
+
+          if (normalizeResult.finished) {
+            return
+          }
         } catch (err) {
           if (err instanceof DecodeError || err instanceof NormalizeError) {
             res.statusCode = 400