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

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.getEditComponentBlockName = exports.EDIT_COMPONENT_BUNDLE_FLAG = 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.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;
@@ -240,8 +240,22 @@ const safeParse = (text) => {
 };
 exports.safeParse = safeParse;
 exports.EDIT_COMPONENT_NAME = 'EditComponent';
-exports.EDIT_COMPONENT_BUNDLE_FLAG = `(${exports.EDIT_COMPONENT_NAME})`;
 const getEditComponentBlockName = (blockName) => {
-    return `${blockName}${exports.EDIT_COMPONENT_BUNDLE_FLAG}`;
+    return `${blockName}(${exports.EDIT_COMPONENT_NAME})`;
 };
 exports.getEditComponentBlockName = getEditComponentBlockName;
+exports.PROPERTIES_SCHEMA_NAME = 'PROPERTIES_SCHEMA';
+const getPropertiesSchemaBlockName = (blockName) => {
+    return `${blockName}(${exports.PROPERTIES_SCHEMA_NAME})`;
+};
+exports.getPropertiesSchemaBlockName = getPropertiesSchemaBlockName;
+exports.AIGNE_OUTPUT_VALUE_SCHEMA_NAME = 'aigneOutputValueSchema';
+const getAigneOutputValueSchemaBlockName = (blockName) => {
+    return `${blockName}(${exports.AIGNE_OUTPUT_VALUE_SCHEMA_NAME})`;
+};
+exports.getAigneOutputValueSchemaBlockName = getAigneOutputValueSchemaBlockName;
+exports.GET_SERVER_SIDE_PROPS_NAME = 'getServerSideProps';
+const getGetServerSidePropsBlockName = (blockName) => {
+    return `${blockName}(${exports.GET_SERVER_SIDE_PROPS_NAME})`;
+};
+exports.getGetServerSidePropsBlockName = getGetServerSidePropsBlockName;

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

@@ -6,7 +6,7 @@ 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, } from '../utils/helper';
+import { findComponentFiles, libDir, getPreviewImageRelativePath, generateYaml, logger, getEditComponentBlockName, getAigneOutputValueSchemaBlockName, getPropertiesSchemaBlockName, getGetServerSidePropsBlockName, } from '../utils/helper';
 const DID = 'z2qa7BQdkEb3TwYyEYC1psK6uvmGnHSUHt5RM';
 const RESOURCE_TYPE = 'page';
 const allTag = '@ALL_COMPONENTS';
@@ -144,6 +144,8 @@ initResourceRouter.post('/', async (req, res) => {
             // get metadata
             const metadata = _metadata;
             const jsName = `${blockName}.js`;
+            // set version to 2
+            set(metadata, 'version', 2);
             // get code to metadata
             const code = fs.readFileSync(join(codeDir, jsName), 'utf8');
             if (code) {
@@ -165,6 +167,39 @@ initResourceRouter.post('/', async (req, res) => {
             catch (error) {
                 // ignore error
             }
+            // get aigne output value schema
+            try {
+                const aigneOutputValueSchemaJsName = `${getAigneOutputValueSchemaBlockName(blockName)}.js`;
+                const aigneOutputValueSchemaCode = fs.readFileSync(join(codeDir, aigneOutputValueSchemaJsName), 'utf8');
+                if (aigneOutputValueSchemaCode) {
+                    set(metadata, 'renderer.aigneOutputValueSchema', aigneOutputValueSchemaCode);
+                }
+            }
+            catch (error) {
+                // ignore error
+            }
+            // get properties schema
+            try {
+                const propertiesSchemaJsName = `${getPropertiesSchemaBlockName(blockName)}.js`;
+                const propertiesSchemaCode = fs.readFileSync(join(codeDir, propertiesSchemaJsName), 'utf8');
+                if (propertiesSchemaCode) {
+                    set(metadata, 'renderer.PROPERTIES_SCHEMA', propertiesSchemaCode);
+                }
+            }
+            catch (error) {
+                // ignore error
+            }
+            // get getServerSideProps
+            try {
+                const getServerSidePropsJsName = `${getGetServerSidePropsBlockName(blockName)}.js`;
+                const getServerSidePropsCode = fs.readFileSync(join(codeDir, getServerSidePropsJsName), 'utf8');
+                if (getServerSidePropsCode) {
+                    set(metadata, 'renderer.getServerSideProps', getServerSidePropsCode);
+                }
+            }
+            catch (error) {
+                // ignore error
+            }
             // Handle preview image if exists
             if (metadata.previewImage) {
                 const imagePath = path.join(path.dirname(fullPath), getPreviewImageRelativePath(metadata.previewImage));

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

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

package/lib/esm/plugins/_theme.js

@@ -7,7 +7,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // add tailwindcss css to the head
 import { createAuthServiceSessionContext } from '@arcblock/did-connect/lib/Session';
 import { useConfig } from '@arcblock/ux/lib/Config';
-import { LocaleProvider, useLocaleContext } from '@arcblock/ux/lib/Locale/context';
+import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Toast, { ToastProvider } from '@arcblock/ux/lib/Toast';
 import { createAxios } from '@blocklet/js-sdk';
 import { PagesKitThemeProvider } from '@blocklet/pages-kit-inner-components/theme';
@@ -27,7 +27,7 @@ import LaptopMacIcon from '@mui/icons-material/LaptopMac';
 import PhoneAndroidIcon from '@mui/icons-material/PhoneAndroid';
 import SettingsIcon from '@mui/icons-material/Settings';
 import SortByAlphaIcon from '@mui/icons-material/SortByAlpha';
-import { Alert, Box, Button, CircularProgress, Dialog, DialogContent, DialogTitle, IconButton, List, ListItem, ListItemButton, Skeleton, Stack, StyledEngineProvider, TextField, ToggleButton, ToggleButtonGroup, Tooltip, Typography, backdropClasses, circularProgressClasses, styled, } from '@mui/material';
+import { Alert, Box, Button, CircularProgress, Dialog, DialogContent, DialogTitle, IconButton, List, ListItem, ListItemButton, Skeleton, Stack, TextField, ToggleButton, ToggleButtonGroup, Tooltip, Typography, backdropClasses, circularProgressClasses, styled, } from '@mui/material';
 import { useDebounceFn, useLocalStorageState, useReactive } from 'ahooks';
 import { useUpdateEffect } from 'ahooks';
 import cloneDeep from 'lodash/cloneDeep';
@@ -51,7 +51,7 @@ const api = createAxios({
 }, {
     componentDid: PAGES_KIT_BLOCK_STUDIO_BLOCKLET_DID,
 });
-const { SessionProvider, SessionContext } = createAuthServiceSessionContext();
+const { SessionContext } = createAuthServiceSessionContext();
 function useIsInsideIframe() {
     const location = useLocation();
     const isInsideIframe = useMemo(() => {
@@ -191,6 +191,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',
@@ -1181,7 +1182,7 @@ const StyledDashboard = styled(Dashboard) `
 `;
 function LayoutWrapper({ loadState, loadedData, ...rest }) {
     const isInsideIframe = useIsInsideIframe();
-    return (_jsx(StyledEngineProvider, { injectFirst: true, children: _jsx(PagesKitThemeProvider, { isDashboard: isInsideIframe, children: _jsx(ToastProvider, { children: _jsx(LocaleProvider, { translations: translations, fallbackLocale: "en", children: _jsx(SessionProvider, { serviceHost: basename, protectedRoutes: [`${basename}/*`], children: _jsx(Layout, { loadState: loadState, loadedData: loadedData }) }) }) }) }) }));
+    return (_jsx(PagesKitThemeProvider, { isDashboard: !isInsideIframe, children: _jsx(ToastProvider, { children: _jsx(Layout, { loadState: loadState, loadedData: loadedData }) }) }));
 }
 export default LayoutWrapper;
 function CreateResource({ open, onClose }) {

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

@@ -1,16 +1,10 @@
 // import typescript from '@rollup/plugin-typescript';
-import { createBuiltinModuleTransformer } from '@blocklet/pages-kit/utils/typescript/builtin-module-transformer';
-// @ts-ignore
-import { analyzeFileChunks } from '@blocklet/pages-kit/utils/typescript/chunks-analyzer-transformer';
-import { readFileSync, existsSync, mkdirSync, writeFileSync, readdirSync, statSync } from 'fs';
+import { readFileSync, existsSync } from 'fs';
 import camelCase from 'lodash/camelCase';
 import upperFirst from 'lodash/upperFirst';
-import pLimit from 'p-limit';
 import * as path from 'path';
-import { basename } from 'path';
 import externalGlobals from 'rollup-plugin-external-globals';
 // import { visualizer } from 'rollup-plugin-visualizer';
-import ts from 'typescript';
 import { joinURL } from 'ufo';
 import cssInjectedByJsPlugin from 'vite-plugin-css-injected-by-js';
 import { nodePolyfills } from 'vite-plugin-node-polyfills';
@@ -37,12 +31,6 @@ const isMatchAfterSlachExternals = (id, externals) => {
             return true;
         }
     }
-    // 检查其他外部依赖的子路径
-    for (const externalModule of Object.keys(externals)) {
-        if (id.startsWith(`${externalModule}/`)) {
-            return true;
-        }
-    }
     return false;
 };
 const defaultBlockExternals = {
@@ -101,7 +89,6 @@ export function initBlockStudioPlugins(options) {
     const workingDir = options?.cwd || process.cwd();
     const entryFilesPattern = options?.entryFilesPattern || getBlockEntryFilesPattern();
     const transpileBuiltinModule = options?.transpileBuiltinModule ?? true;
-    const ignoreSplitEditComponent = options?.ignoreSplitEditComponent ?? false;
     const watchFilesDir = options?.watchFilesDir || getWatchFilesDir() || workingDir;
     // default fallback to __dirname if _theme.tsx not exists
     let pagesDir = __dirname.replace('cjs', 'esm');
@@ -325,121 +312,14 @@ export function initBlockStudioPlugins(options) {
         }),
         // initHtmlPreviewTransformPlugin(),
         cssInjectedByJsPlugin(),
-        ignoreSplitEditComponent ? undefined : vitePluginCodeSplitter(),
+        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 = readdirSync(dir);
-                    files.forEach((file) => {
-                        const filePath = path.join(dir, file);
-                        const stats = statSync(filePath);
-                        if (stats.isDirectory()) {
-                            transpileBuiltinModuleFn(filePath, format); // 递归处理子目录
-                        }
-                        else if (file.endsWith('.js')) {
-                            try {
-                                const script = readFileSync(filePath, 'utf8');
-                                // @ts-ignore
-                                const chunks = analyzeFileChunks(ts, script);
-                                // ensure chunksMap is with all chunks
-                                allChunksMap[basename(filePath)] = new Set(chunks);
-                                const moduleMap = {
-                                    es: ts.ModuleKind.ESNext,
-                                    cjs: ts.ModuleKind.CommonJS,
-                                    umd: ts.ModuleKind.ESNext,
-                                };
-                                const code = ts.transpileModule(script, {
-                                    compilerOptions: {
-                                        jsx: ts.JsxEmit.React,
-                                        target: ts.ScriptTarget.ES2016,
-                                        module: moduleMap[format],
-                                    },
-                                    transformers: {
-                                        // @ts-ignore
-                                        before: [createBuiltinModuleTransformer(ts)],
-                                    },
-                                }).outputText;
-                                writeFileSync(filePath, code);
-                                logger.info(`Transpiled: ${filePath}`);
-                                // updateStatus(`Transpiled: ${filePath}`);
-                            }
-                            catch (error) {
-                                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 = pLimit(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 (!existsSync(chunkDir)) {
-                        mkdirSync(chunkDir, { recursive: true });
-                    }
-                    if (transpileBuiltinModule) {
-                        await limit(() => transpileBuiltinModuleFn(formatDir, format));
-                    }
-                }));
-                // 现在可以处理完整依赖链
-                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) => {
-                    // 存下来
-                    writeFileSync(path.join(outDir, `${format}/chunks-map.json`), JSON.stringify(serializedMap, null, 2));
-                });
-            },
             closeBundle() {
                 // ensure vite build exit
                 setTimeout(() => {