@cloudbase/lowcode-builder 1.8.73 → 1.8.75

package/lib/builder/mp/mixMode.js

@@ -26,155 +26,88 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleMixMode = void 0;
+exports.handleSubApps = exports.handleMixMode = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importStar(require("fs-extra"));
 const mp_1 = require("../util/mp");
-const plugin_1 = require("./plugin");
-const chalk_1 = __importDefault(require("chalk"));
 const generateFiles_1 = require("../util/generateFiles");
-const webpack_1 = require("../service/webpack");
 // 将 BUILD 目录往混合模式移动
-async function handleMixMode({ buildContext, apps = [], miniprogramRoot, plugins = [], ignoreInstall, }) {
-    const { projDir: generateMpPath, endpointType } = buildContext;
-    // await handleMainApp()
-    // await handleAppPages()
-    await handleSubApps();
-    // await handleAppJson()
-    // await handlePkgJson()
-    await (0, webpack_1.installDependencies)(miniprogramRoot, {
-        ignoreInstall,
-        fixNodeModulesMap: { mobx: true, '@cloudbase/js-sdk': endpointType !== 'tcb-api' },
-    });
-    await handlePlugins();
-    // 复制框架公用内容
-    async function handleMainApp() {
-        // 可以独立删除的
-        const aloneDirs = ['common', 'app', 'lowcode', 'materials'];
-        // 与主程序混合不能主动删除的
-        const dirs = aloneDirs;
-        await Promise.all(dirs.map(async (dirname) => {
-            const srcDir = path_1.default.join(miniprogramRoot, dirname);
-            if (await fs_extra_1.default.pathExists(srcDir)) {
-                const distDir = path_1.default.join(generateMpPath, dirname);
-                if (aloneDirs.includes(dirname)) {
-                    await fs_extra_1.default.remove(distDir);
+async function handleMixMode({ buildContext, apps = [], miniprogramRoot, wedaRoot, }) {
+    await handleSubApps({ buildContext, apps, miniprogramRoot, wedaRoot });
+}
+exports.handleMixMode = handleMixMode;
+async function handleSubApps({ buildContext, apps = [], miniprogramRoot, wedaRoot, }) {
+    let modifiedAppJson = false;
+    const rootAppJosnPath = path_1.default.join(miniprogramRoot, 'app.json');
+    let rootAppJosn = await fs_extra_1.default.readJSON(rootAppJosnPath);
+    let modifiedPackageJosn = false;
+    const rootPackageJosnPath = path_1.default.join(wedaRoot, 'package.json');
+    let rootPackageJson = fs_extra_1.default.existsSync(rootPackageJosnPath)
+        ? await fs_extra_1.default.readJson(rootPackageJosnPath)
+        : {
+            name: 'WeDa-app',
+            version: '1.0.0',
+        };
+    let mergeDependencies = {};
+    await Promise.all(apps
+        .filter((app) => app.rootPath)
+        .map(async (app) => {
+        const subAppPath = path_1.default.join(wedaRoot, ...(app.rootPath ? ['packages', app.rootPath] : ['']));
+        // 复制整个子包
+        // 新模式下已经生成，感觉无需进行复制 @royhyang
+        // const distDir = path.join(generateMpPath, app.rootPath || '')
+        // await fs.copy(subAppPath, distDir, { overwrite: true })
+        const appJsonPath = path_1.default.join(subAppPath, 'app.json');
+        if (fs_extra_1.default.existsSync(appJsonPath)) {
+            let appJson = await fs_extra_1.default.readJson(appJsonPath);
+            if (appJson) {
+                let { subpackages = [] } = rootAppJosn;
+                const subRoot = path_1.default.join('./', buildContext.wedaRoot || '', `packages/${app.rootPath}`);
+                const find = subpackages.find((item) => item.root === subRoot);
+                if (find) {
+                    find.pages = appJson.pages;
                 }
-                await fs_extra_1.default.copy(srcDir, distDir);
-            }
-        }));
-    }
-    // 复制主包的页面，需要判断是否有冲突
-    async function handleAppPages() {
-        // 需要特殊处理的
-        const srcDir = path_1.default.join(miniprogramRoot, 'pages');
-        const distDir = path_1.default.join(generateMpPath, 'pages');
-        const pageList = await fs_extra_1.default.readdir(srcDir);
-        await Promise.all(pageList.map(async (page) => {
-            const srcPageDir = path_1.default.join(srcDir, page);
-            const srcDistDir = path_1.default.join(distDir, page);
-            if (await fs_extra_1.default.pathExists(srcDistDir)) {
-                console.log(chalk_1.default.yellow(`【混合模式】 WeApps 中的 pages/${page} 与小程序 pages/${page} 重复，会以 WeApps 的为主`));
-            }
-            await fs_extra_1.default.copy(srcPageDir, srcDistDir);
-        }));
-    }
-    async function handleSubApps() {
-        let modifiedAppJson = false;
-        const rootAppJosnPath = path_1.default.join(miniprogramRoot, 'app.json');
-        let rootAppJosn = await fs_extra_1.default.readJSON(rootAppJosnPath);
-        let modifiedPackageJosn = false;
-        const rootPackageJosnPath = path_1.default.join(miniprogramRoot, 'package.json');
-        let rootPackageJson = fs_extra_1.default.existsSync(rootPackageJosnPath)
-            ? await fs_extra_1.default.readJson(rootPackageJosnPath)
-            : {
-                name: 'WeDa-app',
-                version: '1.0.0',
-            };
-        let mergeDependencies = {};
-        await Promise.all(apps
-            .filter((app) => app.rootPath)
-            .map(async (app) => {
-            const subAppPath = path_1.default.join(miniprogramRoot, ...(app.rootPath ? ['packages', app.rootPath] : ['']));
-            // 复制整个子包
-            // 新模式下已经生成，感觉无需进行复制 @royhyang
-            // const distDir = path.join(generateMpPath, app.rootPath || '')
-            // await fs.copy(subAppPath, distDir, { overwrite: true })
-            const appJsonPath = path_1.default.join(subAppPath, 'app.json');
-            if (fs_extra_1.default.existsSync(appJsonPath)) {
-                let appJson = await fs_extra_1.default.readJson(appJsonPath);
-                if (appJson) {
-                    let { subpackages = [] } = rootAppJosn;
-                    const find = subpackages.find((item) => item.root === `packages/${app.rootPath}`);
-                    if (find) {
-                        find.pages = appJson.pages;
-                    }
-                    else {
-                        if (!rootAppJosn.subpackages) {
-                            rootAppJosn.subpackages = [];
-                        }
-                        rootAppJosn.subpackages.push({
-                            root: `packages/${app.rootPath}`,
-                            pages: appJson.pages,
-                        });
+                else {
+                    if (!rootAppJosn.subpackages) {
+                        rootAppJosn.subpackages = [];
                     }
-                    modifiedAppJson = true;
+                    rootAppJosn.subpackages.push({
+                        root: subRoot,
+                        pages: appJson.pages,
+                    });
                 }
+                modifiedAppJson = true;
             }
-            const packageJosnPath = path_1.default.join(subAppPath, 'package.json');
-            if (fs_extra_1.default.existsSync(packageJosnPath)) {
-                mergeDependencies = {
-                    ...mergeDependencies,
-                    ...(await (0, mp_1.mergePackageDependencies)(mergeDependencies, await fs_extra_1.default.readJson(packageJosnPath))),
-                };
-                modifiedPackageJosn = true;
-            }
-            await Promise.all([
-                'app.json',
-                'app.js',
-                'app.wxss',
-                'project.config.json',
-                'package.json',
-                'node_modules',
-                'miniprograme_npm',
-            ].map((name) => {
-                let clearPath = path_1.default.join(subAppPath, name);
-                return name.includes('.') ? (0, generateFiles_1.removeFile)(clearPath) : (0, generateFiles_1.cleanDir)(clearPath, []);
-            }));
-        }));
-        if (modifiedAppJson) {
-            await (0, fs_extra_1.writeFile)(rootAppJosnPath, JSON.stringify(rootAppJosn, undefined, 2));
         }
-        if (modifiedPackageJosn) {
-            await (0, fs_extra_1.writeFile)(rootPackageJosnPath, JSON.stringify({
-                ...rootPackageJson,
-                ...(0, mp_1.mergePackageDependencies)(mergeDependencies, rootPackageJson), // 主包优先
-            }, undefined, 2));
+        const packageJosnPath = path_1.default.join(subAppPath, 'package.json');
+        if (fs_extra_1.default.existsSync(packageJosnPath)) {
+            mergeDependencies = {
+                ...mergeDependencies,
+                ...(await (0, mp_1.mergePackageDependencies)(mergeDependencies, await fs_extra_1.default.readJson(packageJosnPath))),
+            };
+            modifiedPackageJosn = true;
         }
-    }
-    // 复制插件
-    async function handlePlugins() {
-        const mpPlugins = (await (0, plugin_1.getPluginType)(generateMpPath, plugins)).filter((item) => item.type === 'mp');
-        return Promise.all(mpPlugins.map(async (plugin) => {
-            const pluginModule = plugin.module;
-            const pluginNodeModuleDir = path_1.default.resolve(generateMpPath, 'node_modules', pluginModule);
-            const pluginPkgJson = await fs_extra_1.default.readJson(path_1.default.join(pluginNodeModuleDir, 'package.json'));
-            const { pluginName } = pluginPkgJson;
-            const pluginDir = path_1.default.join(miniprogramRoot, pluginName);
-            const distDir = path_1.default.join(generateMpPath, pluginName);
-            await fs_extra_1.default.copy(pluginDir, distDir, { overwrite: true });
+        await Promise.all([
+            'app.json',
+            'app.js',
+            'app.wxss',
+            'project.config.json',
+            'package.json',
+            'node_modules',
+            'miniprograme_npm',
+        ].map((name) => {
+            let clearPath = path_1.default.join(subAppPath, name);
+            return name.includes('.') ? (0, generateFiles_1.removeFile)(clearPath) : (0, generateFiles_1.cleanDir)(clearPath, []);
         }));
+    }));
+    if (modifiedAppJson) {
+        await (0, fs_extra_1.writeFile)(rootAppJosnPath, JSON.stringify(rootAppJosn, undefined, 2));
     }
-    async function handleAppJson() {
-        const baseAppJsonPath = path_1.default.join(generateMpPath, 'app.json');
-        const mergeAppJsonPath = path_1.default.join(miniprogramRoot, 'app.json');
-        await (0, mp_1.mergePages)(baseAppJsonPath, mergeAppJsonPath);
-        await (0, mp_1.mergeSubPackages)(baseAppJsonPath, mergeAppJsonPath);
-    }
-    async function handlePkgJson() {
-        const basePkgJsonPath = path_1.default.join(generateMpPath, 'package.json');
-        const mergePkgJsonPath = path_1.default.join(miniprogramRoot, 'package.json');
-        await (0, mp_1.mergePackageJson)(basePkgJsonPath, mergePkgJsonPath);
+    if (modifiedPackageJosn) {
+        await (0, fs_extra_1.writeFile)(rootPackageJosnPath, JSON.stringify({
+            ...rootPackageJson,
+            ...(0, mp_1.mergePackageDependencies)(mergeDependencies, rootPackageJson), // 主包优先
+        }, undefined, 2));
     }
 }
-exports.handleMixMode = handleMixMode;
+exports.handleSubApps = handleSubApps;

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

@@ -7,7 +7,7 @@ import { IBuildWedaApp } from '../core';
  * @param kboneConfig https://wechat-miniprogram.github.io/kbone/docs/config/
  * @param appConfigs app config from prop edit panel
  */
-export declare function generateMpConfig(ctx: IBuildContext, weapps: IWeAppData[], options: {
+export declare function generateMpConfig(ctx: Omit<IBuildContext, 'wedaRoot'>, weapps: IWeAppData[], options: {
     mpAppId?: string;
     mpConfig?: IBuildWedaApp['mpConfig'];
 }): {

package/lib/builder/mp/mp_config.js

@@ -34,6 +34,7 @@ const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
 const config_1 = require("../config");
 const net_1 = require("../util/net");
 const chalk_1 = __importDefault(require("chalk"));
+const util_1 = require("../util");
 /**
  * generate app.json & page.json for mp
  *
@@ -41,7 +42,7 @@ const chalk_1 = __importDefault(require("chalk"));
  * @param appConfigs app config from prop edit panel
  */
 function generateMpConfig(ctx, weapps, options) {
-    var _a, _b;
+    var _a;
     const appConfig = {
         useExtendedLib: { weui: true },
     };
@@ -66,9 +67,8 @@ function generateMpConfig(ctx, weapps, options) {
     const kbConfig = (_a = weapps[0].lowCodes) === null || _a === void 0 ? void 0 : _a.find((m) => m.name === config_1.MP_CONFIG_MODULE_NAME);
     const { tradingCapability, ...mainAppConfig } = weapps[0].appConfig || {};
     // keep main app config only, ignore subapp config
-    const { subpackages, ...extra } = extractPages(weapps, pageConfigs);
     const configs = (kbConfig ? [eval(`(${kbConfig.code.replace(/export\s+default/, '')})`)] : []).concat([
-        { appJson: (0, lodash_1.merge)({}, mainAppConfig, extra) },
+        { appJson: mainAppConfig },
         options.mpConfig,
     ]);
     configs.forEach((config) => {
@@ -81,10 +81,12 @@ function generateMpConfig(ctx, weapps, options) {
                 parseTabConfig(appJson.tabBar, ctx.projDir);
             }
             (0, lodash_1.merge)(appConfig, appJson);
-            // # page.json
-            // merge(pageConfigs, pagesConfigJson)
         }
     });
+    // 若存在 wedaRoot，则正规化
+    if (projConfig.wedaRoot) {
+        projConfig.wedaRoot = (0, util_1.normalizeWedaRoot)(projConfig.wedaRoot);
+    }
     /**
      * 基础配置合并完成
      * 开启特殊合并合并/覆盖逻辑
@@ -92,23 +94,28 @@ function generateMpConfig(ctx, weapps, options) {
     projConfig.packOptions.ignore.push(...ctx.materialLibs
         .filter((lib) => !lib.isComposite)
         .reduce((arr, lib) => {
-        arr.push({ type: 'file', value: `materials/${lib.name}/meta.json` });
+        arr.push({
+            type: 'file',
+            value: path.posix.join(projConfig.wedaRoot || '', `materials/${lib.name}/meta.json`),
+        });
         return arr;
     }, []));
     /**
-     * 合并追加系统子包
+     * 合并追加系统页面子包
      */
+    const { subpackages, pages = [] } = extractPages(weapps, pageConfigs, { wedaRoot: projConfig.wedaRoot });
+    appConfig.pages = Array.from(new Set([...(appConfig.pages || []), ...pages]));
     appConfig.subpackages = mergeSubPackages(appConfig.subpackages, [
         {
-            root: 'packages/$wd_system',
+            root: path.posix.join(projConfig.wedaRoot || '', 'packages/$wd_system'),
             name: 'wd-sys-module',
-            pages: [],
+            pages: ['pages/login/index'],
         },
     ]
-        .concat(ctx.enableAsyncMaterials && !((_b = weapps[0]) === null || _b === void 0 ? void 0 : _b.mpPkgUrl)
+        .concat(ctx.enableAsyncMaterials
         ? [
             {
-                root: config_1.materialsDirName,
+                root: path.posix.join(projConfig.wedaRoot || '', config_1.materialsDirName),
                 name: 'wd-sys-materials',
                 pages: [],
             },
@@ -155,12 +162,12 @@ function generateMpConfig(ctx, weapps, options) {
     projConfig.setting.packNpmManually = true;
     projConfig.setting.packNpmRelationList = [
         {
-            packageJsonPath: './package.json',
-            miniprogramNpmDistDir: './',
+            packageJsonPath: path.posix.join(projConfig.wedaRoot || './', 'package.json'),
+            miniprogramNpmDistDir: projConfig.wedaRoot || './',
         },
         {
-            packageJsonPath: './packages/$wd_system/package.json',
-            miniprogramNpmDistDir: './packages/$wd_system',
+            packageJsonPath: path.posix.join(projConfig.wedaRoot || './', 'packages', '$wd_system', 'package.json'),
+            miniprogramNpmDistDir: path.posix.join(projConfig.wedaRoot || './', 'packages', '$wd_system'),
         },
     ];
     if (process.env.IS_WEB_WORKER) {
@@ -173,13 +180,14 @@ function generateMpConfig(ctx, weapps, options) {
     return { appConfig, projConfig, pageConfigs };
 }
 exports.generateMpConfig = generateMpConfig;
-function extractPages(weapps, pageConfigs) {
+function extractPages(weapps, pageConfigs, options) {
     const pages = [];
     const subpackages = [];
     let homePage = '';
+    const { wedaRoot } = options || {};
     weapps.forEach((weapp, index) => {
         const { rootPath } = weapp;
-        const subPackage = { root: rootPath ? `packages/${rootPath}` : '', pages: [] };
+        const subPackage = { root: rootPath ? path.posix.join('./', wedaRoot || '', `packages/${rootPath}`) : '', pages: [] };
         if (rootPath) {
             subpackages.push(subPackage);
         }
@@ -190,10 +198,10 @@ function extractPages(weapps, pageConfigs) {
                 subPackage.pages.push(`pages/${page.id}/${pageFileName}`);
             }
             else if (!page.isHome) {
-                pages.push(`pages/${page.id}/${pageFileName}`);
+                pages.push(path.posix.join('./', wedaRoot || '', `pages/${page.id}/${pageFileName}`));
             }
             else {
-                homePage = `pages/${page.id}/${pageFileName}`;
+                homePage = path.posix.join('./', wedaRoot || '', `pages/${page.id}/${pageFileName}`);
             }
         });
     });
@@ -215,7 +223,7 @@ function transformDynamicData(originData) {
     const temp = {};
     for (const key in originData) {
         const target = originData[key];
-        if (target === null || target === void 0 ? void 0 : target.value) {
+        if ((target === null || target === void 0 ? void 0 : target.value) && ((target === null || target === void 0 ? void 0 : target.type) === 'static' || !(target === null || target === void 0 ? void 0 : target.type))) {
             temp[key] = target.value;
         }
     }

package/lib/builder/mp/wxml.js

@@ -12,6 +12,7 @@ const materials_1 = require("./materials");
 const name_mangler_1 = __importDefault(require("@cloudbase/lowcode-generator/lib/generator/util/name-mangler"));
 const config_1 = require("../config");
 const util_1 = require("./util");
+const path_1 = __importDefault(require("path"));
 exports.WD_EMPTY_PLACEHOLDER = 'wd-ph';
 const WD_INFO = 'wd-info';
 exports.WD_RUNTIME_TAG = [exports.WD_EMPTY_PLACEHOLDER, WD_INFO];
@@ -36,9 +37,9 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
         const originElements = xmlJson.elements;
         xmlJson.elements = [pageMeta];
         // usingComponents['wd-privacy'] = '/common/privacyModal/index';
-        usingComponents[WD_INFO] = '/common/info/index';
+        usingComponents[WD_INFO] = path_1.default.posix.join('/', ctx.wedaRoot || '', '/common/info/index');
         if (enableAsyncMaterials) {
-            usingComponents[exports.WD_EMPTY_PLACEHOLDER] = '/common/placeholder/index';
+            usingComponents[exports.WD_EMPTY_PLACEHOLDER] = path_1.default.posix.join('/', ctx.wedaRoot || '', '/common/placeholder/index');
         }
         if (disabled && ctx.pageUUID !== ctx.statusPageId) {
             pageMeta.elements = [
@@ -127,6 +128,22 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
                     _parent: pageMeta,
                 });
             }
+            if (ctx.enableAd) {
+                const textNode = {
+                    type: 'text',
+                    text: '当前小程序正使用云开发免费版云模板，升级后即可免广告。',
+                };
+                pageMeta.elements.unshift({
+                    type: 'element',
+                    name: 'view',
+                    attributes: {
+                        style: 'position: fixed;top: 0;left: 0;right: 0;z-index:10000; background: rgba(255, 103, 112, 0.95); font-size: 12px; color: white; line-height: 2.5em;padding-left: .5em;',
+                    },
+                    elements: [textNode],
+                    _order: -Infinity,
+                    _parent: pageMeta,
+                });
+            }
             if (ctx.enableLoading) {
                 pageMeta.elements.push({
                     type: 'element',

package/lib/builder/service/webpack.js

@@ -127,7 +127,7 @@ function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = c
         entry: path_1.default.resolve(appBuildDir, 'src/index.jsx'),
         output: {
             path: path_1.default.resolve(appBuildDir, exports.OUTPUT_DIR),
-            filename: '[name].[contenthash].bundle.js',
+            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,

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

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

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.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;
+exports.normalizeWedaRoot = 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"));
@@ -301,3 +301,10 @@ function normalizePackageName(packageName) {
     return packageName;
 }
 exports.normalizePackageName = normalizePackageName;
+function normalizeWedaRoot(root = '') {
+    return root
+        .split('/')
+        .filter((item) => !!item && item !== '.')
+        .join('/');
+}
+exports.normalizeWedaRoot = normalizeWedaRoot;

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

@@ -1,3 +1,4 @@
+import { IBuildWedaApp } from '../core';
 export declare function downloadFile(url: string, filePath: string): Promise<void>;
 /**
  * Download zip file and extract to dstDir
@@ -23,4 +24,12 @@ export declare function downloadZipInBrowser(url: string, dstDir: string, noCach
  * miniprogram_npm待微信提供端能力
  * @param output
  */
-export declare function downloadBrowserMaterial(output?: string): Promise<void>;
+export declare function downloadBrowserMaterial({ runtimeEndpointType, browser, }: {
+    runtimeEndpointType: IBuildWedaApp['endpointType'];
+    browser?: boolean;
+}): Promise<void>;
+export declare function installBrowserDependencies({ type, path: outPath, runtimeEndpointType, }: {
+    type: 'wedaRoot' | '$weda_system';
+    path: string;
+    runtimeEndpointType: IBuildWedaApp['endpointType'];
+}): Promise<void>;

package/lib/builder/util/net.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.downloadBrowserMaterial = exports.downloadZipInBrowser = exports.downloadZipInNode = exports.downloadZip = exports.downloadFile = void 0;
+exports.installBrowserDependencies = exports.downloadBrowserMaterial = exports.downloadZipInBrowser = exports.downloadZipInNode = exports.downloadZip = exports.downloadFile = void 0;
 const axios_1 = __importDefault(require("axios"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path = __importStar(require("path"));
@@ -118,14 +118,53 @@ async function saveFiles(files, dstDir) {
  * miniprogram_npm待微信提供端能力
  * @param output
  */
-async function downloadBrowserMaterial(output = '.weapps-build') {
+async function downloadBrowserMaterial({ runtimeEndpointType, browser = true, }) {
+    const BUILD_TEMPLATES = require('../mp/template.json');
     await Promise.all([
-        downloadZip(config_1.builderTemplateURL, config_1.appTemplateDir, true),
-        downloadZip(config_1.miniprogramURL, config_1.miniprogramDir, true),
-        downloadZip(config_1.systemSubpackageMiniprogramURL, config_1.systemSubpackageMiniprogramDir, true),
+        new Promise((resolve, reject) => {
+            try {
+                for (const key in BUILD_TEMPLATES) {
+                    fs_extra_1.default.ensureFileSync(path.join(config_1.appTemplateDir, key));
+                    fs_extra_1.default.writeFileSync(path.join(config_1.appTemplateDir, key), BUILD_TEMPLATES[key].code);
+                }
+                resolve(null);
+            }
+            catch (e) {
+                reject(e);
+            }
+        }),
+        runtimeEndpointType === 'tcb-api'
+            ? downloadZip(config_1.cloudbaseMiniprogramURL, config_1.cloudbaseMiniprogramDir, browser)
+            : downloadZip(config_1.miniprogramURL, config_1.miniprogramDir, browser),
+        downloadZip(config_1.systemSubpackageMiniprogramURL, config_1.systemSubpackageMiniprogramDir, browser),
     ]);
-    // 必须先下载到.weapps-materials目录，因为.weapps-materials是默认下载目录，共享组件逻辑sharedMaterialsDir时会读取文件
-    (0, generateFiles_1.copyRecursiveSync)(config_1.miniprogramDir, path.join(output, 'miniprogram_npm'));
-    (0, generateFiles_1.copyRecursiveSync)(config_1.systemSubpackageMiniprogramDir, path.join(output, 'packages', '$wd_system', 'miniprogram_npm'));
 }
 exports.downloadBrowserMaterial = downloadBrowserMaterial;
+async function installBrowserDependencies({ type, path: outPath, runtimeEndpointType, }) {
+    // 必须先下载到.weapps-materials目录，因为.weapps-materials是默认下载目录，共享组件逻辑sharedMaterialsDir时会读取文件
+    const MAP = {
+        wedaRoot: runtimeEndpointType === 'tcb-api'
+            ? {
+                url: config_1.cloudbaseMiniprogramURL,
+                src: config_1.cloudbaseMiniprogramDir,
+            }
+            : {
+                url: config_1.miniprogramURL,
+                src: config_1.miniprogramDir,
+            },
+        ['$weda_system']: {
+            url: config_1.systemSubpackageMiniprogramURL,
+            src: config_1.systemSubpackageMiniprogramDir,
+        },
+    };
+    const meta = MAP[type];
+    if (meta) {
+        if (!fs_extra_1.default.existsSync(meta.src)) {
+            await downloadZip(meta.url, path.join(outPath, 'miniprogram_npm'), true);
+        }
+        else {
+            (0, generateFiles_1.copyRecursiveSync)(meta.src, path.join(outPath, 'miniprogram_npm'));
+        }
+    }
+}
+exports.installBrowserDependencies = installBrowserDependencies;