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

package/lib/cjs/{block-studio → utils}/build-lib.js

@@ -17,13 +17,13 @@ exports.buildLib = buildLib;
 /* eslint-disable no-console */
 const chalk_1 = __importDefault(require("chalk"));
 const child_process_1 = require("child_process");
-const utils_1 = require("./utils");
+const helper_1 = require("./helper");
 function buildLib(options) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const workingDir = (options === null || options === void 0 ? void 0 : options.cwd) || process.cwd();
         // Scan for all index files
-        const allBlocks = (0, utils_1.findComponentFiles)({ cwd: workingDir }).map((entry) => {
+        const allBlocks = (0, helper_1.findComponentFiles)({ cwd: workingDir }).map((entry) => {
             return entry.blockName;
         });
         const filterModules = process.argv.includes('--filter')
@@ -60,7 +60,6 @@ function buildLib(options) {
                         libDir,
                         '--emptyOutDir=false',
                         hasConfig ? `--config ${configFile}.*` : '',
-                        multiMode ? '--multi' : '',
                     ], {
                         stdio: ignoreViteLog ? ['inherit', 'ignore', 'ignore'] : 'inherit',
                         shell: true,

package/lib/cjs/{block-studio → utils}/generate-wrapper-code.js

@@ -43,9 +43,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateWrapperCode = generateWrapperCode;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function generateWrapperCode(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ project, version }) {
-        const projectName = (project.name || project.id).toLowerCase().replaceAll(/[^a-z0-9]/g, '_');
+    return __awaiter(this, arguments, void 0, function* ({ project, state, version }) {
+        const projectName = (project.name || project.id).toLowerCase().replaceAll(/[^a-z0-9]/g, '-');
         const packageName = `@pages-kit-project/${projectName}`;
         const packageJson = JSON.stringify({
             name: packageName,
@@ -79,14 +80,16 @@ function generateWrapperCode(_a) {
                 },
             },
         }, null, 2);
-        const index = `\
+        const client = `\
 import HomeComponent from '@blocklet/pages-kit-runtime/client';
 
+
+
 export default HomeComponent;
 `;
-        const client = index;
+        const index = client;
         const middleware = `
-import { initResourceRouter } from '@blocklet/pages-kit-block-studio/block-studio/init-resource-router';
+import { initResourceRouter } from '@blocklet/pages-kit-block-studio/init-resource-router';
 import { getPreloadComponents } from '@blocklet/pages-kit-inner-components/components';
 import { initPackResourceStates } from '@blocklet/pages-kit-inner-components/site-state';
 import express, { Router } from 'express';
@@ -193,10 +196,15 @@ router.use(
 
 export default router;
 `;
+        const data = JSON.stringify({
+            project,
+            state,
+        }, null, 2);
         const tsFiles = [
             { fileName: 'index.ts', content: index },
             { fileName: 'client.ts', content: client },
             { fileName: 'middleware.ts', content: middleware },
+            { fileName: 'data.json', content: data },
         ];
         const ts = yield Promise.resolve().then(() => __importStar(require('typescript')));
         const compilerOptions = {
@@ -206,6 +214,14 @@ export default router;
             declaration: true,
         };
         const result = (yield Promise.all(tsFiles.map((_a) => __awaiter(this, [_a], void 0, function* ({ fileName, content }) {
+            if (fileName === 'data.json') {
+                return [
+                    {
+                        fileName: 'data.json',
+                        content: data,
+                    },
+                ];
+            }
             const cjs = ts.transpileModule(content, {
                 fileName,
                 compilerOptions: Object.assign(Object.assign({}, compilerOptions), { module: ts.ModuleKind.CommonJS }),

package/lib/cjs/{block-studio/utils.js → utils/helper.js}

@@ -8,6 +8,7 @@ exports.setBlockEntryFilesPattern = setBlockEntryFilesPattern;
 exports.getBlockEntryFilesPattern = getBlockEntryFilesPattern;
 exports.findComponentFiles = findComponentFiles;
 exports.getBlockName = getBlockName;
+exports.generateBlockYml = generateBlockYml;
 const glob_1 = require("glob");
 const path_1 = __importDefault(require("path"));
 const DEFAULT_BLOCK_ENTRY_FILES_PATTERN = 'src/**/index.{ts,tsx,html}';
@@ -51,3 +52,4 @@ function getBlockName(entry) {
     return path_1.default.basename(entry, path_1.default.extname(entry));
 }
 exports.logger = console;
+function generateBlockYml() { }

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

@@ -12,9 +12,9 @@ import { spawn } from 'child_process';
 import { Router } from 'express';
 import fs from 'fs';
 import path, { join } from 'path';
-import { findComponentFiles } from './utils';
+import { findComponentFiles } from '../utils/helper';
 const DID = 'z2qa7rr3eUyVnWp2PCxEVARuUfLFh6cE5V2xV';
-const RESOURCE_TYPE = 'block';
+const RESOURCE_TYPE = 'page';
 const allTag = '@ALL_COMPONENTS';
 export function copyFile(src, dest) {
     return new Promise((resolve, reject) => {

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

@@ -12,7 +12,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { readFileSync, existsSync } from 'fs';
 import * as path from 'path';
 import pages, { DefaultPageStrategy } from 'vite-plugin-react-pages';
-import { findComponentFiles, setBlockEntryFilesPattern, getBlockEntryFilesPattern, getBlockName, logger, } from '../utils';
+import { findComponentFiles, setBlockEntryFilesPattern, getBlockEntryFilesPattern, getBlockName, logger, } from '../utils/helper';
 import { initHtmlPreviewTransformPlugin, VIRTUAL_MODULE_ID } from './vite-plugin-html-transform';
 // import initRemoteScriptLocalizerPlugin from './vite-plugin-remote-script-localizer';
 export function initBlockStudioPlugins(options) {
@@ -51,25 +51,25 @@ export 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 import(`${workingDir}/package.json`).then((res) => res.name).catch(() => 'MyLib');
+                    const entryList = findComponentFiles({ cwd: workingDir })
+                        .map((entry) => {
+                        const { blockName } = entry;
+                        const { isHtml } = entry;
+                        const { file } = entry;
+                        if (isHtml) {
+                            return [blockName, `${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(findComponentFiles({ cwd: workingDir })
-                                    .map((entry) => {
-                                    const { blockName } = entry;
-                                    const { isHtml } = entry;
-                                    const { file } = entry;
-                                    if (isHtml) {
-                                        return [blockName, `${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: [