@cloudbase/lowcode-builder 1.8.86 → 1.8.88

package/lib/builder/mp/index.js

@@ -58,12 +58,8 @@ const templateDir = `${config_1.appTemplateDir}/mp/`;
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
 function patchBuildContext(ctx, calses) {
-    var _a, _b;
     const { mainAppData } = ctx;
     const used = (0, cals_1.getUsedComps)(calses, ctx.materialLibs, { streamline: true, withAction: true });
-    if ((_a = used.component) === null || _a === void 0 ? void 0 : _a['$template']) {
-        ctx.materialLibs = [...ctx.materialLibs, (0, cals_1.processTemplatesToDependiencies)((_b = calses === null || calses === void 0 ? void 0 : calses[0]) === null || _b === void 0 ? void 0 : _b.templates)];
-    }
     /**
      * 修改 buildContext 进行 miniprogramPlugins 精简
      */
@@ -71,7 +67,7 @@ function patchBuildContext(ctx, calses) {
     return { used: used };
 }
 async function generateWxMp({ buildContext: _buildContext, weapps, calses, deployOptions, options, buildTypeList, ignoreInstall = false, cdnEndpoints = {}, mpConfig = {}, }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
     console.log(`Generating ${em('Wexin MiniProgram')} to ${_buildContext.projDir}`);
@@ -84,10 +80,30 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
      * 依据所有应用的低码配置生成默认项目json
      * 次高优先级，生成整个小程序的配置信息
      */
-    const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(_buildContext, weapps, calses, {
+    const { projConfig, appConfig, pageConfigs } = await (0, mp_config_1.generateMpConfig)(_buildContext, weapps, calses, {
         mpAppId: options.mpAppId,
         mpConfig,
     });
+    Object.values((appConfig === null || appConfig === void 0 ? void 0 : appConfig.usingComponents) || {}).forEach((path) => {
+        var _a;
+        const matched = path.match(new RegExp(`(?:\\.)?(?:\\/)?${config_1.materialsDirName}\\/\\$template\\/(.*)?\\/index`));
+        if (matched) {
+            const componentName = matched[1];
+            if (!((_a = used.component) === null || _a === void 0 ? void 0 : _a['$template'])) {
+                used.component['$template'] = new Set();
+            }
+            used.component['$template'].add(componentName);
+        }
+    });
+    /**
+     * 此处逻辑分离自 patchBuildContext
+     * 因为 materialLibs 依赖 used 修正，used 依赖 generateMpConfig 后获取 appConfig 修正，generateMpConfig 有依赖 materialLibs 中源码组件库信息进行生成产生了循环
+     * 根据当前的逻辑牺牲封装在此继续修正
+     */
+    if ((_a = used.component) === null || _a === void 0 ? void 0 : _a['$template']) {
+        const templateLib = (0, cals_1.processTemplatesToDependiencies)((_b = calses === null || calses === void 0 ? void 0 : calses[0]) === null || _b === void 0 ? void 0 : _b.templates);
+        _buildContext.materialLibs = [..._buildContext.materialLibs, templateLib];
+    }
     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);
@@ -132,7 +148,7 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
             endpointType,
         }, 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'))
+        const cssVarMap = Object.entries((0, theme_1.mergeCssVarConfig)((_d = (_c = calses[0]) === null || _c === void 0 ? void 0 : _c.theme) === null || _d === void 0 ? void 0 : _d.cssVarConfig, 'MP'))
             .map(([key, _value]) => {
             const value = _value || '';
             return [key, value.replace(/;$/, '')];
@@ -142,8 +158,8 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
             return map;
         }, {}) || {};
         let customLoginConfig;
-        let loginConfigPathname = ((_d = (_c = calses[0]) === null || _c === void 0 ? void 0 : _c.extra) === null || _d === void 0 ? void 0 : _d.loginConfigVersion)
-            ? (0, cals_1.generateCustomLoginConfigPathname)({ appId, version: (_f = (_e = calses[0]) === null || _e === void 0 ? void 0 : _e.extra) === null || _f === void 0 ? void 0 : _f.loginConfigVersion })
+        let loginConfigPathname = ((_f = (_e = calses[0]) === null || _e === void 0 ? void 0 : _e.extra) === null || _f === void 0 ? void 0 : _f.loginConfigVersion)
+            ? (0, cals_1.generateCustomLoginConfigPathname)({ appId, version: (_h = (_g = calses[0]) === null || _g === void 0 ? void 0 : _g.extra) === null || _h === void 0 ? void 0 : _h.loginConfigVersion })
             : '';
         if (loginConfigPathname) {
             const url = `https://${domain}${loginConfigPathname}`;
@@ -165,8 +181,8 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                 expirationStartTimesnap,
                 runtimeDynamicConfig: buildContext.runtimeDynamicConfig,
                 RUNTIME_CONFIG_URL: index_1.RUNTIME_CONFIG_URL,
-                loginConfigPathname: ((_h = (_g = calses[0]) === null || _g === void 0 ? void 0 : _g.extra) === null || _h === void 0 ? void 0 : _h.loginConfigVersion)
-                    ? (0, cals_1.generateCustomLoginConfigPathname)({ appId, version: (_k = (_j = calses[0]) === null || _j === void 0 ? void 0 : _j.extra) === null || _k === void 0 ? void 0 : _k.loginConfigVersion })
+                loginConfigPathname: ((_k = (_j = calses[0]) === null || _j === void 0 ? void 0 : _j.extra) === null || _k === void 0 ? void 0 : _k.loginConfigVersion)
+                    ? (0, cals_1.generateCustomLoginConfigPathname)({ appId, version: (_m = (_l = calses[0]) === null || _l === void 0 ? void 0 : _l.extra) === null || _m === void 0 ? void 0 : _m.loginConfigVersion })
                     : '',
                 customLoginConfig: customLoginConfig ? JSON.stringify(customLoginConfig, undefined, 2) : 'null',
             },
@@ -220,9 +236,9 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                 appID: appId,
                 resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
                 isProd: (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.UPLOAD,
-                clientID: ((_l = mainAppData.extra) === null || _l === void 0 ? void 0 : _l.enableLoginStatusShare)
+                clientID: ((_o = mainAppData.extra) === null || _o === void 0 ? void 0 : _o.enableLoginStatusShare)
                     ? mainAppData.envId
-                    : (_m = mainAppData.extra) === null || _m === void 0 ? void 0 : _m.clientId,
+                    : (_p = mainAppData.extra) === null || _p === void 0 ? void 0 : _p.clientId,
                 cdnEndpoints,
                 builderVersion: core_1.version || '',
                 officialLibVersion: (officialLib === null || officialLib === void 0 ? void 0 : officialLib.version) || '',
@@ -272,8 +288,8 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
         projectConfigJson.setting = {
             ...projectConfigJson.setting,
             ...projConfig.setting,
-            packNpmRelationList: ((_o = projConfig.setting) === null || _o === void 0 ? void 0 : _o.packNpmRelationList) || ((_p = projectConfigJson.setting) === null || _p === void 0 ? void 0 : _p.packNpmRelationList)
-                ? (0, mp_config_1.mergePackNpmRelationList)(projConfig.setting.packNpmRelationList, (_q = projectConfigJson.setting) === null || _q === void 0 ? void 0 : _q.packNpmRelationList)
+            packNpmRelationList: ((_q = projConfig.setting) === null || _q === void 0 ? void 0 : _q.packNpmRelationList) || ((_r = projectConfigJson.setting) === null || _r === void 0 ? void 0 : _r.packNpmRelationList)
+                ? (0, mp_config_1.mergePackNpmRelationList)(projConfig.setting.packNpmRelationList, (_s = projectConfigJson.setting) === null || _s === void 0 ? void 0 : _s.packNpmRelationList)
                 : undefined,
         };
         const wedaRoot = path_1.default.posix.join('./', projectConfigJson.miniprogramRoot || '/', projectConfigJson.wedaRoot || '');
@@ -291,9 +307,9 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
             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);
+        const appJsonPath = path_1.default.join(miniprogramRoot, 'app.json');
+        const appJson = await fs.readJson(appJsonPath);
+        appJson.subpackages = (0, mp_config_1.mergeSubPackages)(((_u = (_t = appJson.subpackages) === null || _t === void 0 ? void 0 : _t.filter) === null || _u === void 0 ? void 0 : _u.call(_t, (item) => item.name !== 'wd-sys-module' && item.name !== 'wd-sys-materials')) || [], appConfig.subpackages);
         await (0, generateFiles_1.writeFile)(appJsonPath, JSON.stringify(appJson, undefined, 2));
     }
     else {

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

@@ -11,11 +11,11 @@ import { IPlatformApp } from '@cloudbase/cals';
 export declare function generateMpConfig(ctx: Omit<IBuildContext, 'wedaRoot'>, weapps: IWeAppData[], calses: IPlatformApp[], options: {
     mpAppId?: string;
     mpConfig?: IBuildWedaApp['mpConfig'];
-}): {
+}): Promise<{
     appConfig: any;
     projConfig: any;
     pageConfigs: {}[];
-};
+}>;
 interface ISubpackage {
     root: string;
     pages?: string[];

package/lib/builder/mp/mp_config.js

@@ -41,8 +41,8 @@ const util_1 = require("../util");
  * @param kboneConfig https://wechat-miniprogram.github.io/kbone/docs/config/
  * @param appConfigs app config from prop edit panel
  */
-function generateMpConfig(ctx, weapps, calses, options) {
-    var _a, _b, _c, _d, _e;
+async function generateMpConfig(ctx, weapps, calses, options) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const appConfig = {
         useExtendedLib: { weui: true },
     };
@@ -84,10 +84,6 @@ function generateMpConfig(ctx, weapps, calses, options) {
             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);
         }
     });
@@ -95,6 +91,10 @@ function generateMpConfig(ctx, weapps, calses, options) {
     if (projConfig.wedaRoot) {
         projConfig.wedaRoot = (0, util_1.normalizeWedaRoot)(projConfig.wedaRoot);
     }
+    // # app.json, https://developers.weixin.qq.com/miniprogram/dev/reference/configuration/app.html
+    if (appConfig.tabBar) {
+        await parseTabConfig(appConfig.tabBar, path.posix.join(ctx.projDir, projConfig.miniprogramRoot || ''), path.posix.join('./', projConfig.wedaRoot || ''));
+    }
     /**
      * 基础配置合并完成
      * 开启特殊合并合并/覆盖逻辑
@@ -104,7 +104,7 @@ function generateMpConfig(ctx, weapps, calses, options) {
         .reduce((arr, lib) => {
         arr.push({
             type: 'file',
-            value: path.posix.join(projConfig.wedaRoot || '', `materials/${lib.name}/meta.json`),
+            value: path.posix.join(projConfig.wedaRoot || '', `${config_1.materialsDirName}/${lib.name}/meta.json`),
         });
         return arr;
     }, []));
@@ -113,11 +113,11 @@ function generateMpConfig(ctx, weapps, calses, options) {
      */
     const { subpackages, pages = [] } = extractPages(weapps, pageConfigs, { wedaRoot: projConfig.wedaRoot });
     appConfig.pages = Array.from(new Set([...(appConfig.pages || []), ...pages]));
-    appConfig.subpackages = mergeSubPackages(appConfig.subpackages, [
+    appConfig.subpackages = mergeSubPackages(((_e = (_d = appConfig.subpackages) === null || _d === void 0 ? void 0 : _d.filter) === null || _e === void 0 ? void 0 : _e.call(_d, (item) => item.name !== 'wd-sys-module' && item.name !== 'wd-sys-materials')) || [], [
         {
             root: path.posix.join(projConfig.wedaRoot || '', 'packages/$wd_system'),
             name: 'wd-sys-module',
-            pages: ((_e = (_d = calses === null || calses === void 0 ? void 0 : calses[0]) === null || _d === void 0 ? void 0 : _d.extra) === null || _e === void 0 ? void 0 : _e.loginConfigVersion) ? ['pages/login/index'] : [],
+            pages: ((_g = (_f = calses === null || calses === void 0 ? void 0 : calses[0]) === null || _f === void 0 ? void 0 : _f.extra) === null || _g === void 0 ? void 0 : _g.loginConfigVersion) ? ['pages/login/index'] : [],
         },
     ]
         .concat(ctx.enableAsyncMaterials
@@ -171,9 +171,9 @@ function generateMpConfig(ctx, weapps, calses, options) {
     if (!projConfig.setting.packNpmRelationList) {
         projConfig.setting.packNpmRelationList = [];
     }
-    projConfig.setting.packNpmRelationList = mergePackNpmRelationList(generateSystemPackNpmRelationList(path.posix.join('./', projConfig.miniprogramRoot || '/', projConfig.wedaRoot || '')), projConfig.setting.packNpmRelationList.filter((item) => {
+    projConfig.setting.packNpmRelationList = mergePackNpmRelationList(generateSystemPackNpmRelationList(path.posix.join('./', projConfig.miniprogramRoot || '/', projConfig.wedaRoot || '')), ((_j = (_h = projConfig.setting.packNpmRelationList) === null || _h === void 0 ? void 0 : _h.filter) === null || _j === void 0 ? void 0 : _j.call(_h, (item) => {
         return !/\/packages\/\$wd_system\/package.json/.test(item.packageJsonPath);
-    }));
+    })) || []);
     if (process.env.IS_WEB_WORKER) {
         projConfig.setting.ignoreUploadUnusedFiles = true;
     }
@@ -214,7 +214,7 @@ function extractPages(weapps, pageConfigs, options) {
     }
     return { pages, subpackages };
 }
-function getAppPagesConfig(pages) {
+function getAppPagesConfig(pages = []) {
     const pagesConfig = {};
     pages.map((page) => {
         const pageConfig = transformDynamicData(page.data);
@@ -233,27 +233,35 @@ function transformDynamicData(originData) {
     }
     return temp;
 }
-function parseTabConfig(tabBar, projDir) {
-    tabBar.list.map((tab, index) => {
-        const { iconPath, selectedIconPath } = tab;
-        if (iconPath) {
-            tab.iconPath = parseTabIcon(iconPath, index, 'icon');
-        }
-        if (selectedIconPath) {
-            tab.selectedIconPath = parseTabIcon(selectedIconPath, index, 'selectedIcon');
-        }
-    });
-    function parseTabIcon(iconUrl, index, filename) {
+function parseTabConfig(tabBar, miniprogramRoot, wedaRoot) {
+    var _a, _b;
+    async function parseTabIcon(iconUrl, index, filename) {
         if (typeof iconUrl !== 'string') {
             console.error(chalk_1.default.red('App.json invalid tabbar icon path'), iconUrl);
             return;
         }
-        const iconPath = `assets/tab${index}/${filename}${path.extname(iconUrl)}`;
-        (0, net_1.downloadFile)(iconUrl, `${projDir}/${iconPath}`).catch((e) => {
+        const iconPath = path.posix.join('./', wedaRoot || '/', `assets/tab${index}/${filename}${path.extname(iconUrl)}`);
+        await (0, net_1.downloadFile)(iconUrl, `${miniprogramRoot}/${iconPath}`).catch((e) => {
             console.error(chalk_1.default.red(`Fail to download tabBar icon from ${iconUrl}`), e);
+            throw e;
         });
         return iconPath;
     }
+    return Promise.all(((_b = (_a = tabBar.list) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, async (tab, index) => {
+        const { iconPath, selectedIconPath } = tab;
+        if (iconPath && /^http(s):\/\//.test(iconPath)) {
+            try {
+                tab.iconPath = await parseTabIcon(iconPath, index, 'icon');
+            }
+            catch (e) { }
+        }
+        if (selectedIconPath && /^http(s):\/\//.test(selectedIconPath)) {
+            try {
+                tab.selectedIconPath = await parseTabIcon(selectedIconPath, index, 'selectedIcon');
+            }
+            catch (e) { }
+        }
+    })) || []);
 }
 function mergeSubPackages(base = [], extra = []) {
     const baseMap = base.reduce((map, item) => {

package/lib/builder/util/net.js

@@ -36,9 +36,12 @@ const config_1 = require("../config");
 const generateFiles_1 = require("../util/generateFiles");
 const junk_1 = require("../util/junk");
 async function downloadFile(url, filePath) {
+    if (fs_extra_1.default.existsSync(filePath)) {
+        return;
+    }
     await fs_extra_1.default.ensureDir(path.dirname(filePath));
-    const res = await axios_1.default.get(url, { responseType: 'stream' });
-    res.data.pipe(fs_extra_1.default.createWriteStream(filePath));
+    const res = await axios_1.default.get(url, { responseType: 'arraybuffer' });
+    fs_extra_1.default.writeFileSync(filePath, res.data);
 }
 exports.downloadFile = downloadFile;
 /**