@cloudbase/lowcode-builder 1.8.93 → 1.8.95

package/lib/builder/core/index.js

@@ -295,15 +295,9 @@ function normalizeInputs(inputs, { envId, getWebRootPath, }) {
     };
     if (inputs.mainAppSerializeData) {
         inputs.mainAppSerializeData = normalizeCals(inputs.mainAppSerializeData, normalizeCalsOptions);
-        if ((0, common_1.buildAsWebByBuildType)(inputs.buildTypeList)) {
-            inputs.subAppSerializeDataList = [];
-        }
     }
     if (inputs.cals) {
         inputs.cals = normalizeCals(inputs.cals, normalizeCalsOptions);
-        if ((0, common_1.buildAsWebByBuildType)(inputs.buildTypeList)) {
-            inputs.subAppCalsList = [];
-        }
     }
     if (!(0, common_1.buildAsWebByBuildType)(inputs.buildTypeList)) {
         // 小程序构建

package/lib/builder/h5/index.js

@@ -113,8 +113,8 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
         await (0, generate_1.generateProjectFiles)({
             dependencies: processedDependencies,
             cals,
+            sub_cals: subAppCalsList,
             mainAppData,
-            subAppDataList,
             appKey,
             publicPath,
             i18nConfig,
@@ -128,6 +128,7 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
             _indexPage,
             isPrivateMode,
             expirationStartTimesnap: enableExpiredTag ? Date.now() : undefined,
+            usedComps: used,
         });
         console.timeEnd(runGenerateTag);
         // // 构建 NPM 包
@@ -195,11 +196,28 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
         // 普通 web 模式，且非hash模式，根据页面生成多份入口
         if (!((_f = cals.extra) === null || _f === void 0 ? void 0 : _f.historyType) || cals.extra.historyType === types_1.HISTORY_TYPE.BROWSER) {
             preHeatUrls.push(path_1.default.posix.join(basename || ''));
-            await Promise.all((cals.items || []).map((page) => {
-                preHeatUrls.push(path_1.default.posix.join(basename || '', page.id));
-                preHeatUrls.push(path_1.default.posix.join(basename || '', page.id, '/'));
-                return fs_extra_1.default.copy(path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, 'index.html'), path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, page.id, 'index.html'));
-            }));
+            await Promise.all([
+                ...(cals.items || []).map((page) => {
+                    preHeatUrls.push(path_1.default.posix.join(basename || '', page.id));
+                    preHeatUrls.push(path_1.default.posix.join(basename || '', page.id, '/'));
+                    return fs_extra_1.default.copy(path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, 'index.html'), path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, page.id, 'index.html'));
+                }),
+                ...(subAppCalsList || []).reduce((list, cals) => {
+                    const { rootPath } = cals.extra || {};
+                    const packageName = (0, util_1.normalizePackageName)(rootPath);
+                    if (packageName) {
+                        preHeatUrls.push(path_1.default.posix.join(basename || '', packageName));
+                        preHeatUrls.push(path_1.default.posix.join(basename || '', packageName, '/'));
+                        list.push(fs_extra_1.default.copy(path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, 'index.html'), path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, packageName, 'index.html')));
+                        (cals.items || []).forEach((page) => {
+                            preHeatUrls.push(path_1.default.posix.join(basename || '', packageName, page.id));
+                            preHeatUrls.push(path_1.default.posix.join(basename || '', packageName, page.id, '/'));
+                            list.push(fs_extra_1.default.copy(path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, 'index.html'), path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, packageName, page.id, 'index.html')));
+                        });
+                    }
+                    return list;
+                }, []),
+            ]);
         }
         await fs_extra_1.default.writeFile(path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, 'weda-manifest.json'), JSON.stringify({ preHeatUrls }, undefined, 2));
         return h5BuildDir;

package/lib/builder/mp/index.js

@@ -64,7 +64,7 @@ function patchBuildContext(ctx, calses) {
      * 修改 buildContext 进行 miniprogramPlugins 精简
      */
     ctx.miniprogramPlugins = (mainAppData.miniprogramPlugins || []).filter((plugin) => used.component[plugin.name] || used.action[plugin.name]);
-    return { used: used };
+    return { used };
 }
 async function generateWxMp({ buildContext: _buildContext, weapps, calses, deployOptions, 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;

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

@@ -1,6 +1,6 @@
 import { IComponentInputProps, IComponentsInfoMap, IPackageJson } from '../types/common';
 import { IMaterialItem, IWeAppComponentInstance, IWeAppCode } from '@cloudbase/lowcode-generator/lib/weapps-core';
-export { getMetaInfoBySourceKey, isArray, isPlainObject, deepDeal, simpleDeepClone, deepDealSchema, getFileNameByUrl, } from '@cloudbase/lowcode-generator/lib/generator/util/common';
+export { getMetaInfoBySourceKey, isArray, isPlainObject, deepDeal, simpleDeepClone, getFileNameByUrl, } from '@cloudbase/lowcode-generator/lib/generator/util/common';
 declare type PromiseResult<T> = Promise<[null, T] | [Error, null]>;
 export declare function promiseWrapper<T>(p: Promise<T>): PromiseResult<T>;
 export declare function getCurrentPackageJson(): {

package/lib/builder/util/common.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.normalizeWedaRoot = exports.normalizePackageName = exports.generateLowcodeImportor = exports.getCompileDirs = exports.deepDealComponentSchemaJson = exports.canUseVite = exports.isOfficialComponentLib = exports.readComponentLibMata = exports.writeLibCommonRes2file = exports.getYyptConfigInfo = exports.getComponentsInfo = exports.getInputProps = exports.removeRequireUncached = exports.requireUncached = exports.JsonToStringWithVariableName = exports.getSelfPackageJson = exports.getCurrentPackageJson = exports.promiseWrapper = exports.getFileNameByUrl = exports.deepDealSchema = exports.simpleDeepClone = exports.deepDeal = exports.isPlainObject = exports.isArray = exports.getMetaInfoBySourceKey = void 0;
+exports.normalizeWedaRoot = exports.normalizePackageName = exports.generateLowcodeImportor = exports.getCompileDirs = exports.deepDealComponentSchemaJson = exports.canUseVite = exports.isOfficialComponentLib = exports.readComponentLibMata = exports.writeLibCommonRes2file = exports.getYyptConfigInfo = exports.getComponentsInfo = exports.getInputProps = exports.removeRequireUncached = exports.requireUncached = exports.JsonToStringWithVariableName = exports.getSelfPackageJson = exports.getCurrentPackageJson = exports.promiseWrapper = exports.getFileNameByUrl = exports.simpleDeepClone = exports.deepDeal = exports.isPlainObject = exports.isArray = exports.getMetaInfoBySourceKey = void 0;
 // import * as R from 'ramda'
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -19,7 +19,6 @@ Object.defineProperty(exports, "isArray", { enumerable: true, get: function () {
 Object.defineProperty(exports, "isPlainObject", { enumerable: true, get: function () { return common_1.isPlainObject; } });
 Object.defineProperty(exports, "deepDeal", { enumerable: true, get: function () { return common_1.deepDeal; } });
 Object.defineProperty(exports, "simpleDeepClone", { enumerable: true, get: function () { return common_1.simpleDeepClone; } });
-Object.defineProperty(exports, "deepDealSchema", { enumerable: true, get: function () { return common_1.deepDealSchema; } });
 Object.defineProperty(exports, "getFileNameByUrl", { enumerable: true, get: function () { return common_1.getFileNameByUrl; } });
 const homeDir = os_1.default.homedir();
 const commandConfigPath = path_1.default.join(homeDir, '.warc');