@cloudbase/lowcode-builder 1.9.12 → 1.10.0

package/lib/builder/config/dependencies.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSystemPackageDependencies = exports.generateLibDependencies = exports.generatePackageDependencies = void 0;
 const cals_1 = require("@cloudbase/cals");
-const CLOUDBASE_VERSION = '2.8.21-beta.0';
+const CLOUDBASE_VERSION = '2.8.23-beta.0';
 const BASE_DEPS = {
     'miniprogram-gesture': '^1.0.6',
     mobx: '^5',
@@ -13,11 +13,11 @@ const BASE_DEPS = {
  * 注意锁版本
  */
 const CLOUDBASE_DEPS = {
-    '@cloudbase/weda-client': '1.1.13',
-    '@cloudbase/weda-cloud-sdk': '1.0.89',
+    '@cloudbase/weda-client': '1.1.15',
+    '@cloudbase/weda-cloud-sdk': '1.0.96',
 };
 const COMPONENT_DEPS = {
-    '@cloudbase/lowcode-render': '^1.1.6',
+    '@cloudbase/lowcode-render': '^1.1.7',
 };
 const SYS_CLOUDBASE_DEPS = {
     '@cloudbase/adapter-wx_mp': '^1.0.3',

package/lib/builder/core/index.js

@@ -99,9 +99,14 @@ async function buildWedaApp({ cals, subAppCalsList: _subAppCalsList = [], depend
     let appBuildDir = (output === null || output === void 0 ? void 0 : output.path) || (runtime === types_1.RUNTIME.CI ? (_a = (0, util_1.getCompileDirs)('app')) === null || _a === void 0 ? void 0 : _a.appBuildDir : (_b = (0, util_1.getCompileDirs)(appKey)) === null || _b === void 0 ? void 0 : _b.appBuildDir);
     let runtimeDynamicConfig = {};
     if (enableExpiredTag) {
-        const { data } = await axios_1.default.get(config_1.RUNTIME_CONFIG_URL, { responseType: 'json' });
-        if (data) {
-            runtimeDynamicConfig = data;
+        try {
+            const { data } = await axios_1.default.get(config_1.RUNTIME_CONFIG_URL, { responseType: 'json' });
+            if (data) {
+                runtimeDynamicConfig = data;
+            }
+        }
+        catch (e) {
+            console.log('get runtime config error', e);
         }
     }
     const officialLib = dependencies.find((item) => item.name === cals_1.OFFICIAL_LIB_KEY);

package/lib/builder/h5/generate.js

@@ -101,12 +101,7 @@ enableLoading = undefined, publicPath = '/', }) {
          * 当应用数据补充完成后可以祛除
          */
         enableLoading: !(0, common_2.buildAsAdminPortalByBuildType)(buildTypeList) && enableLoading === undefined
-            ? [
-                'lowcode-4gzdsu5k66946492',
-                'lowcode-2gay8jgh25c7b1cf',
-                'lowcode-4g9b78bx94404d85',
-                'lowcode-8gmx7bat3135e2de',
-            ].includes(envId)
+            ? ['lowcode-4g9b78bx94404d85'].includes(envId)
             : enableLoading,
     }));
 }

package/lib/builder/mp/wxml.js

@@ -146,11 +146,20 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
                 });
             }
             if (ctx.enableLoading) {
+                let loadingTag = WD_INFO;
+                if (typeof ctx.enableLoading !== 'boolean') {
+                    const meta = (0, materials_1.getWxmlTag)(ctx, { moduleName: '$template', name: ctx.enableLoading }, nameMangler, mode);
+                    if (meta.path) {
+                        loadingTag = 'wd-custom-loading-tag';
+                        usingComponents[loadingTag] = meta.path;
+                    }
+                }
                 pageMeta.elements.push({
                     type: 'element',
-                    name: WD_INFO,
+                    name: loadingTag,
                     attributes: {
                         ['wx:if']: '{{_isCheckingAtuh && !_expiredMessage}}',
+                        pageUUID: ctx.pageUUID,
                         type: 'loading',
                     },
                     elements: [],