Merge branch 'vercel:main' into rafaeltab/grouped-output

vercel · Feb 22, 2023 · 038e51d · 038e51d
2 parents f243ec7 + 55f7060
commit 038e51d
Show file tree

Hide file tree

Showing 170 changed files with 13,858 additions and 5,805 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/next-core/js/src/overlay/internal/ReactDevOverlay.tsx b/crates/next-core/js/src/overlay/internal/ReactDevOverlay.tsx
@@ -32,6 +32,8 @@ type OverlayState = {
   errors: SupportedErrorEvent[];
 
   refreshState: RefreshState;
+
+  reactError: Error | null;
 };
 
 function pushErrorFilterDuplicates(
@@ -50,6 +52,13 @@ function pushErrorFilterDuplicates(
 function reducer(state: OverlayState, ev: Bus.BusEvent): OverlayState {
   switch (ev.type) {
     case Bus.TYPE_BUILD_OK: {
+      if (state.reactError != null) {
+        console.warn(
+          "[Fast Refresh] performing full reload because your application had an unrecoverable error"
+        );
+        window.location.reload();
+      }
+
       return { ...state };
     }
     case Bus.TYPE_TURBOPACK_ISSUES: {
@@ -104,6 +113,9 @@ function reducer(state: OverlayState, ev: Bus.BusEvent): OverlayState {
           return state;
       }
     }
+    case Bus.TYPE_REACT_ERROR: {
+      return { ...state, reactError: ev.error };
+    }
     default: {
       return state;
     }
@@ -142,6 +154,7 @@ export default function ReactDevOverlay({
     refreshState: {
       type: "idle",
     },
+    reactError: null,
   });
 
   React.useEffect(() => {
@@ -152,8 +165,12 @@ export default function ReactDevOverlay({
   }, [dispatch]);
 
   const onComponentError = React.useCallback(
-    (_error: Error, _componentStack: string | null) => {
-      // TODO: special handling
+    (error: Error, componentStack: string | null) => {
+      Bus.emit({
+        type: Bus.TYPE_REACT_ERROR,
+        error,
+        componentStack,
+      });
     },
     []
   );

diff --git a/crates/next-core/js/src/overlay/internal/bus.ts b/crates/next-core/js/src/overlay/internal/bus.ts
@@ -8,6 +8,7 @@ export const TYPE_BEFORE_REFRESH = "before-fast-refresh";
 export const TYPE_REFRESH = "fast-refresh";
 export const TYPE_UNHANDLED_ERROR = "unhandled-error";
 export const TYPE_UNHANDLED_REJECTION = "unhandled-rejection";
+export const TYPE_REACT_ERROR = "react-error";
 
 export type BuildOk = { type: typeof TYPE_BUILD_OK };
 export type TurbopackIssues = {
@@ -26,13 +27,20 @@ export type UnhandledRejection = {
   reason: Error;
   frames: StackFrame[];
 };
+export type ReactError = {
+  type: typeof TYPE_REACT_ERROR;
+  error: Error;
+  componentStack: string | null;
+};
+
 export type BusEvent =
   | BuildOk
   | TurbopackIssues
   | BeforeFastRefresh
   | FastRefresh
   | UnhandledError
-  | UnhandledRejection;
+  | UnhandledRejection
+  | ReactError;
 
 export type BusEventHandler = (ev: BusEvent) => void;