@cloudbase/lowcode-builder 1.8.73 → 1.8.75

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

@@ -2,22 +2,19 @@ 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.file.myqcloud.com/lcap-builder/template.1.8.67.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.file.myqcloud.com/lcap-builder/miniprogram_npm.1.8.57.zip";
+export declare const cloudbaseMiniprogramURL = "https://comp-public-1303824488.file.myqcloud.com/lcap-builder/cloudbase_miniprogram_npm.1.8.57.zip";
 export declare const systemSubpackageMiniprogramURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/wd_system_miniprogram_npm.zip";
 export declare const RUNTIME_CONFIG_URL = "https://comp-public-1303824488.file.myqcloud.com/release_config/runtime/exp_runtime.json";
 /**
  * miniprogram_npm存放目录。IDE插件builder用到
  */
 export declare const miniprogramDir: string;
+export declare const cloudbaseMiniprogramDir: string;
 export declare const systemSubpackageMiniprogramDir: string;
 export interface ICDN_ENDPOINTS_COFIG {
     common?: string;

package/lib/builder/config/index.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.REPEATER = exports.generateCdnEndpoints = exports.CDN_ENDPONTS_CONFIG = exports.systemSubpackageMiniprogramDir = exports.miniprogramDir = exports.RUNTIME_CONFIG_URL = exports.systemSubpackageMiniprogramURL = exports.miniprogramURL = exports.builderTemplateURL = exports.materialsDirName = exports.appTemplateDir = exports.sharedMaterialsDir = exports.OFFICIAL_LIB_KEY = exports.rpxConfig = exports.remConfig = exports.npmRegistry = exports.KBONE_PAGE_KEYS = exports.MP_CONFIG_MODULE_NAME = exports.REPLACE_SIGN = void 0;
+exports.REPEATER = exports.generateCdnEndpoints = exports.CDN_ENDPONTS_CONFIG = exports.systemSubpackageMiniprogramDir = exports.cloudbaseMiniprogramDir = exports.miniprogramDir = exports.RUNTIME_CONFIG_URL = exports.systemSubpackageMiniprogramURL = exports.cloudbaseMiniprogramURL = exports.miniprogramURL = exports.materialsDirName = exports.appTemplateDir = exports.sharedMaterialsDir = exports.OFFICIAL_LIB_KEY = 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"));
 const index_1 = require("@cloudbase/lowcode-generator/lib/generator/config/index");
@@ -41,22 +41,19 @@ Object.defineProperty(exports, "OFFICIAL_LIB_KEY", { enumerable: true, get: func
 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.file.myqcloud.com/lcap-builder/template.1.8.67.zip';
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
 exports.miniprogramURL = 'https://comp-public-1303824488.file.myqcloud.com/lcap-builder/miniprogram_npm.1.8.57.zip';
+exports.cloudbaseMiniprogramURL = 'https://comp-public-1303824488.file.myqcloud.com/lcap-builder/cloudbase_miniprogram_npm.1.8.57.zip';
 exports.systemSubpackageMiniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/wd_system_miniprogram_npm.zip';
 exports.RUNTIME_CONFIG_URL = `https://comp-public-1303824488.file.myqcloud.com/release_config/runtime/exp_runtime.json`;
 /**
  * miniprogram_npm存放目录。IDE插件builder用到
  */
 exports.miniprogramDir = path.join(os_1.default.homedir(), exports.sharedMaterialsDir, 'miniprogram_npm');
+exports.cloudbaseMiniprogramDir = path.join(os_1.default.homedir(), exports.sharedMaterialsDir, 'cloudbase_miniprogram_npm');
 exports.systemSubpackageMiniprogramDir = path.join(os_1.default.homedir(), exports.sharedMaterialsDir, '$wd_system_miniprogram_npm');
 exports.CDN_ENDPONTS_CONFIG = {
     common: '',

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

@@ -44,6 +44,7 @@ export interface IBuildWedaApp extends IBaseAppProps {
     isPrivateMode?: boolean;
     endpointType?: 'tcb-api' | 'wechat-service';
     enableExpiredTag?: boolean;
+    enableAd?: boolean;
     account?: {
         uin?: string;
     };
@@ -59,7 +60,7 @@ export declare function buildWedaConfig({ output, domain, isPrivateMode, endpoin
     endpointType?: IBuildWedaApp['endpointType'];
     buildTypeList?: IBuildWedaApp['buildTypeList'];
 }): Promise<void>;
-export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, endpointType, enableExpiredTag, account, mpConfig, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<any>;
+export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, endpointType, enableExpiredTag, enableAd, account, mpConfig, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<any>;
 export declare function cleanComponentDir(): Promise<void>;
 export declare const version: any;
 export { getFiles, fileToZip, strToBuf } from '../util/generateFiles';

package/lib/builder/core/index.js

@@ -5,13 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeInputs = exports.getCompileDirs = exports.downloadZip = exports.strToBuf = exports.fileToZip = exports.getFiles = exports.version = exports.cleanComponentDir = exports.buildWedaApp = exports.buildWedaConfig = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
 const util_1 = require("../util");
 const common_1 = require("../types/common");
 const index_1 = require("../mp/index");
 const types_1 = require("../../types");
-const mixMode_1 = require("../mp/mixMode");
 const common_2 = require("../../utils/common");
 const postProcess_1 = require("../../utils/postProcess");
 const cals_1 = require("@cloudbase/cals");
@@ -27,13 +25,13 @@ async function buildWedaConfig({ output, domain = undefined, isPrivateMode = und
     if (!outDir) {
         throw new Error('无效的项目输出路径');
     }
-    let miniprogramRoot = outDir;
+    let wedaRoot = outDir;
     let projectJsonPath = path_1.default.resolve(outDir, 'project.config.json');
     if (fs_extra_1.default.existsSync(projectJsonPath)) {
         const projectConfigJson = await fs_extra_1.default.readJson(projectJsonPath);
-        miniprogramRoot = path_1.default.join(outDir, projectConfigJson.miniprogramRoot || '/');
+        wedaRoot = path_1.default.join(outDir, projectConfigJson.miniprogramRoot || '/', (0, util_1.normalizeWedaRoot)(projectConfigJson.wedaRoot) || '');
     }
-    const configPath = path_1.default.resolve(miniprogramRoot, 'common/config.js');
+    const configPath = path_1.default.resolve(wedaRoot, 'common/config.js');
     let data = { domain, isPrivateMode, endpointType };
     if (fs_extra_1.default.existsSync(configPath)) {
         try {
@@ -61,7 +59,7 @@ exports.buildWedaConfig = buildWedaConfig;
 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, isBrowserMpBuilder = false, cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, account = {}, mpConfig = {}, }, cb) {
+}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, enableAd = false, account = {}, mpConfig = {}, }, cb) {
     var _a, _b, _c, _d, _e, _f;
     if (!cals) {
         console.error('无效的应用配置');
@@ -74,10 +72,19 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
      * 刷新正规化 packageName
      */
     [cals, ...subAppCalsList].forEach((app) => {
+        var _a, _b;
         if (!app.extra) {
             app.extra = {};
         }
         app.extra.rootPath = (0, util_1.normalizePackageName)(app.extra.rootPath);
+        /**
+         * 历史登录页清理
+         * 使用默认的登录
+         */
+        app.items = (_b = (_a = app.items) === null || _a === void 0 ? void 0 : _a.filter) === null || _b === void 0 ? void 0 : _b.call(_a, (item) => {
+            var _a;
+            return !((_a = item.attributes) === null || _a === void 0 ? void 0 : _a.isCustomLoginPage);
+        });
     });
     let appBuildDir = (output === null || output === void 0 ? void 0 : output.path) || (runtime === types_1.RUNTIME.CI ? (_a = (0, util_1.getCompileDirs)('app')) === null || _a === void 0 ? void 0 : _a.appBuildDir : (_b = (0, util_1.getCompileDirs)(appKey)) === null || _b === void 0 ? void 0 : _b.appBuildDir);
     let runtimeDynamicConfig = {};
@@ -100,6 +107,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
         isPrivateMode,
         endpointType,
         enableExpiredTag,
+        enableAd,
         runtimeDynamicConfig,
         disabled: (_c = cals.extra) === null || _c === void 0 ? void 0 : _c.disabled,
         statusPageId: (_d = cals.extra) === null || _d === void 0 ? void 0 : _d.statusPageId,
@@ -148,7 +156,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
             const calses = [cals, ...subAppCalsList];
             if (isBrowserMpBuilder) {
                 // 尽早下载物料
-                await (0, net_1.downloadBrowserMaterial)(output === null || output === void 0 ? void 0 : output.path);
+                await (0, net_1.downloadBrowserMaterial)({ runtimeEndpointType: endpointType });
             }
             const { enablePageRoot } = (0, cals_1.parseVersion)(cals === null || cals === void 0 ? void 0 : cals.schemaVersion, dependencies);
             const mpBuildContext = {
@@ -182,18 +190,6 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 cdnEndpoints: (0, config_1.generateCdnEndpoints)(cdnEndpoints),
                 mpConfig,
             });
-            // 如果是混合模式，则将特定的目录复制到工程下
-            // 针对 app.json / package.json 则采用 merge 的操作
-            if (buildContext.isMixMode) {
-                console.log(chalk_1.default.green('【混合模式】'), mpBuildContext.projDir);
-                await (0, mixMode_1.handleMixMode)({
-                    buildContext: mpBuildContext,
-                    apps,
-                    miniprogramRoot: result.miniprogramRoot,
-                    plugins,
-                    ignoreInstall,
-                });
-            }
             const outDir = mpBuildContext.projDir;
             let projectJsonPath = path_1.default.resolve(outDir, 'project.config.json');
             await (0, postProcess_1.postprocessProjectConfig)(projectJsonPath, {
@@ -202,11 +198,6 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
             });
             // 如果是代开发的模式，则写入ext.json
             await (0, postProcess_1.postprocessDeployExtraJson)(outDir, deployOptions);
-            if (!isBrowserMpBuilder && generateMpType === common_1.GenerateMpType.APP && !ignoreInstall) {
-                // 模板拷入的 miniprogram_npm 有问题，直接删除使用重新构建的版本
-                // 模板需要占位保证 mp 文件夹存在
-                fs_extra_1.default.removeSync(path_1.default.resolve(outDir, 'miniprogram_npm'));
-            }
             await (cb === null || cb === void 0 ? void 0 : cb(null, {
                 ...result,
                 outDir,

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

@@ -1,7 +1 @@
-import { IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
-/**
- * 安装小程序插件
- * @param appBuildDir
- * @param plugins
- */
-export declare function runHandleMpPlugin(appBuildDir: string, plugins: IPlugin[]): Promise<void>;
+export {};

package/lib/builder/core/plugin.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runHandleMpPlugin = void 0;
 const plugin_1 = require("../mp/plugin");
 /**
  * 安装小程序插件
@@ -12,4 +11,3 @@ async function runHandleMpPlugin(appBuildDir, plugins) {
     await (0, plugin_1.installMpPlugin)(appBuildDir, plugins);
     console.timeEnd('runHandleMpPlugin');
 }
-exports.runHandleMpPlugin = runHandleMpPlugin;

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

@@ -42,6 +42,10 @@ export interface ICommonBuildContext {
      * 是否启用过期
      */
     enableExpiredTag?: boolean;
+    /**
+     * 显示微信云模板toast
+     */
+    enableAd?: boolean;
     /**
      * 应用运行态动态全局配置
      */
@@ -65,4 +69,8 @@ export interface IBuildContext extends ICommonBuildContext {
      * 组件库目录独立子包
      */
     enableAsyncMaterials?: boolean;
+    /**
+     * weda 默认自身root
+     */
+    wedaRoot?: string;
 }

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

@@ -4,8 +4,8 @@ import { IBuildContext } from './BuildContext';
 import { BuildType } from '../types/common';
 import { IPlatformApp } from '@cloudbase/cals';
 import { IBuildWedaApp } from '../core';
-export declare function generateWxMp({ buildContext, weapps, calses, plugins, deployOptions, options, buildTypeList, ignoreInstall, cdnEndpoints, mpConfig, }: {
-    buildContext: IBuildContext;
+export declare function generateWxMp({ buildContext: _buildContext, weapps, calses, deployOptions, options, buildTypeList, ignoreInstall, cdnEndpoints, mpConfig, }: {
+    buildContext: Omit<IBuildContext, 'wedaRoot'>;
     weapps: IWeAppData[];
     calses: IPlatformApp[];
     plugins: IPlugin[];