@cloudbase/lowcode-builder 1.1.8 → 1.1.10

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.cos.ap-shanghai.myqcloud.com/lcap-builder/template_20220810.zip";
+export declare const builderTemplateURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template_20221202.zip";
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
@@ -16,11 +16,3 @@ 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.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.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");
@@ -44,7 +44,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.cos.ap-shanghai.myqcloud.com/lcap-builder/template_20220810.zip';
+exports.builderTemplateURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template_20221202.zip';
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
@@ -54,18 +54,3 @@ 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,8 +2,7 @@ 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';
-import { ICDN_ENDPOINTS_COFIG } from '../config';
-interface IBaseAppProps {
+export interface IBaseAppProps {
     appKey: string;
     dependencies?: IMaterialItem[];
     publicPath?: string;
@@ -36,40 +35,11 @@ export interface IBuildWedaApp extends IBaseAppProps {
         path?: string;
     };
     isBrowserMpBuilder?: boolean;
-    cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
-    isPrivateMode?: boolean;
 }
-export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, }: 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, }: 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.normalizeInputs = exports.getCompileDirs = exports.downloadZip = exports.strToBuf = exports.fileToZip = exports.getFiles = exports.version = exports.cleanComponentDir = exports.buildWedaApp = void 0;
+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, cdnEndpoints, isPrivateMode = false, }, cb) {
+}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, }, cb) {
     var _a, _b;
     if (!cals) {
         console.error('无效的应用配置');
@@ -28,17 +28,6 @@ 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,
-    };
     console.log('domain', domain);
     console.log('应用名', appKey);
     console.log('生成模式', generateMpType);
@@ -48,25 +37,28 @@ 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,
-                buildContext: mpBuildContext,
+                projDir: appBuildDir,
+                appId: appKey,
+                domain: domain,
+                materials: dependencies,
                 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,
@@ -74,16 +66,17 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
             });
             // 如果是混合模式，则将特定的目录复制到工程下
             // 针对 app.json / package.json 则采用 merge 的操作
-            if (buildContext.isMixMode) {
-                console.log(chalk_1.default.green('【混合模式】'), mpBuildContext.projDir);
+            if (isMixMode) {
+                console.log(chalk_1.default.green('【混合模式】'), appBuildDir);
                 await (0, mixMode_1.handleMixMode)({
-                    buildContext: mpBuildContext,
                     apps,
+                    generateMpPath: appBuildDir,
                     miniprogramRoot: result.miniprogramRoot,
                     plugins,
+                    ignoreInstall,
                 });
             }
-            const outDir = mpBuildContext.projDir;
+            const outDir = appBuildDir;
             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,
@@ -96,16 +89,18 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 // 模板需要占位保证 mp 文件夹存在
                 fs_extra_1.default.removeSync(path_1.default.resolve(outDir, 'miniprogram_npm'));
             }
-            await (cb === null || cb === void 0 ? void 0 : cb(null, {
+            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)({
-                buildContext: { ...buildContext, isMixMode: false },
+                appKey,
+                buildDir: appBuildDir,
+                dependencies,
                 cals,
                 subAppCalsList,
                 extraData,
@@ -115,36 +110,18 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 runtime,
                 deployMode,
                 ignoreInstall,
-                cdnEndpoints,
+                domain,
             });
-            await (cb === null || cb === void 0 ? void 0 : cb(null, {
+            cb === null || cb === void 0 ? void 0 : cb(null, {
                 outDir: h5BuildDir,
                 timeElapsed: Date.now() - startTime,
-            }));
+            });
             return h5BuildDir;
         }
     }
-    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;
+    catch (e) {
+        cb === null || cb === void 0 ? void 0 : cb(e);
+        throw e;
     }
 }
 exports.buildWedaApp = buildWedaApp;
@@ -162,98 +139,3 @@ 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,11 +1,10 @@
 import { BuildAppProps } from '@cloudbase/lowcode-generator';
-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, cdnEndpoints, }: {
+export declare function generateHTML({ appId, appBuildDir, jsApis, mode, devTool, isBuildApp, buildTypeList, }: {
     appId: string;
     jsApis: string[];
     appBuildDir: string;
@@ -13,7 +12,6 @@ export declare function generateHTML({ appId, appBuildDir, jsApis, mode, devTool
     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

@@ -24,7 +24,7 @@ async function generateProjectFiles(buildData) {
     }));
 }
 exports.generateProjectFiles = generateProjectFiles;
-async function generateHTML({ appId, appBuildDir, jsApis, mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, }) {
+async function generateHTML({ appId, appBuildDir, jsApis, mode, devTool, isBuildApp, buildTypeList, }) {
     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' });
@@ -37,7 +37,6 @@ async function generateHTML({ appId, appBuildDir, jsApis, mode, devTool, isBuild
         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 { II18nConfig, IExtraData } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { IMaterialItem, 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';
-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'>;
+export declare function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraData, cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployMode, ignoreInstall, domain, }: {
+    appKey: string;
+    buildDir: string;
     cals: IPlatformApp;
     subAppCalsList: IPlatformApp[];
+    dependencies: IMaterialItem[];
     i18nConfig?: II18nConfig;
     buildTypeList: BuildType[];
     extraData: IExtraData;
@@ -16,5 +16,5 @@ export declare function buildH5App({ buildContext, i18nConfig, extraData, cals,
     runtime?: RUNTIME;
     deployMode?: DEPLOY_MODE;
     ignoreInstall?: boolean;
-    cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
+    domain: string;
 }): 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");
-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;
+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;
     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, mainAppData: mainAppSerializeData },
+            buildContext,
             weapps: [mainAppSerializeData, ...subAppSerializeDataList],
+            materials: dependencies,
         });
         // 处理应用数据
         const mainAppData = (0, weapps_core_1.deserialize)(mainAppSerializeData);
         if (!mainAppData.extra) {
-            mainAppData.extra = { domain };
+            mainAppData.extra = { domain: domain };
         }
         if (!((_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.domain)) {
             mainAppData.extra.domain = domain;
@@ -88,7 +88,6 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildType
             runtime,
             deployMode,
             _indexPage,
-            isPrivateMode,
         });
         console.timeEnd(runGenerateTag);
         // // 构建 NPM 包
@@ -117,7 +116,6 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildType
             devTool,
             publicPath,
             domain,
-            cdnEndpoints,
         });
         await new Promise((resolve, reject) => {
             // 开始编译前清理一下 lowcode 内容
@@ -135,10 +133,6 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildType
                 }
             });
         });
-        // 普通 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,13 +1,11 @@
 import { IWebRuntimeAppData } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { BuildAppProps } from '../core/index';
-import { ICDN_ENDPOINTS_COFIG } from '../config';
 interface IWebpackCoreProps extends BuildAppProps {
     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, cdnEndpoints, }: IWebpackCoreProps): Promise<string>;
+export declare function runWebpackCore({ mainAppData, subAppDataList, appBuildDir, publicPath, mode, appKey, buildTypeList, mpConfig, assets, devTool, generateMpType, }: IWebpackCoreProps): Promise<string>;
 export {};

package/lib/builder/h5/webpack.js

@@ -4,7 +4,7 @@ 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, cdnEndpoints, }) {
+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, }) {
     console.time('runWebpackCore');
     console.time('webpackGenerate');
     const allAppDataList = subAppDataList.concat(mainAppData);
@@ -33,7 +33,6 @@ async function runWebpackCore({ mainAppData, subAppDataList, appBuildDir, public
         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,9 +3,6 @@ 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;
@@ -17,5 +14,4 @@ export interface IBuildContext {
     miniprogramPlugins?: IMiniprogramPlugin[];
     debugMode?: boolean;
     isBrowserMpBuilder?: boolean;
-    isPrivateMode?: boolean;
 }

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

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

package/lib/builder/mp/index.js

@@ -54,18 +54,35 @@ const cals_1 = require("@cloudbase/cals");
 const templateDir = `${config_1.appTemplateDir}/mp/`;
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
-async function generateWxMp({ buildContext, weapps, plugins, deployMode, options, buildTypeList, isBrowserMpBuilder = false, ignoreInstall = false, }) {
+async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, isBrowserMpBuilder = false, ignoreInstall = false, }) {
     var _a;
-    const { appId, projDir, materialLibs: materials, isProduction, mainAppData, domain, isPrivateMode = false, } = buildContext;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
     console.log(`Generating ${em('Wexin MiniProgram')} to ${projDir}`);
-    const { allAppUsedComps } = handleUsedComponents({ buildContext, weapps });
+    console.log(em('domain') + domain);
+    let mainAppData = weapps[0];
+    const buildContext = {
+        projDir,
+        appId,
+        isProduction,
+        materialLibs: materials,
+        debugMode: !isProduction && !!process.env.WEAPPS_DEBUG,
+        isMixMode,
+        mainAppData,
+        domain,
+        isBrowserMpBuilder,
+    };
+    const yyptConfig = await (0, util_3.getYyptConfigInfo)(extraData);
+    const { allAppUsedComps } = handleUsedComponents({
+        buildContext,
+        weapps,
+        materials,
+    });
     buildContext.miniprogramPlugins = (mainAppData.miniprogramPlugins || []).filter((plugin) => allAppUsedComps[plugin.name]);
     // 安装依赖库，生成 materials 目录
     await (0, materials_1.installMaterials)(projDir, allAppUsedComps, weapps, buildContext);
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!isProduction);
-    const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(weapps, buildContext, { mpAppId: options.mpAppId });
+    const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(weapps, buildContext, { mpAppId: options === null || options === void 0 ? void 0 : options.mpAppId });
     // #1 generate project files
     if (!mainAppData.mpPkgUrl) {
         const projectFileData = {
@@ -118,8 +135,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
         };
     }
     if (mainAppData.mpPkgUrl) {
-        // 合并 project 和 app json，复写 appId
-        projectConfigJson.appId = projConfig.appId;
+        // 合并 project 和 app json
         if (!projectConfigJson.setting) {
             projectConfigJson.setting = {};
         }
@@ -137,6 +153,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
         const importor = (0, util_3.generateLowcodeImportor)(mainAppData.lowCodes || []);
         appFileData = {
             ...appFileData,
+            'common/wx_yypt_report_v2.js': {},
             'app.js': { appConfig, importor },
             'app.json': { content: appConfig },
             'app.wxss': {
@@ -149,7 +166,6 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
             },
             'package.json': {
                 appId,
-                isPrivateMode,
                 extraDeps: resolveNpmDeps(),
             },
         };
@@ -171,7 +187,6 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
                 resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
                 isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
                 clientID: (_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.clientId,
-                isPrivateMode,
             },
             'datasources/datasource-profiles.js.tpl': {
                 datasourceProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasourceProfiles)(
@@ -206,7 +221,6 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
                 await (0, generateFiles_1.default)({
                     'package.json': {
                         appId,
-                        isPrivateMode,
                         extraDeps: resolveNpmDeps(),
                     },
                 }, templateDir, subpackageRootPath, buildContext);
@@ -214,10 +228,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
         }
     }));
     if (!isBrowserMpBuilder && fs.existsSync(path_1.default.join(miniprogramRoot, 'package.json'))) {
-        await (0, webpack_1.installDependencies)(miniprogramRoot, {
-            ignoreInstall,
-            fixNodeModulesMap: { '@cloudbase/js-sdk': !isPrivateMode, mobx: true },
-        });
+        await (0, webpack_1.installDependencies)(miniprogramRoot, { ignoreInstall });
     }
     await handleMpPlugins();
     console.timeEnd(operationLabel);
@@ -229,7 +240,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
         var _a;
         const deps = [
             {
-                deps: ((_a = weapps.find((a) => !a.rootPath)) === null || _a === void 0 ? void 0 : _a.npmDependencies) || {},
+                deps: ((_a = weapps.find((a) => !a.rootPath)) === null || _a === void 0 ? void 0 : _a.npmDependencies) || [],
                 name: '主包',
             },
         ];
@@ -416,7 +427,7 @@ async function writeLowCodeFiles(appData, outDir, ctx) {
     // 混合模式，子包不生成顶级（应用级）的 lowcodes
     if (!(ctx.isMixMode && appData.rootPath)) {
         await Promise.all(lowCodes
-            .filter((mod) => mod.type !== cals_1.ECodeType.RENDERER)
+            .filter((mod) => mod.type !== 'renderer')
             .map((m) => {
             (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { appDir: outDir }, themeStyle.code);
         }));
@@ -424,7 +435,7 @@ async function writeLowCodeFiles(appData, outDir, ctx) {
     await Promise.all((0, weapps_core_1.loopDealWithFn)(appData.pageInstanceList, async (page) => {
         const codes = (0, cals_1.processRuntimeCodeResources)({ id: page.id }, page.lowCodes || page.codeModules, 'page');
         await codes
-            .filter((mod) => mod.type !== cals_1.ECodeType.RENDERER)
+            .filter((mod) => mod.type !== 'renderer')
             .forEach((m) => {
             (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { pageId: page.id, appDir: outDir }, themeStyle.code, ctx);
         });
@@ -452,8 +463,7 @@ function getAppendableJson(json) {
  * TODO: 与 cals 里的实现进行整合
  * 关键点在于 appUsedComps 分组， 与 generic componen 的实现
  */
-function handleUsedComponents({ buildContext, weapps }) {
-    const { materialLibs: materials } = buildContext;
+function handleUsedComponents({ buildContext, weapps, materials, }) {
     const appUsedComps = weapps.map((app) => {
         var _a;
         const usedComps = {};

package/lib/builder/mp/materials.js

@@ -327,12 +327,6 @@ async function generateCompositeComponent(compositedComp, ctx, compLibCommonReso
          ${compLibCommonResource.theme.class || ''}
       `;
         }
-        /**
-         * 低码没有开放 index 类别，直接去掉
-         */
-        if (mod.name === 'index') {
-            return;
-        }
         return (0, lowcode_1.writeCode2file)(mod, path.join(outDir, LOWCODE_DIR_NAME), { comp: compositedComp }, themeCode, ctx);
     });
     // await writeLowCodeFiles(weapp, appRoot)

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

@@ -1,10 +1,10 @@
 import { IWeAppData, IPlugin, IMaterialItem } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IAppUsedComp } from '../types/common';
-import { IBuildContext } from '../mp/BuildContext';
-export declare function handleMixMode({ buildContext, apps, miniprogramRoot, plugins, }: {
-    buildContext: IBuildContext;
+export declare function handleMixMode({ apps, generateMpPath, miniprogramRoot, plugins, ignoreInstall, }: {
     apps: IWeAppData[];
+    generateMpPath: string;
     miniprogramRoot: string;
     plugins: IPlugin[];
+    ignoreInstall: boolean;
 }): Promise<void>;
 export declare function handleMixMaterials(projDir: string, apps: IWeAppData[], appUsedComps: IAppUsedComp[], compositedLibs: IMaterialItem[]): Promise<void[]>;

package/lib/builder/mp/mixMode.js

@@ -36,16 +36,13 @@ const chalk_1 = __importDefault(require("chalk"));
 const generateFiles_1 = require("../util/generateFiles");
 const webpack_1 = require("../service/webpack");
 // 将 BUILD 目录往混合模式移动
-async function handleMixMode({ buildContext, apps = [], miniprogramRoot, plugins = [], }) {
-    const { projDir: generateMpPath, isPrivateMode } = buildContext;
+async function handleMixMode({ apps = [], generateMpPath, miniprogramRoot, plugins = [], ignoreInstall, }) {
     // await handleMainApp()
     // await handleAppPages()
     await handleSubApps();
     // await handleAppJson()
     // await handlePkgJson()
-    await (0, webpack_1.installDependencies)(miniprogramRoot, {
-        fixNodeModulesMap: { mobx: true, '@cloudbase/js-sdk': !isPrivateMode },
-    });
+    await (0, webpack_1.installDependencies)(miniprogramRoot, { ignoreInstall });
     await handlePlugins();
     // 复制框架公用内容
     async function handleMainApp() {

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

@@ -6,7 +6,7 @@ import { IBuildContext } from './BuildContext';
  * @param kboneConfig https://wechat-miniprogram.github.io/kbone/docs/config/
  * @param appConfigs app config from prop edit panel
  */
-export declare function generateMpConfig(weapps: IWeAppData[], ctx: IBuildContext, options: {
+export declare function generateMpConfig(weapps: IWeAppData[], ctx: IBuildContext, options?: {
     mpAppId?: string;
 }): {
     appConfig: any;

package/lib/builder/mp/mp_config.js

@@ -117,9 +117,6 @@ function generateMpConfig(weapps, ctx, options) {
             });
         }
     });
-    if (options.mpAppId) {
-        projConfig.appId = options.mpAppId;
-    }
     // merge(pageConfigs, extractAllPagesConfig())
     return { appConfig, projConfig, pageConfigs };
 }
@@ -168,7 +165,7 @@ function transformDynamicData(originData) {
     const temp = {};
     for (const key in originData) {
         const target = originData[key];
-        if (target === null || target === void 0 ? void 0 : target.value) {
+        if (target && target.value) {
             temp[key] = target.value;
         }
     }

package/lib/builder/mp/util.js

@@ -99,7 +99,7 @@ function generateDataBindMeta(bind) {
                 }
                 else {
                     expr = value
-                        .replace(/^\w+./, `${isGlobal ? 'app' : '$page'}.${PREFIX_MAP[type]}.`)
+                        .replace(/^\w+([.[])/, (_, $1) => `${isGlobal ? 'app' : '$page'}.${PREFIX_MAP[type]}${$1}`)
                         .replace(/^comp-\w+/, `$comp.${PREFIX_MAP[type]}`)
                         .replace(/^\$comp_\w+/, `$comp.${PREFIX_MAP[type]}`);
                 }

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

@@ -2,7 +2,6 @@ import { IMaterialItem, IWebRuntimeAppData } from '@cloudbase/lowcode-generator/
 import { BuildType, WebpackModeType } from '../types/common';
 import { RUNTIME } from '../../types';
 export declare const PERSISTENT_DEPENDIENCES_MAP: {};
-export declare const OUTPUT_DIR = "preview";
 export interface IMpConfig {
     origin: string;
     entry: string;
@@ -75,17 +74,11 @@ export interface IInstallOpts {
         version: string;
         downloadUrl: string;
     };
-    fixNodeModulesMap?: IFixNodeModulesMap;
 }
 export declare function installDependencies(targetDir: string, options?: IInstallOpts): Promise<void>;
-interface IFixNodeModulesMap {
-    mobx?: boolean;
-    '@cloudbase/js-sdk'?: boolean;
-}
 export declare function getMaterialNodeModulesPathList(dependencies: IMaterialItem[] | undefined, materialsDir: string, base?: string): string[];
 export declare function generateWebpackWebDevServerFile({ appBuildDir, buildTypeList }: {
     appBuildDir: any;
     buildTypeList: any;
 }): Promise<void>;
 export declare function downloadAssets(targetDir: string, assetUrl: string): Promise<unknown>;
-export {};

package/lib/builder/service/webpack.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.downloadAssets = exports.generateWebpackWebDevServerFile = exports.getMaterialNodeModulesPathList = exports.installDependencies = exports.downloadDependencies = exports.downloadAndInstallDependencies = exports.getAllPageMpEntryPath = exports.getWebpackMpBuildParams = exports.getWebpackWebBuildParams = exports.getMpAllRouterConfig = exports.getPageName = exports.getHomePageInstance = exports.getMainAppDataByList = exports.generateMpJsonConfigFile = exports.generateKboneAppConfig = exports.generateKbonePageConfig = exports.downloadAndWriteTabBarIcon = exports.generateKboneTabBarConfig = exports.generateAppConfig = exports.generateWebpackWebBuildParamsFile = exports.fixAppJson = exports.OUTPUT_DIR = exports.PERSISTENT_DEPENDIENCES_MAP = void 0;
+exports.downloadAssets = exports.generateWebpackWebDevServerFile = exports.getMaterialNodeModulesPathList = exports.installDependencies = exports.downloadDependencies = exports.downloadAndInstallDependencies = exports.getAllPageMpEntryPath = exports.getWebpackMpBuildParams = exports.getWebpackWebBuildParams = exports.getMpAllRouterConfig = exports.getPageName = exports.getHomePageInstance = exports.getMainAppDataByList = exports.generateMpJsonConfigFile = exports.generateKboneAppConfig = exports.generateKbonePageConfig = exports.downloadAndWriteTabBarIcon = exports.generateKboneTabBarConfig = exports.generateAppConfig = exports.generateWebpackWebBuildParamsFile = exports.fixAppJson = exports.PERSISTENT_DEPENDIENCES_MAP = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const lodash_1 = require("lodash");
@@ -18,7 +18,6 @@ const common_2 = require("../util/common");
 const types_1 = require("../../types");
 const generateFiles_1 = require("../util/generateFiles");
 exports.PERSISTENT_DEPENDIENCES_MAP = {};
-exports.OUTPUT_DIR = 'preview';
 async function fixAppJson(appBuildDir) {
     const appJsonPath = path_1.default.resolve(appBuildDir, 'dist/mp/app.json');
     if (!fs_extra_1.default.existsSync(appJsonPath)) {
@@ -274,7 +273,7 @@ function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = c
         watch: false,
         entry: path_1.default.resolve(appBuildDir, 'src/index.jsx'),
         output: {
-            path: path_1.default.resolve(appBuildDir, exports.OUTPUT_DIR),
+            path: path_1.default.resolve(appBuildDir, './preview'),
             filename: '[name].[contenthash].bundle.js',
             chunkFilename: '[name].[contenthash].chunk.js',
             publicPath: buildTypeList.includes(common_1.BuildType.APP) || buildTypeList.includes(common_1.BuildType.ADMIN_PORTAL) ? '' : publicPath,
@@ -295,6 +294,8 @@ function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = c
         resolveModules: [path_1.default.resolve(appBuildDir), 'node_modules'],
         definePlugin: {
             'process.env.buildType': `"${buildTypeList[0]}"`,
+            'process.env.isApp': buildTypeList.includes(common_1.BuildType.APP),
+            'process.env.isAdminPortal': (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
             ...extraDefine,
         },
         devtool: ['app-nvzcvt10', 'app-msa2ihs9'].includes(appId)
@@ -455,10 +456,13 @@ async function installDependencies(targetDir, options = {}) {
         }
     }
     catch (e) { }
-    // 如果generatedFileContents[path.resolve(targetDir, 'package.json')]不存在，说明是不存在缓存文件，isPkgModify必须是true，才不会忽略install
-    const isPkgModify = !generateFiles_1.generatedFileContents[path_1.default.resolve(targetDir, 'package.json')]
-        ? true
-        : generateFiles_1.generatedFileContents[path_1.default.resolve(targetDir, 'package.json')].modify;
+    const packageJsonPath = path_1.default.resolve(targetDir, 'package.json');
+    /**
+     * 无 cacheMeta 或 cacheMeta.once 时 遵循 options?.ignoreInstall 配置
+     * 否则认为文件发生了更改，应该忽略参数强制安装
+     */
+    const cacheMeta = generateFiles_1.generatedFileContents[packageJsonPath];
+    const isPkgModify = !cacheMeta || cacheMeta.once ? false : cacheMeta.modify;
     if ((options === null || options === void 0 ? void 0 : options.ignoreInstall) && fs_extra_1.default.existsSync(path_1.default.join(targetDir, 'node_modules')) && !isPkgModify) {
         console.log(`ignore install dependencies in ${targetDir}`);
         return;
@@ -484,25 +488,23 @@ async function installDependencies(targetDir, options = {}) {
             };
         }
     }
+    let installProcess;
     // 云端构建, 选用 npm
-    const installProcessOptions = {
+    const installlProcessOptions = {
         cwd: targetDir,
         // NODE_ENV="production"时，devDependencies里的包不会下载，兼容h5在线编译
         env: { ...process.env, NODE_ENV: '' },
         stdio: 'inherit',
     };
-    let installprocess;
-    // TODO: install 失败 应该终止进程
     if (yarnExists && (options === null || options === void 0 ? void 0 : options.runtime) !== types_1.RUNTIME.CI) {
         const addPackage = packageName ? ['add', packageName] : [];
-        installprocess = cross_spawn_1.default.sync('yarn', [...addPackage, registry], installProcessOptions);
+        installProcess = cross_spawn_1.default.sync('yarn', [...addPackage, registry], installlProcessOptions);
     }
     else {
-        installprocess = cross_spawn_1.default.sync('npm', ['install', packageName, ...npmOptions], installProcessOptions);
+        installProcess = cross_spawn_1.default.sync('npm', ['install', packageName, ...npmOptions], installlProcessOptions);
     }
-    // TODO: 确认 process.status 语义来判断是否标识进程正常退出
-    if (installprocess.status) {
-        throw new Error(`安装依赖失败 ${installprocess.error || ''}`);
+    if (installProcess.status) {
+        throw new Error(`安装依赖失败 ${installProcess.error || ''}`);
     }
     fixNodeModules(targetDir);
     try {
@@ -513,24 +515,14 @@ async function installDependencies(targetDir, options = {}) {
     console.timeEnd(operationTag);
 }
 exports.installDependencies = installDependencies;
-function fixNodeModules(projDir, options = { mobx: false, '@cloudbase/js-sdk': false }) {
-    const { mobx = false, ['@cloudbase/js-sdk']: jsSDK = false } = options;
-    if (mobx) {
-        // # fix mobx/package.json: "main": "lib/index.js" -> "main": "lib/index.js"
-        const mobxPackageFile = path_1.default.join(projDir, 'node_modules', 'mobx/package.json');
-        if (fs_extra_1.default.existsSync(mobxPackageFile)) {
-            const mobxPackageFileContent = fs_extra_1.default.readJSONSync(mobxPackageFile);
-            if (fs_extra_1.default.existsSync(path_1.default.join(projDir, 'node_modules', 'mobx/lib/mobx.min.js'))) {
-                mobxPackageFileContent.main = 'lib/mobx.min.js';
-                fs_extra_1.default.writeJSONSync(mobxPackageFile, mobxPackageFileContent);
-            }
-        }
-    }
-    if (jsSDK) {
-        const scriptPath = path_1.default.resolve(projDir, 'node_modules', '@cloudbase/weda-cloud-sdk/scripts/fix-wx-none-private');
-        if (fs_extra_1.default.existsSync(scriptPath)) {
-            const fix = require(scriptPath);
-            fix();
+function fixNodeModules(projDir) {
+    // # fix mobx/package.json: "main": "lib/index.js" -> "main": "lib/index.js"
+    const mobxPackageFile = path_1.default.join(projDir, 'node_modules', 'mobx/package.json');
+    if (fs_extra_1.default.existsSync(mobxPackageFile)) {
+        const mobxPackageFileContent = fs_extra_1.default.readJSONSync(mobxPackageFile);
+        if (fs_extra_1.default.existsSync(path_1.default.join(projDir, 'node_modules', 'mobx/lib/mobx.min.js'))) {
+            mobxPackageFileContent.main = 'lib/mobx.min.js';
+            fs_extra_1.default.writeJSONSync(mobxPackageFile, mobxPackageFileContent);
         }
     }
 }

package/lib/builder/util/generateFiles.js

@@ -67,8 +67,16 @@ async function generateFiles(appFileData, srcDir, dstDir, ctx) {
 }
 exports.default = generateFiles;
 async function writeFile(outFile, content) {
-    var _a;
-    const generated = (_a = exports.generatedFileContents[outFile]) === null || _a === void 0 ? void 0 : _a.content;
+    if (!exports.generatedFileContents[outFile]) {
+        exports.generatedFileContents[outFile] = {
+            once: true,
+        };
+    }
+    else {
+        exports.generatedFileContents[outFile].once = false;
+    }
+    const meta = exports.generatedFileContents[outFile];
+    const generated = meta.content;
     if (generated === content && fs_extra_1.default.existsSync(outFile)) {
         exports.generatedFileContents[outFile].modify = false;
         return false;
@@ -76,7 +84,7 @@ async function writeFile(outFile, content) {
     // console.log(outFile);
     await fs_extra_1.default.ensureFile(outFile);
     await fs_extra_1.default.writeFile(outFile, content);
-    exports.generatedFileContents[outFile] = { content, modify: true };
+    exports.generatedFileContents[outFile] = { ...meta, content, modify: true };
     return true;
 }
 exports.writeFile = writeFile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.1.8",
+  "version": "1.1.10",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -38,8 +38,8 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^0.4.11",
-    "@cloudbase/lowcode-generator": "^1.1.4",
+    "@cloudbase/cals": "^0.5.0",
+    "@cloudbase/lowcode-generator": "^1.1.5",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",
@@ -72,7 +72,7 @@
     "@types/weixin-app": "^2.9.0",
     "cross-env": "^7.0.3",
     "csstype": "^2.6.10",
-    "jest": "^26.0.1",
+    "jest": "^27.5.1",
     "ts-loader": "^8.3.0",
     "ts-node": "^10.4.0",
     "typescript": "^4.7.4",

package/template/html/index.html.ejs

@@ -461,7 +461,7 @@
     ></script>
     <script
       crossorigin
-      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.59a4c563eb076206c8bd.bundle.js"
+      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.408037dbe5cfeca28aeb.bundle.js"
     ></script>
   </body>
 </html>