@cloudbase/lowcode-builder 1.8.74 → 1.8.76

package/lib/builder/mp/index.js

@@ -41,8 +41,6 @@ const util_2 = require("./util");
 const wxml_1 = require("./wxml");
 const lowcode_1 = require("./lowcode");
 const mp_config_1 = require("./mp_config");
-const plugin_1 = require("./plugin");
-const plugin_2 = require("../core/plugin");
 const util_3 = require("../util");
 const lowcode_generator_1 = require("@cloudbase/lowcode-generator");
 const types_1 = require("../../types");
@@ -54,6 +52,7 @@ const cals_1 = require("@cloudbase/cals");
 const core_1 = require("../core");
 const theme_1 = require("../../utils/theme");
 const index_1 = require("../config/index");
+const mixMode_1 = require("./mixMode");
 const templateDir = `${config_1.appTemplateDir}/mp/`;
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
@@ -70,24 +69,26 @@ function patchBuildContext(ctx, calses) {
     ctx.miniprogramPlugins = (mainAppData.miniprogramPlugins || []).filter((plugin) => used.component[plugin.name] || used.action[plugin.name]);
     return { used: used };
 }
-async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptions, options, buildTypeList, ignoreInstall = false, cdnEndpoints = {}, mpConfig = {}, }) {
+async function generateWxMp({ buildContext: _buildContext, weapps, calses, deployOptions, options, buildTypeList, ignoreInstall = false, cdnEndpoints = {}, mpConfig = {}, }) {
     var _a, _b, _c, _d;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
-    console.log(`Generating ${em('Wexin MiniProgram')} to ${buildContext.projDir}`);
+    console.log(`Generating ${em('Wexin MiniProgram')} to ${_buildContext.projDir}`);
     /**
      * 此函数具有副作用，用于补充修正小程序特殊的buildContext
      * 注意一定在入口进行处理，应当尽可能提前，后续逻辑不应该更新buildContext
      */
-    const { used } = patchBuildContext(buildContext, calses);
-    const { uin = '', appId, projDir, materialLibs: materials, isProduction, mainAppData, domain, isPrivateMode = false, endpointType = '', isBrowserMpBuilder = false, } = buildContext;
-    // 安装依赖库，生成 materials 目录
-    await (0, materials_1.installMaterials)(buildContext, projDir, used, weapps);
-    const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!isProduction);
-    const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(buildContext, weapps, {
+    const { used } = patchBuildContext(_buildContext, calses);
+    /**
+     * 依据所有应用的低码配置生成默认项目json
+     * 次高优先级，生成整个小程序的配置信息
+     */
+    const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(_buildContext, weapps, {
         mpAppId: options.mpAppId,
         mpConfig,
     });
+    const { uin = '', appId, projDir, materialLibs: materials, isProduction, mainAppData, domain, isPrivateMode = false, endpointType = '', isBrowserMpBuilder = false, } = _buildContext;
+    const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!isProduction);
     const hasLowcodePkg = weapps.find((item) => !item.mpPkgUrl);
     // #1 generate project files
     if (!mainAppData.mpPkgUrl) {
@@ -97,27 +98,36 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
         console.log(`Generating ${em('project')} files`);
         await (0, generateFiles_1.default)(projectFileData, templateDir, projDir);
     }
-    // #2 生成主包
-    await generatePkg({ ...buildContext, rootPath: mainAppData.rootPath }, { cals: calses[0], weapp: mainAppData }, path_1.default.join(projDir, '/'), pageConfigs[0]);
-    const projectConfigJsonPath = path_1.default.join(projDir, mainAppData.rootPath || '', 'project.config.json');
+    else {
+        /**
+         * 若主包为代码包，则下载了基础项目代码，包涵项目 projectConfigJson
+         */
+        await generatePkg({ ..._buildContext, rootPath: mainAppData.rootPath }, { cals: calses[0], weapp: mainAppData }, path_1.default.join(projDir, '/'), pageConfigs[0]);
+    }
+    const projectConfigJsonPath = path_1.default.join(projDir, 'project.config.json');
     let projectConfigJson = await fs.readJSON(projectConfigJsonPath);
     const miniprogramRoot = path_1.default.join(projDir, projectConfigJson.miniprogramRoot || '/');
-    await generateFramework(buildContext, mainAppData, miniprogramRoot, { deployOptions });
-    // #3 生成主包根路径文件
-    let appFileData = {};
+    const localWedaRoot = path_1.default.join(miniprogramRoot, projectConfigJson.wedaRoot || '/');
+    const buildContext = {
+        ..._buildContext,
+        wedaRoot: (0, util_3.normalizeWedaRoot)(projectConfigJson.wedaRoot),
+    };
+    // #2 生成主包, 若主包为代码包，则下载了基础项目代码，包涵项目 projectConfigJson
+    if (mainAppData.mpPkgUrl) {
+    }
+    else {
+        await generatePkg({ ...buildContext, rootPath: mainAppData.rootPath }, { cals: calses[0], weapp: mainAppData }, localWedaRoot, pageConfigs[0]);
+    }
+    // #3 生成 wedaRoot 文件
     if (hasLowcodePkg) {
-        await generateFramework(buildContext, mainAppData, miniprogramRoot, { deployOptions });
-        // 有了 framework app 之后，并且是源码的方式,追加 app 引用
-        if (mainAppData.mpPkgUrl) {
-            let appJsPath = path_1.default.join(miniprogramRoot, 'app.js');
-            let appJsContent = await fs.readFile(appJsPath);
-            await (0, generateFiles_1.writeFile)(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
-        }
+        await generateFramework(buildContext, { cals: calses[0], weapp: mainAppData }, localWedaRoot, { deployOptions });
+        // 安装依赖库，生成 materials 目录
+        await (0, materials_1.installMaterials)(buildContext, localWedaRoot, used, weapps);
         await generateConfig({
             domain,
             isPrivateMode,
             endpointType,
-        }, miniprogramRoot);
+        }, localWedaRoot);
         const expirationStartTimesnap = buildContext.enableExpiredTag ? Date.now() : 0;
         const cssVarMap = Object.entries((0, theme_1.mergeCssVarConfig)((_b = (_a = calses[0]) === null || _a === void 0 ? void 0 : _a.theme) === null || _b === void 0 ? void 0 : _b.cssVarConfig, 'MP'))
             .map(([key, _value]) => {
@@ -128,8 +138,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
             map[key] = value;
             return map;
         }, {}) || {};
-        appFileData = {
-            ...appFileData,
+        const wedaRootFileData = {
             'common/style.js': {},
             'common/util.js': {
                 skipCheckAuth: process.env.SKIP_CHECK_AUTH,
@@ -157,6 +166,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
             'common/query.js': {},
             'common/flow.js': {},
             'common/info': {},
+            'common/placeholder': {},
             /**
              * 使用微信的 modal
              * 暂时保留内部实现待之后使用
@@ -167,56 +177,6 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
              * 调试用
              */
             // 'common/behaviors.js': {},
-        };
-        if (buildContext.enableAsyncMaterials && !appFileData['common/placeholder']) {
-            appFileData['common/placeholder'] = {};
-        }
-    }
-    if (mainAppData.mpPkgUrl) {
-        // 合并 project 和 app json，复写 appId
-        projectConfigJson.appId = projConfig.appId;
-        projectConfigJson.setting = {
-            ...projectConfigJson.setting,
-            ...projConfig.setting,
-        };
-        const projectMpRoot = projectConfigJson.miniprogramRoot || '/';
-        if (!projectConfigJson.setting.packNpmManually) {
-            projectConfigJson.setting.packNpmManually = true;
-        }
-        if (!projectConfigJson.setting.packNpmRelationList) {
-            projectConfigJson.setting.packNpmRelationList = [];
-        }
-        projectConfigJson.setting.packNpmRelationList = [
-            ...projectConfigJson.setting.packNpmRelationList.filter((item) => item.packageJsonPath === './package.json' || item.packageJsonPath === './packages/$wd_system/package.json'),
-            {
-                packageJsonPath: path_1.default.posix.join(projectMpRoot, 'package.json'),
-                miniprogramNpmDistDir: projectMpRoot,
-            },
-            {
-                packageJsonPath: path_1.default.posix.join(projectMpRoot, 'packages', '$wd_system', 'package.json'),
-                miniprogramNpmDistDir: path_1.default.posix.join(projectMpRoot, 'packages', '$wd_system'),
-            },
-        ];
-        await (0, generateFiles_1.writeFile)(projectConfigJsonPath, JSON.stringify(projectConfigJson, undefined, 2));
-        let appJsonPath = path_1.default.join(miniprogramRoot, 'app.json');
-        let appJson = await fs.readJson(appJsonPath);
-        appJson.subpackages = (0, mp_config_1.mergeSubPackages)(appJson.subpackages, appConfig.subpackages);
-        await (0, generateFiles_1.writeFile)(appJsonPath, JSON.stringify(appJson, undefined, 2));
-    }
-    else {
-        const importor = (0, util_3.generateLowcodeImportor)(mainAppData.lowCodes || []);
-        appFileData = {
-            ...appFileData,
-            'app.js': { appConfig, importor, materialSubPackagePath: config_1.materialsDirName },
-            'app.json': { content: appConfig },
-            'app.wxss': {
-                importStyles: materials
-                    .reduce((styles, lib) => {
-                    styles = styles.concat((lib.styles || []).map((stylePath) => stylePath && !stylePath.startsWith('/') ? `/${config_1.materialsDirName}/${lib.name}/${stylePath}` : stylePath) || []);
-                    return styles;
-                }, [])
-                    .concat(importor.styles.map((mod) => path_1.default.posix.join('lowcode', (0, weapps_core_1.getCodeModuleFilePath)('global', mod, { style: '.wxss' })))),
-            },
             'package.json': {
                 appId,
                 importJSSDK: endpointType === 'tcb-api',
@@ -224,16 +184,9 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
                 cdnEndpoints,
             },
         };
-    }
-    console.log(`Generating ${em('miniprogramRoot')} files`);
-    await (0, generateFiles_1.default)(appFileData, templateDir, miniprogramRoot);
-    // 若项目目录与小程序根目录不同，则拷贝素材到小程序根目录
-    if (miniprogramRoot !== path_1.default.join(projDir, '/') && fs.existsSync(path_1.default.join(projDir, config_1.materialsDirName))) {
-        console.log(`Move ${em(config_1.materialsDirName)} from` + `${projDir} to ${miniprogramRoot}`);
-        await fs.move(path_1.default.join(projDir, config_1.materialsDirName), path_1.default.join(miniprogramRoot, config_1.materialsDirName));
-    }
-    // 生成数据源
-    if (hasLowcodePkg) {
+        console.log(`Generating ${em('weda root')} files`);
+        await (0, generateFiles_1.default)(wedaRootFileData, templateDir, localWedaRoot);
+        // 生成数据源
         const officialLib = materials.find((item) => item.name === cals_1.OFFICIAL_LIB_KEY);
         const datasourceFileData = {
             'datasources/index.js.tpl': {
@@ -256,35 +209,120 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
                 datasourceProfiles: (0, util_3.JsonToStringWithVariableName)([], { EOL: false }),
             },
             'datasources/dataset-profiles.js.tpl': {
-                datasetProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasetProfiles)(mainAppData, weapps), { EOL: true }),
+                datasetProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasetProfiles)(mainAppData, /* 页面的dataset由各页面本身按需注册，不再提前注册 */ []), {
+                    EOL: true,
+                }),
             },
         };
         console.log(`Generating ${em('datasources')} files`);
-        await (0, generateFiles_1.default)(datasourceFileData, templateDir, miniprogramRoot);
-    }
-    // 生成上报 & 系统子包模块模块
-    if (hasLowcodePkg) {
-        const subpackageRootPath = path_1.default.join(miniprogramRoot, 'packages', '$wd_system');
+        await (0, generateFiles_1.default)(datasourceFileData, templateDir, localWedaRoot);
+        // 生成上报 & 系统子包模块模块
+        const subpackageRootPath = path_1.default.join(localWedaRoot, 'packages', '$wd_system');
         const sysSubpackageFileData = {
             'package.json': { cdnEndpoints },
             'index.js.tpl': { cdnEndpoints },
         };
         console.log(`Generating ${em('system subpackage')} files`);
+        await (0, generateFiles_1.copyRecursiveSync)(path_1.default.join(templateDir, 'packages/$wd_system/pages'), path_1.default.join(subpackageRootPath, 'pages'), {
+            filter: (src) => {
+                if (/.tpl$/.test(src)) {
+                    return false;
+                }
+                return true;
+            },
+        });
         await (0, generateFiles_1.default)(sysSubpackageFileData, path_1.default.join(templateDir, 'packages/$wd_system'), subpackageRootPath);
     }
+    // #4 生成 miniprogramRoot 文件
+    if (mainAppData.mpPkgUrl) {
+        // 合并 project 和 app json，复写 appId
+        projectConfigJson.appId = projConfig.appId;
+        projectConfigJson.setting = {
+            ...projectConfigJson.setting,
+            ...projConfig.setting,
+        };
+        const wedaRoot = path_1.default.posix.join('./', projectConfigJson.miniprogramRoot || '/', projectConfigJson.wedaRoot || '');
+        if (!projectConfigJson.setting.packNpmManually) {
+            projectConfigJson.setting.packNpmManually = true;
+        }
+        if (!projectConfigJson.setting.packNpmRelationList) {
+            projectConfigJson.setting.packNpmRelationList = [];
+        }
+        projectConfigJson.setting.packNpmRelationList = [
+            ...projectConfigJson.setting.packNpmRelationList.filter((item) => [
+                './package.json',
+                '/package.json',
+                './packages/$wd_system/package.json',
+                '/packages/$wd_system/package.json',
+            ].includes(item.packageJsonPath)),
+            {
+                packageJsonPath: `./${path_1.default.posix.join(wedaRoot, 'package.json')}`,
+                miniprogramNpmDistDir: `./${wedaRoot}`,
+            },
+            {
+                packageJsonPath: `./${path_1.default.posix.join(wedaRoot, 'packages', '$wd_system', 'package.json')}`,
+                miniprogramNpmDistDir: `./${path_1.default.posix.join(wedaRoot, 'packages', '$wd_system')}`,
+            },
+        ];
+        await (0, generateFiles_1.writeFile)(projectConfigJsonPath, JSON.stringify(projectConfigJson, undefined, 2));
+        // 有了 framework app 之后，并且是源码的方式,追加 app 引用
+        if (hasLowcodePkg) {
+            let appJsPath = path_1.default.join(miniprogramRoot, 'app.js');
+            let appJsContent = await fs.readFile(appJsPath);
+            await (0, generateFiles_1.writeFile)(appJsPath, `import { app as wedaApp } from './${path_1.default.posix.join('./', projectConfigJson.wedaRoot, 'app/weapps-api')}'\n${appJsContent}`);
+        }
+        let appJsonPath = path_1.default.join(miniprogramRoot, 'app.json');
+        let appJson = await fs.readJson(appJsonPath);
+        appJson.subpackages = (0, mp_config_1.mergeSubPackages)(appJson.subpackages, appConfig.subpackages);
+        await (0, generateFiles_1.writeFile)(appJsonPath, JSON.stringify(appJson, undefined, 2));
+    }
+    else {
+        const importor = (0, util_3.generateLowcodeImportor)(mainAppData.lowCodes || []);
+        let appFileData = {
+            'app.js': {
+                appConfig,
+                importor,
+                materialSubPackagePath: path_1.default.posix.join(buildContext.wedaRoot || '', config_1.materialsDirName),
+                wedaRootRelativePath: `.${path_1.default.posix.join('/', buildContext.wedaRoot || '', '/')}`,
+            },
+            'app.json': { content: appConfig },
+            'app.wxss': {
+                importStyles: materials
+                    .reduce((styles, lib) => {
+                    styles = styles.concat((lib.styles || []).map((stylePath) => stylePath && !stylePath.startsWith('/')
+                        ? path_1.default.posix.join('./', buildContext.wedaRoot || '', config_1.materialsDirName, lib.name, stylePath)
+                        : stylePath) || []);
+                    return styles;
+                }, [])
+                    .concat(importor.styles.map((mod) => path_1.default.posix.join('./', buildContext.wedaRoot || '', 'lowcode', (0, weapps_core_1.getCodeModuleFilePath)('global', mod, { style: '.wxss' })))),
+            },
+        };
+        console.log(`Generating ${em('miniprogramRoot')} files`);
+        await (0, generateFiles_1.default)(appFileData, templateDir, miniprogramRoot);
+    }
+    // 若项目目录与小程序根目录不同，则拷贝素材到小程序根目录
+    // if (miniprogramRoot !== path.join(projDir, '/') && fs.existsSync(path.join(projDir, materialsDirName))) {
+    //   console.log(`Move ${em(materialsDirName)} from` + `${projDir} to ${miniprogramRoot}`);
+    //   await fs.move(
+    //     path.join(projDir, materialsDirName),
+    //     path.join(miniprogramRoot, buildContext.wedaRoot || '', materialsDirName),
+    //   );
+    // }
     // 生成子包
     await Promise.all(weapps.map(async (app, index) => {
         if (index == 0) {
             return;
         }
         else {
-            const subpackageRootPath = path_1.default.join(miniprogramRoot, 'packages', app.rootPath || '/');
+            const subpackageRootPath = path_1.default.join(localWedaRoot, 'packages', app.rootPath || '/');
             let subpackageBuildCtx = {
                 ...buildContext,
                 rootPath: app.rootPath,
             };
             await generatePkg(subpackageBuildCtx, { cals: calses[index], weapp: app }, subpackageRootPath, pageConfigs[index]);
-            await generateFramework(subpackageBuildCtx, app, subpackageRootPath, { deployOptions });
+            await generateFramework(subpackageBuildCtx, { cals: calses[index], weapp: app }, subpackageRootPath, {
+                deployOptions,
+            });
             // 生成package.json
             let packageJsonPath = path_1.default.join(subpackageRootPath, 'package.json');
             if (!fs.existsSync(packageJsonPath)) {
@@ -299,34 +337,46 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
             }
         }
     }));
-    if (!isBrowserMpBuilder) {
-        if (fs.existsSync(path_1.default.join(miniprogramRoot, 'package.json'))) {
-            await (0, webpack_1.installDependencies)(miniprogramRoot, {
-                ignoreInstall,
-                fixNodeModulesMap: { '@cloudbase/js-sdk': endpointType !== 'tcb-api', mobx: true },
-            });
-        }
-        const wdSystemSubRoot = path_1.default.join(miniprogramRoot, 'packages', '$wd_system');
-        if (fs.existsSync(path_1.default.join(wdSystemSubRoot, 'package.json'))) {
-            await (0, webpack_1.installDependencies)(wdSystemSubRoot, {
-                ignoreInstall,
-            });
+    // 将子包中 app.json / package.json merge 进主包中
+    if (weapps.length > 1) {
+        console.log(chalk_1.default.green('【混合模式】'), miniprogramRoot);
+        await (0, mixMode_1.handleSubApps)({
+            buildContext,
+            apps: weapps,
+            miniprogramRoot,
+            wedaRoot: localWedaRoot,
+        });
+    }
+    const roots = (path_1.default.posix.join('/', projectConfigJson.wedaRoot || '') === '/'
+        ? []
+        : [{ type: 'miniprogramRoot', path: miniprogramRoot }]).concat([
+        { type: 'wedaRoot', path: localWedaRoot },
+        { type: '$weda_system', path: path_1.default.join(localWedaRoot, 'packages', '$wd_system') },
+    ]);
+    for (let meta of roots) {
+        if (fs.existsSync(path_1.default.join(meta.path, 'package.json'))) {
+            if (isBrowserMpBuilder) {
+                await (0, net_1.installBrowserDependencies)({
+                    type: meta.type,
+                    path: meta.path,
+                    runtimeEndpointType: endpointType || undefined,
+                });
+            }
+            else {
+                await (0, webpack_1.installDependencies)(meta.path, {
+                    ignoreInstall,
+                    fixNodeModulesMap: { '@cloudbase/js-sdk': endpointType !== 'tcb-api', mobx: true },
+                });
+            }
         }
     }
-    await handleMpPlugins();
     console.timeEnd(operationLabel);
     // web端的builder不需要清除
     if (!isBrowserMpBuilder) {
-        cleanProj(weapps, miniprogramRoot);
-        cleanMaterils(path_1.default.join(miniprogramRoot, config_1.materialsDirName), used);
+        cleanProj(weapps, localWedaRoot);
+        cleanMaterils(path_1.default.join(localWedaRoot, config_1.materialsDirName), used);
     }
     return { miniprogramRoot };
-    // SDK 插件
-    async function handleMpPlugins() {
-        // 编译后置原生小程序类的安装
-        const mpPlugins = (await (0, plugin_1.getPluginType)(miniprogramRoot, plugins)).filter((item) => item.type === 'mp');
-        await (0, plugin_2.runHandleMpPlugin)(miniprogramRoot, mpPlugins);
-    }
 }
 exports.generateWxMp = generateWxMp;
 function resolveNpmDeps(weapps, materials, extra = {}) {
@@ -474,6 +524,7 @@ async function generatePkg(ctx, { cals, weapp }, appRoot, pageConfigs) {
                     subLevelPath,
                     importor,
                     query: (0, util_2.createTemplateQuery)(ctx, (_f = page.dataset) === null || _f === void 0 ? void 0 : _f.query),
+                    datasetProfile: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.generateDynamicDataset)(page.dataset), { EOL: true }),
                     eventFlows: (0, util_2.createTemplateEventFlows)(ctx, page.eventFlows),
                     resetShare: ((_j = (_h = (_g = page === null || page === void 0 ? void 0 : page.data) === null || _g === void 0 ? void 0 : _g.appShareMessage) === null || _h === void 0 ? void 0 : _h.value) === null || _j === void 0 ? void 0 : _j.enable) ||
                         ((_k = allAppUsedComps === null || allAppUsedComps === void 0 ? void 0 : allAppUsedComps[cals_1.OFFICIAL_LIB_KEY]) === null || _k === void 0 ? void 0 : _k.has('Share')) ||
@@ -510,10 +561,14 @@ async function generatePkg(ctx, { cals, weapp }, appRoot, pageConfigs) {
         await writeLowCodeFiles(ctx, weapp, appRoot);
     }
 }
-async function generateFramework(ctx, appData, outDir, options) {
-    var _a, _b;
+async function generateFramework(ctx, { cals, weapp: appData }, outDir, options) {
+    var _a, _b, _c;
     let fileData = {};
     if (appData.mpPkgUrl) {
+        /**
+         * 当前包为代码包 + 主包
+         * framework 基础兜底
+         */
         if (!appData.rootPath) {
             fileData = {
                 ...fileData,
@@ -562,6 +617,8 @@ async function generateFramework(ctx, appData, outDir, options) {
                         version: (_a = options === null || options === void 0 ? void 0 : options.deployOptions) === null || _a === void 0 ? void 0 : _a.version,
                         envId: appData.envId,
                         envVersion: (ctx === null || ctx === void 0 ? void 0 : ctx.isProduction) ? 'production' : 'preview',
+                        loginConfigVersion: (_b = cals.extra) === null || _b === void 0 ? void 0 : _b.loginConfigVersion,
+                        basename: ctx.wedaRoot,
                         pages: appData.pageInstanceList
                             .sort((item) => (item.isHome ? -1 : 1))
                             .map((item) => {
@@ -576,7 +633,7 @@ async function generateFramework(ctx, appData, outDir, options) {
                             });
                         }),
                     }),
-                    appQuery: (0, util_2.createTemplateQuery)(ctx, (_b = appData.dataset) === null || _b === void 0 ? void 0 : _b.query),
+                    appQuery: (0, util_2.createTemplateQuery)(ctx, (_c = appData.dataset) === null || _c === void 0 ? void 0 : _c.query),
                     /**
                      * @deprecated
                      */
@@ -635,17 +692,15 @@ function getAppendableJson(json = {}) {
     return '';
 }
 // 处理使用到的组件
-async function cleanProj(weapps, miniprogramRoot) {
-    weapps.map((pkg) => cleanPkg(pkg, miniprogramRoot));
+async function cleanProj(weapps, wedaRoot) {
+    weapps.map((pkg) => cleanPkg(pkg, wedaRoot));
 }
-async function cleanPkg(pkg, miniprogramRoot) {
+async function cleanPkg(pkg, wedaRoot) {
     // zip 模式跳过clean
     if (pkg.mpPkgUrl) {
         return;
     }
-    const pkgDir = [miniprogramRoot, pkg.rootPath ? `packages${path_1.default.sep}${pkg.rootPath}` : '']
-        .filter((p) => !!p)
-        .join(path_1.default.sep);
+    const pkgDir = [wedaRoot, pkg.rootPath ? `packages${path_1.default.sep}${pkg.rootPath}` : ''].filter((p) => !!p).join(path_1.default.sep);
     const pagesDir = path_1.default.join(pkgDir, 'pages');
     const lowcodesDir = path_1.default.join(pkgDir, 'lowcode');
     const existedPages = await fs.readdir(pagesDir);

package/lib/builder/mp/materials.d.ts

@@ -2,7 +2,7 @@ import { IWeAppComponentInstance, IWeAppData } from '@cloudbase/lowcode-generato
 import { IBuildContext } from './BuildContext';
 import NameMangler from '@cloudbase/lowcode-generator/lib/generator/util/name-mangler';
 import { IUsedComps } from '../types/common';
-export declare function installMaterials(ctx: IBuildContext, projDir: string, usedMeta: {
+export declare function installMaterials(ctx: IBuildContext, outDir: string, usedMeta: {
     component: IUsedComps;
     action: IUsedComps;
 }, weapps: IWeAppData[]): Promise<void>;

package/lib/builder/mp/materials.js

@@ -43,7 +43,7 @@ const name_mangler_1 = __importDefault(require("@cloudbase/lowcode-generator/lib
 const junk = __importStar(require("../util/junk"));
 const cals_1 = require("@cloudbase/cals");
 const templateDir = `${config_1.appTemplateDir}/mp/`;
-async function installMaterials(ctx, projDir, usedMeta, weapps) {
+async function installMaterials(ctx, outDir, usedMeta, weapps) {
     let { materialLibs: _materialLibs, isBrowserMpBuilder } = ctx;
     const weappsList = ctx.isMixMode ? weapps : weapps.filter((item) => !item.rootPath);
     let materialLibs = _materialLibs.filter((lib) => usedMeta.component[lib.name] || usedMeta.action[lib.name]);
@@ -78,10 +78,7 @@ async function installMaterials(ctx, projDir, usedMeta, weapps) {
         // 混合模式下，各个子包获取自己使用过的组件和复合组件（会出现冗余）
         // 统一都放在根目录下，可以减少冗余
         await Promise.all(weappsList.map(async (app) => {
-            const targetDir = path.join(projDir, 
-            // 统一放在根目录下引用
-            // app.rootPath || '',
-            config_1.materialsDirName, name);
+            const targetDir = path.join(outDir, config_1.materialsDirName, name);
             if (usingMaterialMap[targetDir]) {
                 return;
             }
@@ -177,7 +174,7 @@ async function installMaterials(ctx, projDir, usedMeta, weapps) {
     // #2 Generate composited libs
     await Promise.all(compositedLibs.map(async (lib) => {
         console.log(`Generate composited library ${lib.name}`);
-        await (0, util_2.writeLibCommonRes2file)(lib, path.join(ctx.projDir, config_1.materialsDirName, lib.name, 'libCommonRes'));
+        await (0, util_2.writeLibCommonRes2file)(lib, path.join(outDir, config_1.materialsDirName, lib.name, 'libCommonRes'));
         await Promise.all(lib.components.map(async (cmp) => {
             return generateCompositeComponent({
                 ...ctx,
@@ -188,7 +185,7 @@ async function installMaterials(ctx, projDir, usedMeta, weapps) {
                 processCssUnit: lib.name !== '$template' ? 'rpx' : ctx.processCssUnit,
                 // 只生成在主目录中，减少冗余
                 // rootPath: app.rootPath || '', // 主包是没有 rootPath 的
-            }, cmp, lib.compLibCommonResource);
+            }, cmp, path.join(outDir, config_1.materialsDirName), lib.compLibCommonResource);
         }));
     }));
 }
@@ -209,18 +206,16 @@ async function downloadMaterial(zipUrl, dstFolder, isBrowser = false, noCache =
         return;
     await (0, net_1.downloadZip)(zipUrl, dstFolder, isBrowser, noCache);
 }
-async function generateCompositeComponent(ctx, compositedComp, compLibCommonResource) {
+async function generateCompositeComponent(ctx, compositedComp, outDir, compLibCommonResource) {
     const compositeCtx = {
         ...ctx,
         isPage: false,
         enableLoading: false,
     };
     const { materialName } = compositedComp;
-    const outDir = path.join(compositeCtx.projDir, 
-    // compositeCtx.rootPath || '', // 所有组件统一生成到根目录
-    config_1.materialsDirName, materialName, compositedComp.name);
+    const componentDir = path.join(outDir, materialName, compositedComp.name);
     const LOWCODE_DIR_NAME = 'lowcode';
-    console.log(`Generating composited component ${materialName}:${compositedComp.name} to ${outDir}`);
+    console.log(`Generating composited component ${materialName}:${compositedComp.name} to ${componentDir}`);
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!compositeCtx.isProduction);
     // # Generating page
     const usingComponents = {};
@@ -292,7 +287,7 @@ async function generateCompositeComponent(ctx, compositedComp, compLibCommonReso
         },
     };
     // Generating file by template and data
-    await (0, generateFiles_1.default)(pageFileData, `${templateDir}/component`, outDir);
+    await (0, generateFiles_1.default)(pageFileData, `${templateDir}/component`, componentDir);
     // #3 writing lowcode files
     /**
      * 低码没有开放 index 类别，直接去掉
@@ -320,7 +315,7 @@ async function generateCompositeComponent(ctx, compositedComp, compLibCommonReso
         if (mod.name === 'index') {
             return;
         }
-        return (0, lowcode_1.writeCode2file)(compositeCtx, mod, path.join(outDir, LOWCODE_DIR_NAME), { comp: compositedComp }, themeCode);
+        return (0, lowcode_1.writeCode2file)(compositeCtx, mod, path.join(componentDir, LOWCODE_DIR_NAME), { comp: compositedComp }, themeCode);
     });
     // await writeLowCodeFiles(weapp, appRoot)
     // await generateFramework(weapp, appRoot)
@@ -355,14 +350,10 @@ function getWxmlTag(ctx, cmp, nameMangler) {
             tagName = (_f = cmpMeta === null || cmpMeta === void 0 ? void 0 : cmpMeta.platforms) === null || _f === void 0 ? void 0 : _f.mp.tagName;
         }
         if (compPath) {
-            // 小程序混合模式时，组件库会存在子包内
-            // 组件库永远都在根目录下，这样才能减少冗余 - royhyang
-            const rootPath = ctx.rootPath || '';
             compPath =
                 compPath.startsWith('/') || compPath.indexOf('://') > 0
                     ? compPath
-                    : path.posix.join(
-                    /* ctx.isMixMode ? '/' + rootPath : */ '', `/${config_1.materialsDirName}/${cmp.moduleName}`, compPath);
+                    : path.posix.join('/', ctx.wedaRoot || '', `${config_1.materialsDirName}/${cmp.moduleName}`, compPath);
             tagName = `${/^\$/.test(moduleName) ? NAME_MANAGER.mangle(moduleName) : moduleName}-${name}`;
             if (nameMangler) {
                 tagName = nameMangler.mangle(tagName);

package/lib/builder/mp/mixMode.d.ts

@@ -1,9 +1,15 @@
-import { IWeAppData, IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { IWeAppData } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IBuildContext } from '../mp/BuildContext';
-export declare function handleMixMode({ buildContext, apps, miniprogramRoot, plugins, ignoreInstall, }: {
+export declare function handleMixMode({ buildContext, apps, miniprogramRoot, wedaRoot, }: {
     buildContext: IBuildContext;
     apps: IWeAppData[];
     miniprogramRoot: string;
-    plugins: IPlugin[];
+    wedaRoot: string;
     ignoreInstall: boolean;
 }): Promise<void>;
+export declare function handleSubApps({ buildContext, apps, miniprogramRoot, wedaRoot, }: {
+    buildContext: IBuildContext;
+    apps: IWeAppData[];
+    miniprogramRoot: string;
+    wedaRoot: string;
+}): Promise<void>;