@blocklet/pages-kit 0.4.127 → 0.4.129

package/lib/cjs/types/builtin.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChunksMountPointGlobalVariableName = exports.BuiltinModulesGlobalVariableName = void 0;
+exports.RelativeModulesGlobalVariableName = exports.ChunksMountPointGlobalVariableName = exports.BuiltinModulesGlobalVariableName = void 0;
 exports.BuiltinModulesGlobalVariableName = '__PAGES_KIT_BUILTIN_MODULES__';
 exports.ChunksMountPointGlobalVariableName = '__PAGES_KIT_CHUNKS_MOUNT_POINT__';
+exports.RelativeModulesGlobalVariableName = '__PAGES_KIT_RELATIVE_MODULES__';

package/lib/cjs/utils/inject-global-components.js

@@ -75,6 +75,7 @@ function injectGlobalComponents() {
         };
     }
     win.React = react_1.default;
+    win[builtin_1.RelativeModulesGlobalVariableName] = {};
     // create module map
     const modules = {
         React: react,
@@ -139,12 +140,15 @@ function injectGlobalComponents() {
                     window?.blocklet?.prefix ||
                     '/';
                 const fullUrl = (0, ufo_1.joinURL)(window.location.origin, relativeChunksMountPoint, 'chunks', fileName);
-                if (enableShim) {
-                    const mod = window.importShim(/* @vite-ignore */ fullUrl);
-                    return mod;
+                if (!win[builtin_1.RelativeModulesGlobalVariableName][fullUrl]) {
+                    if (enableShim) {
+                        win[builtin_1.RelativeModulesGlobalVariableName][fullUrl] = window.importShim(/* @vite-ignore */ fullUrl);
+                    }
+                    else {
+                        win[builtin_1.RelativeModulesGlobalVariableName][fullUrl] = Promise.resolve(`${fullUrl}`).then(s => __importStar(require(s)));
+                    }
                 }
-                const mod = Promise.resolve(`${fullUrl}`).then(s => __importStar(require(s)));
-                return mod;
+                return win[builtin_1.RelativeModulesGlobalVariableName][fullUrl];
             }
             return null;
         },

package/lib/esm/components/CustomComponentRenderer/ErrorComponent.js

@@ -1,8 +1,30 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Box, Typography, Button } from '@mui/material';
-export const ComponentError = ({ title = 'Component Failed to Load', message, componentId, componentName, blockletId, blockletTitle, showHints = false, error, resetErrorBoundary, }) => {
-    // 如果提供了error但没有message，使用error.message
+import { useEffect, useState } from 'react';
+export const ComponentError = ({ title = 'Component Failed to Load', message, componentId, componentName, blockletId, blockletTitle, showHints = false, error, resetErrorBoundary, delay = 0, shouldShow, }) => {
+    const [showError, setShowError] = useState(delay === 0);
+    // 处理延迟显示逻辑
+    useEffect(() => {
+        // 如果没有延迟，直接显示
+        if (delay === 0)
+            return undefined;
+        const timer = setTimeout(() => {
+            // 如果有额外显示条件，只有条件满足时才显示
+            if (typeof shouldShow === 'function') {
+                if (shouldShow()) {
+                    setShowError(true);
+                }
+            }
+            else {
+                setShowError(true);
+            }
+        }, delay);
+        return () => clearTimeout(timer);
+    }, [delay, shouldShow]);
     const displayMessage = message || (error ? error.message : 'Unknown error');
+    if (!showError) {
+        return null;
+    }
     return (_jsxs(Box, { sx: {
             p: 3,
             border: '1px dashed #d32f2f',

package/lib/esm/components/CustomComponentRenderer/index.js

@@ -45,9 +45,6 @@ function ComponentRenderer({ renderCount = 0, blockletId, blockletTitle, compone
         });
         return result;
     }, [props?.props, component?.properties, component?.props]);
-    if (component?.error) {
-        throw component.error;
-    }
     const renderComponentChildren = (Component) => {
         const children = _jsx(Renderer, { renderCount: renderCount + 1, ...props, Component: Component, props: parsedProps });
         return ctx?.customRendererComponent ? (_jsx(ctx.customRendererComponent, { Component: Component, children: children })) : (children);
@@ -62,6 +59,12 @@ function ComponentRenderer({ renderCount = 0, blockletId, blockletTitle, compone
     if (dev?.mode === 'draft' && dev && dev.components?.[props.componentId] === undefined) {
         return (_jsx(ComponentError, { componentId: props.componentId, componentName: componentName, blockletId: blockletId, blockletTitle: blockletTitle, message: "Component not found in available components", showHints: true }));
     }
+    // 如果什么都没有，但是有 transpile 的错误，则抛出错误(延迟 10 秒后显示)， safari 下兼容性问题
+    // https://github.com/sveltejs/kit/issues/7805
+    // https://bugs.webkit.org/show_bug.cgi?id=242740
+    if (component?.error) {
+        return _jsx(ComponentError, { error: component.error, delay: 10 * 1000 });
+    }
     return null;
 }
 function Renderer({ renderCount, Component, locale, props, }) {

package/lib/esm/components/CustomComponentRenderer/state.js

@@ -150,6 +150,7 @@ export const customComponentStates = () => {
             components: Object.fromEntries(Object.entries({ ...PRELOAD_COMPONENTS_STATE?.components })
                 .map(([componentId, preload]) => {
                 let Component;
+                // umd 格式的逻辑，会走到这里
                 if (preload.componentModuleGlobalVariable) {
                     const m = window[preload.componentModuleGlobalVariable];
                     // handle the global variable