@cloudbase/lowcode-builder 1.8.54 → 1.8.56

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

@@ -6,16 +6,18 @@ 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.52.zip";
+export declare const builderTemplateURL = "https://comp-public-1303824488.file.myqcloud.com/lcap-builder/template.1.8.55-alpha.0.zip";
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
 export declare const miniprogramURL = "https://comp-public-1303824488.file.myqcloud.com/lcap-builder/miniprogram_npm.1.8.43.zip";
+export declare const systemSubpackageMiniprogramURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/wd_system_miniprogram_npm.zip";
 /**
  * miniprogram_npm存放目录。IDE插件builder用到
  */
 export declare const miniprogramDir: string;
+export declare const systemSubpackageMiniprogramDir: string;
 export interface ICDN_ENDPOINTS_COFIG {
     common?: string;
     cloudbase?: string;

package/lib/builder/config/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.REPEATER = exports.generateCdnEndpoints = exports.CDN_ENDPONTS_CONFIG = exports.miniprogramDir = exports.miniprogramURL = exports.builderTemplateURL = exports.materialsDirName = exports.appTemplateDir = exports.sharedMaterialsDir = exports.OFFICIAL_LIB_KEY = exports.rpxConfig = exports.remConfig = exports.npmRegistry = exports.KBONE_PAGE_KEYS = exports.MP_CONFIG_MODULE_NAME = exports.REPLACE_SIGN = void 0;
+exports.REPEATER = exports.generateCdnEndpoints = exports.CDN_ENDPONTS_CONFIG = exports.systemSubpackageMiniprogramDir = exports.miniprogramDir = exports.systemSubpackageMiniprogramURL = exports.miniprogramURL = exports.builderTemplateURL = exports.materialsDirName = exports.appTemplateDir = exports.sharedMaterialsDir = exports.OFFICIAL_LIB_KEY = exports.rpxConfig = exports.remConfig = exports.npmRegistry = exports.KBONE_PAGE_KEYS = exports.MP_CONFIG_MODULE_NAME = exports.REPLACE_SIGN = void 0;
 const path = __importStar(require("path"));
 const os_1 = __importDefault(require("os"));
 const index_1 = require("@cloudbase/lowcode-generator/lib/generator/config/index");
@@ -45,16 +45,18 @@ 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.52.zip';
+exports.builderTemplateURL = 'https://comp-public-1303824488.file.myqcloud.com/lcap-builder/template.1.8.55-alpha.0.zip';
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
 exports.miniprogramURL = 'https://comp-public-1303824488.file.myqcloud.com/lcap-builder/miniprogram_npm.1.8.43.zip';
+exports.systemSubpackageMiniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/wd_system_miniprogram_npm.zip';
 /**
  * miniprogram_npm存放目录。IDE插件builder用到
  */
 exports.miniprogramDir = path.join(os_1.default.homedir(), exports.sharedMaterialsDir, 'miniprogram_npm');
+exports.systemSubpackageMiniprogramDir = path.join(os_1.default.homedir(), exports.sharedMaterialsDir, '$wd_system_miniprogram_npm');
 exports.CDN_ENDPONTS_CONFIG = {
     common: '',
     cloudbase: '//static.cloudbase.net',

package/lib/builder/core/index.js

@@ -141,7 +141,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 // 尽早下载物料
                 await (0, net_1.downloadBrowserMaterial)(output === null || output === void 0 ? void 0 : output.path);
             }
-            const { enablePageRoot } = (0, cals_1.parseVersion)(cals === null || cals === void 0 ? void 0 : cals.schemaVersion, dependencies);
+            const { enablePageRoot, enableAsyncMaterials } = (0, cals_1.parseVersion)(cals === null || cals === void 0 ? void 0 : cals.schemaVersion, dependencies);
             const mpBuildContext = {
                 ...buildContext,
                 projDir: (output === null || output === void 0 ? void 0 : output.path) || path_1.default.join(appBuildDir, 'mp'),
@@ -154,6 +154,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                     : 'rpx'),
                 enablePageRoot,
                 enableLoading: (_e = cals === null || cals === void 0 ? void 0 : cals.extra) === null || _e === void 0 ? void 0 : _e.enableLoading,
+                enableAsyncMaterials,
             };
             const result = await (0, index_1.generateWxMp)({
                 weapps: apps,
@@ -168,7 +169,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 },
                 buildTypeList,
                 ignoreInstall,
-                cdnEndpoints: { ...(0, config_1.generateCdnEndpoints)(cdnEndpoints), aegis: '' },
+                cdnEndpoints: (0, config_1.generateCdnEndpoints)(cdnEndpoints),
             });
             // 如果是混合模式，则将特定的目录复制到工程下
             // 针对 app.json / package.json 则采用 merge 的操作

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

@@ -2,7 +2,7 @@ import { BuildAppProps } from '@cloudbase/lowcode-generator';
 import { IPlatformApp } from '@cloudbase/cals';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
 import { BuildType } from '../types/common';
-import { IBuildContext } from '../mp/BuildContext';
+import { ICommonBuildContext } from '../mp/BuildContext';
 /**
  * 该函数从 @govcloud/generate 取到需要的模版文件
  */
@@ -12,8 +12,8 @@ export declare function generateHTML({ buildContext, appId, envId, description,
  * 由于存量兜底逻辑存在
  * 默认值为 undefined 否则应为 false
  */
-enableLoading, }: {
-    buildContext: Omit<IBuildContext, 'mainAppData'>;
+enableLoading, publicPath, }: {
+    buildContext: Omit<ICommonBuildContext, 'mainAppData'>;
     appId: string;
     envId: string;
     description?: string;
@@ -25,6 +25,7 @@ enableLoading, }: {
     buildTypeList: BuildType[];
     cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
     enableLoading?: boolean;
+    publicPath?: string;
 }): Promise<void>;
 export declare function handleAssets({ appBuildDir, buildTypeList, assets, }: {
     appBuildDir: string;

package/lib/builder/h5/generate.js

@@ -31,7 +31,7 @@ async function generateHTML({ buildContext, appId, envId, description = '', appB
  * 由于存量兜底逻辑存在
  * 默认值为 undefined 否则应为 false
  */
-enableLoading = undefined, }) {
+enableLoading = undefined, publicPath = '/', }) {
     const { materialLibs, uin } = buildContext;
     const officialLib = materialLibs.find((item) => item.name === cals_1.OFFICIAL_LIB_KEY);
     const templatePath = path_1.default.join(config_1.appTemplateDir, 'html', 'index.html.ejs');
@@ -51,6 +51,21 @@ enableLoading = undefined, }) {
             }
         }
     }
+    let wedaPrivateConfigEndpoint = '';
+    /**
+     * 如果 public path 为 domain，
+     * 则文件要制定从静态托管桶加载
+     * 加载位置和webpack publicpath html规则一致
+     */
+    if (/^https?:/.test(publicPath)) {
+        try {
+            const url = new URL(publicPath);
+            if (url.origin) {
+                wedaPrivateConfigEndpoint = url.origin;
+            }
+        }
+        catch (e) { }
+    }
     await fs_extra_1.default.writeFile(dstFilePath, (0, lodash_1.template)(packageTpl)({
         appId,
         title: '',
@@ -62,6 +77,7 @@ enableLoading = undefined, }) {
         isBuildApp,
         isAdminPortal: (0, common_2.buildAsAdminPortalByBuildType)(buildTypeList),
         cdnEndpoints: (0, config_1.generateCdnEndpoints)(cdnEndpoints),
+        wedaPrivateConfigEndpoint,
         ext3: [envId, uin, index_1.version, officialLib === null || officialLib === void 0 ? void 0 : officialLib.version, '' /* mpappId */].join('|'),
         /**
          * @deprecated

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

@@ -3,10 +3,10 @@ import { BuildType, WebpackModeType } from '../types/common';
 import { RUNTIME } from '../../types';
 import { IPlatformApp } from '@cloudbase/cals';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
-import { IBuildContext } from '../mp/BuildContext';
+import { ICommonBuildContext } from '../mp/BuildContext';
 import { IBuildWedaApp } from '../core';
 export declare function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployOptions, ignoreInstall, cdnEndpoints, }: {
-    buildContext: Omit<IBuildContext, 'mainAppData'>;
+    buildContext: Omit<ICommonBuildContext, 'mainAppData'>;
     cals: IPlatformApp;
     subAppCalsList: IPlatformApp[];
     i18nConfig?: II18nConfig;

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

@@ -2,9 +2,9 @@ import { IWebRuntimeAppData } from '@cloudbase/lowcode-generator/lib/weapps-core
 import { BuildAppProps } from '../core/index';
 import { IPlatformApp } from '@cloudbase/cals';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
-import { IBuildContext } from '../mp/BuildContext';
+import { ICommonBuildContext } from '../mp/BuildContext';
 interface IWebpackCoreProps extends BuildAppProps {
-    buildContext: Omit<IBuildContext, 'mainAppData'>;
+    buildContext: Omit<ICommonBuildContext, 'mainAppData'>;
     cals: IPlatformApp;
     appBuildDir: string;
     mainAppData: IWebRuntimeAppData;

package/lib/builder/h5/webpack.js

@@ -36,6 +36,7 @@ async function runWebpackCore({ buildContext, cals, mainAppData, subAppDataList,
         isBuildApp: buildTypeList.includes(common_1.BuildType.APP),
         buildTypeList,
         cdnEndpoints,
+        publicPath,
     });
     if ((0, common_1.buildAsWebByBuildType)(buildTypeList)) {
         if (mode !== common_1.WebpackModeType.PRODUCTION) {

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

@@ -2,7 +2,7 @@ import { IMaterialItem, IWeAppData, IMiniprogramPlugin } from '@cloudbase/lowcod
 /**
  * All build parameters and intermediate data to be share across processes
  */
-export interface IBuildContext {
+export interface ICommonBuildContext {
     /**
      * 账号信息
      */
@@ -11,8 +11,8 @@ export interface IBuildContext {
      * 应用id
      */
     appId: string;
-    domain: string;
     projDir: string;
+    domain: string;
     materialLibs: IMaterialItem[];
     isProduction: boolean;
     mainAppData: IWeAppData;
@@ -30,11 +30,6 @@ export interface IBuildContext {
      * 云开发sdk请求，js-sdk or wx.cloud
      */
     endpointType?: 'tcb-api' | 'wechat-service';
-    /**
-     * 是否在页面层面添加节点
-     * 并设置 #page-root-id
-     */
-    enablePageRoot?: boolean;
     /**
      * 是否使用默认加载
      */
@@ -56,3 +51,14 @@ export interface IBuildContext {
      */
     statusPageId?: string;
 }
+export interface IBuildContext extends ICommonBuildContext {
+    /**
+     * 是否在页面层面添加节点
+     * 并设置 #page-root-id
+     */
+    enablePageRoot?: boolean;
+    /**
+     * 组件库目录独立子包
+     */
+    enableAsyncMaterials?: boolean;
+}

package/lib/builder/mp/index.js

@@ -83,6 +83,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
     await (0, materials_1.installMaterials)(buildContext, projDir, allAppUsedComps, weapps);
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!isProduction);
     const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(buildContext, weapps, { mpAppId: options.mpAppId });
+    const hasLowcodePkg = weapps.find((item) => !item.mpPkgUrl);
     // #1 generate project files
     if (!mainAppData.mpPkgUrl) {
         const projectFileData = {
@@ -99,7 +100,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
     await generateFramework(buildContext, mainAppData, miniprogramRoot, { deployOptions });
     // #3 生成主包根路径文件
     let appFileData = {};
-    if (weapps.find((item) => !item.mpPkgUrl)) {
+    if (hasLowcodePkg) {
         await generateFramework(buildContext, mainAppData, miniprogramRoot, { deployOptions });
         // 有了 framework app 之后，并且是源码的方式,追加 app 引用
         if (mainAppData.mpPkgUrl) {
@@ -149,17 +150,35 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
              */
             // 'common/behaviors.js': {},
         };
+        if (buildContext.enableAsyncMaterials && !appFileData['common/placeholder']) {
+            appFileData['common/placeholder'] = {};
+        }
     }
     if (mainAppData.mpPkgUrl) {
         // 合并 project 和 app json，复写 appId
         projectConfigJson.appId = projConfig.appId;
-        if (!projectConfigJson.setting) {
-            projectConfigJson.setting = {};
-        }
         projectConfigJson.setting = {
             ...projectConfigJson.setting,
             ...projConfig.setting,
         };
+        const projectMpRoot = projectConfigJson.miniprogramRoot || '/';
+        if (!projectConfigJson.setting.packNpmManually) {
+            projectConfigJson.setting.packNpmManually = true;
+        }
+        if (!projectConfigJson.setting.packNpmRelationList) {
+            projectConfigJson.setting.packNpmRelationList = [];
+        }
+        projectConfigJson.setting.packNpmRelationList = [
+            ...projectConfigJson.setting.packNpmRelationList.filter((item) => item.packageJsonPath === './package.json' || item.packageJsonPath === './packages/$wd_system/package.json'),
+            {
+                packageJsonPath: path_1.default.posix.join(projectMpRoot, 'package.json'),
+                miniprogramNpmDistDir: projectMpRoot,
+            },
+            {
+                packageJsonPath: path_1.default.posix.join(projectMpRoot, 'packages', '$wd_system', 'package.json'),
+                miniprogramNpmDistDir: path_1.default.posix.join(projectMpRoot, 'packages', '$wd_system'),
+            },
+        ];
         await (0, generateFiles_1.writeFile)(projectConfigJsonPath, JSON.stringify(projectConfigJson, undefined, 2));
         let appJsonPath = path_1.default.join(miniprogramRoot, 'app.json');
         let appJson = await fs.readJson(appJsonPath);
@@ -170,7 +189,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
         const importor = (0, util_3.generateLowcodeImportor)(mainAppData.lowCodes || []);
         appFileData = {
             ...appFileData,
-            'app.js': { appConfig, importor },
+            'app.js': { appConfig, importor, materialSubPackagePath: config_1.materialsDirName },
             'app.json': { content: appConfig },
             'app.wxss': {
                 importStyles: materials
@@ -196,7 +215,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
         await fs.move(path_1.default.join(projDir, config_1.materialsDirName), path_1.default.join(miniprogramRoot, config_1.materialsDirName));
     }
     // 生成数据源
-    if (weapps.find((item) => !item.mpPkgUrl)) {
+    if (hasLowcodePkg) {
         const officialLib = materials.find((item) => item.name === cals_1.OFFICIAL_LIB_KEY);
         const datasourceFileData = {
             'datasources/index.js.tpl': {
@@ -225,6 +244,16 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
         console.log(`Generating ${em('datasources')} files`);
         await (0, generateFiles_1.default)(datasourceFileData, templateDir, miniprogramRoot);
     }
+    // 生成上报 & 系统子包模块模块
+    if (hasLowcodePkg) {
+        const subpackageRootPath = path_1.default.join(miniprogramRoot, 'packages', '$wd_system');
+        const sysSubpackageFileData = {
+            'package.json': { cdnEndpoints },
+            'index.js.tpl': { cdnEndpoints },
+        };
+        console.log(`Generating ${em('system subpackage')} files`);
+        await (0, generateFiles_1.default)(sysSubpackageFileData, path_1.default.join(templateDir, 'packages/$wd_system'), subpackageRootPath);
+    }
     // 生成子包
     await Promise.all(weapps.map(async (app, index) => {
         if (index == 0) {
@@ -252,11 +281,19 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
             }
         }
     }));
-    if (!isBrowserMpBuilder && fs.existsSync(path_1.default.join(miniprogramRoot, 'package.json'))) {
-        await (0, webpack_1.installDependencies)(miniprogramRoot, {
-            ignoreInstall,
-            fixNodeModulesMap: { '@cloudbase/js-sdk': endpointType !== 'tcb-api', mobx: true },
-        });
+    if (!isBrowserMpBuilder) {
+        if (fs.existsSync(path_1.default.join(miniprogramRoot, 'package.json'))) {
+            await (0, webpack_1.installDependencies)(miniprogramRoot, {
+                ignoreInstall,
+                fixNodeModulesMap: { '@cloudbase/js-sdk': endpointType !== 'tcb-api', mobx: true },
+            });
+        }
+        const wdSystemSubRoot = path_1.default.join(miniprogramRoot, 'packages', '$wd_system');
+        if (fs.existsSync(path_1.default.join(wdSystemSubRoot, 'package.json'))) {
+            await (0, webpack_1.installDependencies)(wdSystemSubRoot, {
+                ignoreInstall,
+            });
+        }
     }
     await handleMpPlugins();
     console.timeEnd(operationLabel);
@@ -365,6 +402,18 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     (0, util_2.setDataBind)(pageDataBinds, prop, val);
                 }
             });
+            /**
+             * 使用最终的 usingComponents 生成一份 componentPlaceholder
+             */
+            let componentPlaceholder;
+            if (usingComponents[wxml_1.WD_EMPTY_PLACEHOLDER] && ctx.enableAsyncMaterials) {
+                componentPlaceholder = Object.keys(usingComponents).reduce((map, key) => {
+                    if (!wxml_1.WD_RUNTIME_TAG.includes(key)) {
+                        map[key] = wxml_1.WD_EMPTY_PLACEHOLDER;
+                    }
+                    return map;
+                }, {});
+            }
             const pageFileData = {
                 [`api.js|api.js`]: {
                     subLevelPath,
@@ -401,6 +450,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                 [`index.json|${pageFileName}.json`]: {
                     usingComponents,
                     componentGenerics,
+                    componentPlaceholder,
                     extra: getAppendableJson(pageConfigs[page.id]),
                 },
                 [`index.wxml|${pageFileName}.wxml`]: {

package/lib/builder/mp/materials.js

@@ -181,7 +181,11 @@ async function installMaterials(ctx, projDir, usedComps, weapps) {
         await Promise.all(lib.components.map(async (cmp) => {
             return generateCompositeComponent({
                 ...ctx,
-                processCssUnit: 'rpx',
+                /**
+                 * 此处强行覆盖为 rpx 是为了兼容老的复合组件
+                 * $template 应该跟随应用的配置
+                 */
+                processCssUnit: lib.name !== '$template' ? 'rpx' : ctx.processCssUnit,
                 // 只生成在主目录中，减少冗余
                 // rootPath: app.rootPath || '', // 主包是没有 rootPath 的
             }, cmp, lib.compLibCommonResource);

package/lib/builder/mp/mp_config.js

@@ -41,7 +41,7 @@ const chalk_1 = __importDefault(require("chalk"));
  * @param appConfigs app config from prop edit panel
  */
 function generateMpConfig(ctx, weapps, options) {
-    var _a;
+    var _a, _b;
     const appConfig = {
         useExtendedLib: { weui: true },
     };
@@ -87,7 +87,23 @@ function generateMpConfig(ctx, weapps, options) {
     // keep main app config only, ignore subapp config
     const { subpackages, ...extra } = extractPages(weapps, pageConfigs);
     (0, lodash_1.merge)(appConfig, mainAppConfig, extra);
-    appConfig.subpackages = mergeSubPackages(appConfig.subpackages, subpackages);
+    appConfig.subpackages = mergeSubPackages(appConfig.subpackages, [
+        {
+            root: 'packages/$wd_system',
+            name: 'wd-sys-module',
+            pages: [],
+        },
+    ]
+        .concat(ctx.enableAsyncMaterials && !((_b = weapps[0]) === null || _b === void 0 ? void 0 : _b.mpPkgUrl)
+        ? [
+            {
+                root: config_1.materialsDirName,
+                name: 'wd-sys-materials',
+                pages: [],
+            },
+        ]
+        : [])
+        .concat(subpackages));
     if (tradingCapability) {
         const tradePluginKey = `weda-mini-shop-plugin`;
         const pluginMeta = {
@@ -121,6 +137,17 @@ function generateMpConfig(ctx, weapps, options) {
         projConfig.setting = {};
     }
     projConfig.setting.bigPackageSizeSupport = true;
+    projConfig.setting.packNpmManually = true;
+    projConfig.setting.packNpmRelationList = [
+        {
+            packageJsonPath: './package.json',
+            miniprogramNpmDistDir: './',
+        },
+        {
+            packageJsonPath: './packages/$wd_system/package.json',
+            miniprogramNpmDistDir: './packages/$wd_system',
+        },
+    ];
     if (process.env.IS_WEB_WORKER) {
         projConfig.setting.ignoreUploadUnusedFiles = true;
     }

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

@@ -1,5 +1,7 @@
 import { IWeAppComponentInstance, IEventModifiers } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IBuildContext } from './BuildContext';
+export declare const WD_EMPTY_PLACEHOLDER = "wd-ph";
+export declare const WD_RUNTIME_TAG: string[];
 export declare function generateWxml(ctx: IBuildContext & {
     pageUUID?: string;
 }, widgets: {

package/lib/builder/mp/wxml.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUsedComponents = exports.getMpEventHandlerName = exports.generateWxml = void 0;
+exports.getUsedComponents = exports.getMpEventHandlerName = exports.generateWxml = exports.WD_RUNTIME_TAG = exports.WD_EMPTY_PLACEHOLDER = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
 const xml_js_1 = require("xml-js");
@@ -13,6 +13,9 @@ const weapp_1 = require("@cloudbase/lowcode-generator/lib/generator/util/weapp")
 const name_mangler_1 = __importDefault(require("@cloudbase/lowcode-generator/lib/generator/util/name-mangler"));
 const config_1 = require("../config");
 const util_1 = require("./util");
+exports.WD_EMPTY_PLACEHOLDER = 'wd-ph';
+const WD_INFO = 'wd-info';
+exports.WD_RUNTIME_TAG = [exports.WD_EMPTY_PLACEHOLDER, WD_INFO];
 const error = chalk_1.default.redBright;
 function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, componentGenerics, nodeTransform) {
     const nameMangler = ctx.isProduction ? new name_mangler_1.default({ blackList: mp_1.builtinMpTags }) : undefined;
@@ -20,15 +23,18 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
         elements: createXml(widgets),
     };
     if (ctx.pageUUID) {
-        const { enablePageRoot, disabled } = ctx;
+        const { enablePageRoot, disabled, enableAsyncMaterials } = ctx;
         const originElements = xmlJson.elements;
         // usingComponents['wd-privacy'] = '/common/privacyModal/index';
-        usingComponents['wd-info'] = '/common/info/index';
+        usingComponents[WD_INFO] = '/common/info/index';
+        if (enableAsyncMaterials) {
+            usingComponents[exports.WD_EMPTY_PLACEHOLDER] = '/common/placeholder/index';
+        }
         if (disabled && ctx.pageUUID !== ctx.statusPageId) {
             xmlJson.elements = [
                 {
                     type: 'element',
-                    name: 'wd-info',
+                    name: WD_INFO,
                     attributes: {
                         message: '当前页面无法访问',
                         type: 'notfound',
@@ -83,7 +89,7 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
                 },
                 {
                     type: 'element',
-                    name: 'wd-info',
+                    name: WD_INFO,
                     attributes: {
                         ['wx:if']: '{{weDaHasLogin === false && !_expiredMessage}}',
                         message: '无权限访问',
@@ -98,10 +104,9 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
                 },
             ];
             if (ctx.enableExpiredTag) {
-                usingComponents['wd-info'] = '/common/info/index';
                 xmlJson.elements.push({
                     type: 'element',
-                    name: 'wd-info',
+                    name: WD_INFO,
                     attributes: {
                         ['wx:if']: '{{_expiredMessage}}',
                         message: '{{_expiredMessage}}',
@@ -113,10 +118,9 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
                 });
             }
             if (ctx.enableLoading) {
-                usingComponents['wd-info'] = '/common/info/index';
                 xmlJson.elements.push({
                     type: 'element',
-                    name: 'wd-info',
+                    name: WD_INFO,
                     attributes: {
                         ['wx:if']: '{{_isCheckingAtuh && !_expiredMessage}}',
                         type: 'loading',

package/lib/builder/util/net.js

@@ -95,10 +95,11 @@ async function saveFiles(files, dstDir) {
             if ((0, junk_1.isFilePath)(dest)) {
                 continue;
             }
-            if (files[fileName].dir) { // 如果该文件为目录需先创建文件夹
+            if (files[fileName].dir) {
+                // 如果该文件为目录需先创建文件夹
                 if (!fs_extra_1.default.pathExistsSync(dest)) {
                     fs_extra_1.default.mkdirSync(dest, {
-                        recursive: true
+                        recursive: true,
                     });
                 }
             }
@@ -118,8 +119,13 @@ async function saveFiles(files, dstDir) {
  * @param output
  */
 async function downloadBrowserMaterial(output = '.weapps-build') {
-    await Promise.all([downloadZip(config_1.builderTemplateURL, config_1.appTemplateDir, true), downloadZip(config_1.miniprogramURL, config_1.miniprogramDir, true)]);
+    await Promise.all([
+        downloadZip(config_1.builderTemplateURL, config_1.appTemplateDir, true),
+        downloadZip(config_1.miniprogramURL, config_1.miniprogramDir, true),
+        downloadZip(config_1.systemSubpackageMiniprogramURL, config_1.systemSubpackageMiniprogramDir, true),
+    ]);
     // 必须先下载到.weapps-materials目录，因为.weapps-materials是默认下载目录，共享组件逻辑sharedMaterialsDir时会读取文件
     (0, generateFiles_1.copyRecursiveSync)(config_1.miniprogramDir, path.join(output, 'miniprogram_npm'));
+    (0, generateFiles_1.copyRecursiveSync)(config_1.systemSubpackageMiniprogramDir, path.join(output, 'packages', '$wd_system', 'miniprogram_npm'));
 }
 exports.downloadBrowserMaterial = downloadBrowserMaterial;