@cloudbase/lowcode-builder 1.8.102 → 1.8.104

package/lib/builder/core/index.js

@@ -326,6 +326,16 @@ function normalizeInputs(inputs, { envId, getWebRootPath, }) {
             inputs.deployOptions.targetMpAppId = inputs.deployOptions.mpAppId;
         }
     }
+    else {
+        // web 构建
+        const { deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW } } = inputs;
+        if (deployOptions.mode === types_1.DEPLOY_MODE.DYNAMIC) {
+            inputs.deployOptions = {
+                ...deployOptions,
+                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.js

@@ -53,7 +53,7 @@ if (!process.env.IS_WEB_WORKER) {
 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, _d, _e, _f;
     const { projDir: buildDir, domain, materialLibs: dependencies, appId: appKey, isPrivateMode, enableExpiredTag, privatelinkConfig, } = buildContext;
-    if (!deployOptions.mode) {
+    if (!deployOptions.mode || deployOptions.mode === types_1.DEPLOY_MODE.DYNAMIC) {
         deployOptions.mode = types_1.DEPLOY_MODE.PREVIEW;
     }
     try {
@@ -124,7 +124,7 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
             buildTypeList,
             isSandbox: false,
             runtime,
-            deployOptions,
+            deployOptions: deployOptions,
             _indexPage,
             isPrivateMode,
             expirationStartTimesnap: enableExpiredTag ? Date.now() : undefined,

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

@@ -19,6 +19,24 @@ export interface ICommonBuildContext {
      */
     isPrivateMode?: boolean;
 }
+export interface IDefaultAppWindowConfig {
+    navigationBarBackgroundColor?: string;
+    navigationBarTextStyle?: 'white' | 'black';
+    navigationBarTitleText?: string;
+    navigationStyle?: 'default' | 'custom';
+    homeButton?: boolean;
+    backgroundColor?: string;
+    backgroundTextStyle?: 'dark' | 'light';
+    backgroundColorTop?: string;
+    backgroundColorBottom?: string;
+    enablePullDownRefresh?: boolean;
+    onReachBottomDistance?: number;
+    pageOrientation?: 'portrait' | 'auto' | 'landscape';
+    restartStrategy?: string;
+    initialRenderingCache?: 'static' | 'dynamic';
+    visualEffectInBackground?: 'none' | 'hidden';
+    handleWebviewPreload?: 'static' | 'manual' | 'auto';
+}
 export interface IAppCommonBuildContext extends ICommonBuildContext {
     /**
      * 应用id
@@ -82,4 +100,8 @@ export interface IBuildContext extends IAppCommonBuildContext, IMpCommonBuildCon
      * weda 默认自身root
      */
     wedaRoot?: string;
+    /**
+     * app.json文件window配置
+     */
+    defaultAppWindowConfig?: IDefaultAppWindowConfig;
 }

package/lib/builder/mp/index.js

@@ -249,6 +249,7 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                 appID: appId,
                 resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
                 isProd: (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.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
                     : (_h = mainAppData.extra) === null || _h === void 0 ? void 0 : _h.clientId,
@@ -375,6 +376,8 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
     //     path.join(miniprogramRoot, buildContext.wedaRoot || '', materialsDirName),
     //   );
     // }
+    const appJsonPath = path_1.default.join(miniprogramRoot, 'app.json');
+    const appJson = await fs.readJson(appJsonPath);
     // 生成子包
     await Promise.all(weapps.map(async (app, index) => {
         if (index === 0) {
@@ -386,6 +389,9 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                 ...buildContext,
                 rootPath: app.rootPath,
             };
+            if (appJson === null || appJson === void 0 ? void 0 : appJson.window) {
+                subpackageBuildCtx.defaultAppWindowConfig = appJson.window;
+            }
             await generatePkg(subpackageBuildCtx, { cals: calses[index], weapp: app }, subpackageRootPath, pageConfigs[index], cssVarMap);
             await generateFramework(subpackageBuildCtx, { cals: calses[index], weapp: app }, subpackageRootPath, {
                 deployOptions,
@@ -500,7 +506,7 @@ async function generatePkg(ctx, { cals, weapp }, appRoot, pageConfigs, cssVarMap
     var _a;
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!ctx.isProduction);
     console.log(`Generating ${em(weapp.rootPath ? 'subApp' : 'app')} to ${appRoot}`);
-    const { processCssUnit = 'rpx' } = ctx;
+    const { processCssUnit = 'rpx', defaultAppWindowConfig = {} } = ctx;
     if (weapp.mpPkgUrl) {
         // 清空历史文件，使用zip覆盖
         console.log(`Removing ${appRoot}`);
@@ -604,7 +610,7 @@ async function generatePkg(ctx, { cals, weapp }, appRoot, pageConfigs, cssVarMap
                     usingComponents,
                     componentGenerics,
                     componentPlaceholder,
-                    extra: getAppendableJson(pageConfigs[page.id]),
+                    extra: getAppendableJson((0, util_2.cleanWindowDefultConfig)(pageConfigs[page.id], defaultAppWindowConfig)),
                 },
                 [`index.wxml|${pageFileName}.wxml`]: {
                     content: wxml,
@@ -687,7 +693,6 @@ async function generateFramework(ctx, { cals, weapp: appData }, outDir, options)
                         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',
                         loginConfigVersion: (_b = cals.extra) === null || _b === void 0 ? void 0 : _b.loginConfigVersion,
                         basename: ctx.wedaRoot,
                         pages: appData.pageInstanceList

package/lib/builder/mp/lowcode.js

@@ -25,7 +25,7 @@ async function writeCode2file(ctx, mod, lowcodeRootDir, opts = {}, themeCode, ex
             // Generate app lowcode
             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(`packages/${ctx.rootPath}`, '')}/` : '';
+            const relativeRoot = (ctx === null || ctx === void 0 ? void 0 : ctx.isMixMode) && ctx.rootPath ? `${path_1.default.posix.relative(`packages/${ctx.rootPath}`, '')}/` : '';
             let weappsApiPrefix = externalAPIImport
                 ? importFromClientSDK(pageId === 'global')
                 : [`import { app, $app${pageId !== 'global' ? '' : ', $w'} } from '${relativeRoot}${baseDir}/app/weapps-api';`]; // windows compatibility

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

@@ -12,8 +12,8 @@ export declare function generateMpConfig(ctx: Omit<IBuildContext, 'wedaRoot'>, w
     mpAppId?: string;
     mpConfig?: IBuildWedaApp['mpConfig'];
 }): Promise<{
-    appConfig: any;
     projConfig: any;
+    appConfig: any;
     pageConfigs: {}[];
 }>;
 interface ISubpackage {

package/lib/builder/mp/mp_config.js

@@ -35,6 +35,7 @@ const config_1 = require("../config");
 const net_1 = require("../util/net");
 const chalk_1 = __importDefault(require("chalk"));
 const util_1 = require("../util");
+const util_2 = require("./util");
 /**
  * generate app.json & page.json for mp
  *
@@ -162,6 +163,9 @@ async function generateMpConfig(ctx, weapps, calses, options) {
             });
         }
     });
+    if (appConfig === null || appConfig === void 0 ? void 0 : appConfig.window) {
+        appConfig.window = (0, util_2.cleanWindowDefultConfig)(appConfig);
+    }
     if (!projConfig.setting) {
         projConfig.setting = {};
     }
@@ -181,7 +185,7 @@ async function generateMpConfig(ctx, weapps, calses, options) {
         projConfig.appId = options.mpAppId;
     }
     // merge(pageConfigs, extractAllPagesConfig())
-    return { appConfig, projConfig, pageConfigs };
+    return { projConfig, appConfig, pageConfigs };
 }
 exports.generateMpConfig = generateMpConfig;
 function extractPages(weapps, pageConfigs, options) {

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

@@ -1,5 +1,5 @@
 import { IDynamicValue, IWeAppComponentInstance, ActionType, ICompositedComponent, IWeAppPage, IEventListener, IQueryData } from '@cloudbase/lowcode-generator/lib/weapps-core';
-import { IMpCommonBuildContext } from './BuildContext';
+import { IMpCommonBuildContext, IDefaultAppWindowConfig } from './BuildContext';
 export declare function generatedDynamicData(data: {
     [key: string]: IDynamicValue;
 }, compInfo?: ICompositedComponent, filterBuiltInProps?: boolean): {
@@ -53,3 +53,4 @@ export declare function isRepeaterWidget(w: {
         componentType?: string;
     };
 }, repeaterComponentName: string): true | undefined;
+export declare function cleanWindowDefultConfig(jsonConfig: IDefaultAppWindowConfig, appConfig?: IDefaultAppWindowConfig): IDefaultAppWindowConfig;

package/lib/builder/mp/util.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRepeaterWidget = exports.generateScopedStyleText = exports.findComponentInfo = exports.processRepeaterSchema = exports.setDataBind = exports.createDataBinds = exports.generateArgsDynamicValueFromData = exports.createTemplateEventFlows = exports.createTemplateQuery = exports.generateDataContainerListeners = exports.generateSyncListeners = exports.createEventHandlers = exports.createWidgetProps = exports.generatedDynamicData = void 0;
+exports.cleanWindowDefultConfig = exports.isRepeaterWidget = exports.generateScopedStyleText = exports.findComponentInfo = exports.processRepeaterSchema = exports.setDataBind = exports.createDataBinds = exports.generateArgsDynamicValueFromData = exports.createTemplateEventFlows = exports.createTemplateQuery = exports.generateDataContainerListeners = exports.generateSyncListeners = exports.createEventHandlers = exports.createWidgetProps = exports.generatedDynamicData = void 0;
 const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
 const lowcode_generator_1 = require("@cloudbase/lowcode-generator");
 const weapp_1 = require("@cloudbase/lowcode-generator/lib/generator/util/weapp");
@@ -585,3 +585,40 @@ function checkRepeaterComponent(xComponent) {
     }
     return false;
 }
+// 小程序app.json window属性默认配置
+const defaultConfig = {
+    navigationBarBackgroundColor: '#000000',
+    navigationBarTextStyle: 'white',
+    navigationBarTitleText: '',
+    navigationStyle: 'default',
+    homeButton: false,
+    backgroundColor: '#FFFFFF',
+    backgroundTextStyle: 'dark',
+    backgroundColorTop: '#FFFFFF',
+    backgroundColorBottom: '#FFFFFF',
+    enablePullDownRefresh: false,
+    onReachBottomDistance: 50,
+    pageOrientation: 'portrait',
+    restartStrategy: 'homePage',
+    visualEffectInBackground: 'none',
+    handleWebviewPreload: 'static',
+};
+// 筛选传入参数中与默认参数重复的部分,兼容大小写。
+function removeDuplicatedSettings(customConfig, defaultConfig, appConfig) {
+    const resultConfig = {};
+    for (const key in customConfig) {
+        const customVal = typeof customConfig[key] === 'string' ? customConfig[key].toLowerCase() : customConfig[key];
+        const defaultVal = typeof defaultConfig[key] === 'string' ? defaultConfig[key].toLowerCase() : defaultConfig[key];
+        const appVal = typeof appConfig[key] === 'string' ? appConfig[key].toLowerCase() : appConfig[key];
+        // 逻辑为若appVal存在，则对比app，不存在情况下对比全局默认
+        if (customVal !== (appVal || defaultVal)) {
+            resultConfig[key] = customConfig[key];
+        }
+    }
+    return resultConfig;
+}
+// 删除传入配置中与默认值或者在index.json中与app.json相同的属性
+function cleanWindowDefultConfig(jsonConfig, appConfig = {}) {
+    return removeDuplicatedSettings(jsonConfig, defaultConfig, appConfig);
+}
+exports.cleanWindowDefultConfig = cleanWindowDefultConfig;