@lark-apaas/client-toolkit 1.1.19-alpha.error.1 → 1.1.19

package/lib/components/ErrorRender/index.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
 declare const RenderError: React.FC<{
     error: Error;
-    resetErrorBoundary?: () => void;
 }>;
 export default RenderError;

package/lib/components/ErrorRender/index.js

@@ -1,11 +1,10 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useEffect } from "react";
 import { logger } from "../../logger/index.js";
-import { createApplyHandle, getModuleHot } from "../../utils/module-hot.js";
 const RenderError = (props)=>{
-    const { error, resetErrorBoundary } = props;
+    const { error } = props;
     useEffect(()=>{
-        if (error) logger.log({
+        if (props.error) logger.log({
             level: 'error',
             args: [
                 'Render Error',
@@ -16,16 +15,7 @@ const RenderError = (props)=>{
             }
         });
     }, [
-        error
-    ]);
-    useEffect(()=>{
-        if (!resetErrorBoundary) return;
-        const hot = getModuleHot();
-        if (hot) hot.addStatusHandler(createApplyHandle((success)=>{
-            if (success) resetErrorBoundary();
-        }));
-    }, [
-        resetErrorBoundary
+        props.error
     ]);
     return /*#__PURE__*/ jsx("div", {
         className: "min-h-screen flex items-center justify-center bg-white",

package/lib/logger/intercept-global-error.js

@@ -1,4 +1,3 @@
-import { createApplyHandle, getModuleHot } from "../utils/module-hot.js";
 import { submitPostMessage, submitSlardarEvent } from "../utils/postMessage.js";
 import { levelSchema } from "./log-types.js";
 import { logger } from "./logger.js";
@@ -62,17 +61,10 @@ function processDevServerLog(log) {
         });
     }
 }
-function listenModuleHmr() {
-    const hot = getModuleHot();
-    if (hot) hot.addStatusHandler(createApplyHandle((success)=>{
-        if (success) submitPostMessage({
-            type: 'DevServerMessage',
-            data: {
-                type: 'devServer-status',
-                status: 'hmr-apply-success'
-            }
-        });
-        else {
+function listenHmrApplyFailed() {
+    const hot = import.meta.webpackHot || module.hot;
+    if (hot) hot.addStatusHandler((status)=>{
+        if ('fail' === status || 'abort' === status) {
             console.warn('hmr apply failed', status);
             submitSlardarEvent({
                 name: 'sandbox-devServer',
@@ -82,7 +74,7 @@ function listenModuleHmr() {
                 }
             });
         }
-    }));
+    });
 }
 function interceptErrors() {
     window.addEventListener('error', (event)=>{
@@ -91,7 +83,7 @@ function interceptErrors() {
     window.addEventListener('unhandledrejection', (event)=>{
         logger.error(event.reason);
     });
-    listenModuleHmr();
+    listenHmrApplyFailed();
     const PROXY_CONSOLE_METHOD = [
         'log',
         'info',

package/lib/types/iframe-events.d.ts

@@ -41,7 +41,7 @@ export interface HmrMessage extends IframeMessage<Record<string, never>> {
 /** devServer相关消息 */
 export interface DevServerMessage extends IframeMessage<{
     type: 'devServer-status';
-    status: 'connected' | 'disconnected' | 'hmr-apply-success';
+    status: 'connected' | 'disconnected';
 }> {
     type: 'DevServerMessage';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.1.19-alpha.error.1",
+  "version": "1.1.19",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -76,7 +76,7 @@
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
     "@data-loom/js": "^0.4.0",
-    "@lark-apaas/miaoda-inspector": "^1.0.2",
+    "@lark-apaas/miaoda-inspector": "^1.0.4",
     "@radix-ui/react-avatar": "^1.1.10",
     "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-slot": "^1.2.3",

package/lib/utils/module-hot.d.ts

@@ -1,24 +0,0 @@
-/**
- * Module Hot Replacement 状态类型定义
- *
- * - idle: The process is waiting for a call to check
- * - check: The process is checking for updates
- * - prepare: The process is getting ready for the update (e.g. downloading the updated module)
- * - ready: The update is prepared and available
- * - dispose: The process is calling the dispose handlers on the modules that will be replaced
- * - apply: The process is calling the accept handlers and re-executing self-accepted modules
- * - abort: An update was aborted, but the system is still in its previous state
- * - fail: An update has thrown an exception and the system's state has been compromised
- */
-type ModuleHotType = 'idle' | 'check' | 'prepare' | 'ready' | 'dispose' | 'apply' | 'abort' | 'fail';
-interface ModuleHotInstance {
-    addStatusHandler: (handler: (status: ModuleHotType) => void) => void;
-}
-export declare function getModuleHot(): ModuleHotInstance | null;
-/**
- * 创建模块热更成功处理函数
- * 监听模块热更状态，当状态为apply时，调用回调函数并传入true
- * @param callback 热更成功回调函数，参数为是否成功
- */
-export declare function createApplyHandle(callback: (success: boolean) => void): (status: ModuleHotType) => void;
-export {};

package/lib/utils/module-hot.js

@@ -1,22 +0,0 @@
-function getModuleHot() {
-    if ('production' === process.env.NODE_ENV) return null;
-    return import.meta.webpackHot || module.hot;
-}
-function createApplyHandle(callback) {
-    let hasApply = false;
-    return (status)=>{
-        if ('fail' === status || 'abort' === status) {
-            hasApply = false;
-            return callback(false);
-        }
-        if (hasApply) {
-            if ('idle' === status) {
-                hasApply = false;
-                callback(true);
-            }
-            return;
-        }
-        hasApply = 'apply' === status;
-    };
-}
-export { createApplyHandle, getModuleHot };