@cloudbase/lowcode-builder 1.8.100 → 1.8.102

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

@@ -28,3 +28,7 @@ export declare const REPEATER: {
     REPEATER_NAME: string;
     REPEATER_ITEM_NAME: string;
 };
+export declare function getPrivatelinkJsUrl(cdngoDomain?: string | undefined): {
+    vm: string;
+    vender: 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.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;
+exports.getPrivatelinkJsUrl = 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");
@@ -79,3 +79,10 @@ exports.REPEATER = {
     REPEATER_NAME: 'Repeater',
     REPEATER_ITEM_NAME: 'RepeaterItem',
 };
+function getPrivatelinkJsUrl(cdngoDomain = exports.CDN_ENDPONTS_CONFIG.cdngo) {
+    return {
+        vm: `${cdngoDomain}/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/privatelink@0.0.1/dist/cdn/cloudbase.privatelink.vm.js`,
+        vender: `${cdngoDomain}/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/privatelink-vender@0.0.2/dist/cdn/cloudbase.privatelink.vender.js`,
+    };
+}
+exports.getPrivatelinkJsUrl = getPrivatelinkJsUrl;

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

@@ -53,6 +53,7 @@ export interface IBuildWedaApp extends IBaseAppProps {
         appJson?: Record<string, any>;
         projectConfigJson?: Record<string, any>;
     };
+    privatelinkConfig?: Record<string, any>;
 }
 export declare function buildWedaConfig({ output, domain, isPrivateMode, endpointType, buildTypeList, }: {
     output: Required<IBuildWedaApp['output']>;
@@ -61,7 +62,7 @@ export declare function buildWedaConfig({ output, domain, isPrivateMode, endpoin
     endpointType?: IBuildWedaApp['endpointType'];
     buildTypeList?: IBuildWedaApp['buildTypeList'];
 }): Promise<void>;
-export declare function buildWedaApp({ cals, subAppCalsList: _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 buildWedaApp({ cals, subAppCalsList: _subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints: _cdnEndpoints, isPrivateMode, endpointType, enableExpiredTag, enableAd, account, mpConfig, privatelinkConfig, }: 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

@@ -60,8 +60,9 @@ exports.buildWedaConfig = buildWedaConfig;
 async function buildWedaApp({ cals, subAppCalsList: _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, enableAd = false, account = {}, mpConfig = {}, }, cb) {
+}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints: _cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, enableAd = false, account = {}, mpConfig = {}, privatelinkConfig = undefined, }, cb) {
     var _a, _b, _c, _d, _e, _f;
+    const cdnEndpoints = (0, config_1.generateCdnEndpoints)(_cdnEndpoints);
     if (!cals) {
         console.error('无效的应用配置');
         return;
@@ -117,6 +118,7 @@ async function buildWedaApp({ cals, subAppCalsList: _subAppCalsList = [], depend
         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,
+        privatelinkConfig: privatelinkConfig ? { uin: account === null || account === void 0 ? void 0 : account.uin, ...privatelinkConfig } : undefined,
     };
     console.log('domain', domain);
     console.log('应用名', appKey);
@@ -171,6 +173,9 @@ async function buildWedaApp({ cals, subAppCalsList: _subAppCalsList = [], depend
             const { enablePageRoot } = (0, cals_1.parseVersion)(cals === null || cals === void 0 ? void 0 : cals.schemaVersion, dependencies);
             const mpBuildContext = {
                 ...buildContext,
+                privatelinkConfig: buildContext.privatelinkConfig
+                    ? { ...buildContext.privatelinkConfig, jsUrl: undefined }
+                    : undefined,
                 projDir: (output === null || output === void 0 ? void 0 : output.path) || path_1.default.join(appBuildDir, 'mp'),
                 mainAppData: mainAppSerializeData,
                 processCssUnit: (calses.find((cals) => {
@@ -197,7 +202,7 @@ async function buildWedaApp({ cals, subAppCalsList: _subAppCalsList = [], depend
                 },
                 buildTypeList,
                 ignoreInstall,
-                cdnEndpoints: (0, config_1.generateCdnEndpoints)(cdnEndpoints),
+                cdnEndpoints,
                 mpConfig,
             });
             const outDir = mpBuildContext.projDir;
@@ -220,7 +225,13 @@ async function buildWedaApp({ cals, subAppCalsList: _subAppCalsList = [], depend
             if (!process.env.IS_WEB_WORKER) {
                 const { buildH5App } = require('../h5/index');
                 const h5BuildDir = await buildH5App({
-                    buildContext: { ...buildContext, isMixMode: false },
+                    buildContext: {
+                        ...buildContext,
+                        isMixMode: false,
+                        privatelinkConfig: buildContext.privatelinkConfig
+                            ? { ...buildContext.privatelinkConfig, jsUrl: (0, config_1.getPrivatelinkJsUrl)(cdnEndpoints.cdngo) }
+                            : undefined,
+                    },
                     cals,
                     subAppCalsList,
                     extraData,
@@ -230,7 +241,7 @@ async function buildWedaApp({ cals, subAppCalsList: _subAppCalsList = [], depend
                     runtime,
                     deployOptions,
                     ignoreInstall,
-                    cdnEndpoints: (0, config_1.generateCdnEndpoints)(cdnEndpoints),
+                    cdnEndpoints,
                 });
                 await (cb === null || cb === void 0 ? void 0 : cb(null, {
                     outDir: h5BuildDir,

package/lib/builder/h5/index.js

@@ -52,7 +52,7 @@ if (!process.env.IS_WEB_WORKER) {
 }
 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, } = buildContext;
+    const { projDir: buildDir, domain, materialLibs: dependencies, appId: appKey, isPrivateMode, enableExpiredTag, privatelinkConfig, } = buildContext;
     if (!deployOptions.mode) {
         deployOptions.mode = types_1.DEPLOY_MODE.PREVIEW;
     }
@@ -129,6 +129,7 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
             isPrivateMode,
             expirationStartTimesnap: enableExpiredTag ? Date.now() : undefined,
             usedComps: used,
+            privatelinkConfig,
         });
         console.timeEnd(runGenerateTag);
         // // 构建 NPM 包

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

@@ -1,4 +1,5 @@
 import { IMaterialItem, IWeAppData, IMiniprogramPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { IBuildWedaApp } from '../core';
 /**
  * All build parameters and intermediate data to be share across processes
  */
@@ -31,6 +32,10 @@ export interface IAppCommonBuildContext extends ICommonBuildContext {
      * 云开发sdk请求，js-sdk or wx.cloud
      */
     endpointType?: 'tcb-api' | 'wechat-service';
+    /**
+     * 云开发私密链路配置
+     */
+    privatelinkConfig?: IBuildWedaApp['privatelinkConfig'];
     /**
      * 是否使用默认加载
      */

package/lib/builder/mp/index.js

@@ -256,6 +256,9 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                 builderVersion: core_1.version || '',
                 officialLibVersion: (officialLib === null || officialLib === void 0 ? void 0 : officialLib.version) || '',
                 uin,
+                privatelink: buildContext.privatelinkConfig
+                    ? JSON.stringify(buildContext.privatelinkConfig, undefined, 2)
+                    : undefined,
             },
             'datasources/datasource-profiles.js.tpl': {
                 datasourceProfiles: (0, util_3.JsonToStringWithVariableName)([], { EOL: false }),
@@ -271,27 +274,42 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
         // 生成上报 & 系统子包模块模块
         const subpackageRootPath = path_1.default.join(localWedaRoot, 'packages', '$wd_system');
         const sysSubpackageFileData = {
-            'package.json': { cdnEndpoints },
-            'index.js.tpl': { cdnEndpoints },
+            'package.json': { cdnEndpoints, privatelink: !!buildContext.privatelinkConfig },
+            'index.js.tpl': { cdnEndpoints, privatelink: !!buildContext.privatelinkConfig },
         };
         console.log(`Generating ${em('system subpackage')} files`);
-        await (0, generateFiles_1.copyRecursiveSync)(path_1.default.join(templateDir, 'packages/$wd_system/pages'), path_1.default.join(subpackageRootPath, 'pages'), {
-            filter: (src) => {
-                var _a, _b;
-                if (/.tpl$/.test(src)) {
-                    return false;
-                }
-                if (/login\//.test(src)) {
-                    if ((_b = (_a = calses[0]) === null || _a === void 0 ? void 0 : _a.extra) === null || _b === void 0 ? void 0 : _b.loginConfigVersion) {
-                        return true;
-                    }
-                    else {
+        function copyFilterTplRecursiveSync(src, dest, options) {
+            return (0, generateFiles_1.copyRecursiveSync)(src, dest, {
+                filter: (src) => {
+                    if (/.tpl$/.test(src)) {
                         return false;
                     }
-                }
-                return true;
-            },
-        });
+                    if (options === null || options === void 0 ? void 0 : options.filter) {
+                        return options === null || options === void 0 ? void 0 : options.filter(src);
+                    }
+                    return true;
+                },
+            });
+        }
+        Promise.all([
+            !!buildContext.privatelinkConfig
+                ? copyFilterTplRecursiveSync(path_1.default.join(templateDir, 'packages/$wd_system/privatelink'), path_1.default.join(subpackageRootPath, 'privatelink'))
+                : Promise.resolve(),
+            copyFilterTplRecursiveSync(path_1.default.join(templateDir, 'packages/$wd_system/pages'), path_1.default.join(subpackageRootPath, 'pages'), {
+                filter: (src) => {
+                    var _a, _b;
+                    if (/login\//.test(src)) {
+                        if ((_b = (_a = calses[0]) === null || _a === void 0 ? void 0 : _a.extra) === null || _b === void 0 ? void 0 : _b.loginConfigVersion) {
+                            return true;
+                        }
+                        else {
+                            return false;
+                        }
+                    }
+                    return true;
+                },
+            }),
+        ]);
         await (0, generateFiles_1.default)(sysSubpackageFileData, path_1.default.join(templateDir, 'packages/$wd_system'), subpackageRootPath);
     }
     // #4 生成 miniprogramRoot 文件

package/lib/builder/mp/materials.js

@@ -85,7 +85,7 @@ async function generateCompLibs(ctx, outDir, mode) {
                 processCssUnit: lib.name === cals_1.OFFICIAL_COMPONENT_LIB_NAME || reg.test(lib.name) ? 'rpx' : ctx.processCssUnit,
                 // 只生成在主目录中，减少冗余
                 // rootPath: app.rootPath || '', // 主包是没有 rootPath 的
-            }, cmp, outDir, lib.rootPath !== undefined ? lib.rootPath : path.join(config_1.materialsDirName, lib.name), lib.compLibCommonResource, mode);
+            }, cmp, outDir, lib.rootPath !== undefined ? lib.rootPath : path.posix.join(config_1.materialsDirName, lib.name), lib.compLibCommonResource, mode);
         }));
     }));
 }

package/lib/builder/mp/wxml.js

@@ -47,7 +47,7 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
                     type: 'element',
                     name: WD_INFO,
                     attributes: {
-                        message: '当前页面无法访问',
+                        message: disabled ? '当前应用已停用' : '当前页面无法访问',
                         type: 'notfound',
                         enableCustom: true,
                         pageUUID: ctx.pageUUID,