@blocklet/pages-kit 0.4.16-beta.20250305 → 0.4.16-beta.20250306-1

package/lib/esm/utils/inject-es-module-shims-options.js

@@ -1,10 +1,7 @@
-"use strict";
-function initShimsOptions() {
+export function injectESModulesShimsOptions() {
     window.esmsInitOptions = {
-        // Enable Shim Mode
         shimMode: true,
-        // Enable polyfill features.
         polyfillEnable: ['css-modules', 'json-modules', 'wasm-modules', 'source-phase'],
     };
 }
-initShimsOptions();
+injectESModulesShimsOptions();

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

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import 'es-module-shims';
 import React from 'react';
 import { joinURL } from 'ufo';
@@ -36,9 +27,12 @@ import * as zustand from '../builtin/zustand';
 import * as zustandMiddlewareImmer from '../builtin/zustand/middleware/immer';
 import CustomComponentRenderer from '../components/CustomComponentRenderer';
 import { BuiltinModulesGlobalVariableName } from '../types/builtin';
+import { isRelativeModule } from './typescript/builtin-module-transformer';
 // Initialize ES Module Shims before any imports
 export function injectGlobalComponents() {
+    var _a;
     const win = window || {};
+    const enableShim = !!((_a = window === null || window === void 0 ? void 0 : window.esmsInitOptions) === null || _a === void 0 ? void 0 : _a.shimMode);
     win.React = React;
     // 创建模块映射
     const modules = {
@@ -68,26 +62,37 @@ export function injectGlobalComponents() {
         '@blocklet/pages-kit/builtin/async/react-syntax-highlighter': reactSyntaxHighlighter,
         '@blocklet/pages-kit/builtin/async/image-preview': imagePreview,
         '@blocklet/pages-kit/builtin/async/ai-runtime': aiRuntime,
+        // crypto: {
+        //   // 手动暴露 crypto 的属性和方法
+        //   subtle: win.crypto.subtle,
+        //   getRandomValues: win.crypto.getRandomValues,
+        //   randomUUID: win.crypto.randomUUID,
+        //   // 如果需要作为默认导出
+        //   default: win.crypto,
+        // },
     };
     // 设置全局变量
     win[BuiltinModulesGlobalVariableName] = {
         modules,
         require(module) {
-            return __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                // 处理内置模块
-                const builtinModule = this.modules[module];
-                if (builtinModule) {
-                    return builtinModule;
+            var _a;
+            // 处理内置模块
+            const builtinModule = this.modules[module];
+            if (builtinModule) {
+                return builtinModule;
+            }
+            // 处理相对路径导入
+            if (isRelativeModule(module)) {
+                const fileName = module.split('/').pop();
+                const fullUrl = joinURL(window.location.origin, ((_a = window === null || window === void 0 ? void 0 : window.blocklet) === null || _a === void 0 ? void 0 : _a.prefix) || '/', 'chunks', fileName);
+                if (enableShim) {
+                    const mod = window.importShim(fullUrl);
+                    return mod;
                 }
-                // 处理相对路径导入
-                if (module.startsWith('./') || module.startsWith('../')) {
-                    const fileName = module.split('/').pop();
-                    const fullUrl = joinURL(window.location.origin, ((_a = window === null || window === void 0 ? void 0 : window.blocklet) === null || _a === void 0 ? void 0 : _a.prefix) || '/', 'chunks', fileName);
-                    return yield importShim(fullUrl);
-                }
-                return null;
-            });
+                const mod = import(/* @vite-ignore */ fullUrl);
+                return mod;
+            }
+            return null;
         },
     };
     // 创建 importmap
@@ -111,8 +116,16 @@ export function injectGlobalComponents() {
         const importMap = {
             imports,
         };
-        importShim.addImportMap(importMap);
+        if (enableShim) {
+            window.importShim.addImportMap(importMap);
+        }
+        else {
+            // fallback to create script tag
+            const script = document.createElement('script');
+            script.type = 'importmap';
+            script.textContent = JSON.stringify(importMap);
+            document.head.appendChild(script);
+        }
     };
     setupImportMap();
 }
-injectGlobalComponents();

package/lib/esm/utils/typescript/builtin-module-transformer.js

@@ -1,13 +1,14 @@
 import { BuiltinModulesGlobalVariableName } from '../../types/builtin';
+export const isRelativeModule = (moduleSpecifier) => {
+    return moduleSpecifier.startsWith('./') || moduleSpecifier.startsWith('../');
+};
 export const createBuiltinModuleTransformer = (ts) => (context) => (file) => {
     const { factory } = context;
     // 统一的模块导入收集器
     const imports = [];
     // check if the module is a target module
     const isTargetModule = (moduleSpecifier) => {
-        return (moduleSpecifier.startsWith('@blocklet/pages-kit/builtin/') ||
-            moduleSpecifier.startsWith('./') ||
-            moduleSpecifier.startsWith('../'));
+        return moduleSpecifier.startsWith('@blocklet/pages-kit/builtin/') || isRelativeModule(moduleSpecifier);
     };
     // filter and collect the import statements that need to be processed
     const statements = file.statements.filter((s) => {
@@ -43,11 +44,9 @@ export const createBuiltinModuleTransformer = (ts) => (context) => (file) => {
     });
     statements.unshift(...imports.flatMap((importInfo) => {
         // call inject-global-components require method
-        const requireCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createPropertyAccessExpression(
-        // factory.createIdentifier('globalThis'),
-        factory.createIdentifier('window'), factory.createIdentifier(BuiltinModulesGlobalVariableName)), factory.createIdentifier('require')), undefined, [factory.createStringLiteral(importInfo.moduleName)]);
-        // create await expression to wait for the async result
-        const mod = factory.createAwaitExpression(requireCall);
+        const requireCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier(BuiltinModulesGlobalVariableName), 'require'), undefined, [factory.createStringLiteral(importInfo.moduleName)]);
+        // create await expression if the module is ../ or ./
+        const mod = isRelativeModule(importInfo.moduleName) ? factory.createAwaitExpression(requireCall) : requireCall;
         return [
             importInfo.name
                 ? factory.createVariableStatement([], factory.createVariableDeclarationList([

package/lib/types/components/CustomComponentRenderer/ErrorComponent.d.ts

@@ -0,0 +1,14 @@
+import React from 'react';
+interface ComponentErrorProps {
+    title?: string;
+    message: string;
+    componentId?: string;
+    componentName?: string;
+    blockletId?: string;
+    blockletTitle?: string;
+    showHints?: boolean;
+    error?: Error;
+    resetErrorBoundary?: () => void;
+}
+export declare const ComponentError: React.FC<ComponentErrorProps>;
+export {};

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

@@ -1,5 +1,4 @@
 import '../utils/inject-es-module-shims-options';
-import '../utils/inject-global-components';
 export { default as CustomComponentRenderer } from './CustomComponentRenderer';
 export * from './CustomComponentRenderer';
 export { default as ResponsiveImage } from './ResponsiveImage';