@cloudbase/lowcode-builder 1.8.88 → 1.8.89

package/lib/builder/mp/index.js

@@ -58,8 +58,12 @@ 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 精简
      */
@@ -67,7 +71,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, _r, _s, _t, _u;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
     console.log(`Generating ${em('Wexin MiniProgram')} to ${_buildContext.projDir}`);
@@ -84,26 +88,6 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
         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);
@@ -148,7 +132,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)((_d = (_c = calses[0]) === null || _c === void 0 ? void 0 : _c.theme) === null || _d === void 0 ? void 0 : _d.cssVarConfig, 'MP'))
+        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]) => {
             const value = _value || '';
             return [key, value.replace(/;$/, '')];
@@ -158,8 +142,8 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
             return map;
         }, {}) || {};
         let customLoginConfig;
-        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 })
+        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 })
             : '';
         if (loginConfigPathname) {
             const url = `https://${domain}${loginConfigPathname}`;
@@ -181,8 +165,8 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                 expirationStartTimesnap,
                 runtimeDynamicConfig: buildContext.runtimeDynamicConfig,
                 RUNTIME_CONFIG_URL: index_1.RUNTIME_CONFIG_URL,
-                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 })
+                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 })
                     : '',
                 customLoginConfig: customLoginConfig ? JSON.stringify(customLoginConfig, undefined, 2) : 'null',
             },
@@ -236,9 +220,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: ((_o = mainAppData.extra) === null || _o === void 0 ? void 0 : _o.enableLoginStatusShare)
+                clientID: ((_l = mainAppData.extra) === null || _l === void 0 ? void 0 : _l.enableLoginStatusShare)
                     ? mainAppData.envId
-                    : (_p = mainAppData.extra) === null || _p === void 0 ? void 0 : _p.clientId,
+                    : (_m = mainAppData.extra) === null || _m === void 0 ? void 0 : _m.clientId,
                 cdnEndpoints,
                 builderVersion: core_1.version || '',
                 officialLibVersion: (officialLib === null || officialLib === void 0 ? void 0 : officialLib.version) || '',
@@ -288,8 +272,8 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
         projectConfigJson.setting = {
             ...projectConfigJson.setting,
             ...projConfig.setting,
-            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)
+            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)
                 : undefined,
         };
         const wedaRoot = path_1.default.posix.join('./', projectConfigJson.miniprogramRoot || '/', projectConfigJson.wedaRoot || '');
@@ -307,9 +291,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}`);
         }
-        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);
+        let appJsonPath = path_1.default.join(miniprogramRoot, 'app.json');
+        let appJson = await fs.readJson(appJsonPath);
+        appJson.subpackages = (0, mp_config_1.mergeSubPackages)(((_s = (_r = appJson.subpackages) === null || _r === void 0 ? void 0 : _r.filter) === null || _s === void 0 ? void 0 : _s.call(_r, (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 {
@@ -488,7 +472,7 @@ async function generatePkg(ctx, { cals, weapp }, appRoot, pageConfigs) {
             return map;
         }, {});
         await Promise.all(weapp.pageInstanceList.map(async (page, index) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
             // # Generating page
             const rootPath = weapp.rootPath || '';
             const usingComponents = {};
@@ -582,9 +566,12 @@ async function generatePkg(ctx, { cals, weapp }, appRoot, pageConfigs) {
                         ? `@import "${path_1.default.posix.relative(`/packages/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
                         : '',
                     content: [
-                        (0, weapps_core_1.toCssText)((0, cals_1.processCommonStyle2CSSProperties)(page.commonStyle, {
-                            defaultUnit: processCssUnit,
-                        }), 'page'),
+                        (0, weapps_core_1.toCssText)(((_o = (_m = CALS_PAGE_MAP[page.id]) === null || _m === void 0 ? void 0 : _m.attributes) === null || _o === void 0 ? void 0 : _o.style) &&
+                            ((_r = Object.keys(((_q = (_p = CALS_PAGE_MAP[page.id]) === null || _p === void 0 ? void 0 : _p.attributes) === null || _q === void 0 ? void 0 : _q.style) || {})) === null || _r === void 0 ? void 0 : _r.length)
+                            ? (0, cals_1.processCSSPropertiesUnit)(((_t = (_s = CALS_PAGE_MAP[page.id]) === null || _s === void 0 ? void 0 : _s.attributes) === null || _t === void 0 ? void 0 : _t.style) || {}, processCssUnit)
+                            : (0, cals_1.processCommonStyle2CSSProperties)(page.commonStyle, {
+                                defaultUnit: processCssUnit,
+                            }), 'page'),
                         (0, util_2.generateScopedStyleText)(componentInstances),
                     ].join('\n'),
                     pageWxss: importor.styles.length ? `@import "../../lowcode/${page.id}/style.wxss"` : '',

package/lib/builder/mp/mp_config.js

@@ -104,7 +104,7 @@ async function generateMpConfig(ctx, weapps, calses, options) {
         .reduce((arr, lib) => {
         arr.push({
             type: 'file',
-            value: path.posix.join(projConfig.wedaRoot || '', `${config_1.materialsDirName}/${lib.name}/meta.json`),
+            value: path.posix.join(projConfig.wedaRoot || '', `materials/${lib.name}/meta.json`),
         });
         return arr;
     }, []));