@cloudbase/lowcode-builder 1.1.4 → 1.1.5-alpha.1

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

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

package/lib/builder/config/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.miniprogramDir = exports.miniprogramURL = exports.builderTemplateURL = exports.materialsDirName = exports.appTemplateDir = exports.sharedMaterialsDir = exports.OFFICIAL_LIB_KEY = exports.rpxConfig = exports.remConfig = exports.npmRegistry = exports.KBONE_PAGE_KEYS = exports.MP_CONFIG_MODULE_NAME = exports.REPLACE_SIGN = void 0;
+exports.generateCdnEndpoints = exports.CDN_ENDPONTS_CONFIG = exports.miniprogramDir = exports.miniprogramURL = exports.builderTemplateURL = exports.materialsDirName = exports.appTemplateDir = exports.sharedMaterialsDir = exports.OFFICIAL_LIB_KEY = exports.rpxConfig = exports.remConfig = exports.npmRegistry = exports.KBONE_PAGE_KEYS = exports.MP_CONFIG_MODULE_NAME = exports.REPLACE_SIGN = void 0;
 const path = __importStar(require("path"));
 const os_1 = __importDefault(require("os"));
 var index_1 = require("@cloudbase/lowcode-generator/lib/generator/config/index");
@@ -54,3 +54,18 @@ exports.miniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqclou
  * miniprogram_npm存放目录。IDE插件builder用到
  */
 exports.miniprogramDir = path.join(os_1.default.homedir(), exports.sharedMaterialsDir, 'miniprogram_npm');
+exports.CDN_ENDPONTS_CONFIG = {
+    common: '',
+    cloudbase: '//static.cloudbase.net',
+    cdngo: 'https://qbase.cdn-go.cn',
+    aegis: 'https://cdn-go.cn',
+};
+function generateCdnEndpoints(endpoints = exports.CDN_ENDPONTS_CONFIG) {
+    for (const key in exports.CDN_ENDPONTS_CONFIG) {
+        if (!Object.prototype.hasOwnProperty.call(endpoints, key)) {
+            endpoints[key] = endpoints.common ? endpoints.common : exports.CDN_ENDPONTS_CONFIG[key];
+        }
+    }
+    return endpoints;
+}
+exports.generateCdnEndpoints = generateCdnEndpoints;

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

@@ -2,6 +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';
 export interface IBaseAppProps {
     appKey: string;
     dependencies?: IMaterialItem[];
@@ -35,11 +36,39 @@ export interface IBuildWedaApp extends IBaseAppProps {
         path?: string;
     };
     isBrowserMpBuilder?: boolean;
+    cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
 }
-export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<string | undefined>;
+export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<string | undefined>;
 export declare function cleanComponentDir(): Promise<void>;
 export declare const version: any;
 export { getFiles, fileToZip, strToBuf } from '../util/generateFiles';
 export { downloadZip } from '../util/net';
 export { getCompileDirs } from '../util';
 export default buildWedaApp;
+interface INormalizeInput {
+    appId?: string;
+    appKey?: string;
+    dependencies?: IBuildWedaApp['dependencies'];
+    buildTypeList: IBuildWedaApp['buildTypeList'];
+    mainAppSerializeData?: IBuildWedaApp['cals'];
+    cals?: IBuildWedaApp['cals'];
+    subAppSerializeDataList?: IBuildWedaApp['subAppCalsList'];
+    subAppCalsList?: IBuildWedaApp['subAppCalsList'];
+    deployOptions: IBuildWedaApp['deployOptions'];
+    mpAppId?: string;
+    extraData?: {
+        isComposite: boolean;
+        compProps: {};
+    };
+    [key: string]: any;
+}
+interface InormalizeOutput extends INormalizeInput {
+    dependencies: Required<INormalizeInput['dependencies']>;
+}
+export declare function normalizeInputs(inputs: INormalizeInput, { envId, getWebRootPath, }: {
+    envId: string;
+    getWebRootPath?: ({ appId, deployOptions }: {
+        appId: any;
+        deployOptions: any;
+    }) => string;
+}): InormalizeOutput;

package/lib/builder/core/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCompileDirs = exports.downloadZip = exports.strToBuf = exports.fileToZip = exports.getFiles = exports.version = exports.cleanComponentDir = exports.buildWedaApp = void 0;
+exports.normalizeInputs = exports.getCompileDirs = exports.downloadZip = exports.strToBuf = exports.fileToZip = exports.getFiles = exports.version = exports.cleanComponentDir = exports.buildWedaApp = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
@@ -20,7 +20,7 @@ const pkg = require('../../../package.json');
 async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appKey = 'test', runtime = types_1.RUNTIME.NONE, ignoreInstall = false, buildTypeList = [common_1.BuildType.WEB], mode = common_1.WebpackModeType.PRODUCTION, devTool = 'webpack', deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW }, generateMpType = common_1.GenerateMpType.APP, plugins = [], extraData = {
     isComposite: false,
     compProps: {},
-}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, }, cb) {
+}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints, }, cb) {
     var _a, _b;
     if (!cals) {
         console.error('无效的应用配置');
@@ -48,15 +48,15 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 weapps: apps,
                 projDir: appBuildDir,
                 appId: appKey,
-                domain: domain,
+                domain,
                 materials: dependencies,
                 plugins,
                 isProduction: mode === common_1.WebpackModeType.PRODUCTION,
                 deployMode,
-                extraData,
                 isMixMode,
                 options: {
                     isCrossAccount: resourceAppId !== deployOptions.targetMpAppId,
+                    mpAppId: deployOptions.mpAppId || '',
                     resourceAppId,
                 },
                 buildTypeList,
@@ -86,11 +86,11 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 // 模板需要占位保证 mp 文件夹存在
                 fs_extra_1.default.removeSync(path_1.default.resolve(outDir, 'miniprogram_npm'));
             }
-            cb === null || cb === void 0 ? void 0 : cb(null, {
+            await (cb === null || cb === void 0 ? void 0 : cb(null, {
                 ...result,
                 outDir,
                 timeElapsed: Date.now() - startTime,
-            });
+            }));
             return outDir;
         }
         else {
@@ -108,17 +108,36 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 deployMode,
                 ignoreInstall,
                 domain,
+                cdnEndpoints,
             });
-            cb === null || cb === void 0 ? void 0 : cb(null, {
+            await (cb === null || cb === void 0 ? void 0 : cb(null, {
                 outDir: h5BuildDir,
                 timeElapsed: Date.now() - startTime,
-            });
+            }));
             return h5BuildDir;
         }
     }
-    catch (e) {
-        cb === null || cb === void 0 ? void 0 : cb(e);
-        throw e;
+    catch (err) {
+        if (err.length) {
+            let messageList = (err[0] || '').split('\n');
+            let lineIndex = 0;
+            let reg = /node_modules\/@babel/;
+            messageList.find((str, index) => {
+                if (reg.test(str)) {
+                    lineIndex = index;
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            });
+            if (lineIndex) {
+                messageList = messageList.slice(0, lineIndex);
+            }
+            err = new Error(messageList.join('\n'));
+        }
+        cb === null || cb === void 0 ? void 0 : cb(err);
+        throw err;
     }
 }
 exports.buildWedaApp = buildWedaApp;
@@ -136,3 +155,98 @@ Object.defineProperty(exports, "downloadZip", { enumerable: true, get: function
 var util_2 = require("../util");
 Object.defineProperty(exports, "getCompileDirs", { enumerable: true, get: function () { return util_2.getCompileDirs; } });
 exports.default = buildWedaApp;
+function normalizeInputs(inputs, { envId, getWebRootPath, }) {
+    const { extraData = { isComposite: false, compProps: {} } } = inputs;
+    /**
+     * 过滤处理 dependencies
+     */
+    let map = {};
+    inputs.dependencies = (inputs.dependencies || []).reduce((list, item) => {
+        if (!map[`${item.name}@${item.version}`]) {
+            map[`${item.name}@${item.version}`] = true;
+            list.push(item);
+        }
+        return list;
+    }, []);
+    const normalizeCalsOptions = {
+        buildTypeList: inputs.buildTypeList,
+        envId,
+        deployOptions: inputs.deployOptions,
+        appId: inputs.appId || inputs.appKey,
+        getWebRootPath: getWebRootPath || _getWebRootPath,
+    };
+    if (inputs.mainAppSerializeData) {
+        inputs.mainAppSerializeData = normalizeCals(inputs.mainAppSerializeData, normalizeCalsOptions);
+        if ((0, common_1.buildAsWebByBuildType)(inputs.buildTypeList)) {
+            inputs.subAppSerializeDataList = [];
+        }
+    }
+    if (inputs.cals) {
+        inputs.cals = normalizeCals(inputs.cals, normalizeCalsOptions);
+        if ((0, common_1.buildAsWebByBuildType)(inputs.buildTypeList)) {
+            inputs.subAppCalsList = [];
+        }
+    }
+    if (!(0, common_1.buildAsWebByBuildType)(inputs.buildTypeList)) {
+        // 小程序构建
+        const { mpAppId, deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW } } = inputs;
+        inputs.deployOptions = {
+            ...deployOptions,
+            mpAppId: deployOptions.mpAppId || mpAppId,
+        };
+        if (inputs.deployOptions.targetMpAppId === undefined) {
+            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,10 +1,11 @@
 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, }: {
+export declare function generateHTML({ appId, appBuildDir, jsApis, mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, }: {
     appId: string;
     jsApis: string[];
     appBuildDir: string;
@@ -12,6 +13,7 @@ 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, }) {
+async function generateHTML({ appId, appBuildDir, jsApis, mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, }) {
     const templatePath = path_1.default.join(config_1.appTemplateDir, 'html', 'index.html.ejs');
     const dstFilePath = path_1.default.join(appBuildDir, 'index.html');
     const packageTpl = await fs_extra_1.default.readFile(templatePath, { encoding: 'utf8' });
@@ -37,6 +37,7 @@ 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

@@ -2,7 +2,8 @@ import { IMaterialItem, II18nConfig, IExtraData } from '@cloudbase/lowcode-gener
 import { BuildType, WebpackModeType } from '../types/common';
 import { DEPLOY_MODE, RUNTIME } from '../../types';
 import { IPlatformApp } from '@cloudbase/cals';
-export declare function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraData, cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployMode, ignoreInstall, domain, }: {
+import { ICDN_ENDPOINTS_COFIG } from '../config';
+export declare function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraData, cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployMode, ignoreInstall, domain, cdnEndpoints, }: {
     appKey: string;
     buildDir: string;
     cals: IPlatformApp;
@@ -17,4 +18,5 @@ export declare function buildH5App({ appKey, buildDir, dependencies, i18nConfig,
     deployMode?: DEPLOY_MODE;
     ignoreInstall?: boolean;
     domain: string;
+    cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
 }): Promise<string>;

package/lib/builder/h5/index.js

@@ -19,11 +19,20 @@ const types_1 = require("../../types");
 const mp_1 = require("../mp");
 const common_2 = require("../../utils/common");
 const config_1 = require("../config");
-async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraData, cals, buildTypeList = [common_1.BuildType.WEB], subAppCalsList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployMode = types_1.DEPLOY_MODE.PREVIEW, ignoreInstall = false, domain = '', }) {
-    var _a, _b;
+const fs_extra_1 = __importDefault(require("fs-extra"));
+async function buildH5App({ 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 = '', cdnEndpoints, }) {
+    var _a, _b, _c;
     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 = {
@@ -43,7 +52,7 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
         // 处理应用数据
         const mainAppData = (0, weapps_core_1.deserialize)(mainAppSerializeData);
         if (!mainAppData.extra) {
-            mainAppData.extra = { domain: domain };
+            mainAppData.extra = { domain };
         }
         if (!((_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.domain)) {
             mainAppData.extra.domain = domain;
@@ -116,6 +125,7 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
             devTool,
             publicPath,
             domain,
+            cdnEndpoints,
         });
         await new Promise((resolve, reject) => {
             // 开始编译前清理一下 lowcode 内容
@@ -133,6 +143,10 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
                 }
             });
         });
+        // 普通 web 模式，且非hash模式，根据页面生成多份入口
+        if (!((_c = cals.extra) === null || _c === void 0 ? void 0 : _c.historyType) || cals.extra.historyType === types_1.HISTORY_TYPE.BROWSER) {
+            await Promise.all((cals.items || []).map((page) => fs_extra_1.default.copy(path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, 'index.html'), path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, page.id, 'index.html'))));
+        }
         return h5BuildDir;
     }
     catch (e) {

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

@@ -1,11 +1,13 @@
 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, }: IWebpackCoreProps): Promise<string>;
+export declare function runWebpackCore({ mainAppData, subAppDataList, appBuildDir, publicPath, mode, appKey, buildTypeList, mpConfig, assets, devTool, generateMpType, cdnEndpoints, }: IWebpackCoreProps): Promise<string>;
 export {};

package/lib/builder/h5/webpack.js

@@ -4,7 +4,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, }) {
+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, }) {
     console.time('runWebpackCore');
     console.time('webpackGenerate');
     const allAppDataList = subAppDataList.concat(mainAppData);
@@ -33,6 +33,7 @@ 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/index.d.ts

@@ -2,7 +2,7 @@ import { IMaterialItem, IWeAppData, IPlugin } from '@cloudbase/lowcode-generator
 import { IBuildContext } from './BuildContext';
 import { DEPLOY_MODE } from '../../types';
 import { BuildType, IAppUsedComp, IUsedComps } from '../types/common';
-export declare function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, isBrowserMpBuilder, }: {
+export declare function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, isMixMode, options, buildTypeList, isBrowserMpBuilder, }: {
     weapps: IWeAppData[];
     projDir: string;
     appId: string;
@@ -11,9 +11,9 @@ export declare function generateWxMp({ weapps, projDir, appId, domain, materials
     plugins: IPlugin[];
     isProduction: boolean;
     deployMode: DEPLOY_MODE;
-    extraData: any;
     isMixMode: boolean;
     options: {
+        mpAppId: string;
         resourceAppId?: string;
         isCrossAccount: boolean;
     };

package/lib/builder/mp/index.js

@@ -54,7 +54,7 @@ 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({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, isBrowserMpBuilder = false, }) {
+async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, isMixMode, options, buildTypeList, isBrowserMpBuilder = false, }) {
     var _a;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
@@ -72,7 +72,6 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         domain,
         isBrowserMpBuilder,
     };
-    const yyptConfig = await (0, util_3.getYyptConfigInfo)(extraData);
     const { allAppUsedComps } = handleUsedComponents({
         buildContext,
         weapps,
@@ -82,7 +81,7 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
     // 安装依赖库，生成 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);
+    const { projConfig, appConfig, pageConfigs } = (0, mp_config_1.generateMpConfig)(weapps, buildContext, { mpAppId: options.mpAppId });
     // #1 generate project files
     if (!mainAppData.mpPkgUrl) {
         const projectFileData = {
@@ -135,7 +134,8 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         };
     }
     if (mainAppData.mpPkgUrl) {
-        // 合并 project 和 app json
+        // 合并 project 和 app json，复写 appId
+        projectConfigJson.appId = projConfig.appId;
         if (!projectConfigJson.setting) {
             projectConfigJson.setting = {};
         }

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

@@ -6,7 +6,9 @@ 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): {
+export declare function generateMpConfig(weapps: IWeAppData[], ctx: IBuildContext, options: {
+    mpAppId?: string;
+}): {
     appConfig: any;
     projConfig: any;
     pageConfigs: {}[];

package/lib/builder/mp/mp_config.js

@@ -40,7 +40,7 @@ const chalk_1 = __importDefault(require("chalk"));
  * @param kboneConfig https://wechat-miniprogram.github.io/kbone/docs/config/
  * @param appConfigs app config from prop edit panel
  */
-function generateMpConfig(weapps, ctx) {
+function generateMpConfig(weapps, ctx, options) {
     var _a;
     const appConfig = {
         useExtendedLib: { weui: true },
@@ -116,6 +116,9 @@ function generateMpConfig(weapps, ctx) {
             });
         }
     });
+    if (options.mpAppId) {
+        projConfig.appId = options.mpAppId;
+    }
     // merge(pageConfigs, extractAllPagesConfig())
     return { appConfig, projConfig, pageConfigs };
 }

package/lib/builder/mp/util.js

@@ -67,7 +67,7 @@ function generateDataBindMeta(bind) {
             imports += (0, lowcode_generator_1.generateExpressionAlias)(value);
         }
         catch (e) {
-            console.error('parse expression error', value, e);
+            console.error('parse expression error', value);
         }
         expr = value;
     }

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

@@ -2,6 +2,7 @@ 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;

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.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.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");
@@ -18,6 +18,7 @@ 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)) {
@@ -273,7 +274,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, './preview'),
+            path: path_1.default.resolve(appBuildDir, exports.OUTPUT_DIR),
             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,
@@ -294,8 +295,6 @@ 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)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.1.4",
+  "version": "1.1.5-alpha.1",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@cloudbase/cals": "^0.4.10",
-    "@cloudbase/lowcode-generator": "^1.1.1",
+    "@cloudbase/lowcode-generator": "^1.1.2-alpha.0",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -12,9 +12,12 @@
     <meta name="description" content="<%= desc %>" />
     <link
       rel="stylesheet"
-      href="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.ba91c21b0d605c84ac7f.css"
+      href="<%=
+        cdnEndpoints.cdngo
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.ba91c21b0d605c84ac7f.css"
     />
-    <script crossorigin="anonymous" src="https://cdn-go.cn/aegis/aegis-sdk/latest/aegis.min.js?v=1"></script>
+    <% if(cdnEndpoints.aegis){ %>
+    <script crossorigin="anonymous" src="<%= cdnEndpoints.aegis %>/aegis/aegis-sdk/latest/aegis.min.js?v=1"></script>
     <script>
       <% if(!isAdminPortal){ %>
       const _aegis = new Aegis({
@@ -36,6 +39,7 @@
       window._aegis = _aegis;
       window._aegis_inited = Date.now()
     </script>
+    <% }%>
     <title><%= title %></title>
     <% if(mode !== 'production'){ %>
     <!-- <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script>
@@ -387,10 +391,10 @@
     <script type="module" src="/src/index.jsx"></script>
     <% } %> <% if(!isAdminPortal){ %>
     <script src="/weda-config/weda-private.js"></script>
-    <script src="//static.cloudbase.net/cloudbase-js-sdk/2.4.7-beta.0/cloudbase.full.js?v=1"></script>
+    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.4.7-beta.0/cloudbase.full.js?v=1"></script>
     <% }%>
     <script>
-      if (window.cloudbase) {
+      if (window.cloudbase && window._aegis) {
         const _callFunction = window.cloudbase.__proto__.callFunction;
         window.cloudbase.__proto__.callFunction = function (args) {
           let promise = _callFunction.call(window.cloudbase, ...arguments);
@@ -431,19 +435,23 @@
     </script>
     <script
       crossorigin
-      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/react@16.14.0/umd/react.production.min.js"
+      src="<%= cdnEndpoints.cdngo %>/lcap/lcap-resource-cdngo/-/release/_npm/react@16.14.0/umd/react.production.min.js"
     ></script>
     <script
       crossorigin
-      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/react-dom@16.14.0/umd/react-dom.production.min.js"
+      src="<%=
+        cdnEndpoints.cdngo
+      %>/lcap/lcap-resource-cdngo/-/release/_npm/react-dom@16.14.0/umd/react-dom.production.min.js"
     ></script>
     <script
-      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/ajax/libs/mobx/5.15.7/mobx.umd.js"
+      src="<%= cdnEndpoints.cdngo %>/lcap/lcap-resource-cdngo/-/0.1.2/_url/ajax/libs/mobx/5.15.7/mobx.umd.js"
       crossorigin="anonymous"
     ></script>
     <script
       crossorigin="anonymous"
-      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.19/dist/h5.browser.js"
+      src="<%=
+        cdnEndpoints.cdngo
+      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.19/dist/h5.browser.js"
     ></script>
     <script>
       // zxing polifill
@@ -453,15 +461,19 @@
     </script>
     <script
       crossorigin="anonymous"
-      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/npm/@zxing/library@0.18.6/umd/index.min.js"
+      src="<%= cdnEndpoints.cdngo %>/lcap/lcap-resource-cdngo/-/0.1.2/_url/npm/@zxing/library@0.18.6/umd/index.min.js"
     ></script>
     <script
       crossorigin
-      src="https://qbase.cdn-go.cn//lcap/lcap-resource-cdngo/-/release/_url/qcloud/lowcode/static/ide/assets/js/babel.min.js"
+      src="<%=
+        cdnEndpoints.cdngo
+      %>/lcap/lcap-resource-cdngo/-/release/_url/qcloud/lowcode/static/ide/assets/js/babel.min.js"
     ></script>
     <script
       crossorigin
-      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.90a1845eb61a012b3d66.bundle.js"
+      src="<%=
+        cdnEndpoints.cdngo
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.90a1845eb61a012b3d66.bundle.js"
     ></script>
   </body>
 </html>

package/template/package.json

@@ -7,7 +7,7 @@
   "dependencies": {
     "@cloudbase/js-sdk": "2.4.0-beta.0",
     "@tcwd/weapps-core": "2.2.6",
-    "@tcwd/weapps-sdk": "1.2.10",
+    "@tcwd/weapps-sdk": "1.2.12",
     "@zxing/library": "^0.18.6",
     "@cloudbase/weda-client": "^0.2.4",
     "lodash": "^4.17.19",