@blocklet/pages-kit 0.4.84 → 0.4.86

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

@@ -106,13 +106,16 @@ function injectGlobalComponents() {
         modules,
         require(module) {
             // handle builtin module
-            const builtinModule = this.modules[module];
+            const builtinModule = win[builtin_1.BuiltinModulesGlobalVariableName].modules[module];
+            const mergeModuleExports = (mod) => ({
+                ...(mod.default ? { ...mod.default } : {}),
+                ...mod,
+            });
+            if (builtinModule instanceof Promise) {
+                return builtinModule.then(mergeModuleExports);
+            }
             if (builtinModule) {
-                return {
-                    // 针对某些包，比如 react-dom，需要同时导出 default 和非 default 的值
-                    ...(builtinModule.default ? { ...builtinModule.default } : {}),
-                    ...builtinModule,
-                };
+                return mergeModuleExports(builtinModule);
             }
             // handle relative path import
             if ((0, builtin_module_transformer_1.isRelativeModule)(module)) {

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBuiltinModuleTransformer = exports.isAwaitModule = exports.isRelativeModule = void 0;
+exports.createBuiltinModuleTransformer = exports.isAsyncModule = exports.isRelativeModule = void 0;
 const builtin_1 = require("../../types/builtin");
 const isRelativeModule = (moduleSpecifier) => {
     if (!moduleSpecifier) {
@@ -9,13 +9,13 @@ const isRelativeModule = (moduleSpecifier) => {
     return moduleSpecifier.startsWith('./') || moduleSpecifier.startsWith('../');
 };
 exports.isRelativeModule = isRelativeModule;
-const isAwaitModule = (moduleSpecifier) => {
+const isAsyncModule = (moduleSpecifier) => {
     if (!moduleSpecifier) {
         return false;
     }
     return ['@blocklet/pages-kit/builtin/async/ai-runtime'].includes(moduleSpecifier);
 };
-exports.isAwaitModule = isAwaitModule;
+exports.isAsyncModule = isAsyncModule;
 const createBuiltinModuleTransformer = (ts) => (context) => (file) => {
     const { factory } = context;
     // 统一的模块导入收集器
@@ -61,7 +61,7 @@ const createBuiltinModuleTransformer = (ts) => (context) => (file) => {
         // call inject-global-components require method
         const requireCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier(builtin_1.BuiltinModulesGlobalVariableName), 'require'), undefined, [factory.createStringLiteral(importInfo.moduleName)]);
         // create await expression if the module is ../ or ./
-        const mod = (0, exports.isRelativeModule)(importInfo.moduleName) || (0, exports.isAwaitModule)(importInfo.moduleName)
+        const mod = (0, exports.isRelativeModule)(importInfo.moduleName) || (0, exports.isAsyncModule)(importInfo.moduleName)
             ? factory.createAwaitExpression(requireCall)
             : requireCall;
         return [

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { cx } from '@emotion/css';
 import { Skeleton, Fade, Box } from '@mui/material';
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 import set from 'lodash/set';
 import { useDeferredValue, useEffect, useRef, useState, useMemo } from 'react';
 import { Helmet } from 'react-helmet';