@cloudbase/lowcode-builder 1.8.79 → 1.8.81

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,10 +56,118 @@ 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 = {}, }, cb) {
+}, 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) {
     var _a, _b, _c, _d, _e, _f;
     if (!cals) {
         console.error('无效的应用配置');
@@ -68,6 +176,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
      */

package/lib/builder/mp/index.js

@@ -53,6 +53,7 @@ const core_1 = require("../core");
 const theme_1 = require("../../utils/theme");
 const index_1 = require("../config/index");
 const mixMode_1 = require("./mixMode");
+const axios_1 = __importDefault(require("axios"));
 const templateDir = `${config_1.appTemplateDir}/mp/`;
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
@@ -70,7 +71,7 @@ function patchBuildContext(ctx, calses) {
     return { used: used };
 }
 async function generateWxMp({ buildContext: _buildContext, weapps, calses, deployOptions, options, buildTypeList, ignoreInstall = false, cdnEndpoints = {}, mpConfig = {}, }) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
     console.log(`Generating ${em('Wexin MiniProgram')} to ${_buildContext.projDir}`);
@@ -140,6 +141,22 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
             map[key] = value;
             return map;
         }, {}) || {};
+        let customLoginConfig;
+        let loginConfigPathname = ((_d = (_c = calses[0]) === null || _c === void 0 ? void 0 : _c.extra) === null || _d === void 0 ? void 0 : _d.loginConfigVersion)
+            ? (0, cals_1.generateCustomLoginConfigPathname)({ appId, version: (_f = (_e = calses[0]) === null || _e === void 0 ? void 0 : _e.extra) === null || _f === void 0 ? void 0 : _f.loginConfigVersion })
+            : '';
+        if (loginConfigPathname) {
+            const url = `https://${domain}${loginConfigPathname}`;
+            try {
+                const { data } = await axios_1.default.get(url, { responseType: 'json' });
+                if (data) {
+                    customLoginConfig = data;
+                }
+            }
+            catch (e) {
+                console.error('预置获取登录配置失败：', url, e);
+            }
+        }
         const wedaRootFileData = {
             'common/style.js': {},
             'common/util.js': {
@@ -148,6 +165,10 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                 expirationStartTimesnap,
                 runtimeDynamicConfig: buildContext.runtimeDynamicConfig,
                 RUNTIME_CONFIG_URL: index_1.RUNTIME_CONFIG_URL,
+                loginConfigPathname: ((_h = (_g = calses[0]) === null || _g === void 0 ? void 0 : _g.extra) === null || _h === void 0 ? void 0 : _h.loginConfigVersion)
+                    ? (0, cals_1.generateCustomLoginConfigPathname)({ appId, version: (_k = (_j = calses[0]) === null || _j === void 0 ? void 0 : _j.extra) === null || _k === void 0 ? void 0 : _k.loginConfigVersion })
+                    : '',
+                customLoginConfig: customLoginConfig ? JSON.stringify(customLoginConfig, undefined, 2) : 'null',
             },
             'common/widget.js': {},
             'common/weapp-page.js': {
@@ -199,9 +220,9 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                 appID: appId,
                 resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
                 isProd: (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.UPLOAD,
-                clientID: ((_c = mainAppData.extra) === null || _c === void 0 ? void 0 : _c.enableLoginStatusShare)
+                clientID: ((_l = mainAppData.extra) === null || _l === void 0 ? void 0 : _l.enableLoginStatusShare)
                     ? mainAppData.envId
-                    : (_d = mainAppData.extra) === null || _d === void 0 ? void 0 : _d.clientId,
+                    : (_m = mainAppData.extra) === null || _m === void 0 ? void 0 : _m.clientId,
                 cdnEndpoints,
                 builderVersion: core_1.version || '',
                 officialLibVersion: (officialLib === null || officialLib === void 0 ? void 0 : officialLib.version) || '',
@@ -242,6 +263,9 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
         projectConfigJson.setting = {
             ...projectConfigJson.setting,
             ...projConfig.setting,
+            packNpmRelationList: ((_o = projConfig.setting) === null || _o === void 0 ? void 0 : _o.packNpmRelationList) || ((_p = projectConfigJson.setting) === null || _p === void 0 ? void 0 : _p.packNpmRelationList)
+                ? (0, mp_config_1.mergePackNpmRelationList)(projConfig.setting.packNpmRelationList, (_q = projectConfigJson.setting) === null || _q === void 0 ? void 0 : _q.packNpmRelationList)
+                : undefined,
         };
         const wedaRoot = path_1.default.posix.join('./', projectConfigJson.miniprogramRoot || '/', projectConfigJson.wedaRoot || '');
         if (!projectConfigJson.setting.packNpmManually) {
@@ -250,22 +274,7 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
         if (!projectConfigJson.setting.packNpmRelationList) {
             projectConfigJson.setting.packNpmRelationList = [];
         }
-        projectConfigJson.setting.packNpmRelationList = [
-            ...projectConfigJson.setting.packNpmRelationList.filter((item) => [
-                './package.json',
-                '/package.json',
-                './packages/$wd_system/package.json',
-                '/packages/$wd_system/package.json',
-            ].includes(item.packageJsonPath)),
-            {
-                packageJsonPath: `./${path_1.default.posix.join(wedaRoot, 'package.json')}`,
-                miniprogramNpmDistDir: `./${wedaRoot}`,
-            },
-            {
-                packageJsonPath: `./${path_1.default.posix.join(wedaRoot, 'packages', '$wd_system', 'package.json')}`,
-                miniprogramNpmDistDir: `./${path_1.default.posix.join(wedaRoot, 'packages', '$wd_system')}`,
-            },
-        ];
+        projectConfigJson.setting.packNpmRelationList = (0, mp_config_1.mergePackNpmRelationList)((0, mp_config_1.generateSystemPackNpmRelationList)(wedaRoot), projectConfigJson.setting.packNpmRelationList);
         await (0, generateFiles_1.writeFile)(projectConfigJsonPath, JSON.stringify(projectConfigJson, undefined, 2));
         // 有了 framework app 之后，并且是源码的方式,追加 app 引用
         if (hasLowcodePkg) {

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

@@ -24,4 +24,18 @@ interface ISubpackage {
     }>;
 }
 export declare function mergeSubPackages(base?: ISubpackage[], extra?: ISubpackage[]): ISubpackage[];
+export declare function mergePackNpmRelationList(base?: {
+    packageJsonPath: string;
+    miniprogramNpmDistDir: string;
+}[], extra?: {
+    packageJsonPath: string;
+    miniprogramNpmDistDir: string;
+}[]): {
+    packageJsonPath: string;
+    miniprogramNpmDistDir: string;
+}[];
+export declare function generateSystemPackNpmRelationList(wedaRootProjectPath: any): {
+    packageJsonPath: string;
+    miniprogramNpmDistDir: any;
+}[];
 export {};

package/lib/builder/mp/mp_config.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.mergeSubPackages = exports.generateMpConfig = void 0;
+exports.generateSystemPackNpmRelationList = exports.mergePackNpmRelationList = exports.mergeSubPackages = exports.generateMpConfig = void 0;
 const path = __importStar(require("path"));
 const lodash_1 = require("lodash");
 const mp_1 = require("@cloudbase/lowcode-generator/lib/generator/config/mp");
@@ -42,7 +42,7 @@ const util_1 = require("../util");
  * @param appConfigs app config from prop edit panel
  */
 function generateMpConfig(ctx, weapps, options) {
-    var _a;
+    var _a, _b, _c;
     const appConfig = {
         useExtendedLib: { weui: true },
     };
@@ -69,7 +69,15 @@ function generateMpConfig(ctx, weapps, options) {
     // keep main app config only, ignore subapp config
     const configs = (kbConfig ? [eval(`(${kbConfig.code.replace(/export\s+default/, '')})`)] : []).concat([
         { appJson: mainAppConfig },
-        options.mpConfig,
+        {
+            ...options.mpConfig,
+            appJson: ((_b = options.mpConfig) === null || _b === void 0 ? void 0 : _b.appJson)
+                ? {
+                    ...(_c = options.mpConfig) === null || _c === void 0 ? void 0 : _c.appJson,
+                    sitemapLocation: undefined,
+                }
+                : {},
+        },
     ]);
     configs.forEach((config) => {
         if (config) {
@@ -160,16 +168,12 @@ function generateMpConfig(ctx, weapps, options) {
     // projConfig.setting.compileHotReLoad = false;
     projConfig.setting.bigPackageSizeSupport = true;
     projConfig.setting.packNpmManually = true;
-    projConfig.setting.packNpmRelationList = [
-        {
-            packageJsonPath: path.posix.join(projConfig.wedaRoot || './', 'package.json'),
-            miniprogramNpmDistDir: projConfig.wedaRoot || './',
-        },
-        {
-            packageJsonPath: path.posix.join(projConfig.wedaRoot || './', 'packages', '$wd_system', 'package.json'),
-            miniprogramNpmDistDir: path.posix.join(projConfig.wedaRoot || './', 'packages', '$wd_system'),
-        },
-    ];
+    if (!projConfig.setting.packNpmRelationList) {
+        projConfig.setting.packNpmRelationList = [];
+    }
+    projConfig.setting.packNpmRelationList = mergePackNpmRelationList(generateSystemPackNpmRelationList(path.posix.join(projConfig.miniprogramRoot, projConfig.wedaRoot)), projConfig.setting.packNpmRelationList.filter((item) => {
+        return !/\/packages\/\$wd_system\/package.json/.test(item.packageJsonPath);
+    }));
     if (process.env.IS_WEB_WORKER) {
         projConfig.setting.ignoreUploadUnusedFiles = true;
     }
@@ -270,3 +274,31 @@ function mergeSubPackages(base = [], extra = []) {
     return base;
 }
 exports.mergeSubPackages = mergeSubPackages;
+function mergePackNpmRelationList(base = [], extra = []) {
+    const baseMap = base.reduce((map, item) => {
+        map[path.posix.join('./', item.packageJsonPath, 'fake')] = true;
+        return map;
+    }, {});
+    const res = [...base];
+    extra.forEach((item) => {
+        const key = path.posix.join('./', item.packageJsonPath, 'fake');
+        if (!baseMap[key]) {
+            res.push(item);
+        }
+    });
+    return res;
+}
+exports.mergePackNpmRelationList = mergePackNpmRelationList;
+function generateSystemPackNpmRelationList(wedaRootProjectPath) {
+    return [
+        {
+            packageJsonPath: path.posix.join(wedaRootProjectPath || './', 'package.json'),
+            miniprogramNpmDistDir: wedaRootProjectPath || './',
+        },
+        {
+            packageJsonPath: path.posix.join(wedaRootProjectPath || './', 'packages', '$wd_system', 'package.json'),
+            miniprogramNpmDistDir: path.posix.join(wedaRootProjectPath || './', 'packages', '$wd_system'),
+        },
+    ];
+}
+exports.generateSystemPackNpmRelationList = generateSystemPackNpmRelationList;