@blocklet/pages-kit-block-studio 0.4.133 → 0.4.134

package/lib/cjs/middlewares/init-block-studio-router.js

@@ -37,9 +37,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initBlockStudioRouter = void 0;
-/* eslint-disable */
+// @ts-nocheck
 const express_1 = require("express");
 const fs_1 = __importDefault(require("fs"));
+const glob_1 = require("glob");
 const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const keyBy_1 = __importDefault(require("lodash/keyBy"));
 const set_1 = __importDefault(require("lodash/set"));
@@ -126,7 +127,10 @@ exports.initBlockStudioRouter.post('/', async (req, res) => {
         if (!fs_1.default.existsSync(dir)) {
             throw new Error('Directory not found');
         }
-        const currentMetadata = (0, helper_1.initializeMetadata)(filePath);
+        const currentMetadata = (0, helper_1.initializeMetadata)(filePath, true);
+        if (!currentMetadata) {
+            return res.status(404).json({ error: 'Metadata file not found' });
+        }
         const mergedContent = { ...currentMetadata, ...content };
         if ((0, isEqual_1.default)(currentMetadata, mergedContent)) {
             return res.json({ success: true, content: mergedContent, message: 'No changes' });
@@ -161,7 +165,25 @@ exports.initBlockStudioRouter.post('/create', async (req, res) => {
     }
     try {
         const pattern = (0, helper_1.getBlockEntryFilesPattern)();
-        const baseDir = path_1.default.dirname(pattern.replace(/\*\*?/g, ''));
+        let baseDir = path_1.default.dirname(pattern.replace(/\*\*?/g, ''));
+        // 使用glob快速查找包含@metadata.json的目录
+        try {
+            // 从baseDir开始向上查找所有包含@metadata.json的目录
+            const metadataFiles = (0, glob_1.globSync)(`**/${constants_1.METADATA_FILE_NAME}`, {
+                cwd: baseDir,
+                absolute: true,
+            });
+            // 按照目录层级深度排序，找到最近的目录
+            if (metadataFiles.length > 0) {
+                // 按路径长度排序，最短的路径通常是最接近baseDir的
+                metadataFiles.sort((a, b) => a.length - b.length);
+                const closestMetadataDir = path_1.default.dirname(metadataFiles[0]);
+                baseDir = path_1.default.dirname(closestMetadataDir);
+            }
+        }
+        catch (error) {
+            console.warn('Error searching for metadata files:', error);
+        }
         const blockDir = path_1.default.join(baseDir, name);
         const metadataPath = path_1.default.join(blockDir, constants_1.METADATA_FILE_NAME);
         const indexPath = path_1.default.join(blockDir, 'index.tsx');
@@ -270,7 +292,7 @@ exports.initBlockStudioRouter.post('/properties-to-interface', async (req, res)
                 fs_1.default.writeFileSync(componentPath, updatedCode);
                 return res.json({
                     success: true,
-                    message: 'TypeScript接口已成功从metadata生成并写入文件',
+                    message: 'TypeScript interface generated successfully!',
                 });
             }
             // 否则，只返回生成的接口内容，不写入文件
@@ -336,7 +358,7 @@ exports.initBlockStudioRouter.post('/interface-to-properties', async (req, res)
                 return res.json({
                     success: true,
                     metadata: newMetadata,
-                    message: 'Metadata 完全更新成功',
+                    message: 'Metadata updated successfully!',
                 });
             }
             // 否则，只返回差异信息，不写入文件

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

@@ -40,8 +40,10 @@ exports.initUploaderRouter = void 0;
 const config_1 = __importDefault(require("@blocklet/sdk/lib/config"));
 const uploader_server_1 = require("@blocklet/uploader-server");
 const express_1 = __importStar(require("express"));
+const glob_1 = require("glob");
 const path_1 = require("path");
 const constants_1 = require("../constants");
+const helper_1 = require("../utils/helper");
 // init uploader router
 exports.initUploaderRouter = (0, express_1.Router)();
 const staticResourceMiddleware = (0, uploader_server_1.initStaticResourceMiddleware)({
@@ -89,7 +91,16 @@ const dynamicResourceMiddleware = (0, uploader_server_1.initDynamicResourceMiddl
 });
 exports.initUploaderRouter.use('/uploads', (0, uploader_server_1.initProxyToMediaKitUploadsMiddleware)({
     express: express_1.default,
-}), staticResourceMiddleware, (_req, res) => {
+}), staticResourceMiddleware, (req, res) => {
+    // if is component studio, should getting from `@preview-images` folder, only in dev mode
+    if (helper_1.isDev && config_1.default.env.componentDid === constants_1.PAGES_KIT_BLOCK_STUDIO_DID) {
+        const globPath = (0, path_1.join)(process.cwd(), (0, path_1.dirname)((0, helper_1.getBlockEntryFilesPattern)()), (0, helper_1.getPreviewImageRelativePath)((0, path_1.basename)(req.url)));
+        const files = (0, glob_1.globSync)(globPath);
+        if (files?.[0]) {
+            res.sendFile(files[0]);
+            return;
+        }
+    }
     res.status(404).send('404 NOT FOUND').end();
 });
 exports.initUploaderRouter.use('/chunks', dynamicResourceMiddleware, staticResourceMiddleware, (_req, res) => {

package/lib/cjs/plugins/_theme.js

@@ -161,13 +161,12 @@ function Layout({ loadState, loadedData }) {
     const location = (0, react_router_dom_1.useLocation)();
     const navigate = (0, react_router_dom_1.useNavigate)();
     const staticData = (0, client_1.useStaticData)();
-    const { routes, firstRoute, currentPage } = (0, react_1.useMemo)(() => {
+    const { routes, currentPage } = (0, react_1.useMemo)(() => {
         const routes = Object.keys(staticData)
             .sort((a, b) => a.localeCompare(b))
             .filter((route) => staticData[route]?.main?.isDeleted !== true);
         return {
             routes,
-            firstRoute: routes.find((route) => route !== '404' && route !== '*'),
             currentPage: {
                 ...staticData[location.pathname]?.main,
                 pageId: location.pathname,
@@ -663,12 +662,6 @@ function Layout({ loadState, loadedData }) {
         getStaticData,
         state.draggingSplitPane,
     ]);
-    // add auto redirect to first route
-    if (loadState.type === '404' &&
-        !routes.includes(location.pathname) &&
-        !location.search.includes('no-redirect=true')) {
-        return (0, jsx_runtime_1.jsx)(react_router_dom_1.Navigate, { to: `${firstRoute ?? '/'}`, replace: true });
-    }
     if (isInsideIframe) {
         return middlePanelContent;
     }

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

@@ -117,6 +117,16 @@ function initBlockStudioPlugins(options) {
     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');
+    // 如果存在 .component-studio-runtime 目录，则使用它
+    if ((0, fs_1.existsSync)(path.join(workingDir, '.component-studio-runtime', '_theme.tsx'))) {
+        pagesDir = path.join(workingDir, '.component-studio-runtime');
+    }
+    else if ((0, fs_1.existsSync)(path.join(workingDir, '_theme.tsx'))) {
+        pagesDir = workingDir;
+    }
     // 处理 blockExternals 参数
     let externalMappings = defaultBlockExternals;
     if (typeof options?.blockExternals === 'function') {
@@ -128,10 +138,9 @@ function initBlockStudioPlugins(options) {
         externalMappings = options.blockExternals;
     }
     (0, helper_1.setBlockEntryFilesPattern)(entryFilesPattern);
-    // fallback to __dirname if _theme.tsx not exists
-    const pagesDir = (0, fs_1.existsSync)(path.join(workingDir, '_theme.tsx')) ? workingDir : __dirname.replace('cjs', 'esm');
     helper_1.logger.log('initBlockStudioPlugins options: ', {
         cwd: workingDir,
+        watchFilesDir,
         entryFilesPattern: (0, helper_1.getBlockEntryFilesPattern)(),
         pagesDir,
         blockExternals: externalMappings, // 添加日志输出
@@ -154,7 +163,7 @@ function initBlockStudioPlugins(options) {
     const filterModules = process.argv.includes('--filter')
         ? process.argv[process.argv.indexOf('--filter') + 1]?.split(',')
         : null;
-    const entryList = (0, helper_1.findComponentFiles)({ cwd: workingDir })
+    const entryList = (0, helper_1.findComponentFiles)({ cwd: watchFilesDir })
         .map((entry) => {
         const { blockName } = entry;
         const { isHtml } = entry;
@@ -162,7 +171,7 @@ function initBlockStudioPlugins(options) {
         if (isHtml) {
             return [blockName, `${vite_plugin_html_transform_1.VIRTUAL_MODULE_ID}?dir=${path.dirname(file)}`];
         }
-        return [blockName, path.resolve(workingDir, file)];
+        return [blockName, path.resolve(watchFilesDir, file)];
     })
         .filter(Boolean)
         .filter(([blockName]) => !filterModules || filterModules.includes(blockName || ''));
@@ -197,7 +206,7 @@ function initBlockStudioPlugins(options) {
             enforce: 'pre',
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             async config(_config) {
-                const name = await Promise.resolve(`${`${workingDir}/package.json`}`).then(s => __importStar(require(s))).then((res) => res.name).catch(() => 'MyLib');
+                const name = await Promise.resolve(`${`${watchFilesDir}/package.json`}`).then(s => __importStar(require(s))).then((res) => res.name).catch(() => 'MyLib');
                 return {
                     mode: 'production',
                     resolve: {
@@ -278,7 +287,7 @@ function initBlockStudioPlugins(options) {
             pagesDir,
             pageStrategy: new vite_plugin_react_pages_1.DefaultPageStrategy({
                 extraFindPages: async (_pagesDir, helpers) => {
-                    helpers.watchFiles(workingDir, (0, helper_1.getBlockEntryFilesPattern)(), async function fileHandler(file, api) {
+                    helpers.watchFiles(watchFilesDir, (0, helper_1.getBlockEntryFilesPattern)(), async function fileHandler(file, api) {
                         const { relative, path: filePath } = file;
                         const isHtml = false && relative.endsWith('.html');
                         const blockName = (0, helper_1.getBlockName)(relative);