Unify serverError hmr event

vercel · Sep 4, 2023 · 1d0a69a · 1d0a69a
1 parent be3a7e4
commit 1d0a69a
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 42 deletions.
diff --git a/packages/next/src/client/dev/webpack-hot-middleware-client.ts b/packages/next/src/client/dev/webpack-hot-middleware-client.ts
@@ -11,54 +11,56 @@ export default () => {
       window.next.router.pathname === '/404' ||
       window.next.router.pathname === '/_error'
 
-    if (obj.action === 'reloadPage') {
-      sendMessage(
-        JSON.stringify({
-          event: 'client-reload-page',
-          clientId: window.__nextDevClientId,
-        })
-      )
-      return window.location.reload()
-    }
-    if (obj.action === 'removedPage') {
-      const [page] = obj.data
-      if (page === window.next.router.pathname || isOnErrorPage) {
+    switch (obj.action) {
+      case 'reloadPage': {
         sendMessage(
           JSON.stringify({
-            event: 'client-removed-page',
+            event: 'client-reload-page',
             clientId: window.__nextDevClientId,
-            page,
           })
         )
         return window.location.reload()
       }
-      return
-    }
-    if (obj.action === 'addedPage') {
-      const [page] = obj.data
-      if (
-        (page === window.next.router.pathname &&
-          typeof window.next.router.components[page] === 'undefined') ||
-        isOnErrorPage
-      ) {
-        sendMessage(
-          JSON.stringify({
-            event: 'client-added-page',
-            clientId: window.__nextDevClientId,
-            page,
-          })
-        )
-        return window.location.reload()
+      case 'removedPage': {
+        const [page] = obj.data
+        if (page === window.next.router.pathname || isOnErrorPage) {
+          sendMessage(
+            JSON.stringify({
+              event: 'client-removed-page',
+              clientId: window.__nextDevClientId,
+              page,
+            })
+          )
+          return window.location.reload()
+        }
+        return
+      }
+      case 'addedPage': {
+        const [page] = obj.data
+        if (
+          (page === window.next.router.pathname &&
+            typeof window.next.router.components[page] === 'undefined') ||
+          isOnErrorPage
+        ) {
+          sendMessage(
+            JSON.stringify({
+              event: 'client-added-page',
+              clientId: window.__nextDevClientId,
+              page,
+            })
+          )
+          return window.location.reload()
+        }
+        return
+      }
+      case 'serverError':
+      case 'devPagesManifestUpdate': {
+        return
+      }
+      default: {
+        throw new Error('Unexpected action ' + obj.action)
       }
-      return
-    }
-    if (
-      obj.action === 'serverError' ||
-      obj.action === 'devPagesManifestUpdate'
-    ) {
-      return
     }
-    throw new Error('Unexpected action ' + obj.action)
   })
 
   return devClient

diff --git a/packages/next/src/client/page-bootstrap.ts b/packages/next/src/client/page-bootstrap.ts
@@ -17,7 +17,7 @@ export function pageBootrap(assetPrefix: string) {
     let buildIndicatorHandler: (obj: Record<string, any>) => void = () => {}
 
     function devPagesHmrListener(payload: any) {
-      if (payload.event === 'server-error' && payload.errorJSON) {
+      if (payload.action === 'serverError' && payload.errorJSON) {
         const { stack, message } = JSON.parse(payload.errorJSON)
         const error = new Error(message)
         error.stack = stack

diff --git a/packages/next/src/server/dev/on-demand-entry-handler.ts b/packages/next/src/server/dev/on-demand-entry-handler.ts
@@ -949,8 +949,7 @@ export function onDemandEntryHandler({
           if (!bufferedHmrServerError && error) {
             client.send(
               JSON.stringify({
-                event: 'server-error', // for pages dir
-                action: 'serverError', // for app dir
+                action: 'serverError',
                 errorJSON: stringifyError(error),
               })
             )