@cloudbase/lowcode-builder 1.10.3 → 1.10.5

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.34';
+const CLOUDBASE_VERSION = '2.9.2';
 const BASE_DEPS = {
     'miniprogram-gesture': '^1.0.6',
     mobx: '^5',
@@ -13,7 +13,7 @@ const BASE_DEPS = {
  * 注意锁版本
  */
 const CLOUDBASE_DEPS = {
-    '@cloudbase/weda-client': '1.1.21',
+    '@cloudbase/weda-client': '1.1.24',
     '@cloudbase/weda-cloud-sdk': '1.0.96',
 };
 const COMPONENT_DEPS = {

package/lib/builder/core/index.js

@@ -424,7 +424,7 @@ async function buildComposite({ dependencies, output, isBrowserMpBuilder, }) {
     };
     if (isBrowserMpBuilder) {
         // 尽早下载物料
-        await (0, net_1.downloadBrowserMaterial)({ runtimeEndpointType: undefined });
+        await (0, net_1.downloadBrowserMaterial)({ runtimeEndpointType: undefined, node_modules: false });
     }
     await (0, index_1.generateWedaRootCommonFile)({
         buildContext,
@@ -470,6 +470,7 @@ async function buildComposite({ dependencies, output, isBrowserMpBuilder, }) {
         packageMiniprogramEntry,
         officialLibVersion: officialLib === null || officialLib === void 0 ? void 0 : officialLib.version,
     });
+    fs_extra_1.default.writeFile(path_1.default.join(output.path, 'index.js'), `import * as sdk from '@cloudbase/weda-client';\nexport * as clientSDK from '@cloudbase/weda-client';\n/* 注意取注，并填入环境ID */\n// sdk.init({\n//   envID: '<填写你的云开发环境ID>'\n// })`);
     return output.path;
     // await generateCompLibs(dependencies, rpxCalcRoot);
 }

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

@@ -4,10 +4,11 @@ import { IBuildContext, IMpCommonBuildContext } from './BuildContext';
 import { BuildType } from '../types/common';
 import { IPlatformApp } from '@cloudbase/cals';
 import { IBuildWedaApp } from '../core';
-export declare function generateWedaRootCommonFile({ buildContext, buildTypeList, localWedaRoot, loginConfigVersion, cssVarMap, appId, filter, }: {
+export declare function generateWedaRootCommonFile({ buildContext, buildTypeList, localWedaRoot, loginConfigVersion, cssVarMap, appId, envId, filter, }: {
     buildContext: IMpCommonBuildContext & Partial<Pick<IBuildContext, 'enableExpiredTag' | 'domain' | 'runtimeDynamicConfig'>>;
     buildTypeList: BuildType[];
     localWedaRoot: string;
+    envId?: string;
     appId?: string;
     loginConfigVersion?: string;
     cssVarMap?: Object;

package/lib/builder/mp/index.js

@@ -66,7 +66,7 @@ function patchBuildContext(ctx, calses) {
     ctx.miniprogramPlugins = (mainAppData.miniprogramPlugins || []).filter((plugin) => used.component[plugin.name] || used.action[plugin.name]);
     return { used };
 }
-async function generateWedaRootCommonFile({ buildContext, buildTypeList, localWedaRoot, loginConfigVersion, cssVarMap, appId, filter = () => true, }) {
+async function generateWedaRootCommonFile({ buildContext, buildTypeList, localWedaRoot, loginConfigVersion, cssVarMap, appId, envId, filter = () => true, }) {
     const expirationStartTimesnap = buildContext.enableExpiredTag ? Date.now() : 0;
     let customLoginConfig;
     let loginConfigPathname = loginConfigVersion
@@ -93,6 +93,7 @@ async function generateWedaRootCommonFile({ buildContext, buildTypeList, localWe
             RUNTIME_CONFIG_URL: index_1.RUNTIME_CONFIG_URL,
             loginConfigPathname,
             customLoginConfig: customLoginConfig ? JSON.stringify(customLoginConfig, undefined, 2) : 'null',
+            ensureUserInfo: envId && ['lowcode-5gchkw9u14e4136a'].includes(envId),
         },
         'common/cloud-sdk.js': {},
         'common/weapp-page.js': {
@@ -205,6 +206,7 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
             buildTypeList,
             localWedaRoot,
             appId,
+            envId: mainAppData.envId,
             loginConfigVersion: (_f = (_e = calses[0]) === null || _e === void 0 ? void 0 : _e.extra) === null || _f === void 0 ? void 0 : _f.loginConfigVersion,
             cssVarMap,
         });
@@ -683,6 +685,7 @@ async function generateFramework(ctx, { cals, weapp: appData }, outDir, options)
                     subPackageName: appData.rootPath || '',
                     importor,
                     appConfig: (0, util_3.JsonToStringWithVariableName)({
+                        name: cals.name || 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,
                         loginConfigVersion: (_b = cals.extra) === null || _b === void 0 ? void 0 : _b.loginConfigVersion,

package/lib/builder/mp/mp_config.js

@@ -46,6 +46,7 @@ async function generateMpConfig(ctx, weapps, calses, options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const appConfig = {
         useExtendedLib: { weui: true },
+        networkTimeout: { request: 2 * 60 * 1000 },
     };
     const { miniprogramPlugins = [] } = ctx;
     const projConfig = (0, lodash_1.merge)({}, mp_1.defaultProjConfig, {

package/lib/builder/mp/util.js

@@ -289,7 +289,8 @@ function getListenersHandlers(ctx, listeners = [], id, componentApi) {
                     }
                     case `${weapps_core_1.ActionType.Platform}:ai.LLM.chat`:
                     case `${weapps_core_1.ActionType.Platform}:ai.bot.sendMessage`:
-                    case `${weapps_core_1.ActionType.Platform}:ai.bot.getRecommendQuestions`: {
+                    case `${weapps_core_1.ActionType.Platform}:ai.bot.getRecommendQuestions`:
+                    case `${weapps_core_1.ActionType.Platform}:_setStateVal`: {
                         handler = `function({data, $w}) { return $app.${(_c = l.handler) === null || _c === void 0 ? void 0 : _c.name}(data, $w);}`;
                         break;
                     }
@@ -313,7 +314,7 @@ function getListenersHandlers(ctx, listeners = [], id, componentApi) {
                 break;
             }
             case weapps_core_1.ActionType.GeneralFunc: {
-                handler = `function({event, $w, params}) { return (\n${((_h = (_g = (_f = l.handler) === null || _f === void 0 ? void 0 : _f.code) === null || _g === void 0 ? void 0 : _g.replace) === null || _h === void 0 ? void 0 : _h.call(_g, /;\s*$/, '')) || '()=>{}'}\n)({event}) }`;
+                handler = `function({event, $w, params}) { const $comp = $w.$comp; return (\n${((_h = (_g = (_f = l.handler) === null || _f === void 0 ? void 0 : _f.code) === null || _g === void 0 ? void 0 : _g.replace) === null || _h === void 0 ? void 0 : _h.call(_g, /;\s*$/, '')) || '()=>{}'}\n)({event}) }`;
                 break;
             }
         }

package/lib/builder/util/net.d.ts

@@ -24,9 +24,10 @@ export declare function downloadZipInBrowser(url: string, dstDir: string, noCach
  * miniprogram_npm待微信提供端能力
  * @param output
  */
-export declare function downloadBrowserMaterial({ runtimeEndpointType, browser, }: {
+export declare function downloadBrowserMaterial({ runtimeEndpointType, browser, node_modules, }: {
     runtimeEndpointType: IBuildWedaApp['endpointType'];
     browser?: boolean;
+    node_modules?: boolean;
 }): Promise<void>;
 export declare function installBrowserDependencies({ type, path: outPath, runtimeEndpointType, }: {
     type: 'wedaRoot' | '$weda_system';

package/lib/builder/util/net.js

@@ -121,7 +121,7 @@ async function saveFiles(files, dstDir) {
  * miniprogram_npm待微信提供端能力
  * @param output
  */
-async function downloadBrowserMaterial({ runtimeEndpointType, browser = true, }) {
+async function downloadBrowserMaterial({ runtimeEndpointType, browser = true, node_modules = true, }) {
     const BUILD_TEMPLATES = require('../mp/template.json');
     await Promise.all([
         new Promise((resolve, reject) => {
@@ -136,10 +136,14 @@ async function downloadBrowserMaterial({ runtimeEndpointType, browser = true, })
                 reject(e);
             }
         }),
-        runtimeEndpointType === 'tcb-api'
-            ? downloadZip(config_1.cloudbaseMiniprogramURL, config_1.cloudbaseMiniprogramDir, browser)
-            : downloadZip(config_1.miniprogramURL, config_1.miniprogramDir, browser),
-        downloadZip(config_1.systemSubpackageMiniprogramURL, config_1.systemSubpackageMiniprogramDir, browser),
+        ...(node_modules
+            ? [
+                runtimeEndpointType === 'tcb-api'
+                    ? downloadZip(config_1.cloudbaseMiniprogramURL, config_1.cloudbaseMiniprogramDir, browser)
+                    : downloadZip(config_1.miniprogramURL, config_1.miniprogramDir, browser),
+                downloadZip(config_1.systemSubpackageMiniprogramURL, config_1.systemSubpackageMiniprogramDir, browser),
+            ]
+            : []),
     ]);
 }
 exports.downloadBrowserMaterial = downloadBrowserMaterial;