@cloudbase/lowcode-builder 1.8.45 → 1.8.48

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.OUTPUT_DIR = exports.PERSISTENT_DEPENDIENCES_MAP = void 0;
+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;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const lodash_1 = require("lodash");
@@ -52,28 +52,6 @@ async function generateWebpackWebBuildParamsFile({ appId, allAppDataList, appBui
     return webpackConfigPath;
 }
 exports.generateWebpackWebBuildParamsFile = generateWebpackWebBuildParamsFile;
-async function generateAppConfig(mainAppData, subAppDataList, appBuildDir) {
-    let originMpConfig = {};
-    // 如果有 mp_config 则读取内容合并。
-    const configMod = mainAppData.codeModules.find((p) => p.name === config_1.MP_CONFIG_MODULE_NAME);
-    if (configMod) {
-        const code = configMod.code.replace(/export\s+default/, '');
-        try {
-            originMpConfig = eval(`(${code})`);
-        }
-        catch (e) {
-            console.error('Kbone config file error', e);
-        }
-    }
-    // app 配置
-    generateKboneAppConfig(originMpConfig, mainAppData);
-    // 页面配置
-    originMpConfig = generateKbonePageConfig(originMpConfig, mainAppData, subAppDataList);
-    // tabbar 配置
-    await generateKboneTabBarConfig(originMpConfig, appBuildDir);
-    return originMpConfig;
-}
-exports.generateAppConfig = generateAppConfig;
 async function generateKboneTabBarConfig(mpConfig, appBuildDir) {
     mpConfig.appExtraConfig = mpConfig.appExtraConfig || {};
     if (mpConfig.appExtraConfig.tabBar) {
@@ -120,109 +98,6 @@ async function downloadAndWriteTabBarIcon(iconPath, pagePath, appBuildDir, fileN
     });
 }
 exports.downloadAndWriteTabBarIcon = downloadAndWriteTabBarIcon;
-// 将 weapps 配置的 page-data 转换到 mp_config
-function generateKbonePageConfig(mpConfig, mainAppData, subAppDataList = []) {
-    mpConfig.pages = mpConfig.pages || {};
-    const allAppDataList = subAppDataList.concat(mainAppData);
-    allAppDataList.map((appData) => {
-        appData.pageInstanceList.forEach((item) => {
-            const pageId = [appData.rootPath, item.id].filter((i) => i).join('_');
-            if (!mpConfig.pages[pageId]) {
-                mpConfig.pages[pageId] = {};
-            }
-            const navigationBarTitleText = item.data.navigationBarTitleText || item.data.title;
-            // 去除部分 mp 不认的属性
-            delete item.data.title;
-            delete item.data.params;
-            delete item.data.scene;
-            // page 配置
-            config_1.KBONE_PAGE_KEYS.forEach((key) => {
-                if (item.data[key]) {
-                    mpConfig.pages[pageId][key] = item.data[key];
-                }
-            });
-            // extra 配置
-            mpConfig.pages[pageId].extra = {
-                ...item.data,
-                navigationBarTitleText,
-            };
-        });
-    });
-    return mpConfig;
-}
-exports.generateKbonePageConfig = generateKbonePageConfig;
-function generateKboneAppConfig(mpConfig, mainAppData) {
-    if (mainAppData === null || mainAppData === void 0 ? void 0 : mainAppData.appConfig) {
-        if (mainAppData.appConfig.window) {
-            mpConfig.app = mpConfig.app || {};
-            mpConfig.app = {
-                ...mainAppData.appConfig.window,
-                ...mpConfig.app,
-            };
-        }
-    }
-}
-exports.generateKboneAppConfig = generateKboneAppConfig;
-// 生成 kbone mp 配置文件
-async function generateMpJsonConfigFile(allAppDataList, userConfig, appBuildDir, options) {
-    const mainAppData = getMainAppDataByList(allAppDataList);
-    const subAppDataList = allAppDataList.filter((i) => i.rootPath);
-    const homeId = getHomePageInstance(mainAppData.pageInstanceList).id;
-    userConfig = userConfig || {};
-    const kbConfig = {
-        origin: 'https://weapps.tencent.com',
-        entry: `/${homeId}`,
-        redirect: {
-            notFound: `${homeId}`,
-            accessDenied: `${homeId}`,
-        },
-        generate: {
-            autoBuildNpm: true,
-            appEntry: 'miniprogram-app',
-            appWxss: 'display',
-            subpackages: {},
-            globalVars: [['__injectProxy', '(window.Proxy = Proxy)']],
-        },
-        app: {
-            navigationBarTitleText: `WeApps-${options.appKey}`,
-        },
-        projectConfig: {
-            appid: 'touristappid',
-            projectname: `WeApps-${options.appKey}`,
-        },
-        packageConfig: {
-            author: 'weapps',
-        },
-        ...userConfig,
-        global: {
-            ...userConfig.global,
-            rem: true, // rem 必须为 true
-        },
-        router: getMpAllRouterConfig(allAppDataList),
-        __homePath__: getMpAllRouterConfig(allAppDataList, true),
-    };
-    if (subAppDataList === null || subAppDataList === void 0 ? void 0 : subAppDataList.length) {
-        const subpackages = {};
-        subAppDataList.map((appData) => {
-            const { rootPath } = appData;
-            subpackages[rootPath] = Object.keys(getMpAllRouterConfig([appData]));
-        });
-        kbConfig.generate = {
-            ...kbConfig.generate,
-            subpackages,
-        };
-    }
-    // kbone 生成子包模式
-    if (options.generateMpType === 'subpackage') {
-        kbConfig.generate = {
-            ...kbConfig.generate,
-            app: 'noemit',
-        };
-    }
-    const templateStr = JSON.stringify(kbConfig, null, 2);
-    await fs_extra_1.default.writeFile(path_1.default.resolve(appBuildDir, 'webpack/miniprogram.config.js'), `export default = ${templateStr}`);
-}
-exports.generateMpJsonConfigFile = generateMpJsonConfigFile;
 function getMainAppDataByList(allAppDataList) {
     return allAppDataList.find((item) => !item.rootPath);
 }
@@ -244,29 +119,6 @@ function getPageName(name) {
     return `${name}`;
 }
 exports.getPageName = getPageName;
-function getMpAllRouterConfig(allAppDataList, getHome = false) {
-    const router = {};
-    let homePath = '';
-    allAppDataList.map((appData) => {
-        const { pageInstanceList, rootPath = '' } = appData;
-        (0, weapps_core_1.loopDealWithFn)(pageInstanceList, (pageInstance) => {
-            const name = [rootPath, pageInstance.id].filter((i) => i).join('_');
-            const path = `/${name}`;
-            if (!homePath) {
-                homePath = name;
-            }
-            if (pageInstance.isHome && !rootPath) {
-                homePath = name;
-            }
-            router[name] = [path];
-        });
-    });
-    if (getHome) {
-        return homePath;
-    }
-    return router;
-}
-exports.getMpAllRouterConfig = getMpAllRouterConfig;
 function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = common_1.WebpackModeType.NONE, buildTypeList = [common_1.BuildType.WEB], extraDefine = {}, assets = []) {
     return {
         context: appBuildDir,
@@ -306,48 +158,6 @@ function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = c
     };
 }
 exports.getWebpackWebBuildParams = getWebpackWebBuildParams;
-function getWebpackMpBuildParams(appBuildDir, materialsDir, dependencies = [], nodeModulesPath, allAppDataList, mode, watch, options) {
-    return {
-        context: appBuildDir,
-        mode,
-        watch,
-        entry: getAllPageMpEntryPath(allAppDataList, appBuildDir),
-        outputPath: path_1.default.resolve(appBuildDir, 'dist/mp/common'),
-        resolveModules: [
-            appBuildDir,
-            path_1.default.resolve(appBuildDir, 'node_modules'),
-            path_1.default.resolve(appBuildDir, 'src'),
-            ...getMaterialNodeModulesPathList(dependencies, materialsDir, appBuildDir),
-            'node_modules',
-        ],
-        watchOptions: {
-            ignored: /node_modules/,
-            aggregateTimeout: 600,
-            poll: 1000,
-        },
-        cache: {
-            type: 'memory',
-        },
-    };
-}
-exports.getWebpackMpBuildParams = getWebpackMpBuildParams;
-function getAllPageMpEntryPath(allAppDataList, appBuildDir) {
-    const entry = {};
-    // 优先填首页
-    const mainAppData = getMainAppDataByList(allAppDataList);
-    const homePageInstance = getHomePageInstance(mainAppData.pageInstanceList);
-    entry[homePageInstance.id] = path_1.default.resolve(appBuildDir, `src/pages/${getPageName(homePageInstance.id)}/main.mp.jsx`);
-    allAppDataList.map((app) => {
-        const { pageInstanceList, rootPath } = app;
-        const packagePathStr = rootPath ? `packages/${rootPath}` : '';
-        (0, weapps_core_1.loopDealWithFn)(pageInstanceList, (pageInstance) => {
-            const pageName = rootPath ? `${rootPath}_${pageInstance.id}` : pageInstance.id;
-            entry[pageName] = path_1.default.resolve(appBuildDir, path_1.default.join('src', packagePathStr, `pages/${getPageName(pageInstance.id)}/main.mp.jsx`));
-        });
-    });
-    return entry;
-}
-exports.getAllPageMpEntryPath = getAllPageMpEntryPath;
 async function downloadAndInstallDependencies(dependencies = [], materialsDir, installOptions = {}) {
     const localPkg = (0, util_1.getCurrentPackageJson)();
     await Promise.all(dependencies.map(async (item) => {

package/lib/builder/util/common.d.ts

@@ -56,3 +56,4 @@ export declare function generateLowcodeImportor(lowcodes?: IWeAppCode[]): {
     common: boolean;
     styles: IWeAppCode[];
 };
+export declare function normalizePackageName(packageName?: string | null): string | null | undefined;

package/lib/builder/util/common.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.generateLowcodeImportor = exports.getCompileDirs = exports.deepDealComponentSchemaJson = exports.canUseVite = exports.isOfficialComponentLib = exports.readComponentLibMata = exports.writeLibCommonRes2file = exports.getYyptConfigInfo = exports.getComponentsInfo = exports.getInputProps = exports.removeRequireUncached = exports.requireUncached = exports.JsonToStringWithVariableName = exports.getSelfPackageJson = exports.getCurrentPackageJson = exports.promiseWrapper = exports.getFileNameByUrl = exports.deepDealSchema = exports.simpleDeepClone = exports.deepDeal = exports.isPlainObject = exports.isArray = exports.getMetaInfoBySourceKey = void 0;
+exports.normalizePackageName = exports.generateLowcodeImportor = exports.getCompileDirs = exports.deepDealComponentSchemaJson = exports.canUseVite = exports.isOfficialComponentLib = exports.readComponentLibMata = exports.writeLibCommonRes2file = exports.getYyptConfigInfo = exports.getComponentsInfo = exports.getInputProps = exports.removeRequireUncached = exports.requireUncached = exports.JsonToStringWithVariableName = exports.getSelfPackageJson = exports.getCurrentPackageJson = exports.promiseWrapper = exports.getFileNameByUrl = exports.deepDealSchema = exports.simpleDeepClone = exports.deepDeal = exports.isPlainObject = exports.isArray = exports.getMetaInfoBySourceKey = void 0;
 // import * as R from 'ramda'
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
@@ -290,3 +290,14 @@ function generateLowcodeImportor(lowcodes = []) {
     return importor;
 }
 exports.generateLowcodeImportor = generateLowcodeImportor;
+function normalizePackageName(packageName) {
+    if (!packageName) {
+        return packageName;
+    }
+    const matched = packageName.match(/packages\/(.*)?/);
+    if (matched) {
+        return matched[1];
+    }
+    return packageName;
+}
+exports.normalizePackageName = normalizePackageName;