@cloudbase/lowcode-builder 1.8.32 → 1.8.33

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

@@ -6,12 +6,12 @@ export declare const materialsDirName = "materials";
  * src/template的代码，在IDE编辑器插件中构建builder
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-export declare const builderTemplateURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template.1.8.27.zip";
+export declare const builderTemplateURL = "https://comp-public-1303824488.file.myqcloud.com/lcap-builder/template.1.8.33.zip";
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-export declare const miniprogramURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm.1.8.19.zip";
+export declare const miniprogramURL = "https://comp-public-1303824488.file.myqcloud.com/lcap-builder/miniprogram_npm.1.8.33.zip";
 /**
  * miniprogram_npm存放目录。IDE插件builder用到
  */

package/lib/builder/config/index.js

@@ -45,12 +45,12 @@ exports.materialsDirName = 'materials'; // materials diretory of current project
  * src/template的代码，在IDE编辑器插件中构建builder
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-exports.builderTemplateURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template.1.8.27.zip';
+exports.builderTemplateURL = 'https://comp-public-1303824488.file.myqcloud.com/lcap-builder/template.1.8.33.zip';
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-exports.miniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm.1.8.19.zip';
+exports.miniprogramURL = 'https://comp-public-1303824488.file.myqcloud.com/lcap-builder/miniprogram_npm.1.8.33.zip';
 /**
  * miniprogram_npm存放目录。IDE插件builder用到
  */

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

@@ -40,6 +40,7 @@ export interface IBuildWedaApp extends IBaseAppProps {
     cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
     isPrivateMode?: boolean;
     endpointType?: 'tcb-api' | 'wechat-service';
+    enableExpiredTag?: boolean;
 }
 export declare function buildWedaConfig({ output, domain, isPrivateMode, endpointType, buildTypeList, }: {
     output: Required<IBuildWedaApp['output']>;
@@ -48,7 +49,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, }: 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, }: 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

@@ -60,7 +60,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, }, cb) {
+}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, }, cb) {
     var _a, _b, _c;
     if (!cals) {
         console.error('无效的应用配置');
@@ -81,6 +81,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
         isBrowserMpBuilder,
         isPrivateMode,
         endpointType,
+        enableExpiredTag,
     };
     console.log('domain', domain);
     console.log('应用名', appKey);

package/lib/builder/h5/index.js

@@ -48,7 +48,7 @@ const url_1 = require("url");
 const transform_1 = require("../../utils/transform");
 async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, buildTypeList = [common_1.BuildType.WEB], subAppCalsList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW }, ignoreInstall = false, cdnEndpoints, }) {
     var _a, _b, _c;
-    const { projDir: buildDir, domain, materialLibs: dependencies, appId: appKey, isPrivateMode } = buildContext;
+    const { projDir: buildDir, domain, materialLibs: dependencies, appId: appKey, isPrivateMode, enableExpiredTag, } = buildContext;
     if (!deployOptions.mode) {
         deployOptions.mode = types_1.DEPLOY_MODE.PREVIEW;
     }
@@ -119,6 +119,7 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
             deployOptions,
             _indexPage,
             isPrivateMode,
+            expirationStartTimesnap: enableExpiredTag ? Date.now() : undefined,
         });
         console.timeEnd(runGenerateTag);
         // // 构建 NPM 包

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

@@ -39,4 +39,8 @@ export interface IBuildContext {
      * 应用版本
      */
     version?: string;
+    /**
+     * 是否启用过期
+     */
+    enableExpiredTag?: boolean;
 }

package/lib/builder/mp/index.js

@@ -99,14 +99,18 @@ async function generateWxMp({ buildContext, weapps, plugins, deployOptions, opti
             isPrivateMode,
             endpointType,
         }, miniprogramRoot);
+        const expirationStartTimesnap = buildContext.enableExpiredTag ? Date.now() : 0;
         appFileData = {
             ...appFileData,
             'common/style.js': {},
             'common/util.js': {
                 isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
+                expirationStartTimesnap,
             },
             'common/widget.js': {},
-            'common/weapp-page.js': {},
+            'common/weapp-page.js': {
+                expirationStartTimesnap,
+            },
             'common/weapp-component.js': {},
             'common/merge-renderer.js': {
                 dataPropNames: wxmlDataPrefix,
@@ -120,7 +124,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployOptions, opti
             },
             'common/query.js': {},
             'common/flow.js': {},
-            'common/loading': {},
+            'common/info': {},
             /**
              * 调试用
              */

package/lib/builder/mp/wxml.js

@@ -29,7 +29,7 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
                 name: enablePageRoot ? 'view' : 'block',
                 attributes: {
                     id: 'wd-page-root',
-                    ['wx:if']: '{{weDaHasLogin}}',
+                    ['wx:if']: '{{weDaHasLogin && !_expiredMessage}}',
                     ['data-weui-theme']: 'light',
                 },
                 elements: [
@@ -54,13 +54,29 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
                 _parent: null,
             },
         ];
+        if (ctx.enableExpiredTag) {
+            usingComponents['wd-info'] = '/common/info/index';
+            xmlJson.elements.push({
+                type: 'element',
+                name: 'wd-info',
+                attributes: {
+                    ['wx:if']: '{{_expiredMessage}}',
+                    message: '{{_expiredMessage}}',
+                    type: 'info',
+                },
+                elements: [],
+                _order: Infinity,
+                _parent: null,
+            });
+        }
         if (ctx.enableLoading) {
-            usingComponents['wd-loading'] = '/common/loading/index';
+            usingComponents['wd-info'] = '/common/info/index';
             xmlJson.elements.push({
                 type: 'element',
-                name: 'wd-loading',
+                name: 'wd-info',
                 attributes: {
-                    ['wx:if']: '{{_isCheckingAtuh}}',
+                    ['wx:if']: '{{_isCheckingAtuh && !_expiredMessage}}',
+                    type: 'loading',
                 },
                 elements: [],
                 _order: Infinity,