simpler approach

packages/next/src/client/components/react-dev-overlay/app/hot-reloader-client.tsx

@@ -55,9 +55,7 @@ let reloading = false
 let startLatency: number | null = null
 
 let pendingHotUpdateWebpack = Promise.resolve()
-let pendingFastRefresh = Promise.resolve()
 let resolvePendingHotUpdateWebpack: () => void = () => {}
-let resolvePendingFastRefresh: () => void = () => {}
 function setPendingHotUpdateWebpack() {
   pendingHotUpdateWebpack = new Promise((resolve) => {
     resolvePendingHotUpdateWebpack = () => {
@@ -66,14 +64,6 @@ function setPendingHotUpdateWebpack() {
   })
 }
 
-function setPendingFastRefresh() {
-  pendingFastRefresh = new Promise((resolve) => {
-    resolvePendingFastRefresh = () => {
-      resolve()
-    }
-  })
-}
-
 export function waitForWebpackRuntimeHotUpdate() {
   return pendingHotUpdateWebpack
 }
@@ -93,7 +83,6 @@ function handleSuccessfulHotUpdateWebpack(
   updatedModules: ReadonlyArray<string>
 ) {
   resolvePendingHotUpdateWebpack()
-  resolvePendingFastRefresh()
   dispatcher.onBuildOk()
   reportHmrLatency(sendMessage, updatedModules)
 
@@ -440,6 +429,7 @@ function processMessage(
       )
 
       if (obj.action === HMR_ACTIONS_SENT_TO_BROWSER.BUILT) {
+        // Handle hot updates
         handleHotUpdate()
       }
       return
@@ -481,9 +471,6 @@ function processMessage(
         reloading = true
         return window.location.reload()
       }
-
-      setPendingFastRefresh()
-
       startTransition(() => {
         router.hmrRefresh()
         dispatcher.onRefresh()
@@ -544,12 +531,7 @@ export default function HotReload({
   const dispatcher = useMemo<Dispatcher>(() => {
     return {
       onBuildOk() {
-        // If fast refresh is triggered and causes server errors and then BUILT action
-        // comes in after, we'll be resetting the errors that were set by the refresh action.
-        // We make sure that the refresh action finished before applying the update
-        pendingFastRefresh.then(() => {
-          dispatch({ type: ACTION_BUILD_OK })
-        })
+        dispatch({ type: ACTION_BUILD_OK })
       },
       onBuildError(message) {
         dispatch({ type: ACTION_BUILD_ERROR, message })