@cloudbase/lowcode-builder 1.8.80 → 1.8.82

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

@@ -60,7 +60,7 @@ export declare function buildWedaConfig({ output, domain, isPrivateMode, endpoin
     endpointType?: IBuildWedaApp['endpointType'];
     buildTypeList?: IBuildWedaApp['buildTypeList'];
 }): Promise<void>;
-export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, endpointType, enableExpiredTag, enableAd, account, mpConfig, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<any>;
+export declare function buildWedaApp({ cals, subAppCalsList: _subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, endpointType, enableExpiredTag, enableAd, account, mpConfig, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<any>;
 export declare function cleanComponentDir(): Promise<void>;
 export declare const version: any;
 export { getFiles, fileToZip, strToBuf } from '../util/generateFiles';

package/lib/builder/core/index.js

@@ -56,118 +56,10 @@ async function buildWedaConfig({ output, domain = undefined, isPrivateMode = und
     await (0, index_1.generateConfig)(data, outDir);
 }
 exports.buildWedaConfig = buildWedaConfig;
-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 = {
+async function buildWedaApp({ cals, subAppCalsList: _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, endpointType = undefined, enableExpiredTag = false, enableAd = false, account = {}, mpConfig = {
-    projectConfigJson: {
-        wedaRoot: '$weda_root',
-        miniprogramRoot: 'miniprogram/',
-        cloudfunctionRoot: 'cloudfunctions/',
-        setting: {
-            urlCheck: true,
-            es6: true,
-            enhance: true,
-            postcss: true,
-            preloadBackgroundData: false,
-            minified: true,
-            newFeature: true,
-            coverView: true,
-            nodeModules: false,
-            autoAudits: false,
-            showShadowRootInWxmlPanel: true,
-            scopeDataCheck: false,
-            uglifyFileName: false,
-            checkInvalidKey: true,
-            checkSiteMap: true,
-            uploadWithSourceMap: true,
-            compileHotReLoad: false,
-            useMultiFrameRuntime: true,
-            useApiHook: true,
-            useApiHostProcess: true,
-            babelSetting: {
-                ignore: [],
-                disablePlugins: [],
-                outputPath: '',
-            },
-            enableEngineNative: false,
-            useIsolateContext: true,
-            useCompilerModule: true,
-            userConfirmedUseCompilerModuleSwitch: false,
-            userConfirmedBundleSwitch: false,
-            packNpmManually: false,
-            packNpmRelationList: [
-                {
-                    packageJsonPath: 'miniprogram/$weda_root/package.json',
-                    miniprogramNpmDistDir: '232miniprogram/$weda_root',
-                },
-                {
-                    packageJsonPath: 'miniprogram/$weda_root/packages/$wd_system/package.json',
-                    miniprogramNpmDistDir: '2323miniprogram/$weda_root/packages/$wd_system',
-                },
-                {
-                    packageJsonPath: '111$weda_root/package.json',
-                    miniprogramNpmDistDir: '$weda_root',
-                },
-                {
-                    packageJsonPath: '/$weda_root/packages/$wd_system/package.json',
-                    miniprogramNpmDistDir: '$weda_root/packages/$wd_system',
-                },
-            ],
-            minifyWXSS: true,
-        },
-        appid: 'wxcf5102ada68a7ac9',
-        projectname: 'quickstart-wx-cloud',
-        libVersion: '2.20.1',
-        cloudfunctionTemplateRoot: 'cloudfunctionTemplate/',
-        condition: {
-            search: {
-                list: [],
-            },
-            conversation: {
-                list: [],
-            },
-            plugin: {
-                list: [],
-            },
-            game: {
-                list: [],
-            },
-            miniprogram: {
-                list: [
-                    {
-                        id: -1,
-                        name: 'db guide',
-                        pathName: 'pages/databaseGuide/databaseGuide',
-                    },
-                ],
-            },
-        },
-        compileType: 'miniprogram',
-        srcMiniprogramRoot: 'miniprogram/',
-        packOptions: {
-            ignore: [],
-            include: [],
-        },
-        editorSetting: {
-            tabIndent: 'auto',
-            tabSize: 2,
-        },
-    },
-    appJson: {
-        pages: [],
-        window: {
-            backgroundColor: '#F6F6F6',
-            backgroundTextStyle: 'light',
-            navigationBarBackgroundColor: '#F6F6F6',
-            navigationBarTitleText: '云开发 QuickStart',
-            navigationBarTextStyle: 'black',
-        },
-        sitemapLocation: 'sitemap.json',
-        style: 'v2',
-        lazyCodeLoading: 'requiredComponents',
-    },
-}, }, cb) {
+}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, enableAd = false, account = {}, mpConfig = {}, }, cb) {
     var _a, _b, _c, _d, _e, _f;
     if (!cals) {
         console.error('无效的应用配置');
@@ -176,6 +68,11 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
     if (!deployOptions.mode) {
         deployOptions.mode = types_1.DEPLOY_MODE.PREVIEW;
     }
+    /**
+     * 正规化子包数据
+     * 清除冗余字段
+     */
+    const subAppCalsList = _subAppCalsList.map((cals) => (0, cals_1.streamlineSubApp)(cals));
     /**
      * 刷新正规化 packageName
      */