@cloudbase/lowcode-builder 1.1.10 → 1.2.1-alpha.0

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

@@ -16,3 +16,11 @@ export declare const miniprogramURL = "https://comp-public-1303824488.cos.ap-sha
  * miniprogram_npm存放目录。IDE插件builder用到
  */
 export declare const miniprogramDir: string;
+export interface ICDN_ENDPOINTS_COFIG {
+    common?: string;
+    cloudbase?: string;
+    cdngo?: string;
+    aegis?: string;
+}
+export declare const CDN_ENDPONTS_CONFIG: ICDN_ENDPOINTS_COFIG;
+export declare function generateCdnEndpoints(endpoints?: ICDN_ENDPOINTS_COFIG): ICDN_ENDPOINTS_COFIG;

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.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.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;
 const path = __importStar(require("path"));
 const os_1 = __importDefault(require("os"));
 var index_1 = require("@cloudbase/lowcode-generator/lib/generator/config/index");
@@ -54,3 +54,18 @@ exports.miniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqclou
  * miniprogram_npm存放目录。IDE插件builder用到
  */
 exports.miniprogramDir = path.join(os_1.default.homedir(), exports.sharedMaterialsDir, 'miniprogram_npm');
+exports.CDN_ENDPONTS_CONFIG = {
+    common: '',
+    cloudbase: '//static.cloudbase.net',
+    cdngo: 'https://qbase.cdn-go.cn',
+    aegis: 'https://cdn-go.cn',
+};
+function generateCdnEndpoints(endpoints = exports.CDN_ENDPONTS_CONFIG) {
+    for (const key in exports.CDN_ENDPONTS_CONFIG) {
+        if (!Object.prototype.hasOwnProperty.call(endpoints, key)) {
+            endpoints[key] = endpoints.common ? endpoints.common : exports.CDN_ENDPONTS_CONFIG[key];
+        }
+    }
+    return endpoints;
+}
+exports.generateCdnEndpoints = generateCdnEndpoints;

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

@@ -2,7 +2,8 @@ import { IMaterialItem, IWeAppData, IPlugin, IExtraData } from '@cloudbase/lowco
 import { BuildType, GenerateMpType, WebpackBuildCallBack, WebpackModeType } from '../types/common';
 import { DEPLOY_MODE, RUNTIME } from '../../types';
 import { IPlatformApp } from '@cloudbase/cals';
-export interface IBaseAppProps {
+import { ICDN_ENDPOINTS_COFIG } from '../config';
+interface IBaseAppProps {
     appKey: string;
     dependencies?: IMaterialItem[];
     publicPath?: string;
@@ -35,11 +36,41 @@ export interface IBuildWedaApp extends IBaseAppProps {
         path?: string;
     };
     isBrowserMpBuilder?: boolean;
+    cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
+    isPrivateMode?: boolean;
+    endpointType?: 'tcb-api' | 'wechat-service';
 }
-export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<string | undefined>;
+export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, endpointType, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<string | undefined>;
 export declare function cleanComponentDir(): Promise<void>;
 export declare const version: any;
 export { getFiles, fileToZip, strToBuf } from '../util/generateFiles';
 export { downloadZip } from '../util/net';
 export { getCompileDirs } from '../util';
 export default buildWedaApp;
+interface INormalizeInput {
+    appId?: string;
+    appKey?: string;
+    dependencies?: IBuildWedaApp['dependencies'];
+    buildTypeList: IBuildWedaApp['buildTypeList'];
+    mainAppSerializeData?: IBuildWedaApp['cals'];
+    cals?: IBuildWedaApp['cals'];
+    subAppSerializeDataList?: IBuildWedaApp['subAppCalsList'];
+    subAppCalsList?: IBuildWedaApp['subAppCalsList'];
+    deployOptions: IBuildWedaApp['deployOptions'];
+    mpAppId?: string;
+    extraData?: {
+        isComposite: boolean;
+        compProps: {};
+    };
+    [key: string]: any;
+}
+interface InormalizeOutput extends INormalizeInput {
+    dependencies: Required<INormalizeInput['dependencies']>;
+}
+export declare function normalizeInputs(inputs: INormalizeInput, { envId, getWebRootPath, }: {
+    envId: string;
+    getWebRootPath?: ({ appId, deployOptions }: {
+        appId: any;
+        deployOptions: any;
+    }) => string;
+}): InormalizeOutput;

package/lib/builder/core/index.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.getCompileDirs = exports.downloadZip = exports.strToBuf = exports.fileToZip = exports.getFiles = exports.version = exports.cleanComponentDir = exports.buildWedaApp = void 0;
+exports.normalizeInputs = exports.getCompileDirs = exports.downloadZip = exports.strToBuf = exports.fileToZip = exports.getFiles = exports.version = exports.cleanComponentDir = exports.buildWedaApp = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
@@ -20,7 +20,7 @@ const pkg = require('../../../package.json');
 async function buildWedaApp({ cals, 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 }, generateMpType = common_1.GenerateMpType.APP, plugins = [], extraData = {
     isComposite: false,
     compProps: {},
-}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, }, cb) {
+}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints, isPrivateMode = false, endpointType = undefined, }, cb) {
     var _a, _b;
     if (!cals) {
         console.error('无效的应用配置');
@@ -28,6 +28,18 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
     }
     const { mode: deployMode = types_1.DEPLOY_MODE.PREVIEW } = deployOptions;
     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,
+        appId: appKey,
+        isProduction: mode === common_1.WebpackModeType.PRODUCTION,
+        materialLibs: dependencies,
+        debugMode: mode !== common_1.WebpackModeType.PRODUCTION && !!process.env.WEAPPS_DEBUG,
+        isMixMode: generateMpType === common_1.GenerateMpType.SUBPACKAGE,
+        domain,
+        isBrowserMpBuilder,
+        isPrivateMode,
+        endpointType,
+    };
     console.log('domain', domain);
     console.log('应用名', appKey);
     console.log('生成模式', generateMpType);
@@ -37,28 +49,25 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
         if (buildTypeList.includes(common_1.BuildType.MP)) {
             const mainAppSerializeData = (0, common_2.processCals2WeappsData)(cals, dependencies);
             const subAppSerializeDataList = (subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.map((item) => (0, common_2.processCals2WeappsData)(item, dependencies))) || [];
-            appBuildDir = (output === null || output === void 0 ? void 0 : output.path) || path_1.default.join(appBuildDir, 'mp');
-            const isMixMode = generateMpType === common_1.GenerateMpType.SUBPACKAGE;
             const apps = [mainAppSerializeData, ...subAppSerializeDataList];
             if (isBrowserMpBuilder) {
                 // 尽早下载物料
                 await (0, net_1.downloadBrowserMaterial)(output === null || output === void 0 ? void 0 : output.path);
             }
+            const mpBuildContext = {
+                ...buildContext,
+                projDir: (output === null || output === void 0 ? void 0 : output.path) || path_1.default.join(appBuildDir, 'mp'),
+                mainAppData: mainAppSerializeData,
+            };
             const result = await (0, index_1.generateWxMp)({
                 weapps: apps,
-                projDir: appBuildDir,
-                appId: appKey,
-                domain: domain,
-                materials: dependencies,
+                buildContext: mpBuildContext,
                 plugins,
-                isProduction: mode === common_1.WebpackModeType.PRODUCTION,
                 deployMode,
-                extraData,
-                isMixMode,
                 options: {
                     isCrossAccount: resourceAppId !== deployOptions.targetMpAppId,
+                    mpAppId: deployOptions.mpAppId || '',
                     resourceAppId,
-                    mpAppId: deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mpAppId,
                 },
                 buildTypeList,
                 isBrowserMpBuilder,
@@ -66,17 +75,17 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
             });
             // 如果是混合模式，则将特定的目录复制到工程下
             // 针对 app.json / package.json 则采用 merge 的操作
-            if (isMixMode) {
-                console.log(chalk_1.default.green('【混合模式】'), appBuildDir);
+            if (buildContext.isMixMode) {
+                console.log(chalk_1.default.green('【混合模式】'), mpBuildContext.projDir);
                 await (0, mixMode_1.handleMixMode)({
+                    buildContext: mpBuildContext,
                     apps,
-                    generateMpPath: appBuildDir,
                     miniprogramRoot: result.miniprogramRoot,
                     plugins,
                     ignoreInstall,
                 });
             }
-            const outDir = appBuildDir;
+            const outDir = mpBuildContext.projDir;
             let projectJsonPath = path_1.default.resolve(outDir, 'project.config.json');
             await (0, postProcess_1.postprocessProjectConfig)(projectJsonPath, {
                 appid: deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mpAppId,
@@ -89,18 +98,16 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 // 模板需要占位保证 mp 文件夹存在
                 fs_extra_1.default.removeSync(path_1.default.resolve(outDir, 'miniprogram_npm'));
             }
-            cb === null || cb === void 0 ? void 0 : cb(null, {
+            await (cb === null || cb === void 0 ? void 0 : cb(null, {
                 ...result,
                 outDir,
                 timeElapsed: Date.now() - startTime,
-            });
+            }));
             return outDir;
         }
         else {
             const h5BuildDir = await (0, index_2.buildH5App)({
-                appKey,
-                buildDir: appBuildDir,
-                dependencies,
+                buildContext: { ...buildContext, isMixMode: false },
                 cals,
                 subAppCalsList,
                 extraData,
@@ -110,18 +117,36 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 runtime,
                 deployMode,
                 ignoreInstall,
-                domain,
+                cdnEndpoints,
             });
-            cb === null || cb === void 0 ? void 0 : cb(null, {
+            await (cb === null || cb === void 0 ? void 0 : cb(null, {
                 outDir: h5BuildDir,
                 timeElapsed: Date.now() - startTime,
-            });
+            }));
             return h5BuildDir;
         }
     }
-    catch (e) {
-        cb === null || cb === void 0 ? void 0 : cb(e);
-        throw e;
+    catch (err) {
+        if (err.length) {
+            let messageList = (err[0] || '').split('\n');
+            let lineIndex = 0;
+            let reg = /node_modules\/@babel/;
+            messageList.find((str, index) => {
+                if (reg.test(str)) {
+                    lineIndex = index;
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            });
+            if (lineIndex) {
+                messageList = messageList.slice(0, lineIndex);
+            }
+            err = new Error(messageList.join('\n'));
+        }
+        cb === null || cb === void 0 ? void 0 : cb(err);
+        throw err;
     }
 }
 exports.buildWedaApp = buildWedaApp;
@@ -139,3 +164,98 @@ Object.defineProperty(exports, "downloadZip", { enumerable: true, get: function
 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, }) {
+    const { extraData = { isComposite: false, compProps: {} } } = inputs;
+    /**
+     * 过滤处理 dependencies
+     */
+    let map = {};
+    inputs.dependencies = (inputs.dependencies || []).reduce((list, item) => {
+        if (!map[`${item.name}@${item.version}`]) {
+            map[`${item.name}@${item.version}`] = true;
+            list.push(item);
+        }
+        return list;
+    }, []);
+    const normalizeCalsOptions = {
+        buildTypeList: inputs.buildTypeList,
+        envId,
+        deployOptions: inputs.deployOptions,
+        appId: inputs.appId || inputs.appKey,
+        getWebRootPath: getWebRootPath || _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)) {
+        // 小程序构建
+        const { mpAppId, deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW } } = inputs;
+        inputs.deployOptions = {
+            ...deployOptions,
+            mpAppId: deployOptions.mpAppId || mpAppId,
+        };
+        if (!inputs.deployOptions.targetMpAppId) {
+            inputs.deployOptions.targetMpAppId = inputs.deployOptions.mpAppId;
+        }
+    }
+    if (extraData.isComposite) {
+        Object.keys(extraData.compProps.events).forEach((eName) => {
+            extraData.compProps.events[eName] = `$$EVENT_${eName}$$`;
+        });
+    }
+    return inputs;
+}
+exports.normalizeInputs = normalizeInputs;
+function normalizeCals(cals, { buildTypeList, envId, deployOptions, appId, getWebRootPath }) {
+    var _a, _b;
+    if (!cals.extra) {
+        cals.extra = {};
+    }
+    if (!cals.mpPkgUrl) {
+        if (buildTypeList.includes(common_1.BuildType.APP) ||
+            buildTypeList.includes(common_1.BuildType.XPAGE_PC) ||
+            buildTypeList.includes(common_1.BuildType.ADMIN_PORTAL)) {
+            cals.extra.historyType = types_1.HISTORY_TYPE.HASH;
+        }
+    }
+    if (!((_a = cals === null || cals === void 0 ? void 0 : cals.extra) === null || _a === void 0 ? void 0 : _a.envId)) {
+        cals.extra.envId = envId;
+    }
+    if ((0, common_1.buildAsWebByBuildType)(buildTypeList)) {
+        // web 构建不处理小程序插件
+        if (cals.extra.miniprogramPlugins) {
+            cals.extra.miniprogramPlugins = [];
+        }
+        let { appConfig = {} } = cals.extra;
+        let { window = {} } = appConfig;
+        let path = getWebRootPath({ appId, deployOptions });
+        cals.extra.appConfig = {
+            ...appConfig,
+            window: {
+                ...window,
+                // Todo: 处理自定义域名逻辑
+                publicPath: (0, common_1.buildAsXPageByBuildType)(buildTypeList)
+                    ? (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.publicPath) || `https://${(_b = cals.extra) === null || _b === void 0 ? void 0 : _b.domain}${path}`
+                    : path,
+                basename: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList)
+                    ? `app/${appId}${(deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) !== types_1.DEPLOY_MODE.UPLOAD ? '-preview' : ''}`
+                    : (0, common_1.buildAsXPageByBuildType)(buildTypeList)
+                        ? '/'
+                        : path,
+            },
+        };
+    }
+    return cals;
+}
+function _getWebRootPath({ appId, deployOptions }) {
+    return (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.PREVIEW ? `/${appId}/preview/` : `/${appId}/production/`;
+}

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

@@ -1,17 +1,20 @@
 import { BuildAppProps } from '@cloudbase/lowcode-generator';
+import { IPlatformApp } from '@cloudbase/cals';
+import { ICDN_ENDPOINTS_COFIG } from '../config';
 import { BuildType } from '../types/common';
 /**
  * 该函数从 @govcloud/generate 取到需要的模版文件
  */
 export declare function generateProjectFiles(buildData: BuildAppProps): Promise<void>;
-export declare function generateHTML({ appId, appBuildDir, jsApis, mode, devTool, isBuildApp, buildTypeList, }: {
+export declare function generateHTML({ appId, appBuildDir, externalResources, mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, }: {
     appId: string;
-    jsApis: string[];
+    externalResources: Required<IPlatformApp>['externalResources'];
     appBuildDir: string;
     mode: string;
     devTool: string;
     isBuildApp: boolean;
     buildTypeList: BuildType[];
+    cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
 }): Promise<void>;
 export declare function handleAssets({ appBuildDir, buildTypeList, assets, }: {
     appBuildDir: string;

package/lib/builder/h5/generate.js

@@ -7,6 +7,7 @@ exports.generateThemeVarsFile = exports.handleAssets = exports.generateHTML = ex
 const lowcode_generator_1 = require("@cloudbase/lowcode-generator");
 const generateFiles_1 = require("../util/generateFiles");
 const path_1 = __importDefault(require("path"));
+const cals_1 = require("@cloudbase/cals");
 const util_1 = require("../util");
 const common_1 = require("../util/common");
 const webpack_1 = require("../service/webpack");
@@ -24,19 +25,35 @@ async function generateProjectFiles(buildData) {
     }));
 }
 exports.generateProjectFiles = generateProjectFiles;
-async function generateHTML({ appId, appBuildDir, jsApis, mode, devTool, isBuildApp, buildTypeList, }) {
+async function generateHTML({ appId, appBuildDir, externalResources = [], mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, }) {
     const templatePath = path_1.default.join(config_1.appTemplateDir, 'html', 'index.html.ejs');
     const dstFilePath = path_1.default.join(appBuildDir, 'index.html');
     const packageTpl = await fs_extra_1.default.readFile(templatePath, { encoding: 'utf8' });
+    const jsApis = [];
+    const cssStyles = [];
+    for (let externalResource of externalResources) {
+        switch (externalResource.type) {
+            case cals_1.EExternalResourceType.JSUrl: {
+                jsApis.push(externalResource.url || '');
+                break;
+            }
+            case cals_1.EExternalResourceType.CSSUrl: {
+                cssStyles.push(externalResource.url || '');
+                break;
+            }
+        }
+    }
     await fs_extra_1.default.writeFile(dstFilePath, (0, lodash_1.template)(packageTpl)({
         appId,
         title: '',
         desc: 'WeDa构建的应用',
         canUseVite: (0, util_1.canUseVite)(mode, devTool),
-        jsApis: (0, lodash_1.uniq)(jsApis),
+        jsApis: Array.from(new Set(jsApis.filter((item) => !!item))),
+        cssStyles: Array.from(new Set(cssStyles.filter((item) => !!item))),
         mode,
         isBuildApp,
         isAdminPortal: (0, common_2.buildAsAdminPortalByBuildType)(buildTypeList),
+        cdnEndpoints: (0, config_1.generateCdnEndpoints)(cdnEndpoints),
     }));
 }
 exports.generateHTML = generateHTML;

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

@@ -1,13 +1,13 @@
-import { IMaterialItem, II18nConfig, IExtraData } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { II18nConfig, IExtraData } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { BuildType, WebpackModeType } from '../types/common';
 import { DEPLOY_MODE, RUNTIME } from '../../types';
 import { IPlatformApp } from '@cloudbase/cals';
-export declare function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraData, cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployMode, ignoreInstall, domain, }: {
-    appKey: string;
-    buildDir: string;
+import { ICDN_ENDPOINTS_COFIG } from '../config';
+import { IBuildContext } from '../mp/BuildContext';
+export declare function buildH5App({ buildContext, i18nConfig, extraData, cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployMode, ignoreInstall, cdnEndpoints, }: {
+    buildContext: Omit<IBuildContext, 'mainAppData'>;
     cals: IPlatformApp;
     subAppCalsList: IPlatformApp[];
-    dependencies: IMaterialItem[];
     i18nConfig?: II18nConfig;
     buildTypeList: BuildType[];
     extraData: IExtraData;
@@ -16,5 +16,5 @@ export declare function buildH5App({ appKey, buildDir, dependencies, i18nConfig,
     runtime?: RUNTIME;
     deployMode?: DEPLOY_MODE;
     ignoreInstall?: boolean;
-    domain: string;
+    cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
 }): Promise<string>;

package/lib/builder/h5/index.js

@@ -19,31 +19,31 @@ const types_1 = require("../../types");
 const mp_1 = require("../mp");
 const common_2 = require("../../utils/common");
 const config_1 = require("../config");
-async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraData, cals, buildTypeList = [common_1.BuildType.WEB], subAppCalsList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployMode = types_1.DEPLOY_MODE.PREVIEW, ignoreInstall = false, domain = '', }) {
-    var _a, _b;
+const fs_extra_1 = __importDefault(require("fs-extra"));
+async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildTypeList = [common_1.BuildType.WEB], subAppCalsList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployMode = types_1.DEPLOY_MODE.PREVIEW, ignoreInstall = false, cdnEndpoints, }) {
+    var _a, _b, _c;
+    const { projDir: buildDir, domain, materialLibs: dependencies, appId: appKey, isPrivateMode } = buildContext;
     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');
+        if (buildTypeList.includes(common_1.BuildType.APP) ||
+            buildTypeList.includes(common_1.BuildType.XPAGE_PC) ||
+            buildTypeList.includes(common_1.BuildType.ADMIN_PORTAL)) {
+            if (!cals.extra) {
+                cals.extra = {};
+            }
+            cals.extra.historyType = types_1.HISTORY_TYPE.HASH;
+        }
         const mainAppSerializeData = (0, common_2.processCals2WeappsData)(cals, dependencies);
         const subAppSerializeDataList = (subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.map((item) => (0, common_2.processCals2WeappsData)(item, dependencies))) || [];
-        const buildContext = {
-            projDir: buildDir,
-            appId: appKey,
-            isProduction: mode === common_1.WebpackModeType.PRODUCTION,
-            materialLibs: dependencies,
-            isMixMode: false,
-            mainAppData: mainAppSerializeData,
-            domain,
-        };
         const { allAppUsedComps } = (0, mp_1.handleUsedComponents)({
-            buildContext,
+            buildContext: { ...buildContext, mainAppData: mainAppSerializeData },
             weapps: [mainAppSerializeData, ...subAppSerializeDataList],
-            materials: dependencies,
         });
         // 处理应用数据
         const mainAppData = (0, weapps_core_1.deserialize)(mainAppSerializeData);
         if (!mainAppData.extra) {
-            mainAppData.extra = { domain: domain };
+            mainAppData.extra = { domain };
         }
         if (!((_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.domain)) {
             mainAppData.extra.domain = domain;
@@ -88,6 +88,7 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
             runtime,
             deployMode,
             _indexPage,
+            isPrivateMode,
         });
         console.timeEnd(runGenerateTag);
         // // 构建 NPM 包
@@ -105,6 +106,7 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
         await (0, generate_1.generateThemeVarsFile)(mainAppData.themeVars, h5BuildDir);
         // 生成 webpack 配置
         const webpackConfigPath = await (0, webpack_1.runWebpackCore)({
+            cals,
             appKey,
             mainAppData,
             subAppDataList,
@@ -116,6 +118,7 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
             devTool,
             publicPath,
             domain,
+            cdnEndpoints,
         });
         await new Promise((resolve, reject) => {
             // 开始编译前清理一下 lowcode 内容
@@ -133,6 +136,10 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
                 }
             });
         });
+        // 普通 web 模式，且非hash模式，根据页面生成多份入口
+        if (!((_c = cals.extra) === null || _c === void 0 ? void 0 : _c.historyType) || cals.extra.historyType === types_1.HISTORY_TYPE.BROWSER) {
+            await Promise.all((cals.items || []).map((page) => 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'))));
+        }
         return h5BuildDir;
     }
     catch (e) {

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

@@ -1,11 +1,15 @@
 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';
 interface IWebpackCoreProps extends BuildAppProps {
+    cals: IPlatformApp;
     appBuildDir: string;
     mpConfig: any;
     mainAppData: IWebRuntimeAppData;
     subAppDataList: IWebRuntimeAppData[];
     assets: string[];
+    cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
 }
-export declare function runWebpackCore({ mainAppData, subAppDataList, appBuildDir, publicPath, mode, appKey, buildTypeList, mpConfig, assets, devTool, generateMpType, }: IWebpackCoreProps): Promise<string>;
+export declare function runWebpackCore({ cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode, appKey, buildTypeList, mpConfig, assets, devTool, generateMpType, cdnEndpoints, }: IWebpackCoreProps): Promise<string>;
 export {};

package/lib/builder/h5/webpack.js

@@ -4,7 +4,8 @@ exports.runWebpackCore = void 0;
 const common_1 = require("../types/common");
 const webpack_1 = require("../service/webpack");
 const generate_1 = require("./generate");
-async function runWebpackCore({ mainAppData, subAppDataList, appBuildDir, publicPath, mode = common_1.WebpackModeType.NONE, appKey, buildTypeList = [common_1.BuildType.WEB], mpConfig, assets = [], devTool = 'vite', generateMpType = common_1.GenerateMpType.APP, }) {
+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, }) {
     console.time('runWebpackCore');
     console.time('webpackGenerate');
     const allAppDataList = subAppDataList.concat(mainAppData);
@@ -28,11 +29,15 @@ async function runWebpackCore({ mainAppData, subAppDataList, appBuildDir, public
     await (0, generate_1.generateHTML)({
         appId: mainAppData.id || appKey,
         appBuildDir,
-        jsApis: assets,
+        externalResources: (cals.externalResources || []).concat(assets.map((url) => ({
+            type: cals_1.EExternalResourceType.CSSUrl,
+            url,
+        }))),
         mode,
         devTool,
         isBuildApp: buildTypeList.includes(common_1.BuildType.APP),
         buildTypeList,
+        cdnEndpoints,
     });
     if ((0, common_1.buildAsWebByBuildType)(buildTypeList)) {
         if (mode !== common_1.WebpackModeType.PRODUCTION) {

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

@@ -3,6 +3,9 @@ import { IMaterialItem, IWeAppData, IMiniprogramPlugin } from '@cloudbase/lowcod
  * All build parameters and intermediate data to be share across processes
  */
 export interface IBuildContext {
+    /**
+     * 应用id
+     */
     appId: string;
     domain: string;
     projDir: string;
@@ -14,4 +17,12 @@ export interface IBuildContext {
     miniprogramPlugins?: IMiniprogramPlugin[];
     debugMode?: boolean;
     isBrowserMpBuilder?: boolean;
+    /**
+     * 是否是私有化的环境
+     */
+    isPrivateMode?: boolean;
+    /**
+     * 云开发sdk请求，js-sdk or wx.cloud
+     */
+    endpointType?: 'tcb-api' | 'wechat-service';
 }

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

@@ -1,21 +1,15 @@
-import { IMaterialItem, IWeAppData, IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { IWeAppData, IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IBuildContext } from './BuildContext';
 import { DEPLOY_MODE } from '../../types';
 import { BuildType, IAppUsedComp, IUsedComps } from '../types/common';
-export declare function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, isBrowserMpBuilder, ignoreInstall, }: {
+export declare function generateWxMp({ buildContext, weapps, plugins, deployMode, options, buildTypeList, isBrowserMpBuilder, ignoreInstall, }: {
+    buildContext: IBuildContext;
     weapps: IWeAppData[];
-    projDir: string;
-    appId: string;
-    domain: string;
-    materials: IMaterialItem[];
     plugins: IPlugin[];
-    isProduction: boolean;
     deployMode: DEPLOY_MODE;
-    extraData: any;
-    isMixMode: boolean;
     options: {
+        mpAppId: string;
         resourceAppId?: string;
-        mpAppId?: string;
         isCrossAccount: boolean;
     };
     buildTypeList: BuildType[];
@@ -29,10 +23,9 @@ export declare function writeLowCodeFiles(appData: IWeAppData, outDir: string, c
  * TODO: 与 cals 里的实现进行整合
  * 关键点在于 appUsedComps 分组， 与 generic componen 的实现
  */
-export declare function handleUsedComponents({ buildContext, weapps, materials, }: {
+export declare function handleUsedComponents({ buildContext, weapps }: {
     buildContext: IBuildContext;
     weapps: IWeAppData[];
-    materials: IMaterialItem[];
 }): {
     appUsedComps: IAppUsedComp[];
     allAppUsedComps: IUsedComps;