@cloudbase/lowcode-builder 1.5.6 → 1.6.1

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

@@ -28,6 +28,7 @@ export interface IBuildWedaApp extends IBaseAppProps {
         mode: DEPLOY_MODE;
         mpAppId?: string;
         targetMpAppId?: string;
+        version?: string;
     };
     runtime?: RUNTIME;
     ignoreInstall?: boolean;

package/lib/builder/core/index.js

@@ -67,7 +67,9 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
         console.error('无效的应用配置');
         return;
     }
-    const { mode: deployMode = types_1.DEPLOY_MODE.PREVIEW } = deployOptions;
+    if (!deployOptions.mode) {
+        deployOptions.mode = types_1.DEPLOY_MODE.PREVIEW;
+    }
     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);
     const buildContext = {
         projDir: appBuildDir,
@@ -138,7 +140,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 weapps: apps,
                 buildContext: mpBuildContext,
                 plugins,
-                deployMode,
+                deployOptions,
                 options: {
                     isCrossAccount: resourceAppId !== deployOptions.targetMpAppId,
                     mpAppId: deployOptions.mpAppId || '',
@@ -189,7 +191,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 mode,
                 devTool,
                 runtime,
-                deployMode,
+                deployOptions,
                 ignoreInstall,
                 cdnEndpoints,
             });
@@ -331,5 +333,5 @@ function normalizeCals(cals, { buildTypeList, envId, deployOptions, appId, getWe
     return cals;
 }
 function _getWebRootPath({ appId, deployOptions }) {
-    return (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.PREVIEW ? `/${appId}/preview/` : `/${appId}/production/`;
+    return (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.UPLOAD ? `/${appId}/production/` : `/${appId}/preview/`;
 }

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

@@ -1,10 +1,11 @@
 import { II18nConfig, IExtraData } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { BuildType, WebpackModeType } from '../types/common';
-import { DEPLOY_MODE, RUNTIME } from '../../types';
+import { RUNTIME } from '../../types';
 import { IPlatformApp } from '@cloudbase/cals';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
 import { IBuildContext } from '../mp/BuildContext';
-export declare function buildH5App({ buildContext, i18nConfig, extraData, cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployMode, ignoreInstall, cdnEndpoints, }: {
+import { IBuildWedaApp } from '../core';
+export declare function buildH5App({ buildContext, i18nConfig, extraData, cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployOptions, ignoreInstall, cdnEndpoints, }: {
     buildContext: Omit<IBuildContext, 'mainAppData'>;
     cals: IPlatformApp;
     subAppCalsList: IPlatformApp[];
@@ -14,7 +15,7 @@ export declare function buildH5App({ buildContext, i18nConfig, extraData, cals,
     mode: WebpackModeType;
     devTool: string;
     runtime?: RUNTIME;
-    deployMode?: DEPLOY_MODE;
+    deployOptions?: IBuildWedaApp['deployOptions'];
     ignoreInstall?: boolean;
     cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
 }): Promise<string>;

package/lib/builder/h5/index.js

@@ -45,9 +45,12 @@ const config_1 = require("../config");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const junk = __importStar(require("../util/junk"));
 const url_1 = require("url");
-async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildTypeList = [common_1.BuildType.WEB], subAppCalsList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployMode = types_1.DEPLOY_MODE.PREVIEW, ignoreInstall = false, cdnEndpoints, }) {
+async function buildH5App({ buildContext, i18nConfig, extraData, 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;
+    if (!deployOptions.mode) {
+        deployOptions.mode = types_1.DEPLOY_MODE.PREVIEW;
+    }
     try {
         const { materialsDir } = runtime === types_1.RUNTIME.CI ? (0, util_1.getCompileDirs)(appKey) : (0, util_1.getCompileDirs)('app');
         const h5BuildDir = path_1.default.join(buildDir, 'h5');
@@ -111,7 +114,7 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildType
             buildTypeList,
             isSandbox: false,
             runtime,
-            deployMode,
+            deployOptions,
             _indexPage,
             isPrivateMode,
         });

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

@@ -31,4 +31,8 @@ export interface IBuildContext {
      * 并设置 #page-root-id
      */
     enablePageRoot?: boolean;
+    /**
+     * 应用版本
+     */
+    version?: string;
 }

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

@@ -1,12 +1,12 @@
 import { IWeAppData, IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IBuildContext } from './BuildContext';
-import { DEPLOY_MODE } from '../../types';
 import { BuildType, IAppUsedComp, IUsedComps } from '../types/common';
-export declare function generateWxMp({ buildContext, weapps, plugins, deployMode, options, buildTypeList, ignoreInstall, }: {
+import { IBuildWedaApp } from '../core';
+export declare function generateWxMp({ buildContext, weapps, plugins, deployOptions, options, buildTypeList, ignoreInstall, }: {
     buildContext: IBuildContext;
     weapps: IWeAppData[];
     plugins: IPlugin[];
-    deployMode: DEPLOY_MODE;
+    deployOptions: Required<IBuildWedaApp>['deployOptions'];
     options: {
         mpAppId: string;
         resourceAppId?: string;

package/lib/builder/mp/index.js

@@ -54,7 +54,7 @@ const cals_1 = require("@cloudbase/cals");
 const templateDir = `${config_1.appTemplateDir}/mp/`;
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
-async function generateWxMp({ buildContext, weapps, plugins, deployMode, options, buildTypeList, ignoreInstall = false, }) {
+async function generateWxMp({ buildContext, weapps, plugins, deployOptions, options, buildTypeList, ignoreInstall = false, }) {
     var _a;
     const { appId, projDir, materialLibs: materials, isProduction, mainAppData, domain, isPrivateMode = false, endpointType = '', isBrowserMpBuilder = false, } = buildContext;
     const operationLabel = em('Wexin MiniProgram Generated');
@@ -83,11 +83,11 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
     const projectConfigJsonPath = path_1.default.join(projDir, mainAppData.rootPath || '', 'project.config.json');
     let projectConfigJson = await fs.readJSON(projectConfigJsonPath);
     const miniprogramRoot = path_1.default.join(projDir, projectConfigJson.miniprogramRoot || '/');
-    await generateFramework(buildContext, mainAppData, miniprogramRoot);
+    await generateFramework(buildContext, mainAppData, miniprogramRoot, { deployOptions });
     // #3 生成主包根路径文件
     let appFileData = {};
     if (weapps.find((item) => !item.mpPkgUrl)) {
-        await generateFramework(buildContext, mainAppData, miniprogramRoot);
+        await generateFramework(buildContext, mainAppData, miniprogramRoot, { deployOptions });
         // 有了 framework app 之后，并且是源码的方式,追加 app 引用
         if (mainAppData.mpPkgUrl) {
             let appJsPath = path_1.default.join(miniprogramRoot, 'app.js');
@@ -181,7 +181,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
                 envID: mainAppData.envId,
                 appID: appId,
                 resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
-                isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
+                isProd: (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.UPLOAD,
                 clientID: (_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.clientId,
             },
             'datasources/datasource-profiles.js.tpl': {
@@ -206,7 +206,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
                 rootPath: app.rootPath,
             };
             await generatePkg(subpackageBuildCtx, app, subpackageRootPath, pageConfigs[index]);
-            await generateFramework(subpackageBuildCtx, app, subpackageRootPath);
+            await generateFramework(subpackageBuildCtx, app, subpackageRootPath, { deployOptions });
             // 生成package.json
             let packageJsonPath = path_1.default.join(subpackageRootPath, 'package.json');
             if (!fs.existsSync(packageJsonPath)) {
@@ -311,7 +311,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
         console.log(`Generating ${em('page')} files`);
         (0, generateFiles_1.cleanDir)(path_1.default.join(appRoot, 'pages'), []);
         await Promise.all(weapp.pageInstanceList.map(async (page) => {
-            var _a, _b;
+            var _a, _b, _c, _d, _e, _f;
             // # Generating page
             const rootPath = weapp.rootPath || '';
             const usingComponents = {};
@@ -331,11 +331,12 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                 [`index.js|${pageFileName}.js`]: {
                     pageUUID: rootPath ? `${rootPath}/${page.id}` : page.id,
                     pageName: page.id,
+                    pageTitle: ((_b = (_a = page === null || page === void 0 ? void 0 : page.data) === null || _a === void 0 ? void 0 : _a.navigationBarTitleText) === null || _b === void 0 ? void 0 : _b.value) || ((_d = (_c = page === null || page === void 0 ? void 0 : page.data) === null || _c === void 0 ? void 0 : _c.title) === null || _d === void 0 ? void 0 : _d.value),
                     pageSource: page.data.src || '',
                     eventHanlders: (0, util_2.createEventHanlders)(ctx, componentInstances, 'this', page),
                     dataBinds: (0, util_2.createDataBinds)(ctx, componentInstances),
                     pageAttributes: {
-                        ...(((_a = page.data) === null || _a === void 0 ? void 0 : _a.appShareMessage) ? { appShareMessage: page.data.appShareMessage.value } : {}),
+                        ...(((_e = page.data) === null || _e === void 0 ? void 0 : _e.appShareMessage) ? { appShareMessage: page.data.appShareMessage.value } : {}),
                     },
                     debug: ctx.debugMode,
                     stringifyObj: util_1.inspect,
@@ -351,7 +352,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     content: wxml,
                 },
                 [`index.wxss|${pageFileName}.wxss`]: {
-                    subWxss: rootPath && !((_b = ctx.mainAppData) === null || _b === void 0 ? void 0 : _b.mpPkgUrl)
+                    subWxss: rootPath && !((_f = ctx.mainAppData) === null || _f === void 0 ? void 0 : _f.mpPkgUrl)
                         ? `@import "${path_1.default.posix.relative(`/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
                         : '',
                     content: (0, weapps_core_1.toCssText)((0, cals_1.processCommonStyle2CSSProperties)(page.commonStyle, {
@@ -367,7 +368,8 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
         await writeLowCodeFiles(ctx, weapp, appRoot);
     }
 }
-async function generateFramework(ctx, appData, outDir) {
+async function generateFramework(ctx, appData, outDir, options) {
+    var _a;
     let fileData = {};
     if (appData.mpPkgUrl) {
         if (!appData.rootPath) {
@@ -403,12 +405,13 @@ async function generateFramework(ctx, appData, outDir) {
                 ...fileData,
                 'app/app-global.js': {},
                 'app/weapps-api.js': {
-                    appId: ctx.appId,
                     subLevelPath: appData.rootPath ? `${path_1.default.posix.relative(`${appData.rootPath}`, '')}/` : '',
                     subPackageName: appData.rootPath || '',
                     importor,
                     appConfig: (0, util_3.JsonToStringWithVariableName)({
                         id: ctx.appId,
+                        label: (appData === null || appData === void 0 ? void 0 : appData.label) || '',
+                        version: (_a = options === null || options === void 0 ? void 0 : options.deployOptions) === null || _a === void 0 ? void 0 : _a.version,
                         envId: appData.envId,
                         envVersion: (ctx === null || ctx === void 0 ? void 0 : ctx.isProduction) ? 'production' : 'preview',
                         pages: appData.pageInstanceList

package/lib/builder/mp/lowcode.js

@@ -19,9 +19,11 @@ async function writeCode2file(ctx, mod, lowcodeRootDir, opts = {}, themeCode) {
             const baseDir = path_1.default.relative(path_1.default.dirname(file), appDir).replace(/\\/g, '/');
             // 子包混合模式需要添加相对索引到根目录
             const relativeRoot = (ctx === null || ctx === void 0 ? void 0 : ctx.isMixMode) && ctx.rootPath ? `${path_1.default.relative(ctx.rootPath, '')}/` : '';
-            let weappsApiPrefix = [`import { app, $app, $w } from '${relativeRoot}${baseDir}/app/weapps-api';`]; // windows compatibility
+            let weappsApiPrefix = [
+                `import { app, $app${pageId !== 'global' ? '' : ', $w'} } from '${relativeRoot}${baseDir}/app/weapps-api';`,
+            ]; // windows compatibility
             if (pageId !== 'global') {
-                weappsApiPrefix.push(`import { $page } from '${baseDir}/pages/${pageId}/api'`);
+                weappsApiPrefix.push(`import { $page, $w } from '${baseDir}/pages/${pageId}/api';`);
             }
             code = `${weappsApiPrefix.join('\n')}\n${code}`;
         }

package/lib/builder/mp/util.js

@@ -299,7 +299,7 @@ function createDataBinds(ctx, widgets) {
         }
         if (style) {
             const styleExpression = _waDisplay
-                ? `{...widgetProps.${id}.style, ...(\n${style === null || style === void 0 ? void 0 : style.expression}\n), display: (()=>{${_waDisplay === null || _waDisplay === void 0 ? void 0 : _waDisplay.imports}\n return (\n${_waDisplay === null || _waDisplay === void 0 ? void 0 : _waDisplay.expression}\n)})() ? undefined: 'none' }`
+                ? `((display)=>{ const style = {...widgetProps.${id}.style, ...(\n${style === null || style === void 0 ? void 0 : style.expression}\n)}; if(!display) {style.display = "none"}; return style })((()=>{${_waDisplay === null || _waDisplay === void 0 ? void 0 : _waDisplay.imports}\n return (\n${_waDisplay === null || _waDisplay === void 0 ? void 0 : _waDisplay.expression}\n)})())`
                 : `{...widgetProps.${id}.style, ...(\n${style === null || style === void 0 ? void 0 : style.expression}\n)}`;
             dataBinds[id].style = {
                 ...style,
@@ -307,7 +307,7 @@ function createDataBinds(ctx, widgets) {
             };
         }
         else if (_waDisplay) {
-            const styleExpression = `{...widgetProps.${id}.style,  display: (\n${_waDisplay === null || _waDisplay === void 0 ? void 0 : _waDisplay.expression}\n)? undefined: 'none' }`;
+            const styleExpression = `((display)=>{ const style = {...widgetProps.${id}.style}; if(!display) {style.display = "none"}; return style })((\n${_waDisplay === null || _waDisplay === void 0 ? void 0 : _waDisplay.expression}\n))`;
             dataBinds[id].style = {
                 ..._waDisplay,
                 expression: processCssUnit === 'rpx' ? `px2rpx(${styleExpression})` : styleExpression,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.5.6",
+  "version": "1.6.1",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -38,8 +38,8 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^0.5.17",
-    "@cloudbase/lowcode-generator": "^1.5.4",
+    "@cloudbase/cals": "^1.0.2",
+    "@cloudbase/lowcode-generator": "^1.6.3",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -543,7 +543,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.a81adb6beadedd9fd68f.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.750df8ba8cd4da81b585.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app/weapps-api.js

@@ -29,10 +29,9 @@ function createGlboalApi() {
     appConfig: {
       staticResourceDomain: config.domain,
       ...(<%= appConfig %>)
-    }
+    },
   });
   const globalAPI = Object.assign(mpApp, {
-    id: '<%= appId %>',
     domain: config.domain,
     pages: {},
     session: {

package/template/mp/common/weapp-page.js

@@ -11,12 +11,14 @@ import {
 } from '../datasources/index';
 import { runWatchers } from './watch';
 import { getMpEventHandlerName } from './util';
+import { $w as baseAPI } from '../app/app-global';
 
 const wxApp = getApp()
 
 export function createPage(
   id,
   uuid,
+  title,
   widgetProps,
   index = {},
   lifecycle,
@@ -63,6 +65,22 @@ export function createPage(
         return {};
       }
     };
+
+    // 更新设备信息 窗口信息
+    result['onResize'] = (res) => {
+      let device = baseAPI.device;
+      if(!device) {
+        return
+      }
+      const width = res?.size?.windowWidth;
+      const height = res?.size?.windowHeight;
+      if (width !== device?.viewport?.width || height !== device?.viewport?.height) {
+        device.viewport = {
+          width,
+          height
+        };
+      }
+    };
     return result;
   }
 
@@ -197,6 +215,8 @@ export function createPage(
           id,
           uuid,
           state: observable(pageState),
+          path: this.route,
+          label: title,
           widgets: {},
         });
         $page = pageContext;

package/template/mp/package.json

@@ -1,19 +1,19 @@
 {
-	"name": "lcap-<%= appId%>",
-	"version": "1.0.8",
-	"scripts": {},
-	"dependencies": {<% if(importJSSDK) {%>
-		"@cloudbase/js-sdk": "2.5.6-beta.1",<% } %>
+  "name": "lcap-<%= appId%>",
+  "version": "1.0.8",
+  "scripts": {},
+  "dependencies": {<% if(importJSSDK) {%>
+		"@cloudbase/js-sdk": "2.5.6-beta.1",<%
+    } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
-		"@cloudbase/weda-client": "0.2.56",
-		"@cloudbase/weda-cloud-sdk": "1.0.26",
-		"mobx": "^5.15.4",
-		"lodash.get": "^4.4.2",
-		"lodash.set": "^4.3.2",
-		"miniprogram-gesture": "^1.0.6",
-		"miniprogram-api-promise": "^1.0.4"<% Object.keys(extraDeps).map(depName => {%>,
-    "<%= depName%>": "<%= extraDeps[depName]%>"<%
+    "@cloudbase/weda-client": "1.0.0",
+    "@cloudbase/weda-cloud-sdk": "1.0.26",
+    "mobx": "^5.15.4",
+    "lodash.get": "^4.4.2",
+    "lodash.set": "^4.3.2",
+    "miniprogram-gesture": "^1.0.6",
+    "miniprogram-api-promise": "^1.0.4"<% Object.keys(extraDeps).map(depName => {%>,
+      "<%= depName%>": "<%= extraDeps[depName]%>"<%
     })%>
-	}
+  }
 }
-

package/template/mp/page/api.js

@@ -8,8 +8,11 @@ export const $w = new Proxy(
   baseAPI,
   {
     get(target, prop) {
-      if(prop === '$page'){
-        return $page
+      /**
+       * 使用当前实例进行覆盖
+       */
+      if (prop === '$page' || prop === 'page') {
+        return $page;
       }
       // 尝试代理页面级别组件实例
       const pageWidget = $page.widgets?.[prop];

package/template/mp/page/index.js

@@ -33,4 +33,4 @@ const dataBinds = {<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
   },<%}) %>
 }
 
-createPage('<%= pageName %>', '<%= pageUUID %>', widgetProps, {}, lifecyle, state, computed, evtListeners, dataBinds, app, handlers, $page, <%= pageAttributes?JSON.stringify(pageAttributes):'{}' %>)
+createPage('<%= pageName %>', '<%= pageUUID %>','<%= pageTitle %>', widgetProps, {}, lifecyle, state, computed, evtListeners, dataBinds, app, handlers, $page, <%= pageAttributes?JSON.stringify(pageAttributes):'{}' %>)