@cloudbase/lowcode-builder 1.8.71 → 1.8.72

package/lib/builder/core/index.d.ts

@@ -14,6 +14,9 @@ interface IBaseAppProps {
     generateMpType?: GenerateMpType;
     plugins?: IPlugin[];
     domain: string;
+    /**
+     * @deprecated
+     */
     extraData?: IExtraData;
 }
 export interface BuildAppProps extends IBaseAppProps {
@@ -44,6 +47,10 @@ export interface IBuildWedaApp extends IBaseAppProps {
     account?: {
         uin?: string;
     };
+    mpConfig?: {
+        appJson?: Record<string, any>;
+        projectConfigJson?: Record<string, any>;
+    };
 }
 export declare function buildWedaConfig({ output, domain, isPrivateMode, endpointType, buildTypeList, }: {
     output: Required<IBuildWedaApp['output']>;
@@ -52,7 +59,7 @@ export declare function buildWedaConfig({ output, domain, isPrivateMode, endpoin
     endpointType?: IBuildWedaApp['endpointType'];
     buildTypeList?: IBuildWedaApp['buildTypeList'];
 }): Promise<void>;
-export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, endpointType, enableExpiredTag, account, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<any>;
+export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, endpointType, enableExpiredTag, account, mpConfig, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<any>;
 export declare function cleanComponentDir(): Promise<void>;
 export declare const version: any;
 export { getFiles, fileToZip, strToBuf } from '../util/generateFiles';

package/lib/builder/core/index.js

@@ -61,7 +61,7 @@ exports.buildWedaConfig = buildWedaConfig;
 async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appKey = 'test', runtime = types_1.RUNTIME.NONE, ignoreInstall = false, buildTypeList = [common_1.BuildType.WEB], mode = common_1.WebpackModeType.PRODUCTION, devTool = 'webpack', deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW }, generateMpType = common_1.GenerateMpType.APP, plugins = [], extraData = {
     isComposite: false,
     compProps: {},
-}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, account = {}, }, cb) {
+}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, account = {}, mpConfig = {}, }, cb) {
     var _a, _b, _c, _d, _e, _f;
     if (!cals) {
         console.error('无效的应用配置');
@@ -94,7 +94,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
         isProduction: mode === common_1.WebpackModeType.PRODUCTION,
         materialLibs: dependencies,
         debugMode: mode !== common_1.WebpackModeType.PRODUCTION && !!process.env.WEAPPS_DEBUG,
-        isMixMode: generateMpType === common_1.GenerateMpType.SUBPACKAGE,
+        isMixMode: !!(subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.length),
         domain,
         isBrowserMpBuilder,
         isPrivateMode,
@@ -106,7 +106,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
     };
     console.log('domain', domain);
     console.log('应用名', appKey);
-    console.log('生成模式', generateMpType);
+    console.log('生成模式', buildContext.isMixMode ? common_1.GenerateMpType.SUBPACKAGE : common_1.GenerateMpType.APP);
     console.log('生成路径', appBuildDir);
     try {
         const startTime = Date.now();
@@ -180,6 +180,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 buildTypeList,
                 ignoreInstall,
                 cdnEndpoints: (0, config_1.generateCdnEndpoints)(cdnEndpoints),
+                mpConfig,
             });
             // 如果是混合模式，则将特定的目录复制到工程下
             // 针对 app.json / package.json 则采用 merge 的操作

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

@@ -4,7 +4,7 @@ import { IBuildContext } from './BuildContext';
 import { BuildType } from '../types/common';
 import { IPlatformApp } from '@cloudbase/cals';
 import { IBuildWedaApp } from '../core';
-export declare function generateWxMp({ buildContext, weapps, calses, plugins, deployOptions, options, buildTypeList, ignoreInstall, cdnEndpoints, }: {
+export declare function generateWxMp({ buildContext, weapps, calses, plugins, deployOptions, options, buildTypeList, ignoreInstall, cdnEndpoints, mpConfig, }: {
     buildContext: IBuildContext;
     weapps: IWeAppData[];
     calses: IPlatformApp[];
@@ -18,6 +18,7 @@ export declare function generateWxMp({ buildContext, weapps, calses, plugins, de
     buildTypeList: BuildType[];
     ignoreInstall: boolean;
     cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
+    mpConfig?: IBuildWedaApp['mpConfig'];
 }): Promise<{
     miniprogramRoot: string;
 }>;

package/lib/builder/mp/index.js

@@ -70,7 +70,7 @@ 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 = {}, }) {
+async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptions, options, buildTypeList, ignoreInstall = false, cdnEndpoints = {}, mpConfig = {}, }) {
     var _a, _b, _c, _d;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
@@ -84,7 +84,10 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
     // 安装依赖库，生成 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, { mpAppId: options.mpAppId });
+    const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(buildContext, weapps, {
+        mpAppId: options.mpAppId,
+        mpConfig,
+    });
     const hasLowcodePkg = weapps.find((item) => !item.mpPkgUrl);
     // #1 generate project files
     if (!mainAppData.mpPkgUrl) {

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

@@ -1,5 +1,6 @@
 import { IWeAppData } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IBuildContext } from './BuildContext';
+import { IBuildWedaApp } from '../core';
 /**
  * generate app.json & page.json for mp
  *
@@ -8,6 +9,7 @@ import { IBuildContext } from './BuildContext';
  */
 export declare function generateMpConfig(ctx: IBuildContext, weapps: IWeAppData[], options: {
     mpAppId?: string;
+    mpConfig?: IBuildWedaApp['mpConfig'];
 }): {
     appConfig: any;
     projConfig: any;

package/lib/builder/mp/mp_config.js

@@ -64,29 +64,40 @@ function generateMpConfig(ctx, weapps, options) {
         return pageConfig;
     });
     const kbConfig = (_a = weapps[0].lowCodes) === null || _a === void 0 ? void 0 : _a.find((m) => m.name === config_1.MP_CONFIG_MODULE_NAME);
-    if (kbConfig) {
-        const { projectConfigJson = {}, appJson = {} } = eval(`(${kbConfig.code.replace(/export\s+default/, '')})`);
-        // # project.config.json, https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html
-        (0, lodash_1.merge)(projConfig, projectConfigJson);
-        // # app.json, https://developers.weixin.qq.com/miniprogram/dev/reference/configuration/app.html
-        if (appJson.tabBar) {
-            parseTabConfig(appJson.tabBar, ctx.projDir);
+    const { tradingCapability, ...mainAppConfig } = weapps[0].appConfig || {};
+    // keep main app config only, ignore subapp config
+    const { subpackages, ...extra } = extractPages(weapps, pageConfigs);
+    const configs = (kbConfig ? [eval(`(${kbConfig.code.replace(/export\s+default/, '')})`)] : []).concat([
+        { appJson: (0, lodash_1.merge)({}, mainAppConfig, extra) },
+        options.mpConfig,
+    ]);
+    configs.forEach((config) => {
+        if (config) {
+            const { projectConfigJson = {}, appJson = {} } = config;
+            // # project.config.json, https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html
+            (0, lodash_1.merge)(projConfig, projectConfigJson);
+            // # app.json, https://developers.weixin.qq.com/miniprogram/dev/reference/configuration/app.html
+            if (appJson.tabBar) {
+                parseTabConfig(appJson.tabBar, ctx.projDir);
+            }
+            (0, lodash_1.merge)(appConfig, appJson);
+            // # page.json
+            // merge(pageConfigs, pagesConfigJson)
         }
-        (0, lodash_1.merge)(appConfig, appJson);
-        // # page.json
-        // merge(pageConfigs, pagesConfigJson)
-    }
-    const matertialMetaIgnores = ctx.materialLibs
+    });
+    /**
+     * 基础配置合并完成
+     * 开启特殊合并合并/覆盖逻辑
+     */
+    projConfig.packOptions.ignore.push(...ctx.materialLibs
         .filter((lib) => !lib.isComposite)
         .reduce((arr, lib) => {
         arr.push({ type: 'file', value: `materials/${lib.name}/meta.json` });
         return arr;
-    }, []);
-    projConfig.packOptions.ignore.push(...matertialMetaIgnores);
-    const { tradingCapability, ...mainAppConfig } = weapps[0].appConfig || {};
-    // keep main app config only, ignore subapp config
-    const { subpackages, ...extra } = extractPages(weapps, pageConfigs);
-    (0, lodash_1.merge)(appConfig, mainAppConfig, extra);
+    }, []));
+    /**
+     * 合并追加系统子包
+     */
     appConfig.subpackages = mergeSubPackages(appConfig.subpackages, [
         {
             root: 'packages/$wd_system',
@@ -104,6 +115,9 @@ function generateMpConfig(ctx, weapps, options) {
         ]
         : [])
         .concat(subpackages));
+    /**
+     * 补全交易插件
+     */
     if (tradingCapability) {
         const tradePluginKey = `weda-mini-shop-plugin`;
         const pluginMeta = {
@@ -136,7 +150,7 @@ function generateMpConfig(ctx, weapps, options) {
     if (!projConfig.setting) {
         projConfig.setting = {};
     }
-    projConfig.setting.compileHotReLoad = false;
+    // projConfig.setting.compileHotReLoad = false;
     projConfig.setting.bigPackageSizeSupport = true;
     projConfig.setting.packNpmManually = true;
     projConfig.setting.packNpmRelationList = [

package/lib/builder/service/webpack.js

@@ -195,6 +195,16 @@ async function downloadAndInstallDependencies(dependencies = [], materialsDir, i
                 await downloadDependencies(targetDir, srcZipUrl);
             }
         }
+        // 同步依赖
+        // const packageJson = await fs.readJson(
+        //   path.join(targetDir, 'package.json')
+        // );
+        // item.dependencies = packageJson.dependencies || {};
+    }));
+    await Promise.all(dependencies.map(async (item) => {
+        const { name, version, srcZipUrl } = item;
+        const materialNameVersion = `${name}@${version}`;
+        const targetDir = path_1.default.join(materialsDir, materialNameVersion);
         console.log(`处理${name}@${version}依赖 ...`);
         await installDependencies(targetDir, {
             ...installOptions,
@@ -206,11 +216,6 @@ async function downloadAndInstallDependencies(dependencies = [], materialsDir, i
                 downloadUrl: srcZipUrl,
             },
         });
-        // 同步依赖
-        // const packageJson = await fs.readJson(
-        //   path.join(targetDir, 'package.json')
-        // );
-        // item.dependencies = packageJson.dependencies || {};
     }));
 }
 exports.downloadAndInstallDependencies = downloadAndInstallDependencies;