@blocklet/pages-kit-block-studio 0.6.1 → 0.6.2

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

@@ -186,6 +186,8 @@ exports.initResourceRouter.post('/', async (req, res) => {
             // get metadata
             const metadata = _metadata;
             const jsName = `${blockName}.js`;
+            // 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');
             if (code) {
@@ -207,6 +209,39 @@ exports.initResourceRouter.post('/', async (req, res) => {
             catch (error) {
                 // ignore error
             }
+            // get aigne output value schema
+            try {
+                const aigneOutputValueSchemaJsName = `${(0, helper_1.getAigneOutputValueSchemaBlockName)(blockName)}.js`;
+                const aigneOutputValueSchemaCode = fs_1.default.readFileSync((0, path_1.join)(codeDir, aigneOutputValueSchemaJsName), 'utf8');
+                if (aigneOutputValueSchemaCode) {
+                    (0, set_1.default)(metadata, 'renderer.aigneOutputValueSchema', aigneOutputValueSchemaCode);
+                }
+            }
+            catch (error) {
+                // ignore error
+            }
+            // get properties schema
+            try {
+                const propertiesSchemaJsName = `${(0, helper_1.getPropertiesSchemaBlockName)(blockName)}.js`;
+                const propertiesSchemaCode = fs_1.default.readFileSync((0, path_1.join)(codeDir, propertiesSchemaJsName), 'utf8');
+                if (propertiesSchemaCode) {
+                    (0, set_1.default)(metadata, 'renderer.PROPERTIES_SCHEMA', propertiesSchemaCode);
+                }
+            }
+            catch (error) {
+                // ignore error
+            }
+            // get getServerSideProps
+            try {
+                const getServerSidePropsJsName = `${(0, helper_1.getGetServerSidePropsBlockName)(blockName)}.js`;
+                const getServerSidePropsCode = fs_1.default.readFileSync((0, path_1.join)(codeDir, getServerSidePropsJsName), 'utf8');
+                if (getServerSidePropsCode) {
+                    (0, set_1.default)(metadata, 'renderer.getServerSideProps', getServerSidePropsCode);
+                }
+            }
+            catch (error) {
+                // ignore error
+            }
             // Handle preview image if exists
             if (metadata.previewImage) {
                 const imagePath = path_1.default.join(path_1.default.dirname(fullPath), (0, helper_1.getPreviewImageRelativePath)(metadata.previewImage));

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

@@ -106,7 +106,4 @@ exports.initUploaderRouter.use('/uploads', (0, uploader_server_1.initProxyToMedi
 exports.initUploaderRouter.use('/chunks', dynamicResourceMiddleware, staticResourceMiddleware, (_req, res) => {
     res.status(404).send('CHUNK NOT FOUND').end();
 });
-exports.initUploaderRouter.use('/.well-known/chunks', dynamicResourceMiddleware, staticResourceMiddleware, (_req, res) => {
-    res.status(404).send('CHUNK NOT FOUND').end();
-});
 exports.default = exports.initUploaderRouter;

package/lib/cjs/plugins/_theme.js

@@ -89,7 +89,7 @@ const api = (0, js_sdk_1.createAxios)({
 }, {
     componentDid: PAGES_KIT_BLOCK_STUDIO_BLOCKLET_DID,
 });
-const { SessionProvider, SessionContext } = (0, Session_1.createAuthServiceSessionContext)();
+const { SessionContext } = (0, Session_1.createAuthServiceSessionContext)();
 function useIsInsideIframe() {
     const location = (0, react_router_dom_1.useLocation)();
     const isInsideIframe = (0, react_1.useMemo)(() => {
@@ -229,6 +229,7 @@ const DraggableRouteItem = ({ route, staticDataInRoute, currentPageId, onNavigat
                         opacity: isHovered ? 0.7 : 0,
                         visibility: isHovered ? 'visible' : 'hidden',
                         transition: 'opacity 0.2s ease',
+                        color: currentPageId === route ? 'white' : '',
                         '&:hover': {
                             bgcolor: 'error.main',
                             color: 'error.contrastText',
@@ -1219,7 +1220,7 @@ const StyledDashboard = (0, material_1.styled)(studio_ui_1.Dashboard) `
 `;
 function LayoutWrapper({ loadState, loadedData, ...rest }) {
     const isInsideIframe = useIsInsideIframe();
-    return ((0, jsx_runtime_1.jsx)(material_1.StyledEngineProvider, { injectFirst: true, children: (0, jsx_runtime_1.jsx)(theme_1.PagesKitThemeProvider, { isDashboard: isInsideIframe, children: (0, jsx_runtime_1.jsx)(Toast_1.ToastProvider, { children: (0, jsx_runtime_1.jsx)(context_1.LocaleProvider, { translations: locales_1.translations, fallbackLocale: "en", children: (0, jsx_runtime_1.jsx)(SessionProvider, { serviceHost: basename, protectedRoutes: [`${basename}/*`], children: (0, jsx_runtime_1.jsx)(Layout, { loadState: loadState, loadedData: loadedData }) }) }) }) }) }));
+    return ((0, jsx_runtime_1.jsx)(theme_1.PagesKitThemeProvider, { isDashboard: !isInsideIframe, children: (0, jsx_runtime_1.jsx)(Toast_1.ToastProvider, { children: (0, jsx_runtime_1.jsx)(Layout, { loadState: loadState, loadedData: loadedData }) }) }));
 }
 exports.default = LayoutWrapper;
 function CreateResource({ open, onClose }) {

package/lib/cjs/plugins/vite-plugin-block-studio.js

@@ -38,18 +38,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initBlockStudioPlugins = initBlockStudioPlugins;
 // import typescript from '@rollup/plugin-typescript';
-const builtin_module_transformer_1 = require("@blocklet/pages-kit/utils/typescript/builtin-module-transformer");
-// @ts-ignore
-const chunks_analyzer_transformer_1 = require("@blocklet/pages-kit/utils/typescript/chunks-analyzer-transformer");
 const fs_1 = require("fs");
 const camelCase_1 = __importDefault(require("lodash/camelCase"));
 const upperFirst_1 = __importDefault(require("lodash/upperFirst"));
-const p_limit_1 = __importDefault(require("p-limit"));
 const path = __importStar(require("path"));
-const path_1 = require("path");
 const rollup_plugin_external_globals_1 = __importDefault(require("rollup-plugin-external-globals"));
 // import { visualizer } from 'rollup-plugin-visualizer';
-const typescript_1 = __importDefault(require("typescript"));
 const ufo_1 = require("ufo");
 const vite_plugin_css_injected_by_js_1 = __importDefault(require("vite-plugin-css-injected-by-js"));
 const vite_plugin_node_polyfills_1 = require("vite-plugin-node-polyfills");
@@ -74,12 +68,6 @@ const isMatchAfterSlachExternals = (id, externals) => {
             return true;
         }
     }
-    // 检查其他外部依赖的子路径
-    for (const externalModule of Object.keys(externals)) {
-        if (id.startsWith(`${externalModule}/`)) {
-            return true;
-        }
-    }
     return false;
 };
 const defaultBlockExternals = {
@@ -138,7 +126,6 @@ function initBlockStudioPlugins(options) {
     const workingDir = options?.cwd || process.cwd();
     const entryFilesPattern = options?.entryFilesPattern || (0, helper_1.getBlockEntryFilesPattern)();
     const transpileBuiltinModule = options?.transpileBuiltinModule ?? true;
-    const ignoreSplitEditComponent = options?.ignoreSplitEditComponent ?? false;
     const watchFilesDir = options?.watchFilesDir || (0, helper_1.getWatchFilesDir)() || workingDir;
     // default fallback to __dirname if _theme.tsx not exists
     let pagesDir = __dirname.replace('cjs', 'esm');
@@ -362,121 +349,14 @@ function initBlockStudioPlugins(options) {
         }),
         // initHtmlPreviewTransformPlugin(),
         (0, vite_plugin_css_injected_by_js_1.default)(),
-        ignoreSplitEditComponent ? undefined : (0, vite_plugin_code_splitter_1.vitePluginCodeSplitter)(),
+        (0, vite_plugin_code_splitter_1.vitePluginCodeSplitter)({
+            formats,
+            transpileBuiltinModule,
+        }),
         {
-            name: 'post-build-file-transpiler',
+            name: 'vite-plugin-build-exit',
             apply: 'build',
             enforce: 'post',
-            async writeBundle(options) {
-                // 用于存储每个格式的 chunks 映射
-                const allChunksMap = {};
-                // 对所有生成的 JavaScript 文件进行 transpileModule 处理
-                const transpileBuiltinModuleFn = (dir, format) => {
-                    const files = (0, fs_1.readdirSync)(dir);
-                    files.forEach((file) => {
-                        const filePath = path.join(dir, file);
-                        const stats = (0, fs_1.statSync)(filePath);
-                        if (stats.isDirectory()) {
-                            transpileBuiltinModuleFn(filePath, format); // 递归处理子目录
-                        }
-                        else if (file.endsWith('.js')) {
-                            try {
-                                const script = (0, fs_1.readFileSync)(filePath, 'utf8');
-                                // @ts-ignore
-                                const chunks = (0, chunks_analyzer_transformer_1.analyzeFileChunks)(typescript_1.default, script);
-                                // ensure chunksMap is with all chunks
-                                allChunksMap[(0, path_1.basename)(filePath)] = new Set(chunks);
-                                const moduleMap = {
-                                    es: typescript_1.default.ModuleKind.ESNext,
-                                    cjs: typescript_1.default.ModuleKind.CommonJS,
-                                    umd: typescript_1.default.ModuleKind.ESNext,
-                                };
-                                const code = typescript_1.default.transpileModule(script, {
-                                    compilerOptions: {
-                                        jsx: typescript_1.default.JsxEmit.React,
-                                        target: typescript_1.default.ScriptTarget.ES2016,
-                                        module: moduleMap[format],
-                                    },
-                                    transformers: {
-                                        // @ts-ignore
-                                        before: [(0, builtin_module_transformer_1.createBuiltinModuleTransformer)(typescript_1.default)],
-                                    },
-                                }).outputText;
-                                (0, fs_1.writeFileSync)(filePath, code);
-                                helper_1.logger.info(`Transpiled: ${filePath}`);
-                                // updateStatus(`Transpiled: ${filePath}`);
-                            }
-                            catch (error) {
-                                helper_1.logger.error(`Failed to transpile ${filePath}:`, error);
-                            }
-                        }
-                    });
-                    // 返回一个 Promise 以便 await
-                    return new Promise((resolve, reject) => {
-                        try {
-                            // ... 处理文件的代码 ...
-                            resolve();
-                        }
-                        catch (error) {
-                            reject(error);
-                        }
-                    });
-                };
-                // 获取输出目录
-                const outDir = options.dir || 'dist';
-                const limit = (0, p_limit_1.default)(20);
-                // 使用 Promise.all 等待所有格式处理完成
-                await Promise.all(formats.map(async (format) => {
-                    const formatDir = path.resolve(outDir, `${format}`);
-                    const chunkDir = path.resolve(formatDir, 'chunks');
-                    // if not exists, create it
-                    if (!(0, fs_1.existsSync)(chunkDir)) {
-                        (0, fs_1.mkdirSync)(chunkDir, { recursive: true });
-                    }
-                    if (transpileBuiltinModule) {
-                        await limit(() => transpileBuiltinModuleFn(formatDir, format));
-                    }
-                }));
-                // 现在可以处理完整依赖链
-                helper_1.logger.info('all transpile tasks done, start to handle dependency chain...');
-                // 在这里处理 allChunksMap 的完整依赖链
-                Object.entries(allChunksMap).forEach(([entryFile, directDeps]) => {
-                    // 收集所有间接依赖
-                    const allDeps = [...directDeps];
-                    // 递归寻找间接依赖
-                    function findTransitiveDeps(chunks) {
-                        chunks.forEach((chunk) => {
-                            // 如果该chunk本身也是个入口(有依赖列表)
-                            if (chunk in allChunksMap) {
-                                const subDeps = allChunksMap[chunk];
-                                // 添加未包含的依赖
-                                if (subDeps) {
-                                    subDeps.forEach((dep) => {
-                                        if (!allDeps.includes(dep)) {
-                                            allDeps.push(dep);
-                                            // 递归寻找这个依赖的依赖
-                                            findTransitiveDeps([dep]);
-                                        }
-                                    });
-                                }
-                            }
-                        });
-                    }
-                    // 开始递归查找
-                    findTransitiveDeps([...directDeps]);
-                    // 更新为完整依赖列表
-                    allChunksMap[entryFile] = new Set(allDeps);
-                });
-                // 转换 Set 为数组以便正确序列化
-                const serializedMap = Object.entries(allChunksMap).reduce((result, [key, deps]) => {
-                    result[key] = Array.from(deps);
-                    return result;
-                }, {});
-                formats.forEach((format) => {
-                    // 存下来
-                    (0, fs_1.writeFileSync)(path.join(outDir, `${format}/chunks-map.json`), JSON.stringify(serializedMap, null, 2));
-                });
-            },
             closeBundle() {
                 // ensure vite build exit
                 setTimeout(() => {