@cloudbase/lowcode-builder 1.9.1 → 1.9.3

package/lib/builder/config/dependencies.js

@@ -14,7 +14,7 @@ const BASE_DEPS = {
 const CLOUDBASE_DEPS = {
     '@cloudbase/oauth': '0.1.1-alpha.15',
     '@cloudbase/weda-client': '1.1.6',
-    '@cloudbase/weda-cloud-sdk': '1.0.68',
+    '@cloudbase/weda-cloud-sdk': '1.0.76',
 };
 function generatePackageDependencies({ importJSSDK, mode, officialLibVersion, uin, }) {
     const deps = {};

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

@@ -54,6 +54,7 @@ export interface IBuildWedaApp extends IBaseAppProps {
         projectConfigJson?: Record<string, any>;
     };
     privatelinkConfig?: Record<string, any>;
+    __defaultLoginType__?: 'openId' | 'anonymous';
 }
 export declare function buildWedaConfig({ output, domain, isPrivateMode, endpointType, buildTypeList, }: {
     output: Required<IBuildWedaApp['output']>;
@@ -62,7 +63,7 @@ export declare function buildWedaConfig({ output, domain, isPrivateMode, endpoin
     endpointType?: IBuildWedaApp['endpointType'];
     buildTypeList?: IBuildWedaApp['buildTypeList'];
 }): Promise<void>;
-export declare function buildWedaApp({ cals, subAppCalsList: _subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints: _cdnEndpoints, isPrivateMode, endpointType, enableExpiredTag, enableAd, account, mpConfig, privatelinkConfig, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<any>;
+export declare function buildWedaApp({ cals, subAppCalsList: _subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints: _cdnEndpoints, isPrivateMode, endpointType, enableExpiredTag, enableAd, account, mpConfig, privatelinkConfig, __defaultLoginType__, }: 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

@@ -17,6 +17,7 @@ const net_1 = require("../util/net");
 const config_1 = require("../config");
 const axios_1 = __importDefault(require("axios"));
 const materials_1 = require("../mp/materials");
+const common_3 = require("@cloudbase/lowcode-generator/lib/generator/types/common");
 const pkg = require('../../../package.json');
 async function buildWedaConfig({ output, domain = undefined, isPrivateMode = undefined, endpointType = undefined, buildTypeList = [common_1.BuildType.WEB], }) {
     if ((0, common_1.buildAsWebByBuildType)(buildTypeList)) {
@@ -57,10 +58,10 @@ async function buildWedaConfig({ output, domain = undefined, isPrivateMode = und
     await (0, index_1.generateConfig)(data, outDir);
 }
 exports.buildWedaConfig = buildWedaConfig;
-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 = {
+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 }, plugins = [], extraData = {
     isComposite: false,
     compProps: {},
-}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints: _cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, enableAd = false, account = {}, mpConfig = {}, privatelinkConfig = undefined, }, cb) {
+}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints: _cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, enableAd = false, account = {}, mpConfig = {}, privatelinkConfig = undefined, __defaultLoginType__ = 'anonymous', }, cb) {
     var _a, _b, _c, _d, _e, _f;
     const cdnEndpoints = (0, config_1.generateCdnEndpoints)(_cdnEndpoints);
     if (!cals) {
@@ -101,6 +102,7 @@ async function buildWedaApp({ cals, subAppCalsList: _subAppCalsList = [], depend
             runtimeDynamicConfig = data;
         }
     }
+    const officialLib = dependencies.find((item) => item.name === cals_1.OFFICIAL_LIB_KEY);
     const buildContext = {
         uin: account === null || account === void 0 ? void 0 : account.uin,
         projDir: appBuildDir,
@@ -119,6 +121,7 @@ async function buildWedaApp({ cals, subAppCalsList: _subAppCalsList = [], depend
         disabled: (_c = cals.extra) === null || _c === void 0 ? void 0 : _c.disabled,
         statusPageId: ((_d = cals.extra) === null || _d === void 0 ? void 0 : _d.statusPageId) || undefined,
         privatelinkConfig: privatelinkConfig ? { uin: account === null || account === void 0 ? void 0 : account.uin, ...privatelinkConfig } : undefined,
+        enableOfficialLibNPM: !!((0, common_3.buildAsLibByBuildType)(buildTypeList) && officialLib),
     };
     console.log('domain', domain);
     console.log('应用名', appKey);
@@ -188,12 +191,13 @@ async function buildWedaApp({ cals, subAppCalsList: _subAppCalsList = [], depend
                 enableLoading: (_e = cals === null || cals === void 0 ? void 0 : cals.extra) === null || _e === void 0 ? void 0 : _e.enableLoading,
                 enableAsyncMaterials: (_f = cals.extra) === null || _f === void 0 ? void 0 : _f.enableAsyncMaterials,
                 disablePageComponentInvoke,
+                __defaultLoginType__,
                 // enableAsyncMaterials: true,
             };
             const result = await (0, index_1.generateWxMp)({
+                buildContext: mpBuildContext,
                 weapps: apps,
                 calses,
-                buildContext: mpBuildContext,
                 plugins,
                 deployOptions,
                 options: {
@@ -309,6 +313,7 @@ function normalizeInputs(inputs, { envId, getWebRootPath, }) {
         deployOptions: inputs.deployOptions,
         appId: inputs.appId || inputs.appKey,
         getWebRootPath: getWebRootPath || _getWebRootPath,
+        webOptions: inputs.webOptions,
     };
     if (inputs.mainAppSerializeData) {
         inputs.mainAppSerializeData = normalizeCals(inputs.mainAppSerializeData, normalizeCalsOptions);
@@ -345,7 +350,7 @@ function normalizeInputs(inputs, { envId, getWebRootPath, }) {
     return inputs;
 }
 exports.normalizeInputs = normalizeInputs;
-function normalizeCals(cals, { buildTypeList, envId, deployOptions, appId, getWebRootPath }) {
+function normalizeCals(cals, { buildTypeList, envId, deployOptions, appId, getWebRootPath, webOptions }) {
     var _a;
     if (!cals.extra) {
         cals.extra = {};
@@ -365,6 +370,7 @@ function normalizeCals(cals, { buildTypeList, envId, deployOptions, appId, getWe
         if (cals.extra.miniprogramPlugins) {
             cals.extra.miniprogramPlugins = [];
         }
+        const { gatewayConfig = {} } = webOptions || {};
         let { appConfig = {} } = cals.extra;
         let { window = {} } = appConfig;
         let path = getWebRootPath({ appId, name: cals.name, deployOptions });
@@ -380,7 +386,7 @@ function normalizeCals(cals, { buildTypeList, envId, deployOptions, appId, getWe
                     ? `app/${appId}${(deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) !== types_1.DEPLOY_MODE.UPLOAD ? '-preview' : ''}`
                     : (0, common_1.buildAsXPageByBuildType)(buildTypeList)
                         ? '/'
-                        : path,
+                        : gatewayConfig.path || path,
             },
         };
     }

package/lib/builder/h5/copy.js

@@ -44,7 +44,6 @@ async function runCopy(appBuildDir, webRuntimeAppData, i18nConfig) {
         const dstFile = path.join(appBuildDir, entry);
         await fs_extra_1.default.copy(path.join(config_1.appTemplateDir, entry), dstFile);
     }
-    await (0, generateFiles_1.writeFile)(path.join(appBuildDir, 'mainAppData.json'), JSON.stringify(webRuntimeAppData, null, 2));
     const fileDir = path.join(appBuildDir, 'src/i18n/');
     if (!fs_extra_1.default.existsSync(fileDir)) {
         fs_extra_1.default.mkdirSync(fileDir, { recursive: true });

package/lib/builder/h5/index.js

@@ -46,14 +46,16 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const junk = __importStar(require("../util/junk"));
 const url_1 = require("url");
 const semver = __importStar(require("semver"));
+const lodash_1 = require("lodash");
+const common_3 = require("@cloudbase/lowcode-generator/lib/generator/types/common");
 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, _d, _e, _f;
-    const { projDir: buildDir, domain, materialLibs: dependencies, appId: appKey, isPrivateMode, enableExpiredTag, privatelinkConfig, } = buildContext;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    const { projDir: buildDir, domain, materialLibs: dependencies, appId: appKey, isPrivateMode, enableExpiredTag, privatelinkConfig, enableOfficialLibNPM, } = buildContext;
     if (!deployOptions.mode || deployOptions.mode === types_1.DEPLOY_MODE.DYNAMIC) {
         deployOptions.mode = types_1.DEPLOY_MODE.PREVIEW;
     }
@@ -80,17 +82,23 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
             var _a;
             return (_a = used.component['$template']) === null || _a === void 0 ? void 0 : _a.has(item.id);
         });
+        const officialLib = dependencies.find((lib) => lib.name === config_1.OFFICIAL_LIB_KEY);
+        if (enableOfficialLibNPM) {
+            if (!((_d = (_c = cals.extra) === null || _c === void 0 ? void 0 : _c.npmDependencies) === null || _d === void 0 ? void 0 : _d[cals_1.OFFICIAL_LIB_NPM_PACKAGENAME])) {
+                (0, lodash_1.set)(cals, `extra.npmDependencies.${cals_1.OFFICIAL_LIB_NPM_PACKAGENAME}`, officialLib === null || officialLib === void 0 ? void 0 : officialLib.version);
+            }
+        }
         // 处理应用数据
         const mainAppData = (0, weapps_core_1.deserialize)((0, common_2.processCals2WeappsData)(cals, dependencies));
         if (!mainAppData.extra) {
             mainAppData.extra = { domain };
         }
-        if (!((_c = mainAppData.extra) === null || _c === void 0 ? void 0 : _c.domain)) {
+        if (!((_e = mainAppData.extra) === null || _e === void 0 ? void 0 : _e.domain)) {
             mainAppData.extra.domain = domain;
         }
-        const subAppDataList = ((_d = subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.map) === null || _d === void 0 ? void 0 : _d.call(subAppCalsList, (sub) => (0, weapps_core_1.deserialize)((0, common_2.processCals2WeappsData)(sub, dependencies)))) || [];
+        const subAppDataList = ((_f = subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.map) === null || _f === void 0 ? void 0 : _f.call(subAppCalsList, (sub) => (0, weapps_core_1.deserialize)((0, common_2.processCals2WeappsData)(sub, dependencies)))) || [];
         // 前置操作
-        const { publicPath, basename, assets = '', _indexPage } = ((_e = mainAppData.appConfig) === null || _e === void 0 ? void 0 : _e.window) || {};
+        const { publicPath, basename, assets = '', _indexPage } = ((_g = mainAppData.appConfig) === null || _g === void 0 ? void 0 : _g.window) || {};
         // 获取 插入的cdn 资源
         const jsAssets = await (0, generate_1.handleAssets)({
             appBuildDir: buildDir,
@@ -107,6 +115,9 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
             // 注意需要包涵官方的(gsd)，部分平台方法需要由其补充
             return lib.name === config_1.OFFICIAL_LIB_KEY || !!(((_a = used.component) === null || _a === void 0 ? void 0 : _a[lib.name]) || ((_b = used.action) === null || _b === void 0 ? void 0 : _b[lib.name]));
         }), materialsDir, runtime, ignoreInstall);
+        if (enableOfficialLibNPM) {
+            await fs_extra_1.default.remove(path_1.default.join(h5BuildDir, 'src', 'libraries', `${officialLib === null || officialLib === void 0 ? void 0 : officialLib.name}@${officialLib === null || officialLib === void 0 ? void 0 : officialLib.version}`));
+        }
         const h5LibDirPath = path_1.default.resolve(h5BuildDir, 'src', 'libraries');
         const libNames = fs_extra_1.default.readdirSync(h5LibDirPath).filter((name) => name !== '.DS_Store');
         let libNameWithVue;
@@ -172,100 +183,102 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
             privatelinkConfig,
         });
         console.timeEnd(runGenerateTag);
-        // // 构建 NPM 包
-        await (0, npm_1.handleNPM)({
-            appKey,
-            mainAppData,
-            subAppDataList,
-            appBuildDir: h5BuildDir,
-            dependencies: processedDependencies,
-            mode,
-            devTool,
-            ignoreInstall,
-            vueVersion,
-        });
-        // 生成主题文件
-        await (0, generate_1.generateThemeVarsFile)(mainAppData.themeVars, h5BuildDir);
-        // 生成 webpack 配置
-        const webpackConfigPath = await (0, webpack_1.runWebpackCore)({
-            buildContext,
-            cals,
-            appKey,
-            mainAppData,
-            subAppDataList,
-            appBuildDir: h5BuildDir,
-            assets: jsAssets,
-            buildTypeList,
-            mode,
-            devTool,
-            publicPath,
-            domain,
-            cdnEndpoints,
-            vueVersion,
-        });
-        if (typeof libNameWithVue === 'string' && !fs_extra_1.default.existsSync(path_1.default.resolve(h5BuildDir, 'node_modules', 'vue'))) {
-            fs_extra_1.default.symlinkSync(path_1.default.resolve(h5BuildDir, 'src', 'libraries', libNameWithVue, 'node_modules', 'vue'), path_1.default.resolve(h5BuildDir, 'node_modules', 'vue'));
-        }
-        await new Promise((resolve, reject) => {
-            // 开始编译前清理一下 lowcode 内容
-            (0, compile_1.startCompile)({
+        if (!(0, common_3.buildAsLibByBuildType)(buildTypeList)) {
+            // // 构建 NPM 包
+            await (0, npm_1.handleNPM)({
+                appKey,
+                mainAppData,
+                subAppDataList,
                 appBuildDir: h5BuildDir,
-                configPath: webpackConfigPath,
+                dependencies: processedDependencies,
+                mode,
+                devTool,
+                ignoreInstall,
+                vueVersion,
+            });
+            // 生成主题文件
+            await (0, generate_1.generateThemeVarsFile)(mainAppData.themeVars, h5BuildDir);
+            // 生成 webpack 配置
+            const webpackConfigPath = await (0, webpack_1.runWebpackCore)({
+                buildContext,
+                cals,
                 appKey,
-                webpackMode: mode,
-            }, function (err, data) {
-                if (err) {
-                    reject(err);
-                }
-                else {
-                    resolve(data);
-                }
+                mainAppData,
+                subAppDataList,
+                appBuildDir: h5BuildDir,
+                assets: jsAssets,
+                buildTypeList,
+                mode,
+                devTool,
+                publicPath,
+                domain,
+                cdnEndpoints,
+                vueVersion,
             });
-        });
-        const MAINIFAST_FILENAME = 'weda-manifest.json';
-        const preHeatUrls = fs_extra_1.default
-            .readdirSync(path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR))
-            .filter((file) => junk.not(file) && file !== MAINIFAST_FILENAME)
-            .map((file) => {
-            if (/LICENSE\.txt$/.test(file) || /\.map$/.test(file)) {
-                return '';
-            }
-            try {
-                const url = new url_1.URL(publicPath);
-                return `${url.origin}${path_1.default.posix.join(url.pathname, file)}`;
+            if (typeof libNameWithVue === 'string' && !fs_extra_1.default.existsSync(path_1.default.resolve(h5BuildDir, 'node_modules', 'vue'))) {
+                fs_extra_1.default.symlinkSync(path_1.default.resolve(h5BuildDir, 'src', 'libraries', libNameWithVue, 'node_modules', 'vue'), path_1.default.resolve(h5BuildDir, 'node_modules', 'vue'));
             }
-            catch (e) {
-                return path_1.default.posix.join(publicPath || '', file);
-            }
-        })
-            .filter((item) => !!item);
-        // 普通 web 模式，且非hash模式，根据页面生成多份入口
-        if (!((_f = cals.extra) === null || _f === void 0 ? void 0 : _f.historyType) || cals.extra.historyType === types_1.HISTORY_TYPE.BROWSER) {
-            preHeatUrls.push(path_1.default.posix.join(basename || ''));
-            await Promise.all([
-                ...(cals.items || []).map((page) => {
-                    preHeatUrls.push(path_1.default.posix.join(basename || '', page.id));
-                    preHeatUrls.push(path_1.default.posix.join(basename || '', page.id, '/'));
-                    return 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'));
-                }),
-                ...(subAppCalsList || []).reduce((list, cals) => {
-                    const { rootPath } = cals.extra || {};
-                    const packageName = (0, util_1.normalizePackageName)(rootPath);
-                    if (packageName) {
-                        preHeatUrls.push(path_1.default.posix.join(basename || '', packageName));
-                        preHeatUrls.push(path_1.default.posix.join(basename || '', packageName, '/'));
-                        list.push(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, packageName, 'index.html')));
-                        (cals.items || []).forEach((page) => {
-                            preHeatUrls.push(path_1.default.posix.join(basename || '', packageName, page.id));
-                            preHeatUrls.push(path_1.default.posix.join(basename || '', packageName, page.id, '/'));
-                            list.push(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, packageName, page.id, 'index.html')));
-                        });
+            await new Promise((resolve, reject) => {
+                // 开始编译前清理一下 lowcode 内容
+                (0, compile_1.startCompile)({
+                    appBuildDir: h5BuildDir,
+                    configPath: webpackConfigPath,
+                    appKey,
+                    webpackMode: mode,
+                }, function (err, data) {
+                    if (err) {
+                        reject(err);
                     }
-                    return list;
-                }, []),
-            ]);
+                    else {
+                        resolve(data);
+                    }
+                });
+            });
+            const MAINIFAST_FILENAME = 'weda-manifest.json';
+            const preHeatUrls = fs_extra_1.default
+                .readdirSync(path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR))
+                .filter((file) => junk.not(file) && file !== MAINIFAST_FILENAME)
+                .map((file) => {
+                if (/LICENSE\.txt$/.test(file) || /\.map$/.test(file)) {
+                    return '';
+                }
+                try {
+                    const url = new url_1.URL(publicPath);
+                    return `${url.origin}${path_1.default.posix.join(url.pathname, file)}`;
+                }
+                catch (e) {
+                    return path_1.default.posix.join(publicPath || '', file);
+                }
+            })
+                .filter((item) => !!item);
+            // 普通 web 模式，且非hash模式，根据页面生成多份入口
+            if (!((_h = cals.extra) === null || _h === void 0 ? void 0 : _h.historyType) || cals.extra.historyType === types_1.HISTORY_TYPE.BROWSER) {
+                preHeatUrls.push(path_1.default.posix.join(basename || ''));
+                await Promise.all([
+                    ...(cals.items || []).map((page) => {
+                        preHeatUrls.push(path_1.default.posix.join(basename || '', page.id));
+                        preHeatUrls.push(path_1.default.posix.join(basename || '', page.id, '/'));
+                        return 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'));
+                    }),
+                    ...(subAppCalsList || []).reduce((list, cals) => {
+                        const { rootPath } = cals.extra || {};
+                        const packageName = (0, util_1.normalizePackageName)(rootPath);
+                        if (packageName) {
+                            preHeatUrls.push(path_1.default.posix.join(basename || '', packageName));
+                            preHeatUrls.push(path_1.default.posix.join(basename || '', packageName, '/'));
+                            list.push(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, packageName, 'index.html')));
+                            (cals.items || []).forEach((page) => {
+                                preHeatUrls.push(path_1.default.posix.join(basename || '', packageName, page.id));
+                                preHeatUrls.push(path_1.default.posix.join(basename || '', packageName, page.id, '/'));
+                                list.push(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, packageName, page.id, 'index.html')));
+                            });
+                        }
+                        return list;
+                    }, []),
+                ]);
+            }
+            await fs_extra_1.default.writeFile(path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, MAINIFAST_FILENAME), JSON.stringify({ preHeatUrls }, undefined, 2));
         }
-        await fs_extra_1.default.writeFile(path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR, 'weda-manifest.json'), JSON.stringify({ preHeatUrls }, undefined, 2));
         return h5BuildDir;
     }
     catch (e) {

package/lib/builder/h5/npm.js

@@ -60,10 +60,6 @@ async function generatePackageJSON(dependencies = {}, appBuildDir, appKey, mode,
         vueVersion: vueVersion === 3 ? '^3' : '^2',
     }));
     const packageInfo = await fs_extra_1.default.readJSON(dstTempPath);
-    // weapps-sdk 要与 builder template 版本一致
-    // govcloud 包废弃
-    // dependencies['@govcloud/weapps-sdk'] =
-    //   packageInfo.dependencies['@govcloud/weapps-sdk'];
     Object.keys(dependencies).forEach((key) => {
         const version = dependencies[key];
         if (packageInfo.dependencies[key] !== version) {

package/lib/builder/h5/webpack.js

@@ -39,14 +39,6 @@ async function runWebpackCore({ buildContext, cals, mainAppData, subAppDataList,
         cdnEndpoints,
         publicPath,
     });
-    if ((0, common_1.buildAsWebByBuildType)(buildTypeList)) {
-        if (mode !== common_1.WebpackModeType.PRODUCTION) {
-            await (0, webpack_1.generateWebpackWebDevServerFile)({
-                appBuildDir,
-                buildTypeList,
-            });
-        }
-    }
     console.timeEnd('runWebpackCore');
     return webWebpackConfigPath;
 }

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

@@ -82,6 +82,10 @@ export interface IAppCommonBuildContext extends ICommonBuildContext {
      * 自定义状态页Id
      */
     statusPageId?: string;
+    /**
+     * use official lib npm
+     */
+    enableOfficialLibNPM?: boolean;
 }
 export interface IMpCommonBuildContext extends ICommonBuildContext {
     /**
@@ -105,4 +109,9 @@ export interface IBuildContext extends IAppCommonBuildContext, IMpCommonBuildCon
      * app.json文件window配置
      */
     defaultAppWindowConfig?: IDefaultAppWindowConfig;
+    /**
+     * 内部定义，请勿使用
+     * 如必须使用 @rohyang
+     */
+    __defaultLoginType__?: 'openId' | 'anonymous';
 }

package/lib/builder/mp/index.js

@@ -243,6 +243,7 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                 privatelink: buildContext.privatelinkConfig
                     ? JSON.stringify(buildContext.privatelinkConfig, undefined, 2)
                     : undefined,
+                defaultLoginType: buildContext.__defaultLoginType__,
             },
             'datasources/datasource-profiles.js.tpl': {
                 datasourceProfiles: (0, util_3.JsonToStringWithVariableName)([], { EOL: false }),
@@ -672,10 +673,8 @@ async function generateFramework(ctx, { cals, weapp: appData }, outDir, options)
                     subPackageName: appData.rootPath || '',
                     importor,
                     appConfig: (0, util_3.JsonToStringWithVariableName)({
-                        id: ctx.appId,
                         label: (appData === null || appData === void 0 ? void 0 : appData.label) || '',
                         version: (_a = options === null || options === void 0 ? void 0 : options.deployOptions) === null || _a === void 0 ? void 0 : _a.version,
-                        envId: appData.envId,
                         loginConfigVersion: (_b = cals.extra) === null || _b === void 0 ? void 0 : _b.loginConfigVersion,
                         basename: ctx.wedaRoot,
                         pages: appData.pageInstanceList

package/lib/builder/mp/util.js

@@ -213,12 +213,13 @@ function generateDataContainerListeners() {
 exports.generateDataContainerListeners = generateDataContainerListeners;
 function createTemplateQuery(ctx, query = {}) {
     return Object.entries(query).reduce((map, [key, item]) => {
+        var _a, _b;
         const { listeners = [], handler, data, args, ...rest } = item;
         const { staticProps, boundProps } = generatedDynamicData(generateArgsDynamicValueFromData(args, data) || {}, undefined, false);
         map[key] = {
             ...rest,
             handler: item.type === cals_1.EQueryType.GeneralFunc
-                ? `(__data__,__params__) => (${handler['code']})({params:__params__,data:__data__})`
+                ? `(__data__,__params__) => (${(_b = (_a = handler['code']) === null || _a === void 0 ? void 0 : _a.replace) === null || _b === void 0 ? void 0 : _b.call(_a, /;\s*$/, '')})({params:__params__,data:__data__})`
                 : `(...args) => $app.${handler === null || handler === void 0 ? void 0 : handler.name}(...args)`,
             data: staticProps,
             dataBinds: boundProps,
@@ -250,7 +251,7 @@ function getListenersHandlers(ctx, listeners = [], id, componentApi) {
     const { enableAsyncMaterials = false } = ctx;
     const eventHandlers = {};
     listeners.forEach((l) => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         const handlerName = (0, wxml_1.getMpEventHandlerName)(id, l.trigger, l);
         const sourceKey = `${((_a = l.handler) === null || _a === void 0 ? void 0 : _a.moduleName) || ''}:${((_b = l.handler) === null || _b === void 0 ? void 0 : _b.name) || ''}`;
         eventHandlers[handlerName] = eventHandlers[handlerName] || [];
@@ -304,7 +305,7 @@ function getListenersHandlers(ctx, listeners = [], id, componentApi) {
                 break;
             }
             case weapps_core_1.ActionType.GeneralFunc: {
-                handler = `function({event, $w, params}) { return (\n${((_e = l.handler) === null || _e === void 0 ? void 0 : _e.code) || '()=>{}'}\n)({event}) }`;
+                handler = `function({event, $w, params}) { return (\n${((_g = (_f = (_e = l.handler) === null || _e === void 0 ? void 0 : _e.code) === null || _f === void 0 ? void 0 : _f.replace) === null || _g === void 0 ? void 0 : _g.call(_f, /;\s*$/, '')) || '()=>{}'}\n)({event}) }`;
                 break;
             }
         }

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

@@ -50,7 +50,6 @@ export declare function downloadAndWriteTabBarIcon(iconPath: any, pagePath: any,
 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 getWebpackWebBuildParams(appId: string, appBuildDir: string, publicPath?: string, mode?: WebpackModeType, buildTypeList?: BuildType[], extraDefine?: {}, assets?: string[], vueVersion?: number): any;
 export declare function downloadAndInstallDependencies(dependencies: IMaterialItem[] | undefined, materialsDir: string, installOptions?: IInstallOpts): Promise<void>;
 export declare function downloadDependencies(targetDir: string, srcZipUrl: string): Promise<void>;
 /**
@@ -77,9 +76,5 @@ interface IFixNodeModulesMap {
     '@cloudbase/js-sdk'?: boolean;
 }
 export declare function getMaterialNodeModulesPathList(dependencies: IMaterialItem[] | undefined, materialsDir: string, base?: string): string[];
-export declare function generateWebpackWebDevServerFile({ appBuildDir, buildTypeList }: {
-    appBuildDir: any;
-    buildTypeList: any;
-}): Promise<void>;
 export declare function downloadAssets(targetDir: string, assetUrl: string): Promise<unknown>;
 export {};

package/lib/builder/service/webpack.js

@@ -3,10 +3,9 @@ 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.getWebpackWebBuildParams = exports.getPageName = exports.getHomePageInstance = exports.getMainAppDataByList = exports.downloadAndWriteTabBarIcon = exports.generateKboneTabBarConfig = exports.generateWebpackWebBuildParamsFile = exports.fixAppJson = exports.OUTPUT_DIR = exports.PERSISTENT_DEPENDIENCES_MAP = void 0;
+exports.downloadAssets = exports.getMaterialNodeModulesPathList = exports.installDependencies = exports.downloadDependencies = exports.downloadAndInstallDependencies = 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");
 const util_1 = require("../util");
 const axios_1 = __importDefault(require("axios"));
 const compressing_1 = __importDefault(require("compressing"));
@@ -41,13 +40,22 @@ async function fixAppJson(appBuildDir) {
 exports.fixAppJson = fixAppJson;
 async function generateWebpackWebBuildParamsFile({ appId, allAppDataList, appBuildDir, publicPath, mode, buildTypeList, assets = [], vueVersion = 0, }) {
     let mainAppData = getMainAppDataByList(allAppDataList);
-    let extraDefine = {
-        'process.env.historyType': `"${mainAppData.historyType || types_1.HISTORY_TYPE.BROWSER}"`,
-    };
-    const params = getWebpackWebBuildParams(appId, appBuildDir, publicPath, mode, buildTypeList, extraDefine, assets, vueVersion);
     const webpackConfigPath = path_1.default.resolve(appBuildDir, './webpack/webpack.web.prod.js');
-    const paramsString = JSON.stringify(params, null, 2);
-    const webpackConfigContent = `const params = ${paramsString};\nmodule.exports = require('./web.prod.js')(params);`;
+    const paramsString = JSON.stringify({
+        output: {
+            path: exports.OUTPUT_DIR,
+            publicPath: buildTypeList.includes(common_1.BuildType.APP) || buildTypeList.includes(common_1.BuildType.ADMIN_PORTAL) ? '' : publicPath,
+        },
+        definePlugin: {
+            'process.env.historyType': `"${mainAppData.historyType || types_1.HISTORY_TYPE.BROWSER}"`,
+        },
+        devtool: ['app-nvzcvt10', 'app-msa2ihs9', 'app-PMoFiTuX'].includes(appId)
+            ? 'source-map'
+            : mode !== common_1.WebpackModeType.PRODUCTION
+                ? 'eval'
+                : false,
+    }, null, 2);
+    const webpackConfigContent = `params = ${paramsString};\nmodule.exports = require('./web.prod.js')(params);`;
     await (0, generateFiles_1.writeFile)(webpackConfigPath, webpackConfigContent);
     return webpackConfigPath;
 }
@@ -119,46 +127,6 @@ function getPageName(name) {
     return `${name}`;
 }
 exports.getPageName = getPageName;
-function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = common_1.WebpackModeType.NONE, buildTypeList = [common_1.BuildType.WEB], extraDefine = {}, assets = [], vueVersion = 0) {
-    return {
-        context: appBuildDir,
-        mode: mode !== common_1.WebpackModeType.PRODUCTION ? 'development' : mode,
-        watch: false,
-        entry: path_1.default.resolve(appBuildDir, 'src/index.jsx'),
-        output: {
-            path: path_1.default.resolve(appBuildDir, exports.OUTPUT_DIR),
-            filename: '[name].[hash].bundle.js',
-            chunkFilename: '[name].[contenthash].chunk.js',
-            publicPath: buildTypeList.includes(common_1.BuildType.APP) || buildTypeList.includes(common_1.BuildType.ADMIN_PORTAL) ? '' : publicPath,
-            pathinfo: false,
-            // clean: mode === WebpackModeType.PRODUCTION,
-        },
-        htmlTemplatePath: path_1.default.resolve(appBuildDir, './index.html'),
-        externals: {
-            react: 'window.React',
-            'react-dom': 'window.ReactDOM',
-            mobx: 'window.mobx',
-            '@cloudbase/js-sdk': 'window.cloudbase',
-            '@cloudbase/weda-cloud-sdk/dist/h5': 'window.CloudSDK',
-            '@cloudbase/weda-cloud-sdk': 'window.CloudSDK',
-            '@cloudbase/weda-client': 'window.WedaClientSDK',
-            '@zxing/library': 'window.ZXing',
-            '@cloudbase/lowcode-render': 'window["weda-render"]',
-        },
-        resolveModules: [path_1.default.resolve(appBuildDir), 'node_modules'],
-        definePlugin: {
-            'process.env.buildType': `"${buildTypeList[0]}"`,
-            ...extraDefine,
-        },
-        devtool: ['app-nvzcvt10', 'app-msa2ihs9', 'app-PMoFiTuX'].includes(appId)
-            ? 'source-map'
-            : mode !== common_1.WebpackModeType.PRODUCTION
-                ? 'eval'
-                : false,
-        vueVersion,
-    };
-}
-exports.getWebpackWebBuildParams = getWebpackWebBuildParams;
 async function downloadAndInstallDependencies(dependencies = [], materialsDir, installOptions = {}) {
     const localPkg = (0, util_1.getCurrentPackageJson)();
     await Promise.all(dependencies.map(async (item) => {
@@ -369,22 +337,6 @@ function getMaterialNodeModulesPathList(dependencies = [], materialsDir, base) {
     });
 }
 exports.getMaterialNodeModulesPathList = getMaterialNodeModulesPathList;
-// 生成devServer 核心依赖
-async function generateWebpackWebDevServerFile({ appBuildDir, buildTypeList }) {
-    const dest = path_1.default.resolve(appBuildDir, `./webpack/devServer.js`);
-    const template = await fs_extra_1.default.readFile(path_1.default.resolve(config_1.appTemplateDir, './webpack/devServer.js'), {
-        encoding: 'utf8',
-    });
-    const jsContent = (0, lodash_1.template)(template, {
-        interpolate: /<%=([\s\S]+?)%>/g,
-    })({
-        isApp: buildTypeList.includes(common_1.BuildType.APP),
-        isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
-    });
-    await fs_extra_1.default.ensureFile(dest);
-    await fs_extra_1.default.writeFile(dest, jsContent);
-}
-exports.generateWebpackWebDevServerFile = generateWebpackWebDevServerFile;
 // 下载js 文件
 async function downloadAssets(targetDir, assetUrl) {
     const isExist = fs_extra_1.default.existsSync(path_1.default.join(targetDir, 'package.json'));

package/lib/builder/util/common.js

@@ -10,7 +10,6 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const style_1 = require("@cloudbase/lowcode-generator/lib/generator/util/style");
 const generateFiles_1 = require("./generateFiles");
 const cals_1 = require("@cloudbase/cals");
-const compare_versions_1 = __importDefault(require("compare-versions"));
 const config_1 = require("../config");
 const os_1 = __importDefault(require("os"));
 var common_1 = require("@cloudbase/lowcode-generator/lib/generator/util/common");
@@ -184,7 +183,6 @@ exports.isOfficialComponentLib = isOfficialComponentLib;
  */
 function canUseVite(mode, devTool) {
     return false;
-    return devTool === 'vite' && mode !== 'production' && (0, compare_versions_1.default)(process.version, '12.0.0') >= 0;
 }
 exports.canUseVite = canUseVite;
 function deepDealComponentSchemaJson(schema, dealFn) {