@blocklet/pages-kit-block-studio 0.6.7 → 0.6.8

package/lib/cjs/middlewares/init-resource-router.js

@@ -48,6 +48,7 @@ const fs_1 = __importDefault(require("fs"));
 const get_1 = __importDefault(require("lodash/get"));
 const set_1 = __importDefault(require("lodash/set"));
 const path_1 = __importStar(require("path"));
+const typescript_1 = __importDefault(require("typescript"));
 const helper_1 = require("../utils/helper");
 const DID = 'z2qa7BQdkEb3TwYyEYC1psK6uvmGnHSUHt5RM';
 const RESOURCE_TYPE = 'page';
@@ -189,12 +190,29 @@ exports.initResourceRouter.post('/', async (req, res) => {
             // set version to 2
             (0, set_1.default)(metadata, 'version', 2);
             // get code to metadata
-            const code = fs_1.default.readFileSync((0, path_1.join)(codeDir, jsName), 'utf8');
+            const code = fs_1.default.readFileSync((0, path_1.join)(codeDir, `${(0, helper_1.getComponentScriptName)(blockName, 'esm')}.js`), 'utf8');
             if (code) {
                 (0, set_1.default)(metadata, 'renderer.script', code);
                 (0, set_1.default)(metadata, 'renderer.type', 'react-component');
                 (0, set_1.default)(metadata, 'renderer.chunks', chunksMap[jsName] || []);
             }
+            // get cjs by code with transpileModule
+            try {
+                const cjsCode = typescript_1.default.transpileModule(code, {
+                    compilerOptions: {
+                        jsx: typescript_1.default.JsxEmit.React,
+                        target: typescript_1.default.ScriptTarget.ES2016,
+                        module: typescript_1.default.ModuleKind.CommonJS,
+                        moduleResolution: typescript_1.default.ModuleResolutionKind.Node16,
+                    },
+                }).outputText;
+                if (cjsCode) {
+                    (0, set_1.default)(metadata, 'renderer.cjsScript', cjsCode);
+                }
+            }
+            catch (error) {
+                // ignore error
+            }
             // get edit component code
             try {
                 const editComponentJsName = `${(0, helper_1.getEditComponentBlockName)(blockName)}.js`;

package/lib/cjs/plugins/vite-plugin-code-splitter.js

@@ -97,20 +97,12 @@ const minify = true;
 const EXPORT_CONFIGS = [
     {
         exportName: 'default',
-        getBlockName: (key) => `${key}`,
+        getBlockName: (key) => (0, helper_1.getComponentScriptName)(key, 'esm'),
         description: 'Default',
         supportSeparateFile: false,
         target: 'browser',
         external: [],
     },
-    // {
-    //   exportName: 'default',
-    //   getBlockName: (key) => `${key}(default)`,
-    //   description: 'Default CJS',
-    //   supportSeparateFile: false,
-    //   target: 'node',
-    //   external: [],
-    // },
     {
         exportName: helper_1.EDIT_COMPONENT_NAME,
         getBlockName: helper_1.getEditComponentBlockName,
@@ -514,7 +506,7 @@ function vitePluginCodeSplitter(options) {
                         return null; // Regular component file, defaults to browser
                     }
                     const exportName = match[1];
-                    return EXPORT_CONFIGS.find((config) => config.exportName === exportName || config.exportName.toLowerCase().includes(exportName.toLowerCase()));
+                    return EXPORT_CONFIGS.find((config) => config.getBlockName('').includes(exportName));
                 };
                 /**
                  * 🎯 FILE TYPE CLASSIFIER