@cloudbase/lowcode-builder 1.10.8 → 1.10.10

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.9.2';
+const CLOUDBASE_VERSION = '2.10.0';
 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.26',
+    '@cloudbase/weda-client': '1.1.27',
     '@cloudbase/weda-cloud-sdk': '1.0.96',
 };
 const COMPONENT_DEPS = {

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

@@ -35,6 +35,9 @@ export interface IBuildWedaApp extends IBaseAppProps {
         targetMpAppId?: string;
         version?: string;
     };
+    runtimeOptions?: {
+        mode?: DEPLOY_MODE;
+    };
     runtime?: RUNTIME;
     ignoreInstall?: boolean;
     resourceAppId?: string;
@@ -64,7 +67,7 @@ export declare function buildWedaConfig({ output, domain, isPrivateMode, endpoin
     endpointType?: IBuildWedaApp['endpointType'];
     buildTypeList?: IBuildWedaApp['buildTypeList'];
 }): Promise<void>;
-export declare function buildWedaApp({ cals, subAppCalsList: _subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints: _cdnEndpoints, isPrivateMode, endpointType, enableExpiredTag, enableAd, account, mpConfig, privatelinkConfig, __defaultLoginType__, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<any>;
+export declare function buildWedaApp({ cals, subAppCalsList: _subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, runtimeOptions, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints: _cdnEndpoints, isPrivateMode, endpointType, enableExpiredTag, enableAd, account, mpConfig, privatelinkConfig, __defaultLoginType__, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<any>;
 export declare function cleanComponentDir(): Promise<void>;
 export declare const version: any;
 export { getFiles, fileToZip, strToBuf } from '../util/generateFiles';
@@ -81,6 +84,7 @@ interface INormalizeInput {
     subAppSerializeDataList?: IBuildWedaApp['subAppCalsList'];
     subAppCalsList?: IBuildWedaApp['subAppCalsList'];
     deployOptions: IBuildWedaApp['deployOptions'];
+    runtimeOptions?: IBuildWedaApp['runtimeOptions'];
     mpAppId?: string;
     extraData?: {
         isComposite: boolean;

package/lib/builder/core/index.js

@@ -60,7 +60,7 @@ async function buildWedaConfig({ output, domain = undefined, isPrivateMode = und
     await (0, index_1.generateConfig)(data, outDir);
 }
 exports.buildWedaConfig = buildWedaConfig;
-async function buildWedaApp({ cals, subAppCalsList: _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 }, plugins = [], extraData = {
+async function buildWedaApp({ cals, subAppCalsList: _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 }, runtimeOptions, plugins = [], extraData = {
     isComposite: false,
     compProps: {},
 }, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints: _cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, enableAd = false, account = {}, mpConfig = {}, privatelinkConfig = undefined, __defaultLoginType__ = 'anonymous', }, cb) {
@@ -73,6 +73,12 @@ async function buildWedaApp({ cals, subAppCalsList: _subAppCalsList = [], depend
     if (!deployOptions.mode) {
         deployOptions.mode = types_1.DEPLOY_MODE.PREVIEW;
     }
+    if (!runtimeOptions) {
+        runtimeOptions = {};
+    }
+    if (!runtimeOptions.mode) {
+        runtimeOptions.mode = deployOptions.mode;
+    }
     /**
      * 正规化子包数据
      * 清除冗余字段
@@ -207,6 +213,7 @@ async function buildWedaApp({ cals, subAppCalsList: _subAppCalsList = [], depend
                 calses,
                 plugins,
                 deployOptions,
+                runtimeOptions,
                 options: {
                     isCrossAccount: resourceAppId !== deployOptions.targetMpAppId,
                     mpAppId: deployOptions.mpAppId || '',
@@ -252,6 +259,7 @@ async function buildWedaApp({ cals, subAppCalsList: _subAppCalsList = [], depend
                     devTool,
                     runtime,
                     deployOptions,
+                    runtimeOptions,
                     ignoreInstall,
                     cdnEndpoints,
                 });
@@ -302,6 +310,7 @@ var util_2 = require("../util");
 Object.defineProperty(exports, "getCompileDirs", { enumerable: true, get: function () { return util_2.getCompileDirs; } });
 exports.default = buildWedaApp;
 function normalizeInputs(inputs, { envId, getWebRootPath, }) {
+    var _a, _b;
     const { extraData = { isComposite: false, compProps: {} } } = inputs;
     /**
      * 过滤处理 dependencies
@@ -349,6 +358,14 @@ function normalizeInputs(inputs, { envId, getWebRootPath, }) {
             };
         }
     }
+    if (!inputs.runtimeOptions) {
+        inputs.runtimeOptions = {};
+    }
+    inputs.runtimeOptions.mode =
+        inputs.runtimeOptions.mode ||
+            (((_a = inputs.deployOptions) === null || _a === void 0 ? void 0 : _a.mode) == types_1.DEPLOY_MODE.DYNAMIC
+                ? types_1.DEPLOY_MODE.PREVIEW
+                : ((_b = inputs.deployOptions) === null || _b === void 0 ? void 0 : _b.mode) || types_1.DEPLOY_MODE.PREVIEW);
     if (extraData.isComposite) {
         Object.keys(extraData.compProps.events).forEach((eName) => {
             extraData.compProps.events[eName] = `$$EVENT_${eName}$$`;

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

@@ -5,7 +5,7 @@ import { IPlatformApp } from '@cloudbase/cals';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
 import { IAppCommonBuildContext } from '../mp/BuildContext';
 import { IBuildWedaApp } from '../core';
-export declare function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployOptions, ignoreInstall, cdnEndpoints, }: {
+export declare function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployOptions, ignoreInstall, runtimeOptions, cdnEndpoints, }: {
     buildContext: Omit<IAppCommonBuildContext, 'mainAppData'>;
     cals: IPlatformApp;
     subAppCalsList: IPlatformApp[];
@@ -18,6 +18,7 @@ export declare function buildH5App({ buildContext, i18nConfig, extraData, cals:
     deployOptions?: IBuildWedaApp['deployOptions'];
     ignoreInstall?: boolean;
     cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
+    runtimeOptions?: IBuildWedaApp['runtimeOptions'];
 }): Promise<string>;
 /**
  * 导出进行单测

package/lib/builder/h5/index.js

@@ -53,12 +53,15 @@ if (!process.env.IS_WEB_WORKER) {
     let transform = require('../../utils/transform');
     BabelTransform = transform.BabelTransform;
 }
-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, }) {
+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, runtimeOptions = {}, cdnEndpoints, }) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     const { projDir: buildDir, domain, materialLibs: dependencies, appId: appKey, isPrivateMode, enableExpiredTag, privatelinkConfig, enableOfficialLibNPM, } = buildContext;
     if (!deployOptions.mode || deployOptions.mode === types_1.DEPLOY_MODE.DYNAMIC) {
         deployOptions.mode = types_1.DEPLOY_MODE.PREVIEW;
     }
+    if (!runtimeOptions.mode) {
+        runtimeOptions.mode = deployOptions.mode;
+    }
     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');
@@ -176,6 +179,7 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
             isSandbox: false,
             runtime,
             deployOptions: deployOptions,
+            runtimeOptions: runtimeOptions,
             _indexPage,
             isPrivateMode,
             expirationStartTimesnap: enableExpiredTag ? Date.now() : undefined,

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

@@ -14,12 +14,13 @@ export declare function generateWedaRootCommonFile({ buildContext, buildTypeList
     cssVarMap?: Object;
     filter?: (src: string) => boolean;
 }): Promise<void>;
-export declare function generateWxMp({ buildContext: _buildContext, weapps, calses, deployOptions, options, buildTypeList, ignoreInstall, cdnEndpoints, mpConfig, }: {
+export declare function generateWxMp({ buildContext: _buildContext, weapps, calses, deployOptions, runtimeOptions, options, buildTypeList, ignoreInstall, cdnEndpoints, mpConfig, }: {
     buildContext: Omit<IBuildContext, 'wedaRoot'>;
     weapps: IWeAppData[];
     calses: IPlatformApp[];
     plugins: IPlugin[];
     deployOptions: Required<IBuildWedaApp>['deployOptions'];
+    runtimeOptions?: IBuildWedaApp['runtimeOptions'];
     options: {
         mpAppId: string;
         resourceAppId?: string;

package/lib/builder/mp/index.js

@@ -112,7 +112,7 @@ async function generateWedaRootCommonFile({ buildContext, buildTypeList, localWe
     await (0, generateFiles_1.default)(wedaRootFileData, templateDir, localWedaRoot, filter);
 }
 exports.generateWedaRootCommonFile = generateWedaRootCommonFile;
-async function generateWxMp({ buildContext: _buildContext, weapps, calses, deployOptions, options, buildTypeList, ignoreInstall = false, cdnEndpoints = {}, mpConfig = {}, }) {
+async function generateWxMp({ buildContext: _buildContext, weapps, calses, deployOptions, runtimeOptions, options, buildTypeList, ignoreInstall = false, cdnEndpoints = {}, mpConfig = {}, }) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
@@ -232,7 +232,7 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                 envID: mainAppData.envId,
                 appID: appId,
                 resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
-                isProd: (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.UPLOAD,
+                isProd: (runtimeOptions === null || runtimeOptions === void 0 ? void 0 : runtimeOptions.mode) === types_1.DEPLOY_MODE.UPLOAD,
                 deployMode: deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode,
                 clientID: ((_g = mainAppData.extra) === null || _g === void 0 ? void 0 : _g.enableLoginStatusShare)
                     ? mainAppData.envId