@cloudbase/lowcode-builder 1.9.0 → 1.9.2

package/lib/builder/config/dependencies.js

@@ -12,14 +12,14 @@ const BASE_DEPS = {
  * 注意锁版本
  */
 const CLOUDBASE_DEPS = {
-    '@cloudbase/oauth': '0.1.1-alpha.14',
-    '@cloudbase/weda-client': '1.1.5',
-    '@cloudbase/weda-cloud-sdk': '1.0.68',
+    '@cloudbase/oauth': '0.1.1-alpha.15',
+    '@cloudbase/weda-client': '1.1.6',
+    '@cloudbase/weda-cloud-sdk': '1.0.70',
 };
 function generatePackageDependencies({ importJSSDK, mode, officialLibVersion, uin, }) {
     const deps = {};
     if (importJSSDK) {
-        deps['@cloudbase/js-sdk'] = '2.5.46-beta.0';
+        deps['@cloudbase/js-sdk'] = '2.5.47-beta.0';
     }
     const mod = uin ? Number(uin) % 10 : undefined;
     if (mode === 'lib') {

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)) {
@@ -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);
@@ -309,6 +312,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 +349,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 +369,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 +385,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

@@ -45,14 +45,17 @@ const config_1 = require("../config");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const junk = __importStar(require("../util/junk"));
 const url_1 = require("url");
+const 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;
     }
@@ -79,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,
@@ -106,6 +115,48 @@ 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;
+        const vueVersions = libNames.map((libName) => {
+            var _a, _b;
+            try {
+                const v = (_b = (_a = require(path_1.default.resolve(h5LibDirPath, libName, 'package.json'))) === null || _a === void 0 ? void 0 : _a.dependencies) === null || _b === void 0 ? void 0 : _b.vue;
+                if (v == null) {
+                    return 0;
+                }
+                const minValidVersion = semver.valid(semver.minVersion(v));
+                if (minValidVersion == null) {
+                    return 0;
+                }
+                libNameWithVue = libName;
+                return semver.gt(minValidVersion, '2.7.16') ? 3 : 2;
+            }
+            catch (e) {
+                console.log(e, `no package.json for ${libName}`);
+                return 0;
+            }
+        });
+        let vueVersion;
+        const vueVersionSet = new Set(vueVersions.filter((v) => v !== 0));
+        if (vueVersionSet.size === 0) {
+            vueVersion = 0;
+        }
+        else if (vueVersionSet.size === 1) {
+            vueVersion = vueVersionSet.has(3) ? 3 : 2;
+        }
+        else {
+            const lib2vueVersionMap = libNames.reduce((map, libName, index) => {
+                map[libName] = vueVersions[index];
+                return map;
+            }, {});
+            throw new Error(`Libraries' vue versions conflict!
+        Vue2 and Vue3 should not be present at the same time!
+        detail: ${JSON.stringify(lib2vueVersionMap, null, 2)}`);
+        }
         console.timeEnd(runHandleMaterialTag);
         // // 获取 generate 需要的构建文件
         const runGenerateTag = '🚥  buildWebApp-generateProjectFiles';
@@ -132,95 +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,
-        });
-        // 生成主题文件
-        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,
-        });
-        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 '';
+            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'));
             }
-            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 (!((_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);
+                    }
+                    else {
+                        resolve(data);
                     }
-                    return list;
-                }, []),
-            ]);
+                });
+            });
+            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.d.ts

@@ -1,5 +1,5 @@
 import { IMaterialItem, IWebRuntimeAppData } from '@cloudbase/lowcode-generator/lib/weapps-core';
-export declare function handleNPM({ mainAppData, subAppDataList, dependencies, appKey, appBuildDir, mode, devTool, ignoreInstall, }: {
+export declare function handleNPM({ mainAppData, subAppDataList, dependencies, appKey, appBuildDir, mode, devTool, ignoreInstall, vueVersion, }: {
     appKey: string;
     appBuildDir: string;
     mode: string;
@@ -8,5 +8,6 @@ export declare function handleNPM({ mainAppData, subAppDataList, dependencies, a
     dependencies: IMaterialItem[];
     devTool: string;
     ignoreInstall?: boolean;
+    vueVersion?: number;
 }): Promise<void>;
-export declare function generatePackageJSON(dependencies: object | undefined, appBuildDir: string, appKey: string, mode: string, devTool: string): Promise<boolean>;
+export declare function generatePackageJSON(dependencies: object | undefined, appBuildDir: string, appKey: string, mode: string, devTool: string, vueVersion?: number): Promise<boolean>;

package/lib/builder/h5/npm.js

@@ -12,7 +12,7 @@ const config_1 = require("../config");
 const generateFiles_1 = require("../util/generateFiles");
 const lodash_1 = require("lodash");
 const util_1 = require("../util");
-async function handleNPM({ mainAppData, subAppDataList = [], dependencies = [], appKey, appBuildDir, mode, devTool, ignoreInstall = false, }) {
+async function handleNPM({ mainAppData, subAppDataList = [], dependencies = [], appKey, appBuildDir, mode, devTool, ignoreInstall = false, vueVersion = 0, }) {
     const allAppDataList = subAppDataList.concat(mainAppData);
     // 安装 NPM 依赖
     const deps = {};
@@ -37,7 +37,7 @@ async function handleNPM({ mainAppData, subAppDataList = [], dependencies = [],
     //     Object.assign(deps, comp.npmDependencies);
     //   });
     // });
-    const isChange = await generatePackageJSON(deps, appBuildDir, appKey, mode, devTool);
+    const isChange = await generatePackageJSON(deps, appBuildDir, appKey, mode, devTool, vueVersion);
     if (!isChange) {
         (0, console_1.notice)('package.json dependencies 已经安装，如出现未安装成功或找不到依赖，请重启wa watch');
     }
@@ -47,7 +47,7 @@ async function handleNPM({ mainAppData, subAppDataList = [], dependencies = [],
     });
 }
 exports.handleNPM = handleNPM;
-async function generatePackageJSON(dependencies = {}, appBuildDir, appKey, mode, devTool) {
+async function generatePackageJSON(dependencies = {}, appBuildDir, appKey, mode, devTool, vueVersion = 0) {
     const templatePath = path_1.default.join(config_1.appTemplateDir, 'package.json');
     const dstFilePath = path_1.default.join(appBuildDir, 'package.json');
     const dstTempPath = path_1.default.join(appBuildDir, '.temp', 'package.json');
@@ -57,12 +57,9 @@ async function generatePackageJSON(dependencies = {}, appBuildDir, appKey, mode,
         canUseVite: (0, util_1.canUseVite)(mode, devTool),
         appKey,
         appId: appKey,
+        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.d.ts

@@ -11,6 +11,7 @@ interface IWebpackCoreProps extends BuildAppProps {
     subAppDataList: IWebRuntimeAppData[];
     assets: string[];
     cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
+    vueVersion?: number;
 }
-export declare function runWebpackCore({ buildContext, cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode, appKey, buildTypeList, assets, devTool, generateMpType, cdnEndpoints, }: IWebpackCoreProps): Promise<string>;
+export declare function runWebpackCore({ buildContext, cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode, appKey, buildTypeList, assets, devTool, generateMpType, cdnEndpoints, vueVersion, }: IWebpackCoreProps): Promise<string>;
 export {};

package/lib/builder/h5/webpack.js

@@ -5,7 +5,7 @@ const common_1 = require("../types/common");
 const webpack_1 = require("../service/webpack");
 const generate_1 = require("./generate");
 const cals_1 = require("@cloudbase/cals");
-async function runWebpackCore({ buildContext, cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode = common_1.WebpackModeType.NONE, appKey, buildTypeList = [common_1.BuildType.WEB], assets = [], devTool = 'vite', generateMpType = common_1.GenerateMpType.APP, cdnEndpoints, }) {
+async function runWebpackCore({ buildContext, cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode = common_1.WebpackModeType.NONE, appKey, buildTypeList = [common_1.BuildType.WEB], assets = [], devTool = 'vite', generateMpType = common_1.GenerateMpType.APP, cdnEndpoints, vueVersion = 0, }) {
     var _a;
     console.time('runWebpackCore');
     console.time('webpackGenerate');
@@ -18,6 +18,7 @@ async function runWebpackCore({ buildContext, cals, mainAppData, subAppDataList,
         mode,
         buildTypeList,
         assets,
+        vueVersion,
     });
     console.timeEnd('webpackGenerate');
     await (0, generate_1.generateHTML)({
@@ -38,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 {
     /**

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

@@ -31,7 +31,7 @@ export interface IMpConfig {
     };
 }
 export declare function fixAppJson(appBuildDir: string): Promise<void>;
-export declare function generateWebpackWebBuildParamsFile({ appId, allAppDataList, appBuildDir, publicPath, mode, buildTypeList, assets, }: {
+export declare function generateWebpackWebBuildParamsFile({ appId, allAppDataList, appBuildDir, publicPath, mode, buildTypeList, assets, vueVersion, }: {
     appId: string;
     allAppDataList: IWebRuntimeAppData[];
     appBuildDir: string;
@@ -39,6 +39,7 @@ export declare function generateWebpackWebBuildParamsFile({ appId, allAppDataLis
     mode: WebpackModeType;
     buildTypeList: BuildType[];
     assets: string[];
+    vueVersion?: number;
 }): Promise<string>;
 export interface IGenerateMpJsonConfigFileOpts {
     appKey?: string;
@@ -49,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[]): any;
 export declare function downloadAndInstallDependencies(dependencies: IMaterialItem[] | undefined, materialsDir: string, installOptions?: IInstallOpts): Promise<void>;
 export declare function downloadDependencies(targetDir: string, srcZipUrl: string): Promise<void>;
 /**
@@ -76,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"));
@@ -39,15 +38,24 @@ async function fixAppJson(appBuildDir) {
     await fs_extra_1.default.writeFile(appJsonPath, JSON.stringify(appJson, null, 2));
 }
 exports.fixAppJson = fixAppJson;
-async function generateWebpackWebBuildParamsFile({ appId, allAppDataList, appBuildDir, publicPath, mode, buildTypeList, assets = [], }) {
+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);
     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,45 +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 = []) {
-    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,
-    };
-}
-exports.getWebpackWebBuildParams = getWebpackWebBuildParams;
 async function downloadAndInstallDependencies(dependencies = [], materialsDir, installOptions = {}) {
     const localPkg = (0, util_1.getCurrentPackageJson)();
     await Promise.all(dependencies.map(async (item) => {
@@ -368,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) {