@cloudbase/lowcode-builder 1.8.45 → 1.8.48

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

@@ -6,7 +6,7 @@ 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.file.myqcloud.com/lcap-builder/template.1.8.45.zip";
+export declare const builderTemplateURL = "https://comp-public-1303824488.file.myqcloud.com/lcap-builder/template.1.8.47.zip";
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F

package/lib/builder/config/index.js

@@ -45,7 +45,7 @@ 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.file.myqcloud.com/lcap-builder/template.1.8.45.zip';
+exports.builderTemplateURL = 'https://comp-public-1303824488.file.myqcloud.com/lcap-builder/template.1.8.47.zip';
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F

package/lib/builder/core/index.js

@@ -61,7 +61,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
     isComposite: false,
     compProps: {},
 }, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, }, cb) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     if (!cals) {
         console.error('无效的应用配置');
         return;
@@ -69,6 +69,15 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
     if (!deployOptions.mode) {
         deployOptions.mode = types_1.DEPLOY_MODE.PREVIEW;
     }
+    /**
+     * 刷新正规化 packageName
+     */
+    [cals, ...subAppCalsList].forEach((app) => {
+        if (!app.extra) {
+            app.extra = {};
+        }
+        app.extra.rootPath = (0, util_1.normalizePackageName)(app.extra.rootPath);
+    });
     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,
@@ -82,6 +91,8 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
         isPrivateMode,
         endpointType,
         enableExpiredTag,
+        disabled: (_c = cals.extra) === null || _c === void 0 ? void 0 : _c.disabled,
+        statusPageId: (_d = cals.extra) === null || _d === void 0 ? void 0 : _d.statusPageId,
     };
     console.log('domain', domain);
     console.log('应用名', appKey);
@@ -141,7 +152,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                     ? 'px'
                     : 'rpx'),
                 enablePageRoot,
-                enableLoading: (_c = cals === null || cals === void 0 ? void 0 : cals.extra) === null || _c === void 0 ? void 0 : _c.enableLoading,
+                enableLoading: (_e = cals === null || cals === void 0 ? void 0 : cals.extra) === null || _e === void 0 ? void 0 : _e.enableLoading,
             };
             const result = await (0, index_1.generateWxMp)({
                 weapps: apps,

package/lib/builder/h5/index.js

@@ -45,7 +45,11 @@ const config_1 = require("../config");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const junk = __importStar(require("../util/junk"));
 const url_1 = require("url");
-const transform_1 = require("../../utils/transform");
+let BabelTransform = (code, options) => code;
+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, }) {
     var _a, _b, _c;
     const { projDir: buildDir, domain, materialLibs: dependencies, appId: appKey, isPrivateMode, enableExpiredTag, } = buildContext;
@@ -88,8 +92,6 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
             assets,
         });
         await (0, copy_1.runCopy)(h5BuildDir, mainAppData, i18nConfig);
-        // 构建 APP 需要的配置文件
-        const appConfig = await (0, webpack_2.generateAppConfig)(mainAppData, subAppDataList, h5BuildDir);
         // // 素材库
         const runHandleMaterialTag = '🚥  buildWebApp-runHandleMaterial';
         console.time(runHandleMaterialTag);
@@ -144,7 +146,6 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
             appBuildDir: h5BuildDir,
             assets: jsAssets,
             buildTypeList,
-            mpConfig: appConfig,
             mode,
             devTool,
             publicPath,
@@ -246,7 +247,7 @@ function _BabelTransformCalsExpression(key, value) {
                     value = value.replace(FOR_IN_REG, '');
                 }
             }
-            value = (0, transform_1.BabelTransform)(value, { IIFE: true });
+            value = BabelTransform(value, { IIFE: true });
             if (forPrefix) {
                 value = `${forPrefix}${value}`;
             }

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

@@ -5,11 +5,10 @@ import { ICDN_ENDPOINTS_COFIG } from '../config';
 interface IWebpackCoreProps extends BuildAppProps {
     cals: IPlatformApp;
     appBuildDir: string;
-    mpConfig: any;
     mainAppData: IWebRuntimeAppData;
     subAppDataList: IWebRuntimeAppData[];
     assets: string[];
     cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
 }
-export declare function runWebpackCore({ cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode, appKey, buildTypeList, mpConfig, assets, devTool, generateMpType, cdnEndpoints, }: IWebpackCoreProps): Promise<string>;
+export declare function runWebpackCore({ cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode, appKey, buildTypeList, assets, devTool, generateMpType, cdnEndpoints, }: IWebpackCoreProps): Promise<string>;
 export {};

package/lib/builder/h5/webpack.js

@@ -5,7 +5,7 @@ const common_1 = require("../types/common");
 const webpack_1 = require("../service/webpack");
 const generate_1 = require("./generate");
 const cals_1 = require("@cloudbase/cals");
-async function runWebpackCore({ cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode = common_1.WebpackModeType.NONE, appKey, buildTypeList = [common_1.BuildType.WEB], mpConfig, assets = [], devTool = 'vite', generateMpType = common_1.GenerateMpType.APP, cdnEndpoints, }) {
+async function runWebpackCore({ cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode = common_1.WebpackModeType.NONE, appKey, buildTypeList = [common_1.BuildType.WEB], assets = [], devTool = 'vite', generateMpType = common_1.GenerateMpType.APP, cdnEndpoints, }) {
     var _a;
     console.time('runWebpackCore');
     console.time('webpackGenerate');
@@ -20,13 +20,6 @@ async function runWebpackCore({ cals, mainAppData, subAppDataList, appBuildDir,
         assets,
     });
     console.timeEnd('webpackGenerate');
-    // compile
-    console.time('generateMpJsonConfigFile');
-    await (0, webpack_1.generateMpJsonConfigFile)(allAppDataList, mpConfig, appBuildDir, {
-        appKey,
-        generateMpType,
-    });
-    console.timeEnd('generateMpJsonConfigFile');
     await (0, generate_1.generateHTML)({
         appId: mainAppData.id || appKey,
         envId: mainAppData.envId || '',

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

@@ -43,4 +43,12 @@ export interface IBuildContext {
      * 是否启用过期
      */
     enableExpiredTag?: boolean;
+    /**
+     * 是否禁用应用
+     */
+    disabled?: boolean;
+    /**
+     * 自定义状态页Id
+     */
+    statusPageId?: string;
 }

package/lib/builder/mp/index.js

@@ -137,8 +137,12 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
             'common/query.js': {},
             'common/flow.js': {},
             'common/info': {},
-            'common/privacyModal': {},
-            'common/modal': {},
+            /**
+             * 使用微信的 modal
+             * 暂时保留内部实现待之后使用
+             */
+            // 'common/privacyModal': {},
+            // 'common/modal': {},
             /**
              * 调试用
              */
@@ -218,7 +222,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
             return;
         }
         else {
-            const subpackageRootPath = path_1.default.join(miniprogramRoot, app.rootPath || '/');
+            const subpackageRootPath = path_1.default.join(miniprogramRoot, 'packages', app.rootPath || '/');
             let subpackageBuildCtx = {
                 ...buildContext,
                 rootPath: app.rootPath,
@@ -341,12 +345,13 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     },
                 ],
             });
-            const wxml = (0, wxml_1.generateWxml)({ ...ctx, rootPath, isPage: true }, componentInstances, `Page ${rootPath ? path_1.default.join(rootPath, 'pages') : ''}/${page.id}`, wxmlDataPrefix, usingComponents, componentGenerics);
+            const wxml = (0, wxml_1.generateWxml)({ ...ctx, rootPath, pageUUID: rootPath ? `${rootPath}/${page.id}` : page.id }, componentInstances, `Page ${rootPath ? path_1.default.join('packages', rootPath, 'pages') : ''}/${page.id}`, wxmlDataPrefix, usingComponents, componentGenerics);
             const importor = (0, util_3.generateLowcodeImportor)(page.lowCodes);
             const pageFileName = (0, lodash_1.get)(pageConfigs, `${page.id}.pageFileName`, 'index');
+            const subLevelPath = rootPath ? `${path_1.default.posix.relative(`packages/${rootPath}`, '')}/` : '';
             const pageFileData = {
                 [`api.js|api.js`]: {
-                    subLevelPath: rootPath ? `${path_1.default.posix.relative(rootPath, '')}/` : '',
+                    subLevelPath,
                     uuid: rootPath ? `${rootPath}/${page.id}` : page.id,
                     label: ((_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),
                 },
@@ -365,7 +370,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     },
                     debug: ctx.debugMode,
                     stringifyObj: util_1.inspect,
-                    subLevelPath: rootPath ? `${path_1.default.posix.relative(rootPath, '')}/` : '',
+                    subLevelPath,
                     importor,
                     query: (0, util_2.createTemplateQuery)(ctx, (_f = page.dataset) === null || _f === void 0 ? void 0 : _f.query),
                     eventFlows: (0, util_2.createTemplateEventFlows)(ctx, page.eventFlows),
@@ -385,7 +390,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                 },
                 [`index.wxss|${pageFileName}.wxss`]: {
                     subWxss: rootPath && !((_l = ctx.mainAppData) === null || _l === void 0 ? void 0 : _l.mpPkgUrl)
-                        ? `@import "${path_1.default.posix.relative(`/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
+                        ? `@import "${path_1.default.posix.relative(`/packages/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
                         : '',
                     content: (0, weapps_core_1.toCssText)((0, cals_1.processCommonStyle2CSSProperties)(page.commonStyle, {
                         defaultUnit: processCssUnit,
@@ -440,7 +445,7 @@ async function generateFramework(ctx, appData, outDir, options) {
                 ...fileData,
                 'app/app-global.js': {},
                 'app/weapps-api.js': {
-                    subLevelPath: appData.rootPath ? `${path_1.default.posix.relative(`${appData.rootPath}`, '')}/` : '',
+                    subLevelPath: appData.rootPath ? `${path_1.default.posix.relative(`packages/${appData.rootPath}`, '')}/` : '',
                     subPackageName: appData.rootPath || '',
                     importor,
                     appConfig: (0, util_3.JsonToStringWithVariableName)({
@@ -451,10 +456,17 @@ async function generateFramework(ctx, appData, outDir, options) {
                         envVersion: (ctx === null || ctx === void 0 ? void 0 : ctx.isProduction) ? 'production' : 'preview',
                         pages: appData.pageInstanceList
                             .sort((item) => (item.isHome ? -1 : 1))
-                            .map((item) => ({
-                            id: item.id,
-                            type: item.data.isCustomLoginPage ? 'login' : '',
-                        })),
+                            .map((item) => {
+                            var _a;
+                            return ({
+                                id: item.id,
+                                type: item.data.isCustomLoginPage
+                                    ? 'login'
+                                    : ((_a = appData.extra) === null || _a === void 0 ? void 0 : _a.statusPageId) === item.id
+                                        ? 'status'
+                                        : '',
+                            });
+                        }),
                     }),
                     appQuery: (0, util_2.createTemplateQuery)(ctx, (_b = appData.dataset) === null || _b === void 0 ? void 0 : _b.query),
                     stringifyObj: util_1.inspect,
@@ -495,8 +507,9 @@ async function writeLowCodeFiles(ctx, appData, outDir) {
 }
 exports.writeLowCodeFiles = writeLowCodeFiles;
 // {a: 1} -> , "a": 1
-function getAppendableJson(json) {
-    const obj = { ...json };
+function getAppendableJson(json = {}) {
+    const { namespace, appShareMessage, ...restJson } = json;
+    const obj = { ...restJson };
     if (obj.reachBottomDistance) {
         obj.onReachBottomDistance = parseInt(obj.reachBottomDistance, 10) || 0;
         delete obj.reachBottomDistance;
@@ -555,7 +568,9 @@ async function cleanPkg(pkg, miniprogramRoot) {
     if (pkg.mpPkgUrl) {
         return;
     }
-    const pkgDir = [miniprogramRoot, pkg.rootPath].filter((p) => !!p).join(path_1.default.sep);
+    const pkgDir = [miniprogramRoot, pkg.rootPath ? `packages${path_1.default.sep}${pkg.rootPath}` : '']
+        .filter((p) => !!p)
+        .join(path_1.default.sep);
     const pagesDir = path_1.default.join(pkgDir, 'pages');
     const lowcodesDir = path_1.default.join(pkgDir, 'lowcode');
     const existedPages = await fs.readdir(pagesDir);

package/lib/builder/mp/lowcode.js

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

package/lib/builder/mp/materials.js

@@ -246,7 +246,8 @@ async function generateCompositeComponent(ctx, compositedComp, compLibCommonReso
         enableLoading: false,
     };
     const { materialName } = compositedComp;
-    const outDir = path.join(compositeCtx.projDir, compositeCtx.rootPath || '', // 混合模式下，可能会有 rootPath
+    const outDir = path.join(compositeCtx.projDir, 
+    // compositeCtx.rootPath || '', // 所有组件统一生成到根目录
     config_1.materialsDirName, materialName, compositedComp.name);
     const LOWCODE_DIR_NAME = 'lowcode';
     console.log(`Generating composited component ${materialName}:${compositedComp.name} to ${outDir}`);

package/lib/builder/mp/mixMode.js

@@ -96,7 +96,7 @@ async function handleMixMode({ buildContext, apps = [], miniprogramRoot, plugins
         await Promise.all(apps
             .filter((app) => app.rootPath)
             .map(async (app) => {
-            const subAppPath = path_1.default.join(miniprogramRoot, app.rootPath || '');
+            const subAppPath = path_1.default.join(miniprogramRoot, ...(app.rootPath ? ['packages', app.rootPath] : ['']));
             // 复制整个子包
             // 新模式下已经生成，感觉无需进行复制 @royhyang
             // const distDir = path.join(generateMpPath, app.rootPath || '')
@@ -106,7 +106,7 @@ async function handleMixMode({ buildContext, apps = [], miniprogramRoot, plugins
                 let appJson = await fs_extra_1.default.readJson(appJsonPath);
                 if (appJson) {
                     let { subpackages = [] } = rootAppJosn;
-                    const find = subpackages.find((item) => item.root == app.rootPath);
+                    const find = subpackages.find((item) => item.root === `packages/${app.rootPath}`);
                     if (find) {
                         find.pages = appJson.pages;
                     }
@@ -115,7 +115,7 @@ async function handleMixMode({ buildContext, apps = [], miniprogramRoot, plugins
                             rootAppJosn.subpackages = [];
                         }
                         rootAppJosn.subpackages.push({
-                            root: app.rootPath,
+                            root: `packages/${app.rootPath}`,
                             pages: appJson.pages,
                         });
                     }

package/lib/builder/mp/mp_config.js

@@ -121,6 +121,9 @@ function generateMpConfig(ctx, weapps, options) {
         projConfig.setting = {};
     }
     projConfig.setting.bigPackageSizeSupport = true;
+    if (process.env.IS_WEB_WORKER) {
+        projConfig.setting.ignoreUploadUnusedFiles = true;
+    }
     if (options.mpAppId) {
         projConfig.appId = options.mpAppId;
     }
@@ -132,10 +135,9 @@ function extractPages(weapps, pageConfigs) {
     const pages = [];
     const subpackages = [];
     let homePage = '';
-    let homePageId = '';
     weapps.forEach((weapp, index) => {
         const { rootPath } = weapp;
-        const subPackage = { root: rootPath, pages: [] };
+        const subPackage = { root: rootPath ? `packages/${rootPath}` : '', pages: [] };
         if (rootPath) {
             subpackages.push(subPackage);
         }
@@ -150,14 +152,13 @@ function extractPages(weapps, pageConfigs) {
             }
             else {
                 homePage = `pages/${page.id}/${pageFileName}`;
-                homePageId = page.id;
             }
         });
     });
     if (homePage) {
         pages.unshift(homePage);
     }
-    return { pages, subpackages, homePageId };
+    return { pages, subpackages };
 }
 function getAppPagesConfig(pages) {
     const pagesConfig = {};

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

@@ -1,7 +1,7 @@
 import { IWeAppComponentInstance, IEventModifiers } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IBuildContext } from './BuildContext';
 export declare function generateWxml(ctx: IBuildContext & {
-    isPage: boolean;
+    pageUUID?: string;
 }, widgets: {
     [key: string]: IWeAppComponentInstance;
 }, docTag: string, wxmlDataPrefix: any, usingComponents: any, componentGenerics: any, nodeTransform?: (cmp: IWeAppComponentInstance, node: any) => void): string;

package/lib/builder/mp/wxml.js

@@ -19,91 +19,113 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
     const xmlJson = {
         elements: createXml(widgets),
     };
-    if (ctx.isPage) {
-        const { enablePageRoot } = ctx;
+    if (ctx.pageUUID) {
+        const { enablePageRoot, disabled } = ctx;
         const originElements = xmlJson.elements;
-        usingComponents['wd-privacy'] = '/common/privacyModal/index';
+        // usingComponents['wd-privacy'] = '/common/privacyModal/index';
         usingComponents['wd-info'] = '/common/info/index';
-        // 登录校验: 向其最外层包裹一层block
-        xmlJson.elements = [
-            {
-                type: 'element',
-                name: 'wd-privacy',
-                attributes: {},
-                elements: [],
-                _order: -Infinity,
-                _parent: null,
-            },
-            {
-                type: 'element',
-                name: enablePageRoot ? 'view' : 'block',
-                attributes: {
-                    id: 'wd-page-root',
-                    ['wx:if']: '{{weDaHasLogin && !_expiredMessage}}',
-                    ['data-weui-theme']: 'light',
-                },
-                elements: [
-                    ...originElements,
-                    /**
-                     * 可能需要依赖添加逻辑节点的方式
-                     * 来触发 page 的 ready
-                     * 目的是为了让 page 的 ready 在组件的 ready 之后
-                     */
-                    // {
-                    //   type: 'element',
-                    //   name: 'readyPlaceHoler',
-                    //   attributes: {
-                    //     ['bind:ready']: '_onReady',
-                    //   },
-                    //   elements: originElements,
-                    //   _order: Infinity,
-                    //   _parent: null,
-                    // },
-                ],
-                _order: -1,
-                _parent: null,
-            },
-            {
-                type: 'element',
-                name: 'wd-info',
-                attributes: {
-                    ['wx:if']: '{{weDaHasLogin === false && !_expiredMessage}}',
-                    message: '无权限访问',
-                    type: 'auth',
-                },
-                elements: [],
-                _order: Infinity,
-                _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',
+        if (disabled && ctx.pageUUID !== ctx.statusPageId) {
+            xmlJson.elements = [
+                {
+                    type: 'element',
+                    name: 'wd-info',
+                    attributes: {
+                        message: '当前页面无法访问',
+                        type: 'notfound',
+                        enableCustom: true,
+                        pageUUID: ctx.pageUUID,
+                    },
+                    elements: [],
+                    _order: Infinity,
+                    _parent: null,
                 },
-                elements: [],
-                _order: Infinity,
-                _parent: null,
-            });
+            ];
         }
-        if (ctx.enableLoading) {
-            usingComponents['wd-info'] = '/common/info/index';
-            xmlJson.elements.push({
-                type: 'element',
-                name: 'wd-info',
-                attributes: {
-                    ['wx:if']: '{{_isCheckingAtuh && !_expiredMessage}}',
-                    type: 'loading',
+        else {
+            // 登录校验: 向其最外层包裹一层block
+            xmlJson.elements = [
+                // {
+                //   type: 'element',
+                //   name: 'wd-privacy',
+                //   attributes: {},
+                //   elements: [],
+                //   _order: -Infinity,
+                //   _parent: null,
+                // },
+                {
+                    type: 'element',
+                    name: enablePageRoot ? 'view' : 'block',
+                    attributes: {
+                        id: 'wd-page-root',
+                        ['wx:if']: '{{weDaHasLogin && !_expiredMessage}}',
+                        ['data-weui-theme']: 'light',
+                    },
+                    elements: [
+                        ...originElements,
+                        /**
+                         * 可能需要依赖添加逻辑节点的方式
+                         * 来触发 page 的 ready
+                         * 目的是为了让 page 的 ready 在组件的 ready 之后
+                         */
+                        // {
+                        //   type: 'element',
+                        //   name: 'readyPlaceHoler',
+                        //   attributes: {
+                        //     ['bind:ready']: '_onReady',
+                        //   },
+                        //   elements: originElements,
+                        //   _order: Infinity,
+                        //   _parent: null,
+                        // },
+                    ],
+                    _order: -1,
+                    _parent: null,
                 },
-                elements: [],
-                _order: Infinity,
-                _parent: null,
-            });
+                {
+                    type: 'element',
+                    name: 'wd-info',
+                    attributes: {
+                        ['wx:if']: '{{weDaHasLogin === false && !_expiredMessage}}',
+                        message: '无权限访问',
+                        type: 'auth',
+                        enableCustom: true,
+                        pageUUID: ctx.pageUUID,
+                        error: '{{loginError}}',
+                    },
+                    elements: [],
+                    _order: Infinity,
+                    _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-info'] = '/common/info/index';
+                xmlJson.elements.push({
+                    type: 'element',
+                    name: 'wd-info',
+                    attributes: {
+                        ['wx:if']: '{{_isCheckingAtuh && !_expiredMessage}}',
+                        type: 'loading',
+                    },
+                    elements: [],
+                    _order: Infinity,
+                    _parent: null,
+                });
+            }
         }
     }
     function createXml(widgets, parent = null, parentForNodes = []) {

package/lib/builder/service/webpack.d.ts

@@ -44,19 +44,12 @@ export interface IGenerateMpJsonConfigFileOpts {
     appKey?: string;
     generateMpType?: 'app' | 'subpackage';
 }
-export declare function generateAppConfig(mainAppData: IWebRuntimeAppData, subAppDataList: IWebRuntimeAppData[], appBuildDir: string): Promise<{}>;
 export declare function generateKboneTabBarConfig(mpConfig: Record<string, any>, appBuildDir: any): Promise<void>;
 export declare function downloadAndWriteTabBarIcon(iconPath: any, pagePath: any, appBuildDir: string, fileName: string): Promise<unknown>;
-export declare function generateKbonePageConfig(mpConfig: Record<string, any>, mainAppData: IWebRuntimeAppData, subAppDataList?: IWebRuntimeAppData[]): Record<string, any>;
-export declare function generateKboneAppConfig(mpConfig: Record<string, any>, mainAppData: IWebRuntimeAppData): void;
-export declare function generateMpJsonConfigFile(allAppDataList: IWebRuntimeAppData[], userConfig: any, appBuildDir: string, options: IGenerateMpJsonConfigFileOpts): Promise<void>;
 export declare function getMainAppDataByList(allAppDataList: IWebRuntimeAppData[]): IWebRuntimeAppData | undefined;
 export declare function getHomePageInstance(pageInstanceList: any): any;
 export declare function getPageName(name: string): string;
-export declare function getMpAllRouterConfig(allAppDataList: IWebRuntimeAppData[], getHome?: boolean): any;
 export declare function getWebpackWebBuildParams(appId: string, appBuildDir: string, publicPath?: string, mode?: WebpackModeType, buildTypeList?: BuildType[], extraDefine?: {}, assets?: string[]): any;
-export declare function getWebpackMpBuildParams(appBuildDir: string, materialsDir: string, dependencies: IMaterialItem[] | undefined, nodeModulesPath: string, allAppDataList: IWebRuntimeAppData[], mode: string, watch: boolean, options: IGenerateMpJsonConfigFileOpts): any;
-export declare function getAllPageMpEntryPath(allAppDataList: IWebRuntimeAppData[], appBuildDir: string): Record<string, any>;
 export declare function downloadAndInstallDependencies(dependencies: IMaterialItem[] | undefined, materialsDir: string, installOptions?: IInstallOpts): Promise<void>;
 export declare function downloadDependencies(targetDir: string, srcZipUrl: string): Promise<void>;
 /**