@cloudbase/lowcode-builder 0.1.3 → 0.1.5-mpbeta.0

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

@@ -2,3 +2,17 @@ export { REPLACE_SIGN, MP_CONFIG_MODULE_NAME, KBONE_PAGE_KEYS, npmRegistry, remC
 export declare const sharedMaterialsDir: string;
 export declare const appTemplateDir: string;
 export declare const materialsDirName = "materials";
+/**
+ * src/template的代码，在IDE编辑器插件中构建builder
+ * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
+ */
+export declare const builderTemplateURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template.zip";
+/**
+ * miniprogram的代码，IDE插件后续会提供端功能
+ * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
+ */
+export declare const miniprogramURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm.zip";
+/**
+ * miniprogram_npm存放目录。IDE插件builder用到
+ */
+export declare const miniprogramDir: string;

package/lib/builder/config/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -22,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.materialsDirName = exports.appTemplateDir = exports.sharedMaterialsDir = exports.rpxConfig = exports.remConfig = exports.npmRegistry = exports.KBONE_PAGE_KEYS = exports.MP_CONFIG_MODULE_NAME = exports.REPLACE_SIGN = void 0;
+exports.miniprogramDir = exports.miniprogramURL = exports.builderTemplateURL = exports.materialsDirName = exports.appTemplateDir = exports.sharedMaterialsDir = exports.rpxConfig = exports.remConfig = exports.npmRegistry = exports.KBONE_PAGE_KEYS = exports.MP_CONFIG_MODULE_NAME = exports.REPLACE_SIGN = void 0;
 const path = __importStar(require("path"));
 const os_1 = __importDefault(require("os"));
 var index_1 = require("@cloudbase/lowcode-generator/lib/generator/config/index");
@@ -35,3 +39,18 @@ Object.defineProperty(exports, "rpxConfig", { enumerable: true, get: function ()
 exports.sharedMaterialsDir = path.join(os_1.default.homedir(), '.weapps-materials');
 exports.appTemplateDir = path.resolve(__dirname, '../../../template');
 exports.materialsDirName = 'materials'; // materials diretory of current project
+/**
+ * src/template的代码，在IDE编辑器插件中构建builder
+ * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
+ */
+exports.builderTemplateURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template.zip';
+/**
+ * miniprogram的代码，IDE插件后续会提供端功能
+ * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
+ */
+// export const miniprogramURL = 'https://cos-1252394733.cos.ap-nanjing.myqcloud.com/miniprogram_npm.zip';
+exports.miniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm.zip';
+/**
+ * miniprogram_npm存放目录。IDE插件builder用到
+ */
+exports.miniprogramDir = path.join(os_1.default.homedir(), exports.sharedMaterialsDir, 'miniprogram_npm');

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

@@ -36,9 +36,12 @@ export interface IBuildWedaApp extends IBaseAppProps {
     output?: {
         path?: string;
     };
+    isBrowserMpBuilder?: boolean;
 }
-export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<string | undefined>;
+export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<string | undefined>;
 export declare function cleanComponentDir(): Promise<void>;
 export declare function installDep(dir: any, opts?: IInstallOpts): Promise<void>;
 export declare const version: any;
+export { getFiles, fileToZip, strToBuf } from '../util/generateFiles';
+export { downloadZip } from '../util/net';
 export default buildWedaApp;

package/lib/builder/core/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.version = exports.installDep = exports.cleanComponentDir = exports.buildWedaApp = exports.getCompileDirs = void 0;
+exports.downloadZip = exports.strToBuf = exports.fileToZip = exports.getFiles = exports.version = exports.installDep = exports.cleanComponentDir = exports.buildWedaApp = exports.getCompileDirs = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const webpack_1 = require("../service/webpack");
 const util_1 = require("../util");
@@ -18,11 +18,12 @@ const index_2 = require("../h5/index");
 const chalk_1 = __importDefault(require("chalk"));
 const common_2 = require("../../utils/common");
 const postProcess_1 = require("../../utils/postProcess");
+const net_1 = require("../util/net");
 const pkg = require('../../../package.json');
 async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appKey = 'test', runtime = types_1.RUNTIME.NONE, ignoreInstall = false, buildTypeList = [common_1.BuildType.WEB], mode = common_1.WebpackModeType.PRODUCTION, devTool = 'webpack', deployOptions = { mode: types_1.DEPLOY_MODE.PREVIEW }, generateMpType = common_1.GenerateMpType.APP, plugins = [], extraData = {
     isComposite: false,
     compProps: {},
-}, resourceAppId = undefined, domain = '', output, }, cb) {
+}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, }, cb) {
     var _a, _b;
     if (!cals) {
         console.error('无效的应用配置');
@@ -44,6 +45,10 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
         appBuildDir = (output === null || output === void 0 ? void 0 : output.path) || path_1.default.join(appBuildDir, 'mp');
         const isMixMode = generateMpType === common_1.GenerateMpType.SUBPACKAGE;
         const apps = [mainAppSerializeData, ...subAppSerializeDataList];
+        if (isBrowserMpBuilder) {
+            // 尽早下载物料
+            await (0, net_1.downloadBrowserMaterial)(output && output.path);
+        }
         try {
             const result = await (0, index_1.generateWxMp)({
                 weapps: apps,
@@ -61,6 +66,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                     resourceAppId,
                 },
                 buildTypeList,
+                isBrowserMpBuilder,
             });
             // 如果是混合模式，则将特定的目录复制到工程下
             // 针对 app.json / package.json 则采用 merge 的操作
@@ -81,7 +87,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
             });
             // 如果是代开发的模式，则写入ext.json
             await (0, postProcess_1.postprocessDeployExtraJson)(outDir, deployOptions);
-            if (generateMpType === common_1.GenerateMpType.APP) {
+            if (!isBrowserMpBuilder && generateMpType === common_1.GenerateMpType.APP) {
                 // 模板拷入的 miniprogram_npm 有问题，直接删除使用重新构建的版本
                 // 模板需要占位保证 mp 文件夹存在
                 fs_extra_1.default.removeSync(path_1.default.resolve(outDir, 'miniprogram_npm'));
@@ -133,4 +139,10 @@ function installDep(dir, opts = {}) {
 }
 exports.installDep = installDep;
 exports.version = pkg.version;
+var generateFiles_1 = require("../util/generateFiles");
+Object.defineProperty(exports, "getFiles", { enumerable: true, get: function () { return generateFiles_1.getFiles; } });
+Object.defineProperty(exports, "fileToZip", { enumerable: true, get: function () { return generateFiles_1.fileToZip; } });
+Object.defineProperty(exports, "strToBuf", { enumerable: true, get: function () { return generateFiles_1.strToBuf; } });
+var net_2 = require("../util/net");
+Object.defineProperty(exports, "downloadZip", { enumerable: true, get: function () { return net_2.downloadZip; } });
 exports.default = buildWedaApp;

package/lib/builder/h5/copy.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/h5/material.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -13,4 +13,5 @@ export interface IBuildContext {
     rootPath?: string;
     miniprogramPlugins?: IMiniprogramPlugin[];
     debugMode?: boolean;
+    isBrowserMpBuilder?: boolean;
 }

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

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

package/lib/builder/mp/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -51,7 +55,7 @@ const net_1 = require("../util/net");
 const templateDir = config_1.appTemplateDir + '/mp/';
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
-async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, }) {
+async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, isBrowserMpBuilder = false, }) {
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
     console.log('Generating ' + em('Wexin MiniProgram') + ' to ' + projDir);
@@ -66,6 +70,7 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         isMixMode,
         mainAppData,
         domain,
+        isBrowserMpBuilder,
     };
     const yyptConfig = await (0, util_3.getYyptConfigInfo)(extraData);
     const { appUsedComps, allAppUsedComps } = handleUsedComponents({
@@ -93,31 +98,42 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
     const miniprogramRoot = path_1.default.join(projDir, projectConfigJson.miniprogramRoot || '/');
     await generateFramework(mainAppData, miniprogramRoot, buildContext);
     // #3 生成主包根路径文件
-    let appFileData = {
-        'common/style.js': {},
-        'common/utils.wxs': {
-            domain: domain,
-        },
-        'common/util.js': {
-            isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
-        },
-        'common/widget.js': {},
-        'common/url.js': {},
-        'common/weapp-sdk.js': {},
-        'common/weapp-page.js': {
-            dataPropNames: wxmlDataPrefix,
-            debug: buildContext.debugMode,
-        },
-        'common/weapp-component.js': {},
-        'common/merge-renderer.js': {
-            dataPropNames: wxmlDataPrefix,
-            debug: buildContext.debugMode,
-        },
-        'common/process.js': {},
-        'common/data-patch.js': {},
-        'common/event-emitter.js': {},
-        'common/watch.js': {},
-    };
+    let appFileData = {};
+    if (weapps.find((item) => !item.mpPkgUrl)) {
+        await generateFramework(mainAppData, miniprogramRoot, buildContext);
+        // 有了 framework app 之后，并且是源码的方式,追加 app 引用
+        if (mainAppData.mpPkgUrl) {
+            let appJsPath = path_1.default.join(miniprogramRoot, 'app.js');
+            let appJsContent = await fs.readFile(appJsPath);
+            await (0, generateFiles_1.writeFile)(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
+        }
+        appFileData = {
+            ...appFileData,
+            'common/style.js': {},
+            'common/utils.wxs': {
+                domain: domain,
+            },
+            'common/util.js': {
+                isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
+            },
+            'common/widget.js': {},
+            'common/url.js': {},
+            'common/weapp-sdk.js': {},
+            'common/weapp-page.js': {
+                dataPropNames: wxmlDataPrefix,
+                debug: buildContext.debugMode,
+            },
+            'common/weapp-component.js': {},
+            'common/merge-renderer.js': {
+                dataPropNames: wxmlDataPrefix,
+                debug: buildContext.debugMode,
+            },
+            'common/process.js': {},
+            'common/data-patch.js': {},
+            'common/event-emitter.js': {},
+            'common/watch.js': {},
+        };
+    }
     if (mainAppData.mpPkgUrl) {
         // 合并 project 和 app json
         if (!projectConfigJson.setting) {
@@ -142,9 +158,6 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         }
         appJson.subpackages = subpackages;
         await (0, generateFiles_1.writeFile)(appJsonPath, JSON.stringify(appJson, undefined, 2));
-        let appJsPath = path_1.default.join(miniprogramRoot, 'app.js');
-        let appJsContent = await fs.readFile(appJsPath);
-        await (0, generateFiles_1.writeFile)(appJsPath, `import { app as wedaApp } from './app/weapps-api'\n${appJsContent}`);
     }
     else {
         appFileData = {
@@ -178,26 +191,28 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         await fs.move(path_1.default.join(projDir, config_1.materialsDirName), path_1.default.join(miniprogramRoot, config_1.materialsDirName));
     }
     // 生成数据源
-    const datasourceFileData = {
-        'datasources/index.js': {},
-        'datasources/config.js.tpl': {
-            envID: mainAppData.envId,
-            appID: appId,
-            resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
-            isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
-        },
-        'datasources/datasource-profiles.js.tpl': {
-            datasourceProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasourceProfiles)(weapps.reduce((datasources, app) => {
-                datasources.push(...(app.datasources || []));
-                return datasources;
-            }, [])), { EOL: true }),
-        },
-        'datasources/dataset-profiles.js.tpl': {
-            datasetProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasetProfiles)(mainAppData, weapps), { EOL: true }),
-        },
-    };
-    console.log('Generating ' + em('datasources') + ' files');
-    await (0, generateFiles_1.default)(datasourceFileData, templateDir, miniprogramRoot, buildContext);
+    if (weapps.find((item) => !item.mpPkgUrl)) {
+        const datasourceFileData = {
+            'datasources/index.js': {},
+            'datasources/config.js.tpl': {
+                envID: mainAppData.envId,
+                appID: appId,
+                resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
+                isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
+            },
+            'datasources/datasource-profiles.js.tpl': {
+                datasourceProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasourceProfiles)(weapps.reduce((datasources, app) => {
+                    datasources.push(...(app.datasources || []));
+                    return datasources;
+                }, [])), { EOL: false }),
+            },
+            'datasources/dataset-profiles.js.tpl': {
+                datasetProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasetProfiles)(mainAppData, weapps), { EOL: true }),
+            },
+        };
+        console.log('Generating ' + em('datasources') + ' files');
+        await (0, generateFiles_1.default)(datasourceFileData, templateDir, miniprogramRoot, buildContext);
+    }
     // 生成子包
     await Promise.all(weapps.map(async (app, index) => {
         if (index == 0) {
@@ -223,13 +238,14 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
             }
         }
     }));
-    if (fs.existsSync(path_1.default.join(miniprogramRoot, 'package.json'))) {
+    if (!isBrowserMpBuilder && fs.existsSync(path_1.default.join(miniprogramRoot, 'package.json'))) {
         await (0, webpack_1.installDependencies)(miniprogramRoot);
     }
     await handleMpPlugins();
     console.timeEnd(operationLabel);
-    cleanProj(weapps, miniprogramRoot);
-    cleanMaterils(path_1.default.join(miniprogramRoot, config_1.materialsDirName), allAppUsedComps);
+    // web端的builder不需要清除
+    !isBrowserMpBuilder && cleanProj(weapps, miniprogramRoot);
+    !isBrowserMpBuilder && cleanMaterils(path_1.default.join(miniprogramRoot, config_1.materialsDirName), allAppUsedComps);
     return { miniprogramRoot };
     function resolveNpmDeps() {
         var _a;
@@ -285,7 +301,7 @@ async function generatePkg(weapp, appRoot, ctx, pageConfigs) {
         // 清空历史文件，使用zip覆盖
         console.log(`Removing ${appRoot}`);
         await (0, generateFiles_1.cleanDir)(appRoot, ['materials']);
-        await (0, net_1.downloadZip)(weapp.mpPkgUrl, appRoot);
+        await (0, net_1.downloadZip)(weapp.mpPkgUrl, appRoot, ctx.isBrowserMpBuilder);
         if (fs.existsSync(path_1.default.join(appRoot, '__MACOSX'))) {
             await fs.remove(path_1.default.join(appRoot, '__MACOSX'));
         }

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

@@ -3,6 +3,13 @@ import { IBuildContext } from './BuildContext';
 import NameMangler from '@cloudbase/lowcode-generator/lib/generator/util/name-mangler';
 import { IUsedComps } from '../types/common';
 export declare function installMaterials(projDir: string, usedComps: IUsedComps, weapps: IWeAppData[], ctx: IBuildContext): Promise<void>;
+/**
+ * 过滤组件库文件
+ * @param src 源文件
+ * @param dest 目标文件
+ * @returns boolean
+ */
+export declare function filterMaterial(src: any, dest: any): boolean;
 export declare function extractUsedCompsRecursively(comps: IUsedComps, checkedComps: ICompositedComponent[], compositedLibs: IMaterialItem[], outputComps?: IUsedComps): IUsedComps;
 /**
  * {

package/lib/builder/mp/materials.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -18,11 +22,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWxmlTag = exports.extractUsedCompsRecursively = exports.installMaterials = void 0;
+exports.getWxmlTag = exports.extractUsedCompsRecursively = exports.filterMaterial = exports.installMaterials = void 0;
 const path = __importStar(require("path"));
 const util_1 = require("util");
 const fs = __importStar(require("fs-extra"));
@@ -32,14 +33,14 @@ const mp_1 = require("@cloudbase/lowcode-generator/lib/generator/config/mp");
 const util_2 = require("../util");
 const util_3 = require("./util");
 const wxml_1 = require("./wxml");
-const generateFiles_1 = __importDefault(require("../util/generateFiles"));
+const generateFiles_1 = __importStar(require("../util/generateFiles"));
 const lowcode_1 = require("./lowcode");
 const net_1 = require("../util/net");
 const util_4 = require("../util");
 const junk = __importStar(require("../util/junk"));
 const templateDir = config_1.appTemplateDir + '/mp/';
 async function installMaterials(projDir, usedComps, weapps, ctx) {
-    let { materialLibs } = ctx;
+    let { materialLibs, isBrowserMpBuilder } = ctx;
     const weappsList = ctx.isMixMode
         ? weapps
         : weapps.filter((item) => !item.rootPath);
@@ -58,7 +59,7 @@ async function installMaterials(projDir, usedComps, weapps, ctx) {
         }
         else {
             materialsSrcDir = path.join(config_1.sharedMaterialsDir, `${name}-mp@${version}`);
-            await downloadMaterial(mpPkgUrl, materialsSrcDir);
+            await downloadMaterial(mpPkgUrl, materialsSrcDir, ctx.isBrowserMpBuilder);
         }
         function libUpdated(libDir, version) {
             const meta = (0, util_4.readComponentLibMata)(libDir);
@@ -86,28 +87,32 @@ async function installMaterials(projDir, usedComps, weapps, ctx) {
             if (libUpdated(targetDir, version)) {
                 const materialsSrcDirPath = path.join(materialsSrcDir, 'src');
                 if (fs.existsSync(materialsSrcDirPath)) {
-                    console.log(`Copying material ${materialId} from ${materialsSrcDir}/src to ${targetDir}`);
+                    console.log(`Copying material ${materialId} from ${isBrowserMpBuilder ? materialsSrcDirPath : materialsSrcDir}/src to ${targetDir}`);
                     // #2 从根目录 copy meta 文件
                     const metaJosnPath = path.join(materialsSrcDir, 'meta.json');
                     if (fs.existsSync(metaJosnPath)) {
-                        await fs.copy(metaJosnPath, path.join(targetDir, 'meta.json'));
+                        !isBrowserMpBuilder ? await fs.copy(metaJosnPath, path.join(targetDir, 'meta.json')) : (0, generateFiles_1.copyRecursiveSync)(metaJosnPath, path.join(targetDir, 'meta.json'));
                     }
                     // #3 copy 组件库代码文件到项目目录
-                    await fs.copy(materialsSrcDirPath, targetDir, {
+                    !isBrowserMpBuilder ? await fs.copy(materialsSrcDirPath, targetDir, {
                         filter: function (src, dest) {
                             const path = src.split('/');
                             return !junk.is(path[path.length - 1]);
                         },
+                    }) : (0, generateFiles_1.copyRecursiveSync)(materialsSrcDirPath, targetDir, {
+                        filter: filterMaterial,
                     });
                 }
                 else {
                     console.log(`Copying material ${materialId} from ${materialsSrcDir} to ${targetDir}`);
                     // #2 link material to current project
-                    await fs.copy(materialsSrcDir, targetDir, {
+                    !isBrowserMpBuilder ? await fs.copy(materialsSrcDir, targetDir, {
                         filter: function (src, dest) {
                             const path = src.split('/');
                             return !junk.is(path[path.length - 1]);
                         },
+                    }) : (0, generateFiles_1.copyRecursiveSync)(materialsSrcDir, targetDir, {
+                        filter: filterMaterial,
                     });
                 }
             }
@@ -172,6 +177,17 @@ async function installMaterials(projDir, usedComps, weapps, ctx) {
     }));
 }
 exports.installMaterials = installMaterials;
+/**
+ * 过滤组件库文件
+ * @param src 源文件
+ * @param dest 目标文件
+ * @returns boolean
+ */
+function filterMaterial(src, dest) {
+    const srcPath = src.split('/');
+    return !junk.is(srcPath[srcPath.length - 1]);
+}
+exports.filterMaterial = filterMaterial;
 // 递归查询复合组件所使用的组件
 function extractUsedCompsRecursively(comps, checkedComps, compositedLibs, outputComps) {
     let usedComps = (outputComps || comps);
@@ -206,10 +222,10 @@ function extractUsedCompsRecursively(comps, checkedComps, compositedLibs, output
     return usedComps;
 }
 exports.extractUsedCompsRecursively = extractUsedCompsRecursively;
-async function downloadMaterial(zipUrl, dstFolder) {
+async function downloadMaterial(zipUrl, dstFolder, isBrowser = false) {
     if (fs.existsSync(path.join(dstFolder, 'meta.json')))
         return;
-    await (0, net_1.downloadZip)(zipUrl, dstFolder);
+    await (0, net_1.downloadZip)(zipUrl, dstFolder, isBrowser);
 }
 async function generateCompositeComponent(compositedComp, ctx, compLibCommonResource) {
     const { materialName } = compositedComp;

package/lib/builder/mp/mixMode.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/mp/mp_config.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -43,7 +47,7 @@ function generateMpConfig(weapps, ctx) {
     };
     const { miniprogramPlugins = [] } = ctx;
     const projConfig = (0, lodash_1.merge)({}, mp_1.defaultProjConfig, {
-        projectname: 'WeDa-' + ctx.appId,
+        projectname: (ctx.mainAppData && ctx.mainAppData.label) || ('WeDa-' + ctx.appId),
     });
     const pageConfigs = weapps.map((app) => {
         var _a;
@@ -102,8 +106,8 @@ function generateMpConfig(weapps, ctx) {
         appConfig.plugins = plugins;
     }
     miniprogramPlugins.forEach((plugin) => {
-        var _a, _b;
-        if (!((_b = (_a = appConfig) === null || _a === void 0 ? void 0 : _a.plugins) === null || _b === void 0 ? void 0 : _b[plugin.name])) {
+        var _a;
+        if (!((_a = appConfig === null || appConfig === void 0 ? void 0 : appConfig.plugins) === null || _a === void 0 ? void 0 : _a[plugin.name])) {
             (0, lodash_1.set)(appConfig, `plugins.${plugin.name}`, {
                 version: plugin.version,
                 provider: plugin.pluginAppId,

package/lib/builder/mp/plugin.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/service/webpack.js

@@ -2,7 +2,6 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 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 = void 0;
 const path_1 = __importDefault(require("path"));
@@ -20,15 +19,6 @@ const config_2 = require("../config");
 const common_2 = require("../util/common");
 const types_1 = require("../../types");
 const generateFiles_1 = require("../util/generateFiles");
-let yarnExists = false;
-try {
-    let { stdout } = cross_spawn_1.default.sync('yarn', ['-v']);
-    let str = stdout.toString();
-    if (Number((_a = str.split('.')) === null || _a === void 0 ? void 0 : _a[0]) <= 1) {
-        yarnExists = true;
-    }
-}
-catch (e) { }
 async function fixAppJson(appBuildDir) {
     const appJsonPath = path_1.default.resolve(appBuildDir, 'dist/mp/app.json');
     if (!fs_extra_1.default.existsSync(appJsonPath)) {
@@ -407,6 +397,16 @@ async function downloadDependencies(targetDir, srcZipUrl) {
 exports.downloadDependencies = downloadDependencies;
 // TODO use yarn if installed
 async function installDependencies(targetDir, options = {}) {
+    var _a;
+    let yarnExists = false;
+    try {
+        let { stdout } = cross_spawn_1.default.sync('yarn', ['-v']);
+        let str = stdout.toString();
+        if (Number((_a = str.split('.')) === null || _a === void 0 ? void 0 : _a[0]) <= 1) {
+            yarnExists = true;
+        }
+    }
+    catch (e) { }
     if ((options === null || options === void 0 ? void 0 : options.ignoreInstall) &&
         fs_extra_1.default.existsSync(path_1.default.join(targetDir, 'node_modules'))) {
         console.log('ignore install dependencies in ' + targetDir);

package/lib/builder/util/common.js

@@ -57,11 +57,12 @@ function getSelfPackageJson() {
 exports.getSelfPackageJson = getSelfPackageJson;
 function JsonToStringWithVariableName(copyJson, options = {}) {
     let variable = JSON.stringify(copyJson, null, 2).replace(/"%%%(.*?)%%%"/g, function (match, expression) {
-        return expression.replace(/\\'/g, "'").replace(/\\"/g, '"');
+        return expression
+            .replace(/\\"/g, '"')
+            .replace(/\\'/g, "'")
+            .replace(/\\r/g, '\r')
+            .replace(/\\n/g, '\n');
     });
-    if (options.EOL) {
-        variable = variable.replace(/\\n/g, '\n').replace(/\\r/g, '\r');
-    }
     return variable;
 }
 exports.JsonToStringWithVariableName = JsonToStringWithVariableName;