@blocklet/pages-kit-block-studio 0.1.27 → 0.1.28

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

@@ -59,6 +59,8 @@ const helper_1 = require("../utils/helper");
 const DID = 'z2qa7rr3eUyVnWp2PCxEVARuUfLFh6cE5V2xV';
 const RESOURCE_TYPE = 'page';
 const allTag = '@ALL_COMPONENTS';
+// use for tracking build process
+let currentBuildProcess = null;
 function copyFile(src, dest) {
     return new Promise((resolve, reject) => {
         const readStream = fs_1.default.createReadStream(src);
@@ -136,12 +138,19 @@ exports.initResourceRouter.post('/', (req, res) => __awaiter(void 0, void 0, voi
     // ignore all tag
     const componentIds = resources.filter((resource) => resource.id !== allTag);
     try {
+        // if current build process exists, kill it
+        if (currentBuildProcess) {
+            currentBuildProcess.kill();
+            currentBuildProcess = null;
+        }
         // Execute build command with filtered components
         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' }),
         });
+        // save current build process
+        currentBuildProcess = buildProcess;
         yield new Promise((resolve, reject) => {
             buildProcess.on('close', (code) => {
                 if (code === 0)
@@ -159,12 +168,15 @@ exports.initResourceRouter.post('/', (req, res) => __awaiter(void 0, void 0, voi
         fs_1.default.mkdirSync(dir, { recursive: true });
         const rootDir = process.cwd();
         const distDir = (0, path_1.join)(rootDir, helper_1.libDir);
+        const codeDir = (0, path_1.join)(distDir, 'es');
         const tmpPackage = (0, path_1.join)(distDir, 'resource-blocklet');
         fs_1.default.mkdirSync(tmpPackage, { recursive: true });
         const pagesDir = (0, path_1.join)(tmpPackage, 'pages');
         fs_1.default.mkdirSync(pagesDir, { recursive: true });
         const componentsDir = (0, path_1.join)(tmpPackage, 'components');
         fs_1.default.mkdirSync(componentsDir, { recursive: true });
+        const chunksDir = (0, path_1.join)(tmpPackage, 'chunks');
+        fs_1.default.mkdirSync(chunksDir, { recursive: true });
         // get @metadata.json by glob
         const canUseComponents = (0, helper_1.findComponentFiles)({ cwd: rootDir, filter: componentIds });
         // Filter and process metadata files
@@ -172,7 +184,7 @@ exports.initResourceRouter.post('/', (req, res) => __awaiter(void 0, void 0, voi
             // get metadata
             const metadata = _metadata;
             // get code to metadata
-            const code = fs_1.default.readFileSync((0, path_1.join)(distDir, 'es', `${blockName}.js`), 'utf8');
+            const code = fs_1.default.readFileSync((0, path_1.join)(codeDir, `${blockName}.js`), 'utf8');
             if (code) {
                 (0, set_1.default)(metadata, 'renderer.script', code);
                 (0, set_1.default)(metadata, 'renderer.type', 'react-component');
@@ -190,10 +202,13 @@ 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);
         // 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 });
         const pagesConfig = {
+            version: 2,
             pages: [],
             components: metadataList.map((metadata) => ({
                 id: metadata.id,