fix(core): handle global script error (#8576)

toeverything · Oct 22, 2024 · ff95f12 · ff95f12
1 parent be3125b
commit ff95f12
Showing 1 changed file with 27 additions and 13 deletions.
diff --git a/tools/cli/src/webpack/error-handler.js b/tools/cli/src/webpack/error-handler.js
@@ -33,23 +33,37 @@
     document.body.append(errorEl);
   }
 
-  function registerGlobalErrorHandler() {
-    function handler(e) {
-      var error =
-        'error' in e ? e.error : e.reason instanceof Error ? e.reason : null;
-      console.error('unhandled unrecoverable error', error);
+  /**
+   * @param event {PromiseRejectionEvent|ErrorEvent}
+   */
+  function handler(event) {
+    var error;
 
-      const shouldCache =
-        // syntax error
-        error && error instanceof SyntaxError;
+    if ('error' in event) {
+      error =
+        event.error ||
+        (event.message === 'Script error.'
+          ? new SyntaxError(event.message)
+          : new Error(event.message));
+    } else {
+      error = event.reason;
+    }
 
-      if (!shouldCache) {
-        return;
-      }
+    console.error('unhandled unrecoverable error', error);
+
+    var shouldCache =
+      // syntax error
+      error && error instanceof SyntaxError;
 
-      e.stopImmediatePropagation();
-      showGlobalErrorPage();
+    if (!shouldCache) {
+      return;
     }
+
+    event.stopImmediatePropagation();
+    showGlobalErrorPage();
+  }
+
+  function registerGlobalErrorHandler() {
     if (typeof document !== 'undefined') {
       globalThis.addEventListener('unhandledrejection', handler);
       globalThis.addEventListener('error', handler);