@blocklet/pages-kit-block-studio 0.4.32 → 0.4.33

package/lib/cjs/components/create-resource.js

@@ -22,11 +22,11 @@ function CreateResource({ open, onClose, blockletDid, mode, }) {
             },
         }
         : {};
-    return ((0, jsx_runtime_1.jsx)(material_1.Box, Object.assign({}, boxProps, { children: (0, jsx_runtime_1.jsx)(react_1.Suspense, { children: (0, jsx_runtime_1.jsx)(ui_react_1.BlockletStudio, { mode: mode, tenantScope: tenantScope, title: "Pages Kit Blocks", description: "", note: "", introduction: "", logo: "", componentDid: blockletDid, 
+    return ((0, jsx_runtime_1.jsx)(material_1.Box, { ...boxProps, children: (0, jsx_runtime_1.jsx)(react_1.Suspense, { children: (0, jsx_runtime_1.jsx)(ui_react_1.BlockletStudio, { mode: mode, tenantScope: tenantScope, title: "Pages Kit Blocks", description: "", note: "", introduction: "", logo: "", componentDid: blockletDid, 
                 // 透传到 get blocklet resource 的参数
                 resourcesParams: {}, dependentComponentsMode: "readonly", open: true, setOpen: () => onClose(), onConnected: () => { }, onUploaded: () => { }, onReleased: () => { }, 
                 // onOpened={() => onOpened?.()}
                 // 默认选中的资源
-                resources: {} }) }) })));
+                resources: {} }) }) }));
 }
 exports.default = CreateResource;

package/lib/cjs/constants/new-block-template/index.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EditComponent = void 0;
 exports.default = HelloWorld;
@@ -34,8 +23,7 @@ function HelloWorld({ title = 'Hello World', logo, description, copyright }) {
                 }, children: copyright }))] }));
 }
 // export edit component
-const EditComponent = (_a) => {
-    var { onChange } = _a, props = __rest(_a, ["onChange"]);
+const EditComponent = ({ onChange, ...props }) => {
     return ((0, jsx_runtime_1.jsxs)("div", { style: { display: 'flex', flexDirection: 'column', gap: '16px' }, children: [(0, jsx_runtime_1.jsx)("div", { style: {
                     fontSize: '14px',
                     fontWeight: 500,
@@ -50,6 +38,6 @@ const EditComponent = (_a) => {
                     fontSize: '14px',
                     transition: 'border-color 0.3s',
                     outline: 'none',
-                }, value: props.copyright || '', onChange: (e) => onChange === null || onChange === void 0 ? void 0 : onChange({ copyright: e.target.value }), placeholder: "Please Input Copyright" })] }));
+                }, value: props.copyright || '', onChange: (e) => onChange?.({ copyright: e.target.value }), placeholder: "Please Input Copyright" })] }));
 };
 exports.EditComponent = EditComponent;

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -21,7 +12,7 @@ const constants_1 = require("../constants");
 const helper_1 = require("../utils/helper");
 exports.initBlockStudioRouter = (0, express_1.Router)();
 const BINARY_EXTENSIONS = ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.ico', '.svg'];
-exports.initBlockStudioRouter.get('/', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+exports.initBlockStudioRouter.get('/', async (req, res) => {
     if (!helper_1.isDev) {
         return res.status(403).json({ error: 'Only available in development mode' });
     }
@@ -49,8 +40,8 @@ exports.initBlockStudioRouter.get('/', (req, res) => __awaiter(void 0, void 0, v
     catch (error) {
         return res.status(500).json({ error: 'Failed to read file' });
     }
-}));
-exports.initBlockStudioRouter.post('/', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+});
+exports.initBlockStudioRouter.post('/', async (req, res) => {
     if (!helper_1.isDev) {
         return res.status(403).json({ error: 'Only available in development mode' });
     }
@@ -67,7 +58,7 @@ exports.initBlockStudioRouter.post('/', (req, res) => __awaiter(void 0, void 0,
             fs_1.default.mkdirSync(dir, { recursive: true });
         }
         const currentMetadata = (0, helper_1.initializeMetadata)(filePath);
-        const mergedContent = Object.assign(Object.assign({}, currentMetadata), content);
+        const mergedContent = { ...currentMetadata, ...content };
         if ((0, lodash_1.isEqual)(currentMetadata, mergedContent)) {
             return res.json({ success: true, content: mergedContent, message: 'No changes' });
         }
@@ -76,7 +67,7 @@ exports.initBlockStudioRouter.post('/', (req, res) => __awaiter(void 0, void 0,
         if ((0, helper_1.isMetadataFile)(filePath) && content.previewImage && currentMetadata.previewImage !== content.previewImage) {
             const previewImagePath = path_1.default.join(dir, (0, helper_1.getPreviewImageRelativePath)(content.previewImage));
             if (!fs_1.default.existsSync(previewImagePath)) {
-                yield (0, helper_1.downloadAsset)({
+                await (0, helper_1.downloadAsset)({
                     asset: content.previewImage,
                     savePath: previewImagePath,
                     componentDid: process.env.BLOCKLET_COMPONENT_DID || '',
@@ -89,8 +80,8 @@ exports.initBlockStudioRouter.post('/', (req, res) => __awaiter(void 0, void 0,
     catch (error) {
         return res.status(500).json({ error: 'Failed to write file' });
     }
-}));
-exports.initBlockStudioRouter.post('/create', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+});
+exports.initBlockStudioRouter.post('/create', async (req, res) => {
     if (!helper_1.isDev) {
         return res.status(403).json({ error: 'Only available in development mode' });
     }
@@ -118,7 +109,10 @@ exports.initBlockStudioRouter.post('/create', (req, res) => __awaiter(void 0, vo
         metadata.updatedAt = new Date().toISOString();
         // get template metadata from @metadata.json
         const metadataContent = fs_1.default.readFileSync(constants_1.NEW_BLOCK_TEMPLATE_METADATA_PATH, 'utf-8');
-        metadata = Object.assign(Object.assign({}, metadata), (0, helper_1.safeParse)(metadataContent));
+        metadata = {
+            ...metadata,
+            ...(0, helper_1.safeParse)(metadataContent),
+        };
         // Write metadata file
         fs_1.default.writeFileSync(metadataPath, JSON.stringify(metadata, null, 2));
         // Copy template file to index.tsx
@@ -130,10 +124,10 @@ exports.initBlockStudioRouter.post('/create', (req, res) => __awaiter(void 0, vo
         console.error('Failed to create block:', error);
         return res.status(500).json({ error: 'Failed to create block' });
     }
-}));
-exports.initBlockStudioRouter.get('/all', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+});
+exports.initBlockStudioRouter.get('/all', async (req, res) => {
     const { withBlockletData = true } = req.query;
-    const allBlocks = yield (0, helper_1.findComponentFiles)();
+    const allBlocks = await (0, helper_1.findComponentFiles)();
     // get code to metadata
     const allBlocksWithCode = allBlocks.map((block) => {
         const code = (0, helper_1.getBlockCode)(block.fullPath);
@@ -159,5 +153,5 @@ exports.initBlockStudioRouter.get('/all', (req, res) => __awaiter(void 0, void 0
         return res.json((0, lodash_1.keyBy)(allBlocksWithBlockletData, 'data.id'));
     }
     return res.json((0, lodash_1.keyBy)(allBlocksWithCode, 'id'));
-}));
+});
 exports.default = exports.initBlockStudioRouter;

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

@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -71,34 +62,30 @@ function copyFile(src, dest) {
         readStream.pipe(writeStream);
     });
 }
-function copyDirectory(src, dest) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield fs_1.default.promises.mkdir(dest, { recursive: true });
-        const entries = yield fs_1.default.promises.readdir(src, { withFileTypes: true });
-        for (const entry of entries) {
-            const srcPath = path_1.default.join(src, entry.name);
-            const destPath = path_1.default.join(dest, entry.name);
-            if (entry.isDirectory()) {
-                // eslint-disable-next-line no-await-in-loop
-                yield copyDirectory(srcPath, destPath);
-            }
-            else {
-                // eslint-disable-next-line no-await-in-loop
-                yield copyFile(srcPath, destPath);
-            }
-        }
-    });
-}
-function copyRecursive(src, dest) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const srcStats = yield fs_1.default.promises.stat(src);
-        if (srcStats.isDirectory()) {
-            yield copyDirectory(src, dest);
+async function copyDirectory(src, dest) {
+    await fs_1.default.promises.mkdir(dest, { recursive: true });
+    const entries = await fs_1.default.promises.readdir(src, { withFileTypes: true });
+    for (const entry of entries) {
+        const srcPath = path_1.default.join(src, entry.name);
+        const destPath = path_1.default.join(dest, entry.name);
+        if (entry.isDirectory()) {
+            // eslint-disable-next-line no-await-in-loop
+            await copyDirectory(srcPath, destPath);
         }
         else {
-            yield copyFile(src, dest);
+            // eslint-disable-next-line no-await-in-loop
+            await copyFile(srcPath, destPath);
         }
-    });
+    }
+}
+async function copyRecursive(src, dest) {
+    const srcStats = await fs_1.default.promises.stat(src);
+    if (srcStats.isDirectory()) {
+        await copyDirectory(src, dest);
+    }
+    else {
+        await copyFile(src, dest);
+    }
 }
 const getExportDir = (projectId, releaseId) => {
     const exportDir = (0, component_1.getResourceExportDir)({ projectId, releaseId });
@@ -106,7 +93,7 @@ const getExportDir = (projectId, releaseId) => {
     return dir;
 };
 exports.initResourceRouter = (0, express_1.Router)();
-exports.initResourceRouter.get('/', (_req, res) => __awaiter(void 0, void 0, void 0, function* () {
+exports.initResourceRouter.get('/', async (_req, res) => {
     const resources = [];
     const rootDir = process.cwd();
     const files = (0, helper_1.findComponentFiles)({ cwd: rootDir });
@@ -134,8 +121,8 @@ exports.initResourceRouter.get('/', (_req, res) => __awaiter(void 0, void 0, voi
             },
         ],
     });
-}));
-exports.initResourceRouter.post('/', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+});
+exports.initResourceRouter.post('/', async (req, res) => {
     const { resources, projectId, releaseId } = req.body;
     // ignore all tag
     const componentIds = resources.filter((resource) => resource.id !== allTag);
@@ -149,11 +136,16 @@ exports.initResourceRouter.post('/', (req, res) => __awaiter(void 0, void 0, voi
         const buildProcess = (0, child_process_1.spawn)('pnpm', ['run', 'build-lib'], {
             stdio: 'inherit',
             shell: true,
-            env: Object.assign(Object.assign({}, process.env), { FORCE_COLOR: '1', BLOCK_FILTER: componentIds.join(','), NODE_OPTIONS: '--max_old_space_size=16384' }),
+            env: {
+                ...process.env,
+                FORCE_COLOR: '1',
+                BLOCK_FILTER: componentIds.join(','),
+                NODE_OPTIONS: '--max_old_space_size=16384',
+            },
         });
         // save current build process
         currentBuildProcess = buildProcess;
-        yield new Promise((resolve, reject) => {
+        await new Promise((resolve, reject) => {
             buildProcess.on('close', (code) => {
                 if (code === 0)
                     resolve(null);
@@ -205,7 +197,7 @@ exports.initResourceRouter.post('/', (req, res) => __awaiter(void 0, void 0, voi
             return metadata;
         });
         // cp _chunks dir
-        yield copyRecursive((0, path_1.join)(codeDir, '_chunks'), chunksDir);
+        await copyRecursive((0, path_1.join)(codeDir, '_chunks'), chunksDir);
         // write pages.config.yml
         const pagesConfigPath = path_1.default.join(tmpPackage, '.blocklet/pages/pages.config.yml');
         fs_1.default.mkdirSync(path_1.default.dirname(pagesConfigPath), { recursive: true });
@@ -221,7 +213,7 @@ exports.initResourceRouter.post('/', (req, res) => __awaiter(void 0, void 0, voi
         };
         fs_1.default.writeFileSync(pagesConfigPath, (0, helper_1.generateYaml)(pagesConfig));
         helper_1.logger.info('generate resource blocklet block count:', metadataList.length);
-        yield copyRecursive(tmpPackage, dir);
+        await copyRecursive(tmpPackage, dir);
         // remove tmpPackage
         // fs.rmSync(tmpPackage, { recursive: true, force: true });
         res.json({ success: true });
@@ -230,5 +222,5 @@ exports.initResourceRouter.post('/', (req, res) => __awaiter(void 0, void 0, voi
         console.error('Build failed:', error);
         res.status(500).json({ error: 'Build failed' });
     }
-}));
+});
 exports.default = exports.initResourceRouter;

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

@@ -32,15 +32,6 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -96,17 +87,16 @@ const defaultBlockExternals = {
     '@blocklet/pages-kit': '@blocklet/pages-kit',
 };
 function initBlockStudioPlugins(options) {
-    var _a, _b;
-    const workingDir = (options === null || options === void 0 ? void 0 : options.cwd) || process.cwd();
-    const entryFilesPattern = (options === null || options === void 0 ? void 0 : options.entryFilesPattern) || (0, helper_1.getBlockEntryFilesPattern)();
-    const transpileBuiltinModule = (_a = options === null || options === void 0 ? void 0 : options.transpileBuiltinModule) !== null && _a !== void 0 ? _a : true;
+    const workingDir = options?.cwd || process.cwd();
+    const entryFilesPattern = options?.entryFilesPattern || (0, helper_1.getBlockEntryFilesPattern)();
+    const transpileBuiltinModule = options?.transpileBuiltinModule ?? true;
     // 处理 blockExternals 参数
     let externalMappings = defaultBlockExternals;
-    if (typeof (options === null || options === void 0 ? void 0 : options.blockExternals) === 'function') {
+    if (typeof options?.blockExternals === 'function') {
         // 如果是函数，则调用它并传入默认值
         externalMappings = options.blockExternals(defaultBlockExternals);
     }
-    else if (options === null || options === void 0 ? void 0 : options.blockExternals) {
+    else if (options?.blockExternals) {
         // 如果是对象，直接使用
         externalMappings = options.blockExternals;
     }
@@ -125,7 +115,7 @@ function initBlockStudioPlugins(options) {
     const externalGlobalMappings = Object.fromEntries(Object.entries(externalMappings).filter(([, value]) => value.startsWith('window.') && value.length > 0));
     const globalsMappings = Object.fromEntries(Object.entries(externalMappings)
         .map(([key, value]) => {
-        if (!(value === null || value === void 0 ? void 0 : value.length)) {
+        if (!value?.length) {
             return [];
         }
         // 移除 "window." 前缀并转换为首字母大写的驼峰式
@@ -135,7 +125,7 @@ function initBlockStudioPlugins(options) {
     })
         .filter((item) => item.length > 0));
     const filterModules = process.argv.includes('--filter')
-        ? (_b = process.argv[process.argv.indexOf('--filter') + 1]) === null || _b === void 0 ? void 0 : _b.split(',')
+        ? process.argv[process.argv.indexOf('--filter') + 1]?.split(',')
         : null;
     const entryList = (0, helper_1.findComponentFiles)({ cwd: workingDir })
         .map((entry) => {
@@ -151,7 +141,7 @@ function initBlockStudioPlugins(options) {
         .filter(([blockName]) => !filterModules || filterModules.includes(blockName || ''));
     // @ts-ignore
     const multiMode = entryList.length > 1;
-    const formats = (options === null || options === void 0 ? void 0 : options.formats) || ['es', multiMode ? 'cjs' : 'umd'];
+    const formats = options?.formats || ['es', multiMode ? 'cjs' : 'umd'];
     // @ts-ignore
     return [
         // {
@@ -176,89 +166,120 @@ function initBlockStudioPlugins(options) {
             apply: 'build',
             enforce: 'pre',
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            config(_config) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    var _a, _b, _c, _d, _e;
-                    const name = yield Promise.resolve(`${`${workingDir}/package.json`}`).then(s => __importStar(require(s))).then((res) => res.name).catch(() => 'MyLib');
-                    return {
-                        resolve: {
-                            alias: {
-                            // crypto: 'crypto-browserify',
+            async config(_config) {
+                const name = await Promise.resolve(`${`${workingDir}/package.json`}`).then(s => __importStar(require(s))).then((res) => res.name).catch(() => 'MyLib');
+                return {
+                    resolve: {
+                        alias: {
+                        // crypto: 'crypto-browserify',
+                        },
+                    },
+                    optimizeDeps: {
+                    // include: ['crypto-browserify'],
+                    },
+                    build: {
+                        ..._config?.build,
+                        // sourcemap: true,
+                        cssCodeSplit: true,
+                        lib: {
+                            name,
+                            entry: {
+                                ...Object.fromEntries(entryList),
                             },
+                            formats,
+                            fileName: (format, entryName) => `${format}/${entryName}.js`,
                         },
-                        optimizeDeps: {
-                        // include: ['crypto-browserify'],
+                        terserOptions: {
+                            // 保留导出名
+                            keep_fnames: true,
+                            keep_classnames: true,
                         },
-                        build: Object.assign(Object.assign({}, _config === null || _config === void 0 ? void 0 : _config.build), { 
-                            // sourcemap: true,
-                            cssCodeSplit: true, lib: {
-                                name,
-                                entry: Object.assign({}, Object.fromEntries(entryList)),
-                                formats,
-                                fileName: (format, entryName) => `${format}/${entryName}.js`,
-                            }, terserOptions: {
-                                // 保留导出名
-                                keep_fnames: true,
-                                keep_classnames: true,
-                            }, rollupOptions: Object.assign(Object.assign({}, (_a = _config === null || _config === void 0 ? void 0 : _config.build) === null || _a === void 0 ? void 0 : _a.rollupOptions), { external: ((_c = (_b = _config === null || _config === void 0 ? void 0 : _config.build) === null || _b === void 0 ? void 0 : _b.rollupOptions) === null || _c === void 0 ? void 0 : _c.external) ||
-                                    ((id) => {
-                                        // 是否匹配后缀
-                                        const isMatchAfterSlash = false;
-                                        const skipList = [...Object.keys(externalMappings)];
-                                        if (skipList.some((item) => (isMatchAfterSlash && id.startsWith(`${item}/`)) || id === item)) {
-                                            return true;
-                                        }
-                                        return false;
-                                    }), treeshake: true, output: Object.assign(Object.assign({}, (_e = (_d = _config === null || _config === void 0 ? void 0 : _config.build) === null || _d === void 0 ? void 0 : _d.rollupOptions) === null || _e === void 0 ? void 0 : _e.output), { chunkFileNames: () => {
-                                        return '[format]/_chunks/[name]-[hash].js';
-                                    }, 
-                                    // 使用没有 window. 前缀的映射用于 globals 配置
-                                    globals: globalsMappings, 
-                                    // 确保正确处理命名导出和默认导出
-                                    interop: 'auto', paths: pathMappings, esModule: true }) }) }),
-                    };
-                });
+                        rollupOptions: {
+                            ..._config?.build?.rollupOptions,
+                            external: _config?.build?.rollupOptions?.external ||
+                                ((id) => {
+                                    // 是否匹配后缀
+                                    const isMatchAfterSlash = false;
+                                    const skipList = [...Object.keys(externalMappings)];
+                                    if (skipList.some((item) => (isMatchAfterSlash && id.startsWith(`${item}/`)) || id === item)) {
+                                        return true;
+                                    }
+                                    return false;
+                                }),
+                            treeshake: true,
+                            output: {
+                                ..._config?.build?.rollupOptions?.output,
+                                chunkFileNames: () => {
+                                    return '[format]/_chunks/[name]-[hash].js';
+                                },
+                                // 使用没有 window. 前缀的映射用于 globals 配置
+                                globals: globalsMappings,
+                                // 确保正确处理命名导出和默认导出
+                                interop: 'auto',
+                                paths: pathMappings,
+                                esModule: true,
+                                // inlineDynamicImports: true,
+                                // manualChunks: (id) => {
+                                //   // 如果是 EditComponent 或其他关键组件，不要放入 chunks
+                                //   if (ignoreChunksKeys.some((item) => id.includes(item))) {
+                                //     return id; // 返回 null 表示不创建单独的 chunk
+                                //   }
+                                //   return null;
+                                // },
+                            },
+                        },
+                    },
+                };
             },
             configResolved(config) {
                 helper_1.logger.info('config.build', config.build);
             },
         },
         transpileBuiltinModule
-            ? Object.assign(Object.assign({}, (0, rollup_plugin_external_globals_1.default)(externalGlobalMappings)), { apply: 'build', enforce: 'pre' }) : undefined,
+            ? {
+                ...(0, rollup_plugin_external_globals_1.default)(externalGlobalMappings),
+                apply: 'build',
+                enforce: 'pre',
+            }
+            : undefined,
         // @ts-ignore
         (0, vite_plugin_react_pages_1.default)({
             pagesDir,
             pageStrategy: new vite_plugin_react_pages_1.DefaultPageStrategy({
-                extraFindPages: (_pagesDir, helpers) => __awaiter(this, void 0, void 0, function* () {
-                    helpers.watchFiles(workingDir, (0, helper_1.getBlockEntryFilesPattern)(), function fileHandler(file, api) {
-                        return __awaiter(this, void 0, void 0, function* () {
-                            const { relative, path: filePath } = file;
-                            const isHtml = relative.endsWith('.html');
-                            const blockName = (0, helper_1.getBlockName)(relative);
-                            const pageId = `/${blockName}`;
-                            const dirPath = path.dirname(filePath);
-                            const metadataPath = path.join(dirPath, '@metadata.json');
-                            const dataPath = isHtml ? `${vite_plugin_html_transform_1.VIRTUAL_MODULE_ID}?dir=${dirPath}` : filePath;
-                            api.addPageData({
-                                pageId,
-                                dataPath,
-                                staticData: isHtml
-                                    ? {
-                                        isHtml: true,
-                                        dataPath,
-                                        code: (0, vite_plugin_html_transform_1.generateComponent)((0, vite_plugin_html_transform_1.readHtmlFiles)(dirPath)),
-                                        blockName,
-                                        dirPath,
-                                        importPath: (0, ufo_1.joinURL)('@id', dataPath),
-                                        metadataPath,
-                                    }
-                                    : Object.assign(Object.assign({}, (yield helpers.extractStaticData(file))), { code: (0, fs_1.readFileSync)(file.path, 'utf-8'), dataPath,
-                                        blockName,
-                                        dirPath, importPath: (0, ufo_1.joinURL)('@fs', dataPath), metadataPath }),
-                            });
+                extraFindPages: async (_pagesDir, helpers) => {
+                    helpers.watchFiles(workingDir, (0, helper_1.getBlockEntryFilesPattern)(), async function fileHandler(file, api) {
+                        const { relative, path: filePath } = file;
+                        const isHtml = relative.endsWith('.html');
+                        const blockName = (0, helper_1.getBlockName)(relative);
+                        const pageId = `/${blockName}`;
+                        const dirPath = path.dirname(filePath);
+                        const metadataPath = path.join(dirPath, '@metadata.json');
+                        const dataPath = isHtml ? `${vite_plugin_html_transform_1.VIRTUAL_MODULE_ID}?dir=${dirPath}` : filePath;
+                        api.addPageData({
+                            pageId,
+                            dataPath,
+                            staticData: isHtml
+                                ? {
+                                    isHtml: true,
+                                    dataPath,
+                                    code: (0, vite_plugin_html_transform_1.generateComponent)((0, vite_plugin_html_transform_1.readHtmlFiles)(dirPath)),
+                                    blockName,
+                                    dirPath,
+                                    importPath: (0, ufo_1.joinURL)('@id', dataPath),
+                                    metadataPath,
+                                }
+                                : {
+                                    ...(await helpers.extractStaticData(file)),
+                                    code: (0, fs_1.readFileSync)(file.path, 'utf-8'),
+                                    dataPath,
+                                    blockName,
+                                    dirPath,
+                                    importPath: (0, ufo_1.joinURL)('@fs', dataPath),
+                                    metadataPath,
+                                },
                         });
                     });
-                }),
+                },
             }),
         }),
         (0, vite_plugin_html_transform_1.initHtmlPreviewTransformPlugin)(),

package/lib/cjs/plugins/vite-plugin-html-transform.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RESOLVED_VIRTUAL_MODULE_ID = exports.VIRTUAL_MODULE_ID = void 0;
 exports.readHtmlFiles = readHtmlFiles;
@@ -258,23 +249,21 @@ function initHtmlPreviewTransformPlugin() {
             }
             return null;
         },
-        load(id) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const useCache = false;
-                if (id.startsWith(exports.RESOLVED_VIRTUAL_MODULE_ID)) {
-                    const dirPath = id.split('?dir=')[1] || '';
-                    // 使用缓存避免重复读取
-                    let content = useCache ? htmlCache.get(dirPath) : null;
-                    if (!content) {
-                        content = readHtmlFiles(dirPath);
-                        if (useCache) {
-                            htmlCache.set(dirPath, content);
-                        }
+        async load(id) {
+            const useCache = false;
+            if (id.startsWith(exports.RESOLVED_VIRTUAL_MODULE_ID)) {
+                const dirPath = id.split('?dir=')[1] || '';
+                // 使用缓存避免重复读取
+                let content = useCache ? htmlCache.get(dirPath) : null;
+                if (!content) {
+                    content = readHtmlFiles(dirPath);
+                    if (useCache) {
+                        htmlCache.set(dirPath, content);
                     }
-                    return generateComponent(content, !isBuild);
                 }
-                return null;
-            });
+                return generateComponent(content, !isBuild);
+            }
+            return null;
         },
         // 清理缓存
         buildEnd() {