@blocklet/pages-kit-block-studio 0.0.10 → 0.0.11

package/lib/cjs/{block-studio → middlewares}/init-resource-router.js

@@ -54,9 +54,9 @@ const child_process_1 = require("child_process");
 const express_1 = require("express");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importStar(require("path"));
-const utils_1 = require("./utils");
+const helper_1 = require("../utils/helper");
 const DID = 'z2qa7rr3eUyVnWp2PCxEVARuUfLFh6cE5V2xV';
-const RESOURCE_TYPE = 'block';
+const RESOURCE_TYPE = 'page';
 const allTag = '@ALL_COMPONENTS';
 function copyFile(src, dest) {
     return new Promise((resolve, reject) => {
@@ -104,7 +104,7 @@ exports.initResourceRouter = (0, express_1.Router)();
 exports.initResourceRouter.get('/', (_req, res) => __awaiter(void 0, void 0, void 0, function* () {
     const resources = [];
     const rootDir = process.cwd();
-    const files = (0, utils_1.findComponentFiles)({ cwd: rootDir });
+    const files = (0, helper_1.findComponentFiles)({ cwd: rootDir });
     for (const file of files) {
         // const filePath = path.join(rootDir, file);
         // const fileContent = fs.readFileSync(filePath, 'utf8');

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

@@ -48,18 +48,18 @@ exports.initBlockStudioPlugins = initBlockStudioPlugins;
 const fs_1 = require("fs");
 const path = __importStar(require("path"));
 const vite_plugin_react_pages_1 = __importStar(require("vite-plugin-react-pages"));
-const utils_1 = require("../utils");
+const helper_1 = require("../utils/helper");
 const vite_plugin_html_transform_1 = require("./vite-plugin-html-transform");
 // import initRemoteScriptLocalizerPlugin from './vite-plugin-remote-script-localizer';
 function initBlockStudioPlugins(options) {
     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, utils_1.getBlockEntryFilesPattern)();
-    (0, utils_1.setBlockEntryFilesPattern)(entryFilesPattern);
+    const entryFilesPattern = (options === null || options === void 0 ? void 0 : options.entryFilesPattern) || (0, helper_1.getBlockEntryFilesPattern)();
+    (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');
-    utils_1.logger.log('initBlockStudioPlugins options: ', {
+    helper_1.logger.log('initBlockStudioPlugins options: ', {
         cwd: workingDir,
-        entryFilesPattern: (0, utils_1.getBlockEntryFilesPattern)(),
+        entryFilesPattern: (0, helper_1.getBlockEntryFilesPattern)(),
         pagesDir,
     });
     return [
@@ -87,25 +87,25 @@ function initBlockStudioPlugins(options) {
                     const filterModules = process.argv.includes('--filter')
                         ? (_a = process.argv[process.argv.indexOf('--filter') + 1]) === null || _a === void 0 ? void 0 : _a.split(',')
                         : null;
-                    const multiMode = !!process.argv.includes('--multi');
                     const name = yield Promise.resolve(`${`${workingDir}/package.json`}`).then(s => __importStar(require(s))).then((res) => res.name).catch(() => 'MyLib');
+                    const entryList = (0, helper_1.findComponentFiles)({ cwd: workingDir })
+                        .map((entry) => {
+                        const { blockName } = entry;
+                        const { isHtml } = entry;
+                        const { file } = entry;
+                        if (isHtml) {
+                            return [blockName, `${vite_plugin_html_transform_1.VIRTUAL_MODULE_ID}?dir=${path.dirname(file)}`];
+                        }
+                        return [blockName, path.resolve(workingDir, file)];
+                    })
+                        .filter(Boolean)
+                        .filter(([blockName]) => !filterModules || filterModules.includes(blockName || ''));
+                    const multiMode = entryList.length > 1;
                     return {
                         build: Object.assign({ cssCodeSplit: false, lib: {
                                 name,
-                                entry: Object.assign({}, Object.fromEntries((0, utils_1.findComponentFiles)({ cwd: workingDir })
-                                    .map((entry) => {
-                                    const { blockName } = entry;
-                                    const { isHtml } = entry;
-                                    const { file } = entry;
-                                    if (isHtml) {
-                                        return [blockName, `${vite_plugin_html_transform_1.VIRTUAL_MODULE_ID}?dir=${path.dirname(file)}`];
-                                    }
-                                    return [blockName, path.resolve(workingDir, file)];
-                                })
-                                    .filter(Boolean)
-                                    .filter(([blockName]) => !filterModules || filterModules.includes(blockName || '')))),
-                                // multiMode not support umd
-                                formats: ['es', multiMode ? 'umd' : 'cjs'],
+                                entry: Object.assign({}, Object.fromEntries(entryList)),
+                                formats: ['es', !multiMode ? 'umd' : 'cjs'],
                                 fileName: (format, entryName) => `${format}/${entryName}.js`,
                             }, rollupOptions: {
                                 external: [
@@ -151,11 +151,11 @@ function initBlockStudioPlugins(options) {
             pagesDir,
             pageStrategy: new vite_plugin_react_pages_1.DefaultPageStrategy({
                 extraFindPages: (_pagesDir, helpers) => __awaiter(this, void 0, void 0, function* () {
-                    helpers.watchFiles(workingDir, (0, utils_1.getBlockEntryFilesPattern)(), function fileHandler(file, api) {
+                    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, utils_1.getBlockName)(relative);
+                            const blockName = (0, helper_1.getBlockName)(relative);
                             const pageId = `/${blockName}`;
                             api.addPageData({
                                 pageId,