@cloudbase/lowcode-builder 1.8.78 → 1.8.79

package/lib/builder/mp/index.js

@@ -112,7 +112,11 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
         ..._buildContext,
         wedaRoot: (0, util_3.normalizeWedaRoot)(projectConfigJson.wedaRoot),
     };
-    // #2 生成主包, 若主包为代码包，则下载了基础项目代码，包涵项目 projectConfigJson
+    // #1.5 安装依赖库，生成 materials 目录副作用修改了buildContext 因此需要早于页面生成
+    if (hasLowcodePkg) {
+        await (0, materials_1.installMaterials)(buildContext, localWedaRoot, used, weapps);
+    }
+    // #2 生成主包, 若主包为代码包上游已经处理过，不再处理
     if (mainAppData.mpPkgUrl) {
     }
     else {
@@ -121,8 +125,6 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
     // #3 生成 wedaRoot 文件
     if (hasLowcodePkg) {
         await generateFramework(buildContext, { cals: calses[0], weapp: mainAppData }, localWedaRoot, { deployOptions });
-        // 安装依赖库，生成 materials 目录
-        await (0, materials_1.installMaterials)(buildContext, localWedaRoot, used, weapps);
         await generateConfig({
             domain,
             isPrivateMode,

package/lib/builder/mp/materials.js

@@ -329,7 +329,7 @@ async function generateCompositeComponent(ctx, compositedComp, outDir, compLibCo
  */
 const NAME_MANAGER = new name_mangler_1.default({ blackList: mp_1.builtinMpTags });
 function getWxmlTag(ctx, cmp, nameMangler) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f;
     const { moduleName, name } = cmp;
     const materialLib = ctx.materialLibs.find((lib) => lib.name === moduleName);
     const miniprogramPlugin = (_a = ctx.miniprogramPlugins) === null || _a === void 0 ? void 0 : _a.find((plugin) => plugin.name === moduleName);
@@ -338,22 +338,16 @@ function getWxmlTag(ctx, cmp, nameMangler) {
     const components = (materialLib === null || materialLib === void 0 ? void 0 : materialLib.components) || (miniprogramPlugin === null || miniprogramPlugin === void 0 ? void 0 : miniprogramPlugin.componentConfigs);
     const findComponent = components === null || components === void 0 ? void 0 : components.find((comp) => comp.name === name);
     if (!findComponent) {
-        if (moduleName === cals_1.OFFICIAL_COMPONENT_LIB_NAME) {
-            console.log('>>>>>>>>>>>>>>>>>>>>', (_c = (_b = components === null || components === void 0 ? void 0 : components.map) === null || _b === void 0 ? void 0 : _b.call(components, (comp) => comp.name)) === null || _c === void 0 ? void 0 : _c.join(','));
-        }
         return { tagName };
     }
     if (materialLib) {
         let cmpMeta = (findComponent === null || findComponent === void 0 ? void 0 : findComponent.meta) || { platforms: undefined };
         if (!cmpMeta.platforms) {
-            if (moduleName === cals_1.OFFICIAL_COMPONENT_LIB_NAME) {
-                console.log('>>>>>>>>>>>>>>>>>>>>', JSON.stringify(cmpMeta));
-            }
             return { tagName };
         }
-        compPath = (_e = (_d = cmpMeta === null || cmpMeta === void 0 ? void 0 : cmpMeta.platforms) === null || _d === void 0 ? void 0 : _d.mp) === null || _e === void 0 ? void 0 : _e.path;
-        if ((_g = (_f = cmpMeta === null || cmpMeta === void 0 ? void 0 : cmpMeta.platforms) === null || _f === void 0 ? void 0 : _f.mp) === null || _g === void 0 ? void 0 : _g.tagName) {
-            tagName = (_h = cmpMeta === null || cmpMeta === void 0 ? void 0 : cmpMeta.platforms) === null || _h === void 0 ? void 0 : _h.mp.tagName;
+        compPath = (_c = (_b = cmpMeta === null || cmpMeta === void 0 ? void 0 : cmpMeta.platforms) === null || _b === void 0 ? void 0 : _b.mp) === null || _c === void 0 ? void 0 : _c.path;
+        if ((_e = (_d = cmpMeta === null || cmpMeta === void 0 ? void 0 : cmpMeta.platforms) === null || _d === void 0 ? void 0 : _d.mp) === null || _e === void 0 ? void 0 : _e.tagName) {
+            tagName = (_f = cmpMeta === null || cmpMeta === void 0 ? void 0 : cmpMeta.platforms) === null || _f === void 0 ? void 0 : _f.mp.tagName;
         }
         if (compPath) {
             compPath =
@@ -376,9 +370,6 @@ function getWxmlTag(ctx, cmp, nameMangler) {
     if (!tagName) {
         tagName = name.toLocaleUpperCase();
     }
-    if (moduleName === cals_1.OFFICIAL_COMPONENT_LIB_NAME && !compPath) {
-        console.log('>>>>>>>>>>>>>>>>>>>>**sdfsdf');
-    }
     return {
         tagName,
         path: compPath,