@blocklet/pages-kit-block-studio 0.4.83 → 0.4.85

package/lib/cjs/constants/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_BLOCK_ENTRY_FILES_PATTERN = exports.NANOID_LENGTH = exports.PREVIEW_IMAGE_DIR = exports.METADATA_FILE_NAME = exports.libDir = exports.NEW_BLOCK_TEMPLATE_METADATA_PATH = exports.NEW_BLOCK_TEMPLATE_PATH = exports.MEDIA_KIT_RESOURCE_TYPE = exports.MEDIA_KIT_DID = exports.PAGES_KIT_BLOCK_STUDIO_RESOURCE_TYPE = exports.PAGES_KIT_BLOCK_STUDIO_DID = exports.PAGES_KIT_RESOURCE_TYPE = exports.PAGES_KIT_DID = void 0;
+exports.PAGES_KIT_STATE_STATE_DIR = exports.IGNORE_WATCH_PREFIX = exports.DEFAULT_BLOCK_ENTRY_FILES_PATTERN = exports.NANOID_LENGTH = exports.PREVIEW_IMAGE_DIR = exports.METADATA_FILE_NAME = exports.libDir = exports.NEW_BLOCK_TEMPLATE_METADATA_PATH = exports.NEW_BLOCK_TEMPLATE_PATH = exports.MEDIA_KIT_RESOURCE_TYPE = exports.MEDIA_KIT_DID = exports.PAGES_KIT_BLOCK_STUDIO_RESOURCE_TYPE = exports.PAGES_KIT_BLOCK_STUDIO_DID = exports.PAGES_KIT_RESOURCE_TYPE = exports.PAGES_KIT_DID = void 0;
 const path_1 = __importDefault(require("path"));
 exports.PAGES_KIT_DID = 'z8iZiDFg3vkkrPwsiba1TLXy3H9XHzFERsP8o';
 exports.PAGES_KIT_RESOURCE_TYPE = 'page';
@@ -18,3 +18,5 @@ exports.METADATA_FILE_NAME = '@metadata.json';
 exports.PREVIEW_IMAGE_DIR = '@preview-images';
 exports.NANOID_LENGTH = 16;
 exports.DEFAULT_BLOCK_ENTRY_FILES_PATTERN = 'src/**/index.{ts,tsx}';
+exports.IGNORE_WATCH_PREFIX = ['@del-*', '@tmp-*', '.*', 'staging', 'production', '@backup-*'];
+exports.PAGES_KIT_STATE_STATE_DIR = 'site-state';

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

@@ -171,17 +171,21 @@ exports.initResourceRouter.post('/', async (req, res) => {
         fs_1.default.mkdirSync(componentsDir, { recursive: true });
         const chunksDir = (0, path_1.join)(tmpPackage, 'chunks');
         fs_1.default.mkdirSync(chunksDir, { recursive: true });
+        const chunksMapPath = (0, path_1.join)(codeDir, 'chunks-map.json');
+        const chunksMap = JSON.parse(fs_1.default.readFileSync(chunksMapPath, 'utf8'));
         // get @metadata.json by glob
         const canUseComponents = (0, helper_1.findComponentFiles)({ cwd: rootDir, filter: componentIds });
         // Filter and process metadata files
         const metadataList = canUseComponents.map(({ fullPath, blockName, metadata: _metadata }) => {
             // get metadata
             const metadata = _metadata;
+            const jsName = `${blockName}.js`;
             // get code to metadata
-            const code = fs_1.default.readFileSync((0, path_1.join)(codeDir, `${blockName}.js`), 'utf8');
+            const code = fs_1.default.readFileSync((0, path_1.join)(codeDir, jsName), 'utf8');
             if (code) {
                 (0, set_1.default)(metadata, 'renderer.script', code);
                 (0, set_1.default)(metadata, 'renderer.type', 'react-component');
+                (0, set_1.default)(metadata, 'renderer.chunks', chunksMap[jsName] || []);
             }
             // write metadata to metadataPath
             const metadataYmlPath = path_1.default.join(componentsDir, `${metadata.name || 'unnamed'}.${metadata.id}.yml`);
@@ -196,8 +200,8 @@ exports.initResourceRouter.post('/', async (req, res) => {
             }
             return metadata;
         });
-        // cp _chunks dir
-        await copyRecursive((0, path_1.join)(codeDir, '_chunks'), chunksDir);
+        // cp chunks dir
+        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 });

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

@@ -32,10 +32,15 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 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 path_1 = require("path");
 const constants_1 = require("../constants");
 // init uploader router
 exports.initUploaderRouter = (0, express_1.Router)();
@@ -63,12 +68,31 @@ const staticResourceMiddleware = (0, uploader_server_1.initStaticResourceMiddlew
         },
     ],
 });
+// will proxy to pages kit data dir each project's chunks folder
+const dynamicResourceMiddleware = (0, uploader_server_1.initDynamicResourceMiddleware)({
+    // 这个中间件只会作用到 PAGES_KIT_DID 的资源
+    componentDid: constants_1.PAGES_KIT_DID,
+    resourcePaths: [
+        {
+            // * is project id
+            path: (0, path_1.join)(config_1.default.env.dataDir, constants_1.PAGES_KIT_STATE_STATE_DIR, '*', 'production', 'chunks'),
+            whitelist: ['.js', '.css', '.png', '.json'], // 可选，只处理这些后缀的文件
+        },
+    ],
+    watchOptions: {
+        ignorePatterns: constants_1.IGNORE_WATCH_PREFIX, // 使用 IGNORE_WATCH_PREFIX 作为忽略模式, 忽略一些临时路径
+    },
+    cacheOptions: {
+        maxAge: '365d',
+        immutable: true,
+    },
+});
 exports.initUploaderRouter.use('/uploads', (0, uploader_server_1.initProxyToMediaKitUploadsMiddleware)({
     express: express_1.default,
 }), staticResourceMiddleware, (_req, res) => {
     res.status(404).send('404 NOT FOUND').end();
 });
-exports.initUploaderRouter.use('/chunks', staticResourceMiddleware, (_req, res) => {
+exports.initUploaderRouter.use('/chunks', dynamicResourceMiddleware, staticResourceMiddleware, (_req, res) => {
     res.status(404).send('CHUNK NOT FOUND').end();
 });
 exports.default = exports.initUploaderRouter;

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

@@ -39,11 +39,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initBlockStudioPlugins = initBlockStudioPlugins;
 // import typescript from '@rollup/plugin-typescript';
 const builtin_module_transformer_1 = require("@blocklet/pages-kit/utils/typescript/builtin-module-transformer");
+// @ts-ignore
+const chunks_analyzer_transformer_1 = require("@blocklet/pages-kit/utils/typescript/chunks-analyzer-transformer");
 const fs_1 = require("fs");
 const camelCase_1 = __importDefault(require("lodash/camelCase"));
 const upperFirst_1 = __importDefault(require("lodash/upperFirst"));
 const p_limit_1 = __importDefault(require("p-limit"));
 const path = __importStar(require("path"));
+const path_1 = require("path");
 const rollup_plugin_external_globals_1 = __importDefault(require("rollup-plugin-external-globals"));
 // import { visualizer } from 'rollup-plugin-visualizer';
 const typescript_1 = __importDefault(require("typescript"));
@@ -213,7 +216,7 @@ function initBlockStudioPlugins(options) {
                             output: {
                                 ..._config?.build?.rollupOptions?.output,
                                 chunkFileNames: () => {
-                                    return '[format]/_chunks/[name]-[hash].js';
+                                    return '[format]/chunks/[name]-[hash].js';
                                 },
                                 // 使用没有 window. 前缀的映射用于 globals 配置
                                 globals: globalsMappings,
@@ -304,7 +307,9 @@ function initBlockStudioPlugins(options) {
             name: 'post-build-file-transpiler',
             apply: 'build',
             enforce: 'post',
-            writeBundle(options) {
+            async writeBundle(options) {
+                // 用于存储每个格式的 chunks 映射
+                const allChunksMap = {};
                 // 对所有生成的 JavaScript 文件进行 transpileModule 处理
                 const transpileBuiltinModuleFn = (dir, format) => {
                     const files = (0, fs_1.readdirSync)(dir);
@@ -317,6 +322,10 @@ function initBlockStudioPlugins(options) {
                         else if (file.endsWith('.js')) {
                             try {
                                 const script = (0, fs_1.readFileSync)(filePath, 'utf8');
+                                // @ts-ignore
+                                const chunks = (0, chunks_analyzer_transformer_1.analyzeFileChunks)(typescript_1.default, script);
+                                // ensure chunksMap is with all chunks
+                                allChunksMap[(0, path_1.basename)(filePath)] = new Set(chunks);
                                 const moduleMap = {
                                     es: typescript_1.default.ModuleKind.ESNext,
                                     cjs: typescript_1.default.ModuleKind.CommonJS,
@@ -342,20 +351,70 @@ function initBlockStudioPlugins(options) {
                             }
                         }
                     });
+                    // 返回一个 Promise 以便 await
+                    return new Promise((resolve, reject) => {
+                        try {
+                            // ... 处理文件的代码 ...
+                            resolve();
+                        }
+                        catch (error) {
+                            reject(error);
+                        }
+                    });
                 };
                 // 获取输出目录
                 const outDir = options.dir || 'dist';
                 const limit = (0, p_limit_1.default)(20);
-                formats.forEach((format) => {
+                // 使用 Promise.all 等待所有格式处理完成
+                await Promise.all(formats.map(async (format) => {
                     const formatDir = path.resolve(outDir, `${format}`);
-                    const chunkDir = path.resolve(formatDir, '_chunks');
+                    const chunkDir = path.resolve(formatDir, 'chunks');
                     // if not exists, create it
                     if (!(0, fs_1.existsSync)(chunkDir)) {
                         (0, fs_1.mkdirSync)(chunkDir, { recursive: true });
                     }
                     if (transpileBuiltinModule) {
-                        limit(() => transpileBuiltinModuleFn(formatDir, format));
+                        await limit(() => transpileBuiltinModuleFn(formatDir, format));
+                    }
+                }));
+                // 现在可以处理完整依赖链
+                helper_1.logger.info('all transpile tasks done, start to handle dependency chain...');
+                // 在这里处理 allChunksMap 的完整依赖链
+                Object.entries(allChunksMap).forEach(([entryFile, directDeps]) => {
+                    // 收集所有间接依赖
+                    const allDeps = [...directDeps];
+                    // 递归寻找间接依赖
+                    function findTransitiveDeps(chunks) {
+                        chunks.forEach((chunk) => {
+                            // 如果该chunk本身也是个入口(有依赖列表)
+                            if (chunk in allChunksMap) {
+                                const subDeps = allChunksMap[chunk];
+                                // 添加未包含的依赖
+                                if (subDeps) {
+                                    subDeps.forEach((dep) => {
+                                        if (!allDeps.includes(dep)) {
+                                            allDeps.push(dep);
+                                            // 递归寻找这个依赖的依赖
+                                            findTransitiveDeps([dep]);
+                                        }
+                                    });
+                                }
+                            }
+                        });
                     }
+                    // 开始递归查找
+                    findTransitiveDeps([...directDeps]);
+                    // 更新为完整依赖列表
+                    allChunksMap[entryFile] = new Set(allDeps);
+                });
+                // 转换 Set 为数组以便正确序列化
+                const serializedMap = Object.entries(allChunksMap).reduce((result, [key, deps]) => {
+                    result[key] = Array.from(deps);
+                    return result;
+                }, {});
+                formats.forEach((format) => {
+                    // 存下来
+                    (0, fs_1.writeFileSync)(path.join(outDir, `${format}/chunks-map.json`), JSON.stringify(serializedMap, null, 2));
                 });
             },
             closeBundle() {