@blocklet/pages-kit 0.6.1 → 0.6.2

package/lib/cjs/utils/builtin.js

@@ -29,6 +29,8 @@ const dayjs = __importStar(require("../builtin/dayjs"));
 const stream = __importStar(require("../builtin/stream"));
 const utils = __importStar(require("../builtin/utils"));
 exports.BuiltinModules = {
+    React: {},
+    ReactDOM: {},
     '@blocklet/pages-kit/builtin/pages-kit': {},
     '@blocklet/pages-kit/builtin/react': {},
     '@blocklet/pages-kit/builtin/react-dom': {},

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

@@ -79,6 +79,7 @@ function injectGlobalComponents() {
     // create module map
     const modules = {
         React: react,
+        ReactDOM: reactDOM,
         '@blocklet/pages-kit/builtin/pages-kit': { CustomComponentRenderer: CustomComponentRenderer_1.default },
         '@blocklet/pages-kit/builtin/dayjs': dayjs,
         '@blocklet/pages-kit/builtin/utils': utils,

package/lib/cjs/utils/preload.js

@@ -21,31 +21,33 @@ function safeJSONStringify(obj) {
                 return char;
         }
     });
+    // return JSON.stringify(obj);
 }
 function injectPreloadComponents(data) {
     if (!data)
         return null;
+    const injectScripts = [];
     const injectState = {
         config: data.config,
         components: Object.fromEntries(Object.entries(data.components).map(([componentId, { script, component }]) => {
             if (script.module !== types_1.PreloadComponentScriptModule.UMD_FN)
                 throw new Error(`Only support inject script with module ${types_1.PreloadComponentScriptModule.UMD_FN}`);
+            injectScripts.push(`<script>
+${script.script}
+</script>`);
+            // 在这里把 script 过滤掉了，不再有 umd 代码
             return [componentId, { componentModuleGlobalVariable: script.moduleName, component }];
         })),
         instances: Object.fromEntries(data.instances.map(({ id, ...instance }) => [id, instance])),
     };
     return {
         html: `\
-${Object.values(data.components)
-            .map(({ script: { script } }) => `\
+${injectScripts.join('\n')}
+
 <script>
-${script}
-</script>
-`)
-            .join('\n')}
-  
-<script>
-var ${types_1.PreloadComponentsStateGlobalVariableName} = ${safeJSONStringify(injectState)}
+
+window.${types_1.PreloadComponentsStateGlobalVariableName} = ${safeJSONStringify(injectState)}
+
 </script>
 `,
     };

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

@@ -358,7 +358,8 @@ function useTranspileComponent({ componentId, locale, properties, dev: { default
                 .then((m) => {
                 setComponent((prev) => ({ ...prev, EditComponent: m.default || m.EditComponent || undefined }));
             })
-                .catch(() => {
+                .catch((e) => {
+                console.warn('transpile edit component error', e);
                 // ignore error when transpile edit component
             });
         }