@shuvi/error-overlay 1.0.26 → 1.0.28

package/lib/client.js

@@ -92,6 +92,10 @@ function stopReportingRuntimeErrors() {
     window.removeEventListener('unhandledrejection', onUnhandledRejection);
 }
 exports.stopReportingRuntimeErrors = stopReportingRuntimeErrors;
+function dismissRuntimeErrors() {
+    hasRuntimeError = false;
+    update();
+}
 function onBuildOk() {
     hasBuildError = false;
     errorTypeList.push({ type: constants_1.TYPE_BUILD_OK });
@@ -148,7 +152,6 @@ function update() {
     const appDocument = window.document;
     appDocument.body.appendChild(loadingIframe);
 }
-let prevRendered = false;
 function updateIframeContent() {
     if (!iframe) {
         throw new Error('Iframe has not been created yet.');
@@ -157,17 +160,16 @@ function updateIframeContent() {
     const isRendered = iframe.contentWindow.updateContent({
         errorTypeList,
         hasBuildError,
-        hasRuntimeError
+        hasRuntimeError,
+        dismissRuntimeErrors
     });
     //After the errors have been added to the queue of the error handler, we must clear the errorTypeList
     errorTypeList = [];
-    // Continuous errors and no errors will not operate dom
-    if (prevRendered && !isRendered) {
+    if (!isRendered) {
         window.document.body.removeChild(iframe);
         iframe = null;
         isIframeReady = false;
     }
-    prevRendered = isRendered;
 }
 window.__SHUVI_ERROR_OVERLAY_GLOBAL_HOOK__ =
     window.__SHUVI_ERROR_OVERLAY_GLOBAL_HOOK__ || {};

package/lib/iframe-bundle.js

@@ -3248,7 +3248,7 @@
 		    }
 		    return '';
 		}
-		const RuntimeError$1 = function RuntimeError({ errors }) {
+		const RuntimeError$1 = function RuntimeError({ errors, close }) {
 		    const [lookups, setLookups] = React.useState({});
 		    const [readyErrors, nextError] = React.useMemo(() => {
 		        let ready = [];
@@ -3307,6 +3307,7 @@
 		    const minimize = React.useCallback((e) => {
 		        e === null || e === void 0 ? void 0 : e.preventDefault();
 		        setDisplayState('minimized');
+		        close();
 		    }, []);
 		    const hide = React.useCallback((e) => {
 		        e === null || e === void 0 ? void 0 : e.preventDefault();
@@ -3953,7 +3954,7 @@
 		        }
 		    }
 		}
-		const ErrorOverlay$1 = function ErrorOverlay() {
+		const ErrorOverlay$1 = function ErrorOverlay({ dismissRuntimeErrors }) {
 		    const [state, dispatch] = React.useReducer(reducer, {
 		        nextId: 1,
 		        buildError: null,
@@ -3968,7 +3969,7 @@
 		    const hasBuildError = state.buildError != null;
 		    const hasRuntimeErrors = Boolean(state.errors.length);
 		    const isMounted = hasBuildError || hasRuntimeErrors;
-		    return ((0, jsx_runtime_1.jsx)(React.Fragment, { children: isMounted ? ((0, jsx_runtime_1.jsxs)(ShadowPortal_1.ShadowPortal, { children: [(0, jsx_runtime_1.jsx)(CssReset_1.CssReset, {}), (0, jsx_runtime_1.jsx)(Base_1.Base, {}), (0, jsx_runtime_1.jsx)(ComponentStyles_1.ComponentStyles, {}), hasBuildError ? ((0, jsx_runtime_1.jsx)(BuildError_1.BuildError, { error: state.buildError })) : hasRuntimeErrors ? ((0, jsx_runtime_1.jsx)(RuntimeError_1.RuntimeError, { errors: state.errors })) : undefined] })) : undefined }));
+		    return ((0, jsx_runtime_1.jsx)(React.Fragment, { children: isMounted ? ((0, jsx_runtime_1.jsxs)(ShadowPortal_1.ShadowPortal, { children: [(0, jsx_runtime_1.jsx)(CssReset_1.CssReset, {}), (0, jsx_runtime_1.jsx)(Base_1.Base, {}), (0, jsx_runtime_1.jsx)(ComponentStyles_1.ComponentStyles, {}), hasBuildError ? ((0, jsx_runtime_1.jsx)(BuildError_1.BuildError, { error: state.buildError })) : hasRuntimeErrors ? ((0, jsx_runtime_1.jsx)(RuntimeError_1.RuntimeError, { errors: state.errors, close: dismissRuntimeErrors })) : undefined] })) : undefined }));
 		};
 		ErrorOverlay.ErrorOverlay = ErrorOverlay$1;
 		
@@ -3991,20 +3992,21 @@
 	let iframeRoot = null;
 	let errorBody = null;
 	let isFirstRender = true;
-	function render({ errorTypeList, hasBuildError, hasRuntimeError }) {
+	function render({ errorTypeList, hasBuildError, hasRuntimeError, dismissRuntimeErrors }) {
 	    errorTypeList.forEach((errorType) => {
 	        errorTypeHandler.emit(errorType);
 	    });
 	    if (!hasBuildError && !hasRuntimeError) {
 	        return null;
 	    }
-	    return (0, jsx_runtime_1.jsx)(ErrorOverlay_1.ErrorOverlay, {});
+	    return (0, jsx_runtime_1.jsx)(ErrorOverlay_1.ErrorOverlay, { dismissRuntimeErrors: dismissRuntimeErrors });
 	}
-	window.updateContent = function updateContent({ errorTypeList, hasBuildError, hasRuntimeError }) {
+	window.updateContent = function updateContent({ errorTypeList, hasBuildError, hasRuntimeError, dismissRuntimeErrors }) {
 	    let renderedElement = render({
 	        errorTypeList,
 	        hasBuildError,
-	        hasRuntimeError
+	        hasRuntimeError,
+	        dismissRuntimeErrors
 	    });
 	    if (renderedElement === null) {
 	        errorBody && errorBody.unmount();

package/lib/iframeScript.js

@@ -40,20 +40,21 @@ const errorTypeHandler = __importStar(require("./view/errorTypeHandler"));
 let iframeRoot = null;
 let errorBody = null;
 let isFirstRender = true;
-function render({ errorTypeList, hasBuildError, hasRuntimeError }) {
+function render({ errorTypeList, hasBuildError, hasRuntimeError, dismissRuntimeErrors }) {
     errorTypeList.forEach((errorType) => {
         errorTypeHandler.emit(errorType);
     });
     if (!hasBuildError && !hasRuntimeError) {
         return null;
     }
-    return (0, jsx_runtime_1.jsx)(ErrorOverlay_1.ErrorOverlay, {});
+    return (0, jsx_runtime_1.jsx)(ErrorOverlay_1.ErrorOverlay, { dismissRuntimeErrors: dismissRuntimeErrors });
 }
-window.updateContent = function updateContent({ errorTypeList, hasBuildError, hasRuntimeError }) {
+window.updateContent = function updateContent({ errorTypeList, hasBuildError, hasRuntimeError, dismissRuntimeErrors }) {
     let renderedElement = render({
         errorTypeList,
         hasBuildError,
-        hasRuntimeError
+        hasRuntimeError,
+        dismissRuntimeErrors
     });
     if (renderedElement === null) {
         errorBody && errorBody.unmount();

package/lib/view/ErrorOverlay.d.ts

@@ -1,2 +1,5 @@
-/// <reference types="react" />
-export declare const ErrorOverlay: () => JSX.Element;
+import * as React from 'react';
+export declare type ErrorOverlayProps = {
+    dismissRuntimeErrors: () => void;
+};
+export declare const ErrorOverlay: React.FC<ErrorOverlayProps>;

package/lib/view/ErrorOverlay.js

@@ -60,7 +60,7 @@ function reducer(state, ev) {
         }
     }
 }
-const ErrorOverlay = function ErrorOverlay() {
+const ErrorOverlay = function ErrorOverlay({ dismissRuntimeErrors }) {
     const [state, dispatch] = React.useReducer(reducer, {
         nextId: 1,
         buildError: null,
@@ -75,6 +75,6 @@ const ErrorOverlay = function ErrorOverlay() {
     const hasBuildError = state.buildError != null;
     const hasRuntimeErrors = Boolean(state.errors.length);
     const isMounted = hasBuildError || hasRuntimeErrors;
-    return ((0, jsx_runtime_1.jsx)(React.Fragment, { children: isMounted ? ((0, jsx_runtime_1.jsxs)(ShadowPortal_1.ShadowPortal, { children: [(0, jsx_runtime_1.jsx)(CssReset_1.CssReset, {}), (0, jsx_runtime_1.jsx)(Base_1.Base, {}), (0, jsx_runtime_1.jsx)(ComponentStyles_1.ComponentStyles, {}), hasBuildError ? ((0, jsx_runtime_1.jsx)(BuildError_1.BuildError, { error: state.buildError })) : hasRuntimeErrors ? ((0, jsx_runtime_1.jsx)(RuntimeError_1.RuntimeError, { errors: state.errors })) : undefined] })) : undefined }));
+    return ((0, jsx_runtime_1.jsx)(React.Fragment, { children: isMounted ? ((0, jsx_runtime_1.jsxs)(ShadowPortal_1.ShadowPortal, { children: [(0, jsx_runtime_1.jsx)(CssReset_1.CssReset, {}), (0, jsx_runtime_1.jsx)(Base_1.Base, {}), (0, jsx_runtime_1.jsx)(ComponentStyles_1.ComponentStyles, {}), hasBuildError ? ((0, jsx_runtime_1.jsx)(BuildError_1.BuildError, { error: state.buildError })) : hasRuntimeErrors ? ((0, jsx_runtime_1.jsx)(RuntimeError_1.RuntimeError, { errors: state.errors, close: dismissRuntimeErrors })) : undefined] })) : undefined }));
 };
 exports.ErrorOverlay = ErrorOverlay;

package/lib/view/container/RuntimeError.d.ts

@@ -6,6 +6,7 @@ export declare type SupportedErrorEvent = {
 };
 export declare type RuntimeErrorProps = {
     errors: SupportedErrorEvent[];
+    close: () => void;
 };
 export declare const RuntimeError: React.FC<RuntimeErrorProps>;
 export declare const styles: string;

package/lib/view/container/RuntimeError.js

@@ -48,7 +48,7 @@ function getErrorSignature(ev) {
     }
     return '';
 }
-const RuntimeError = function RuntimeError({ errors }) {
+const RuntimeError = function RuntimeError({ errors, close }) {
     const [lookups, setLookups] = React.useState({});
     const [readyErrors, nextError] = React.useMemo(() => {
         let ready = [];
@@ -107,6 +107,7 @@ const RuntimeError = function RuntimeError({ errors }) {
     const minimize = React.useCallback((e) => {
         e === null || e === void 0 ? void 0 : e.preventDefault();
         setDisplayState('minimized');
+        close();
     }, []);
     const hide = React.useCallback((e) => {
         e === null || e === void 0 ? void 0 : e.preventDefault();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/error-overlay",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "main": "umd/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -23,8 +23,8 @@
   },
   "dependencies": {
     "@babel/code-frame": "7.14.5",
-    "@shuvi/shared": "1.0.26",
-    "@shuvi/toolpack": "1.0.26",
+    "@shuvi/shared": "1.0.28",
+    "@shuvi/toolpack": "1.0.28",
     "anser": "1.4.9",
     "data-uri-to-buffer": "3.0.1",
     "html-entities": "2.3.2",