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

package/lib/cjs/utils/helper.js

@@ -39,7 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGetServerSidePropsBlockName = exports.GET_SERVER_SIDE_PROPS_NAME = exports.getAigneOutputValueSchemaBlockName = exports.AIGNE_OUTPUT_VALUE_SCHEMA_NAME = exports.getPropertiesSchemaBlockName = exports.PROPERTIES_SCHEMA_NAME = exports.getEditComponentBlockName = exports.EDIT_COMPONENT_NAME = exports.safeParse = exports.getBlockCode = exports.getPreviewImageRelativePath = exports.downloadAsset = exports.isMetadataFile = exports.isDev = exports.isPathSafe = exports.logger = void 0;
+exports.getGetServerSidePropsBlockName = exports.GET_SERVER_SIDE_PROPS_NAME = exports.getAigneOutputValueSchemaBlockName = exports.AIGNE_OUTPUT_VALUE_SCHEMA_NAME = exports.getPropertiesSchemaBlockName = exports.PROPERTIES_SCHEMA_NAME = exports.getEditComponentBlockName = exports.EDIT_COMPONENT_NAME = exports.getComponentScriptName = exports.safeParse = exports.getBlockCode = exports.getPreviewImageRelativePath = exports.downloadAsset = exports.isMetadataFile = exports.isDev = exports.isPathSafe = exports.logger = void 0;
 exports.setBlockEntryFilesPattern = setBlockEntryFilesPattern;
 exports.getBlockEntryFilesPattern = getBlockEntryFilesPattern;
 exports.getWatchFilesDir = getWatchFilesDir;
@@ -239,6 +239,10 @@ const safeParse = (text) => {
     }
 };
 exports.safeParse = safeParse;
+const getComponentScriptName = (blockName, format) => {
+    return `${blockName}(${format})`;
+};
+exports.getComponentScriptName = getComponentScriptName;
 exports.EDIT_COMPONENT_NAME = 'EditComponent';
 const getEditComponentBlockName = (blockName) => {
     return `${blockName}(${exports.EDIT_COMPONENT_NAME})`;

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

@@ -6,7 +6,8 @@ import fs from 'fs';
 import get from 'lodash/get';
 import set from 'lodash/set';
 import path, { join, basename } from 'path';
-import { findComponentFiles, libDir, getPreviewImageRelativePath, generateYaml, logger, getEditComponentBlockName, getAigneOutputValueSchemaBlockName, getPropertiesSchemaBlockName, getGetServerSidePropsBlockName, } from '../utils/helper';
+import ts from 'typescript';
+import { findComponentFiles, libDir, getPreviewImageRelativePath, generateYaml, logger, getComponentScriptName, getEditComponentBlockName, getAigneOutputValueSchemaBlockName, getPropertiesSchemaBlockName, getGetServerSidePropsBlockName, } from '../utils/helper';
 const DID = 'z2qa7BQdkEb3TwYyEYC1psK6uvmGnHSUHt5RM';
 const RESOURCE_TYPE = 'page';
 const allTag = '@ALL_COMPONENTS';
@@ -147,12 +148,29 @@ initResourceRouter.post('/', async (req, res) => {
             // set version to 2
             set(metadata, 'version', 2);
             // get code to metadata
-            const code = fs.readFileSync(join(codeDir, jsName), 'utf8');
+            const code = fs.readFileSync(join(codeDir, `${getComponentScriptName(blockName, 'esm')}.js`), 'utf8');
             if (code) {
                 set(metadata, 'renderer.script', code);
                 set(metadata, 'renderer.type', 'react-component');
                 set(metadata, 'renderer.chunks', chunksMap[jsName] || []);
             }
+            // get cjs by code with transpileModule
+            try {
+                const cjsCode = ts.transpileModule(code, {
+                    compilerOptions: {
+                        jsx: ts.JsxEmit.React,
+                        target: ts.ScriptTarget.ES2016,
+                        module: ts.ModuleKind.CommonJS,
+                        moduleResolution: ts.ModuleResolutionKind.Node16,
+                    },
+                }).outputText;
+                if (cjsCode) {
+                    set(metadata, 'renderer.cjsScript', cjsCode);
+                }
+            }
+            catch (error) {
+                // ignore error
+            }
             // get edit component code
             try {
                 const editComponentJsName = `${getEditComponentBlockName(blockName)}.js`;

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

@@ -50,7 +50,7 @@ import pLimit from 'p-limit';
 import path, { basename } from 'path';
 import ts from 'typescript';
 import { EDIT_COMPONENT_FILE_NAME_REGEX } from '../constants';
-import { EDIT_COMPONENT_NAME, getEditComponentBlockName, logger, PROPERTIES_SCHEMA_NAME, AIGNE_OUTPUT_VALUE_SCHEMA_NAME, GET_SERVER_SIDE_PROPS_NAME, getPropertiesSchemaBlockName, getAigneOutputValueSchemaBlockName, getGetServerSidePropsBlockName, } from '../utils/helper';
+import { EDIT_COMPONENT_NAME, logger, PROPERTIES_SCHEMA_NAME, AIGNE_OUTPUT_VALUE_SCHEMA_NAME, GET_SERVER_SIDE_PROPS_NAME, getEditComponentBlockName, getComponentScriptName, getPropertiesSchemaBlockName, getAigneOutputValueSchemaBlockName, getGetServerSidePropsBlockName, } from '../utils/helper';
 const minify = true;
 /**
  * 导出配置
@@ -58,20 +58,12 @@ const minify = true;
 const EXPORT_CONFIGS = [
     {
         exportName: 'default',
-        getBlockName: (key) => `${key}`,
+        getBlockName: (key) => 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: EDIT_COMPONENT_NAME,
         getBlockName: getEditComponentBlockName,
@@ -475,7 +467,7 @@ export 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