@cloudbase/lowcode-builder 1.8.45 → 1.8.47

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

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

package/lib/builder/config/index.js

@@ -45,7 +45,7 @@ exports.materialsDirName = 'materials'; // materials diretory of current project
  * src/template的代码，在IDE编辑器插件中构建builder
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-exports.builderTemplateURL = 'https://comp-public-1303824488.file.myqcloud.com/lcap-builder/template.1.8.45.zip';
+exports.builderTemplateURL = 'https://comp-public-1303824488.file.myqcloud.com/lcap-builder/template.1.8.47.zip';
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F

package/lib/builder/core/index.js

@@ -69,6 +69,15 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
     if (!deployOptions.mode) {
         deployOptions.mode = types_1.DEPLOY_MODE.PREVIEW;
     }
+    /**
+     * 刷新正规化 packageName
+     */
+    [cals, ...subAppCalsList].forEach((app) => {
+        if (!app.extra) {
+            app.extra = {};
+        }
+        app.extra.rootPath = (0, util_1.normalizePackageName)(app.extra.rootPath);
+    });
     let appBuildDir = (output === null || output === void 0 ? void 0 : output.path) || (runtime === types_1.RUNTIME.CI ? (_a = (0, util_1.getCompileDirs)('app')) === null || _a === void 0 ? void 0 : _a.appBuildDir : (_b = (0, util_1.getCompileDirs)(appKey)) === null || _b === void 0 ? void 0 : _b.appBuildDir);
     const buildContext = {
         projDir: appBuildDir,

package/lib/builder/h5/index.js

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

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

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

package/lib/builder/h5/webpack.js

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

package/lib/builder/mp/index.js

@@ -137,8 +137,12 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
             'common/query.js': {},
             'common/flow.js': {},
             'common/info': {},
-            'common/privacyModal': {},
-            'common/modal': {},
+            /**
+             * 使用微信的 modal
+             * 暂时保留内部实现待之后使用
+             */
+            // 'common/privacyModal': {},
+            // 'common/modal': {},
             /**
              * 调试用
              */
@@ -218,7 +222,7 @@ async function generateWxMp({ buildContext, weapps, calses, plugins, deployOptio
             return;
         }
         else {
-            const subpackageRootPath = path_1.default.join(miniprogramRoot, app.rootPath || '/');
+            const subpackageRootPath = path_1.default.join(miniprogramRoot, 'packages', app.rootPath || '/');
             let subpackageBuildCtx = {
                 ...buildContext,
                 rootPath: app.rootPath,
@@ -341,12 +345,13 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     },
                 ],
             });
-            const wxml = (0, wxml_1.generateWxml)({ ...ctx, rootPath, isPage: true }, componentInstances, `Page ${rootPath ? path_1.default.join(rootPath, 'pages') : ''}/${page.id}`, wxmlDataPrefix, usingComponents, componentGenerics);
+            const wxml = (0, wxml_1.generateWxml)({ ...ctx, rootPath, isPage: true }, componentInstances, `Page ${rootPath ? path_1.default.join('packages', rootPath, 'pages') : ''}/${page.id}`, wxmlDataPrefix, usingComponents, componentGenerics);
             const importor = (0, util_3.generateLowcodeImportor)(page.lowCodes);
             const pageFileName = (0, lodash_1.get)(pageConfigs, `${page.id}.pageFileName`, 'index');
+            const subLevelPath = rootPath ? `${path_1.default.posix.relative(`packages/${rootPath}`, '')}/` : '';
             const pageFileData = {
                 [`api.js|api.js`]: {
-                    subLevelPath: rootPath ? `${path_1.default.posix.relative(rootPath, '')}/` : '',
+                    subLevelPath,
                     uuid: rootPath ? `${rootPath}/${page.id}` : page.id,
                     label: ((_b = (_a = page === null || page === void 0 ? void 0 : page.data) === null || _a === void 0 ? void 0 : _a.navigationBarTitleText) === null || _b === void 0 ? void 0 : _b.value) || ((_d = (_c = page === null || page === void 0 ? void 0 : page.data) === null || _c === void 0 ? void 0 : _c.title) === null || _d === void 0 ? void 0 : _d.value),
                 },
@@ -365,7 +370,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     },
                     debug: ctx.debugMode,
                     stringifyObj: util_1.inspect,
-                    subLevelPath: rootPath ? `${path_1.default.posix.relative(rootPath, '')}/` : '',
+                    subLevelPath,
                     importor,
                     query: (0, util_2.createTemplateQuery)(ctx, (_f = page.dataset) === null || _f === void 0 ? void 0 : _f.query),
                     eventFlows: (0, util_2.createTemplateEventFlows)(ctx, page.eventFlows),
@@ -385,7 +390,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                 },
                 [`index.wxss|${pageFileName}.wxss`]: {
                     subWxss: rootPath && !((_l = ctx.mainAppData) === null || _l === void 0 ? void 0 : _l.mpPkgUrl)
-                        ? `@import "${path_1.default.posix.relative(`/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
+                        ? `@import "${path_1.default.posix.relative(`/packages/${rootPath}/pages/${page.id}`, '/lowcode')}/style.wxss";`
                         : '',
                     content: (0, weapps_core_1.toCssText)((0, cals_1.processCommonStyle2CSSProperties)(page.commonStyle, {
                         defaultUnit: processCssUnit,
@@ -440,7 +445,7 @@ async function generateFramework(ctx, appData, outDir, options) {
                 ...fileData,
                 'app/app-global.js': {},
                 'app/weapps-api.js': {
-                    subLevelPath: appData.rootPath ? `${path_1.default.posix.relative(`${appData.rootPath}`, '')}/` : '',
+                    subLevelPath: appData.rootPath ? `${path_1.default.posix.relative(`packages/${appData.rootPath}`, '')}/` : '',
                     subPackageName: appData.rootPath || '',
                     importor,
                     appConfig: (0, util_3.JsonToStringWithVariableName)({
@@ -555,7 +560,9 @@ async function cleanPkg(pkg, miniprogramRoot) {
     if (pkg.mpPkgUrl) {
         return;
     }
-    const pkgDir = [miniprogramRoot, pkg.rootPath].filter((p) => !!p).join(path_1.default.sep);
+    const pkgDir = [miniprogramRoot, pkg.rootPath ? `packages${path_1.default.sep}${pkg.rootPath}` : '']
+        .filter((p) => !!p)
+        .join(path_1.default.sep);
     const pagesDir = path_1.default.join(pkgDir, 'pages');
     const lowcodesDir = path_1.default.join(pkgDir, 'lowcode');
     const existedPages = await fs.readdir(pagesDir);

package/lib/builder/mp/lowcode.js

@@ -18,7 +18,7 @@ async function writeCode2file(ctx, mod, lowcodeRootDir, opts = {}, themeCode) {
             // Generate app lowcode
             const baseDir = path_1.default.relative(path_1.default.dirname(file), appDir).replace(/\\/g, '/');
             // 子包混合模式需要添加相对索引到根目录
-            const relativeRoot = (ctx === null || ctx === void 0 ? void 0 : ctx.isMixMode) && ctx.rootPath ? `${path_1.default.relative(ctx.rootPath, '')}/` : '';
+            const relativeRoot = (ctx === null || ctx === void 0 ? void 0 : ctx.isMixMode) && ctx.rootPath ? `${path_1.default.relative(`packages/${ctx.rootPath}`, '')}/` : '';
             let weappsApiPrefix = [
                 `import { app, $app${pageId !== 'global' ? '' : ', $w'} } from '${relativeRoot}${baseDir}/app/weapps-api';`,
             ]; // windows compatibility

package/lib/builder/mp/materials.js

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

package/lib/builder/mp/mixMode.js

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

package/lib/builder/mp/mp_config.js

@@ -121,6 +121,9 @@ function generateMpConfig(ctx, weapps, options) {
         projConfig.setting = {};
     }
     projConfig.setting.bigPackageSizeSupport = true;
+    if (process.env.IS_WEB_WORKER) {
+        projConfig.setting.ignoreUploadUnusedFiles = true;
+    }
     if (options.mpAppId) {
         projConfig.appId = options.mpAppId;
     }
@@ -135,7 +138,7 @@ function extractPages(weapps, pageConfigs) {
     let homePageId = '';
     weapps.forEach((weapp, index) => {
         const { rootPath } = weapp;
-        const subPackage = { root: rootPath, pages: [] };
+        const subPackage = { root: rootPath ? `packages/${rootPath}` : '', pages: [] };
         if (rootPath) {
             subpackages.push(subPackage);
         }

package/lib/builder/mp/wxml.js

@@ -22,18 +22,18 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
     if (ctx.isPage) {
         const { enablePageRoot } = ctx;
         const originElements = xmlJson.elements;
-        usingComponents['wd-privacy'] = '/common/privacyModal/index';
+        // usingComponents['wd-privacy'] = '/common/privacyModal/index';
         usingComponents['wd-info'] = '/common/info/index';
         // 登录校验: 向其最外层包裹一层block
         xmlJson.elements = [
-            {
-                type: 'element',
-                name: 'wd-privacy',
-                attributes: {},
-                elements: [],
-                _order: -Infinity,
-                _parent: null,
-            },
+            // {
+            //   type: 'element',
+            //   name: 'wd-privacy',
+            //   attributes: {},
+            //   elements: [],
+            //   _order: -Infinity,
+            //   _parent: null,
+            // },
             {
                 type: 'element',
                 name: enablePageRoot ? 'view' : 'block',

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

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

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.getWebpackWebBuildParams = exports.getPageName = exports.getHomePageInstance = exports.getMainAppDataByList = exports.downloadAndWriteTabBarIcon = exports.generateKboneTabBarConfig = exports.generateWebpackWebBuildParamsFile = exports.fixAppJson = exports.OUTPUT_DIR = 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");
@@ -52,28 +52,6 @@ async function generateWebpackWebBuildParamsFile({ appId, allAppDataList, appBui
     return webpackConfigPath;
 }
 exports.generateWebpackWebBuildParamsFile = generateWebpackWebBuildParamsFile;
-async function generateAppConfig(mainAppData, subAppDataList, appBuildDir) {
-    let originMpConfig = {};
-    // 如果有 mp_config 则读取内容合并。
-    const configMod = mainAppData.codeModules.find((p) => p.name === config_1.MP_CONFIG_MODULE_NAME);
-    if (configMod) {
-        const code = configMod.code.replace(/export\s+default/, '');
-        try {
-            originMpConfig = eval(`(${code})`);
-        }
-        catch (e) {
-            console.error('Kbone config file error', e);
-        }
-    }
-    // app 配置
-    generateKboneAppConfig(originMpConfig, mainAppData);
-    // 页面配置
-    originMpConfig = generateKbonePageConfig(originMpConfig, mainAppData, subAppDataList);
-    // tabbar 配置
-    await generateKboneTabBarConfig(originMpConfig, appBuildDir);
-    return originMpConfig;
-}
-exports.generateAppConfig = generateAppConfig;
 async function generateKboneTabBarConfig(mpConfig, appBuildDir) {
     mpConfig.appExtraConfig = mpConfig.appExtraConfig || {};
     if (mpConfig.appExtraConfig.tabBar) {
@@ -120,109 +98,6 @@ async function downloadAndWriteTabBarIcon(iconPath, pagePath, appBuildDir, fileN
     });
 }
 exports.downloadAndWriteTabBarIcon = downloadAndWriteTabBarIcon;
-// 将 weapps 配置的 page-data 转换到 mp_config
-function generateKbonePageConfig(mpConfig, mainAppData, subAppDataList = []) {
-    mpConfig.pages = mpConfig.pages || {};
-    const allAppDataList = subAppDataList.concat(mainAppData);
-    allAppDataList.map((appData) => {
-        appData.pageInstanceList.forEach((item) => {
-            const pageId = [appData.rootPath, item.id].filter((i) => i).join('_');
-            if (!mpConfig.pages[pageId]) {
-                mpConfig.pages[pageId] = {};
-            }
-            const navigationBarTitleText = item.data.navigationBarTitleText || item.data.title;
-            // 去除部分 mp 不认的属性
-            delete item.data.title;
-            delete item.data.params;
-            delete item.data.scene;
-            // page 配置
-            config_1.KBONE_PAGE_KEYS.forEach((key) => {
-                if (item.data[key]) {
-                    mpConfig.pages[pageId][key] = item.data[key];
-                }
-            });
-            // extra 配置
-            mpConfig.pages[pageId].extra = {
-                ...item.data,
-                navigationBarTitleText,
-            };
-        });
-    });
-    return mpConfig;
-}
-exports.generateKbonePageConfig = generateKbonePageConfig;
-function generateKboneAppConfig(mpConfig, mainAppData) {
-    if (mainAppData === null || mainAppData === void 0 ? void 0 : mainAppData.appConfig) {
-        if (mainAppData.appConfig.window) {
-            mpConfig.app = mpConfig.app || {};
-            mpConfig.app = {
-                ...mainAppData.appConfig.window,
-                ...mpConfig.app,
-            };
-        }
-    }
-}
-exports.generateKboneAppConfig = generateKboneAppConfig;
-// 生成 kbone mp 配置文件
-async function generateMpJsonConfigFile(allAppDataList, userConfig, appBuildDir, options) {
-    const mainAppData = getMainAppDataByList(allAppDataList);
-    const subAppDataList = allAppDataList.filter((i) => i.rootPath);
-    const homeId = getHomePageInstance(mainAppData.pageInstanceList).id;
-    userConfig = userConfig || {};
-    const kbConfig = {
-        origin: 'https://weapps.tencent.com',
-        entry: `/${homeId}`,
-        redirect: {
-            notFound: `${homeId}`,
-            accessDenied: `${homeId}`,
-        },
-        generate: {
-            autoBuildNpm: true,
-            appEntry: 'miniprogram-app',
-            appWxss: 'display',
-            subpackages: {},
-            globalVars: [['__injectProxy', '(window.Proxy = Proxy)']],
-        },
-        app: {
-            navigationBarTitleText: `WeApps-${options.appKey}`,
-        },
-        projectConfig: {
-            appid: 'touristappid',
-            projectname: `WeApps-${options.appKey}`,
-        },
-        packageConfig: {
-            author: 'weapps',
-        },
-        ...userConfig,
-        global: {
-            ...userConfig.global,
-            rem: true, // rem 必须为 true
-        },
-        router: getMpAllRouterConfig(allAppDataList),
-        __homePath__: getMpAllRouterConfig(allAppDataList, true),
-    };
-    if (subAppDataList === null || subAppDataList === void 0 ? void 0 : subAppDataList.length) {
-        const subpackages = {};
-        subAppDataList.map((appData) => {
-            const { rootPath } = appData;
-            subpackages[rootPath] = Object.keys(getMpAllRouterConfig([appData]));
-        });
-        kbConfig.generate = {
-            ...kbConfig.generate,
-            subpackages,
-        };
-    }
-    // kbone 生成子包模式
-    if (options.generateMpType === 'subpackage') {
-        kbConfig.generate = {
-            ...kbConfig.generate,
-            app: 'noemit',
-        };
-    }
-    const templateStr = JSON.stringify(kbConfig, null, 2);
-    await fs_extra_1.default.writeFile(path_1.default.resolve(appBuildDir, 'webpack/miniprogram.config.js'), `export default = ${templateStr}`);
-}
-exports.generateMpJsonConfigFile = generateMpJsonConfigFile;
 function getMainAppDataByList(allAppDataList) {
     return allAppDataList.find((item) => !item.rootPath);
 }
@@ -244,29 +119,6 @@ function getPageName(name) {
     return `${name}`;
 }
 exports.getPageName = getPageName;
-function getMpAllRouterConfig(allAppDataList, getHome = false) {
-    const router = {};
-    let homePath = '';
-    allAppDataList.map((appData) => {
-        const { pageInstanceList, rootPath = '' } = appData;
-        (0, weapps_core_1.loopDealWithFn)(pageInstanceList, (pageInstance) => {
-            const name = [rootPath, pageInstance.id].filter((i) => i).join('_');
-            const path = `/${name}`;
-            if (!homePath) {
-                homePath = name;
-            }
-            if (pageInstance.isHome && !rootPath) {
-                homePath = name;
-            }
-            router[name] = [path];
-        });
-    });
-    if (getHome) {
-        return homePath;
-    }
-    return router;
-}
-exports.getMpAllRouterConfig = getMpAllRouterConfig;
 function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = common_1.WebpackModeType.NONE, buildTypeList = [common_1.BuildType.WEB], extraDefine = {}, assets = []) {
     return {
         context: appBuildDir,
@@ -306,48 +158,6 @@ function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = c
     };
 }
 exports.getWebpackWebBuildParams = getWebpackWebBuildParams;
-function getWebpackMpBuildParams(appBuildDir, materialsDir, dependencies = [], nodeModulesPath, allAppDataList, mode, watch, options) {
-    return {
-        context: appBuildDir,
-        mode,
-        watch,
-        entry: getAllPageMpEntryPath(allAppDataList, appBuildDir),
-        outputPath: path_1.default.resolve(appBuildDir, 'dist/mp/common'),
-        resolveModules: [
-            appBuildDir,
-            path_1.default.resolve(appBuildDir, 'node_modules'),
-            path_1.default.resolve(appBuildDir, 'src'),
-            ...getMaterialNodeModulesPathList(dependencies, materialsDir, appBuildDir),
-            'node_modules',
-        ],
-        watchOptions: {
-            ignored: /node_modules/,
-            aggregateTimeout: 600,
-            poll: 1000,
-        },
-        cache: {
-            type: 'memory',
-        },
-    };
-}
-exports.getWebpackMpBuildParams = getWebpackMpBuildParams;
-function getAllPageMpEntryPath(allAppDataList, appBuildDir) {
-    const entry = {};
-    // 优先填首页
-    const mainAppData = getMainAppDataByList(allAppDataList);
-    const homePageInstance = getHomePageInstance(mainAppData.pageInstanceList);
-    entry[homePageInstance.id] = path_1.default.resolve(appBuildDir, `src/pages/${getPageName(homePageInstance.id)}/main.mp.jsx`);
-    allAppDataList.map((app) => {
-        const { pageInstanceList, rootPath } = app;
-        const packagePathStr = rootPath ? `packages/${rootPath}` : '';
-        (0, weapps_core_1.loopDealWithFn)(pageInstanceList, (pageInstance) => {
-            const pageName = rootPath ? `${rootPath}_${pageInstance.id}` : pageInstance.id;
-            entry[pageName] = path_1.default.resolve(appBuildDir, path_1.default.join('src', packagePathStr, `pages/${getPageName(pageInstance.id)}/main.mp.jsx`));
-        });
-    });
-    return entry;
-}
-exports.getAllPageMpEntryPath = getAllPageMpEntryPath;
 async function downloadAndInstallDependencies(dependencies = [], materialsDir, installOptions = {}) {
     const localPkg = (0, util_1.getCurrentPackageJson)();
     await Promise.all(dependencies.map(async (item) => {

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

@@ -56,3 +56,4 @@ export declare function generateLowcodeImportor(lowcodes?: IWeAppCode[]): {
     common: boolean;
     styles: IWeAppCode[];
 };
+export declare function normalizePackageName(packageName?: string | null): string | null | undefined;

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.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.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;
 // import * as R from 'ramda'
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -290,3 +290,14 @@ function generateLowcodeImportor(lowcodes = []) {
     return importor;
 }
 exports.generateLowcodeImportor = generateLowcodeImportor;
+function normalizePackageName(packageName) {
+    if (!packageName) {
+        return packageName;
+    }
+    const matched = packageName.match(/packages\/(.*)?/);
+    if (matched) {
+        return matched[1];
+    }
+    return packageName;
+}
+exports.normalizePackageName = normalizePackageName;