@cloudbase/lowcode-builder 1.8.95 → 1.8.97

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

@@ -3,6 +3,7 @@ import { BuildType, GenerateMpType, WebpackBuildCallBack, WebpackModeType } from
 import { DEPLOY_MODE, RUNTIME } from '../../types';
 import { IPlatformApp } from '@cloudbase/cals';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
+import { ICommonBuildContext } from '../mp/BuildContext';
 interface IBaseAppProps {
     appKey: string;
     dependencies?: IMaterialItem[];
@@ -94,3 +95,11 @@ export declare function normalizeInputs(inputs: INormalizeInput, { envId, getWeb
         deployOptions: any;
     }) => string;
 }): InormalizeOutput;
+export declare function buildComposite({ dependencies, output, isBrowserMpBuilder, }: {
+    dependencies: IMaterialItem[];
+    rpxCalcRoot?: string;
+    output: {
+        path: string;
+    };
+    isBrowserMpBuilder?: ICommonBuildContext['isBrowserMpBuilder'];
+}): Promise<void>;

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.normalizeInputs = exports.getCompileDirs = exports.downloadZip = exports.strToBuf = exports.fileToZip = exports.getFiles = exports.version = exports.cleanComponentDir = exports.buildWedaApp = exports.buildWedaConfig = void 0;
+exports.buildComposite = 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 path_1 = __importDefault(require("path"));
 const util_1 = require("../util");
@@ -16,6 +16,7 @@ const cals_1 = require("@cloudbase/cals");
 const net_1 = require("../util/net");
 const config_1 = require("../config");
 const axios_1 = __importDefault(require("axios"));
+const materials_1 = require("../mp/materials");
 const pkg = require('../../../package.json');
 async function buildWedaConfig({ output, domain = undefined, isPrivateMode = undefined, endpointType = undefined, buildTypeList = [common_1.BuildType.WEB], }) {
     if ((0, common_1.buildAsWebByBuildType)(buildTypeList)) {
@@ -131,6 +132,10 @@ async function buildWedaApp({ cals, subAppCalsList: _subAppCalsList = [], depend
                     }
                     if (value === null || value === void 0 ? void 0 : value.component) {
                         const component = value;
+                        /**
+                         * TODO: 判断需要根据 componentType 来
+                         * 但是此刻还没有具体的 componentInfo 信息
+                         */
                         if ((value === null || value === void 0 ? void 0 : value.component) &&
                             `${component.module}:${component.component}` === `${config_1.REPEATER.MODULE_NAME}:${config_1.REPEATER.REPEATER_NAME}`) {
                             // 给 Repeater 组件加一层虚拟项组件，在虚拟项组件上挂 for 循环
@@ -362,3 +367,115 @@ function normalizeCals(cals, { buildTypeList, envId, deployOptions, appId, getWe
 function _getWebRootPath({ appId, deployOptions }) {
     return (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.UPLOAD ? `/${appId}/production/` : `/${appId}/preview/`;
 }
+async function buildComposite({ dependencies, output, isBrowserMpBuilder, }) {
+    var _a, _b;
+    const packageMiniprogramEntry = 'dist';
+    const localWedaRoot = path_1.default.join(output.path, packageMiniprogramEntry);
+    const buildContext = {
+        materialLibs: dependencies.map((lib) => {
+            (0, materials_1.normalizeCompositeDependienciesForBuild)(lib);
+            return lib;
+        }),
+        isProduction: true,
+        /**
+         * 新版本不再默认转换
+         * 则此处构建都以px为准
+         */
+        processCssUnit: 'px',
+        isBrowserMpBuilder,
+    };
+    await (0, index_1.generateWedaRootCommonFile)({
+        buildContext,
+        buildTypeList: [common_1.BuildType.MP],
+        localWedaRoot,
+        nativeMode: true,
+        // 组件无需生成，节省空间
+        filter: (src) => {
+            return !/common\/weapp-page/.test(src);
+        },
+    });
+    let usedComps;
+    const composite = dependencies.find((lib) => lib.isComposite);
+    if (composite) {
+        let id = 0;
+        const cals = {
+            items: [
+                {
+                    id: '$page',
+                    type: 'PAGE',
+                    items: ((_b = (_a = composite.components) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, (component) => {
+                        id += 1;
+                        return {
+                            id: `id${id}`,
+                            module: composite.name,
+                            component: component.name,
+                            attributes: {},
+                        };
+                    })) || [],
+                },
+            ],
+        };
+        usedComps = (0, cals_1.getUsedComps)([cals], dependencies, { streamline: true, withAction: true });
+    }
+    await (0, materials_1.installMaterials)(buildContext, localWedaRoot, usedComps, 'lib');
+    await Promise.all(buildContext.materialLibs.map((lib) => {
+        return fs_extra_1.default.remove(path_1.default.join(localWedaRoot, config_1.materialsDirName, lib.name, 'meta.json'));
+    }));
+    await patchMpComponentNPM({
+        packageDir: output.path,
+        name: composite === null || composite === void 0 ? void 0 : composite.name,
+        version: composite === null || composite === void 0 ? void 0 : composite.version,
+        packageMiniprogramEntry,
+    });
+    // await generateCompLibs(dependencies, rpxCalcRoot);
+}
+exports.buildComposite = buildComposite;
+async function patchMpComponentNPM({ packageDir, name, version, packageMiniprogramEntry = '', }) {
+    await fs_extra_1.default.mkdirSync(path_1.default.join(packageDir, 'scripts'));
+    const packageJsonPath = path_1.default.join(packageDir, 'package.json');
+    let packageJSON = {};
+    if (fs_extra_1.default.existsSync(packageJsonPath)) {
+        packageJSON = await fs_extra_1.default.readJSON(packageJsonPath);
+    }
+    const BASE_DEPS = {
+        mobx: '^5.15.4',
+        'lodash.get': '^4.4.2',
+        'lodash.set': '^4.3.2',
+        'miniprogram-gesture': '^1.0.6',
+        'miniprogram-api-promise': '^1.0.4',
+        '@cloudbase/oauth': '^0.1.1-alpha.5',
+        '@cloudbase/weda-client': '^1.0.31',
+        '@cloudbase/weda-cloud-sdk': '^1.0.59',
+    };
+    if (packageJSON.dependencies) {
+        for (const key in BASE_DEPS) {
+            delete packageJSON.dependencies[key];
+        }
+    }
+    packageJSON = {
+        ...packageJSON,
+        name: `@tcwd/weda-component-${name || 'lib'}`,
+        version: version || packageJSON.version || '0.0.1',
+        miniprogram: `./${packageMiniprogramEntry}`,
+        scripts: {
+            ...packageJSON.scripts,
+            postinstall: 'node scripts/fixCloudSdk.js',
+        },
+        peerDependencies: {
+            ...packageJSON.peerDependencies,
+            ...BASE_DEPS,
+        },
+    };
+    await Promise.all([
+        fs_extra_1.default.writeFile(path_1.default.join(packageDir, 'scripts', 'fixCloudSdk.js'), `try {
+const cloudIndex = require.resolve('@cloudbase/weda-cloud-sdk') || '';
+const cloudFixPath = cloudIndex.replace(/@cloudbase\\/weda-cloud-sdk\\/.*$/, '@cloudbase/weda-cloud-sdk/scripts/fix-wx-none-private.js');
+const fix = require(cloudFixPath);
+fix()
+} catch(e) {
+  console.log('run scripts error', e)
+}
+`),
+        fs_extra_1.default.writeFile(packageJsonPath, JSON.stringify(packageJSON, undefined, 2)),
+    ]);
+}

package/lib/builder/h5/generate.d.ts

@@ -13,7 +13,7 @@ export declare function generateHTML({ buildContext, appId, envId, description,
  * 默认值为 undefined 否则应为 false
  */
 enableLoading, publicPath, }: {
-    buildContext: Omit<ICommonBuildContext, 'mainAppData'>;
+    buildContext: Pick<ICommonBuildContext, 'materialLibs' | 'uin'>;
     appId: string;
     envId: string;
     description?: string;

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

@@ -3,10 +3,10 @@ import { BuildType, WebpackModeType } from '../types/common';
 import { RUNTIME } from '../../types';
 import { IPlatformApp } from '@cloudbase/cals';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
-import { ICommonBuildContext } from '../mp/BuildContext';
+import { IAppCommonBuildContext } from '../mp/BuildContext';
 import { IBuildWedaApp } from '../core';
 export declare function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployOptions, ignoreInstall, cdnEndpoints, }: {
-    buildContext: Omit<ICommonBuildContext, 'mainAppData'>;
+    buildContext: Omit<IAppCommonBuildContext, 'mainAppData'>;
     cals: IPlatformApp;
     subAppCalsList: IPlatformApp[];
     i18nConfig?: II18nConfig;

package/lib/builder/h5/webpack.d.ts

@@ -2,9 +2,9 @@ import { IWebRuntimeAppData } from '@cloudbase/lowcode-generator/lib/weapps-core
 import { BuildAppProps } from '../core/index';
 import { IPlatformApp } from '@cloudbase/cals';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
-import { ICommonBuildContext } from '../mp/BuildContext';
+import { IAppCommonBuildContext } from '../mp/BuildContext';
 interface IWebpackCoreProps extends BuildAppProps {
-    buildContext: Omit<ICommonBuildContext, 'mainAppData'>;
+    buildContext: Omit<IAppCommonBuildContext, 'mainAppData'>;
     cals: IPlatformApp;
     appBuildDir: string;
     mainAppData: IWebRuntimeAppData;

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

@@ -7,18 +7,9 @@ export interface ICommonBuildContext {
      * 账号信息
      */
     uin?: string;
-    /**
-     * 应用id
-     */
-    appId: string;
-    projDir: string;
-    domain: string;
     materialLibs: IMaterialItem[];
     isProduction: boolean;
-    mainAppData: IWeAppData;
-    isMixMode: boolean;
     rootPath?: string;
-    miniprogramPlugins?: IMiniprogramPlugin[];
     debugMode?: boolean;
     isBrowserMpBuilder?: boolean;
     processCssUnit?: 'px' | 'rem' | 'rpx';
@@ -26,6 +17,16 @@ export interface ICommonBuildContext {
      * 是否是私有化的环境
      */
     isPrivateMode?: boolean;
+}
+export interface IAppCommonBuildContext extends ICommonBuildContext {
+    /**
+     * 应用id
+     */
+    appId: string;
+    projDir: string;
+    domain: string;
+    mainAppData: IWeAppData;
+    isMixMode: boolean;
     /**
      * 云开发sdk请求，js-sdk or wx.cloud
      */
@@ -59,16 +60,19 @@ export interface ICommonBuildContext {
      */
     statusPageId?: string;
 }
-export interface IBuildContext extends ICommonBuildContext {
+export interface IMpCommonBuildContext extends ICommonBuildContext {
+    /**
+     * 组件库目录独立子包
+     */
+    enableAsyncMaterials?: boolean;
+    miniprogramPlugins?: IMiniprogramPlugin[];
+}
+export interface IBuildContext extends IAppCommonBuildContext, IMpCommonBuildContext {
     /**
      * 是否在页面层面添加节点
      * 并设置 #page-root-id
      */
     enablePageRoot?: boolean;
-    /**
-     * 组件库目录独立子包
-     */
-    enableAsyncMaterials?: boolean;
     /**
      * weda 默认自身root
      */

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

@@ -1,9 +1,19 @@
 import { IWeAppData, IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
-import { IBuildContext } from './BuildContext';
+import { IBuildContext, IMpCommonBuildContext } from './BuildContext';
 import { BuildType } from '../types/common';
 import { IPlatformApp } from '@cloudbase/cals';
 import { IBuildWedaApp } from '../core';
+export declare function generateWedaRootCommonFile({ buildContext, buildTypeList, localWedaRoot, loginConfigVersion, cssVarConfig, appId, nativeMode, filter, }: {
+    buildContext: IMpCommonBuildContext & Partial<Pick<IBuildContext, 'enableExpiredTag' | 'domain' | 'runtimeDynamicConfig'>>;
+    buildTypeList: BuildType[];
+    localWedaRoot: string;
+    appId?: string;
+    loginConfigVersion?: string;
+    cssVarConfig?: Object;
+    nativeMode?: boolean;
+    filter?: (src: string) => boolean;
+}): Promise<void>;
 export declare function generateWxMp({ buildContext: _buildContext, weapps, calses, deployOptions, options, buildTypeList, ignoreInstall, cdnEndpoints, mpConfig, }: {
     buildContext: Omit<IBuildContext, 'wedaRoot'>;
     weapps: IWeAppData[];

package/lib/builder/mp/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.writeLowCodeFiles = exports.generateConfig = exports.generateWxMp = void 0;
+exports.writeLowCodeFiles = exports.generateConfig = exports.generateWxMp = exports.generateWedaRootCommonFile = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
@@ -66,8 +66,85 @@ function patchBuildContext(ctx, calses) {
     ctx.miniprogramPlugins = (mainAppData.miniprogramPlugins || []).filter((plugin) => used.component[plugin.name] || used.action[plugin.name]);
     return { used };
 }
+async function generateWedaRootCommonFile({ buildContext, buildTypeList, localWedaRoot, loginConfigVersion, cssVarConfig, appId, nativeMode, filter = () => true, }) {
+    const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!buildContext.isProduction);
+    const expirationStartTimesnap = buildContext.enableExpiredTag ? Date.now() : 0;
+    const cssVarMap = Object.entries((0, theme_1.mergeCssVarConfig)(cssVarConfig, 'MP'))
+        .map(([key, _value]) => {
+        const value = _value || '';
+        return [key, value.replace(/;$/, '')];
+    })
+        .reduce((map, [key, value]) => {
+        map[key] = value;
+        return map;
+    }, {}) || {};
+    let customLoginConfig;
+    let loginConfigPathname = loginConfigVersion
+        ? (0, cals_1.generateCustomLoginConfigPathname)({ appId: appId || '', version: loginConfigVersion })
+        : '';
+    if (loginConfigPathname && buildContext.domain) {
+        const url = `https://${buildContext.domain}${loginConfigPathname}`;
+        try {
+            const { data } = await axios_1.default.get(url, { responseType: 'json' });
+            if (data) {
+                customLoginConfig = data;
+            }
+        }
+        catch (e) {
+            console.error('预置获取登录配置失败：', url, e);
+        }
+    }
+    const wedaRootFileData = {
+        'common/style.js': {},
+        'common/util.js': {
+            skipCheckAuth: process.env.SKIP_CHECK_AUTH,
+            isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
+            expirationStartTimesnap,
+            runtimeDynamicConfig: buildContext.runtimeDynamicConfig || {},
+            RUNTIME_CONFIG_URL: index_1.RUNTIME_CONFIG_URL,
+            loginConfigPathname,
+            customLoginConfig: customLoginConfig ? JSON.stringify(customLoginConfig, undefined, 2) : 'null',
+        },
+        'common/cloud-sdk.js': {},
+        'common/widget.js': {},
+        'common/weapp-page.js': {
+            expirationStartTimesnap,
+            pageStyle: JSON.stringify(cssVarMap || {}, undefined, 2),
+        },
+        'common/weapp-component.js': {
+            nativeMode,
+        },
+        'common/merge-renderer.js': {
+            dataPropNames: wxmlDataPrefix,
+            debug: buildContext.debugMode,
+        },
+        'common/data-patch.js': {},
+        'common/event-emitter.js': {},
+        'common/watch.js': {},
+        'common/constant.js': {
+            REPEATER: JSON.stringify(config_1.REPEATER, undefined, 2),
+        },
+        'common/query.js': {},
+        'common/flow.js': {},
+        'common/info': {},
+        'common/placeholder': {},
+        /**
+         * 使用微信的 modal
+         * 暂时保留内部实现待之后使用
+         */
+        // 'common/privacyModal': {},
+        // 'common/modal': {},
+        /**
+         * 调试用
+         */
+        // 'common/behaviors.js': {},
+    };
+    console.log(`Generating ${em('weda root')} files`);
+    await (0, generateFiles_1.default)(wedaRootFileData, templateDir, localWedaRoot, filter);
+}
+exports.generateWedaRootCommonFile = generateWedaRootCommonFile;
 async function generateWxMp({ buildContext: _buildContext, weapps, calses, deployOptions, options, buildTypeList, ignoreInstall = false, cdnEndpoints = {}, mpConfig = {}, }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
     console.log(`Generating ${em('Wexin MiniProgram')} to ${_buildContext.projDir}`);
@@ -104,8 +181,7 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
         const templateLib = (0, cals_1.processTemplatesToDependiencies)((_b = calses === null || calses === void 0 ? void 0 : calses[0]) === null || _b === void 0 ? void 0 : _b.templates);
         _buildContext.materialLibs = [..._buildContext.materialLibs, templateLib];
     }
-    const { uin = '', appId, projDir, materialLibs: materials, isProduction, mainAppData, domain, isPrivateMode = false, endpointType = '', isBrowserMpBuilder = false, } = _buildContext;
-    const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!isProduction);
+    const { uin = '', appId, projDir, materialLibs: materials, mainAppData, domain, isPrivateMode = false, endpointType = '', isBrowserMpBuilder = false, } = _buildContext;
     const hasLowcodePkg = weapps.find((item) => !item.mpPkgUrl);
     // #1 generate project files
     if (!mainAppData.mpPkgUrl) {
@@ -131,7 +207,7 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
     };
     // #1.5 安装依赖库，生成 materials 目录副作用修改了buildContext 因此需要早于页面生成
     if (hasLowcodePkg) {
-        await (0, materials_1.installMaterials)(buildContext, localWedaRoot, used, weapps);
+        await (0, materials_1.installMaterials)(buildContext, localWedaRoot, used);
     }
     // #2 生成主包, 若主包为代码包上游已经处理过，不再处理
     if (mainAppData.mpPkgUrl) {
@@ -147,84 +223,21 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
             isPrivateMode,
             endpointType,
         }, localWedaRoot);
-        const expirationStartTimesnap = buildContext.enableExpiredTag ? Date.now() : 0;
-        const cssVarMap = Object.entries((0, theme_1.mergeCssVarConfig)((_d = (_c = calses[0]) === null || _c === void 0 ? void 0 : _c.theme) === null || _d === void 0 ? void 0 : _d.cssVarConfig, 'MP'))
-            .map(([key, _value]) => {
-            const value = _value || '';
-            return [key, value.replace(/;$/, '')];
-        })
-            .reduce((map, [key, value]) => {
-            map[key] = value;
-            return map;
-        }, {}) || {};
-        let customLoginConfig;
-        let loginConfigPathname = ((_f = (_e = calses[0]) === null || _e === void 0 ? void 0 : _e.extra) === null || _f === void 0 ? void 0 : _f.loginConfigVersion)
-            ? (0, cals_1.generateCustomLoginConfigPathname)({ appId, version: (_h = (_g = calses[0]) === null || _g === void 0 ? void 0 : _g.extra) === null || _h === void 0 ? void 0 : _h.loginConfigVersion })
-            : '';
-        if (loginConfigPathname) {
-            const url = `https://${domain}${loginConfigPathname}`;
-            try {
-                const { data } = await axios_1.default.get(url, { responseType: 'json' });
-                if (data) {
-                    customLoginConfig = data;
-                }
-            }
-            catch (e) {
-                console.error('预置获取登录配置失败：', url, e);
-            }
-        }
-        const wedaRootFileData = {
-            'common/style.js': {},
-            'common/util.js': {
-                skipCheckAuth: process.env.SKIP_CHECK_AUTH,
-                isAdminPortal: (0, common_1.buildAsAdminPortalByBuildType)(buildTypeList),
-                expirationStartTimesnap,
-                runtimeDynamicConfig: buildContext.runtimeDynamicConfig,
-                RUNTIME_CONFIG_URL: index_1.RUNTIME_CONFIG_URL,
-                loginConfigPathname: ((_k = (_j = calses[0]) === null || _j === void 0 ? void 0 : _j.extra) === null || _k === void 0 ? void 0 : _k.loginConfigVersion)
-                    ? (0, cals_1.generateCustomLoginConfigPathname)({ appId, version: (_m = (_l = calses[0]) === null || _l === void 0 ? void 0 : _l.extra) === null || _m === void 0 ? void 0 : _m.loginConfigVersion })
-                    : '',
-                customLoginConfig: customLoginConfig ? JSON.stringify(customLoginConfig, undefined, 2) : 'null',
-            },
-            'common/widget.js': {},
-            'common/weapp-page.js': {
-                expirationStartTimesnap,
-                pageStyle: JSON.stringify(cssVarMap || {}, undefined, 2),
-            },
-            'common/weapp-component.js': {},
-            'common/merge-renderer.js': {
-                dataPropNames: wxmlDataPrefix,
-                debug: buildContext.debugMode,
-            },
-            'common/data-patch.js': {},
-            'common/event-emitter.js': {},
-            'common/watch.js': {},
-            'common/constant.js': {
-                REPEATER: JSON.stringify(config_1.REPEATER, undefined, 2),
-            },
-            'common/query.js': {},
-            'common/flow.js': {},
-            'common/info': {},
-            'common/placeholder': {},
-            /**
-             * 使用微信的 modal
-             * 暂时保留内部实现待之后使用
-             */
-            // 'common/privacyModal': {},
-            // 'common/modal': {},
-            /**
-             * 调试用
-             */
-            // 'common/behaviors.js': {},
+        await generateWedaRootCommonFile({
+            buildContext,
+            buildTypeList,
+            localWedaRoot,
+            appId,
+            loginConfigVersion: (_d = (_c = calses[0]) === null || _c === void 0 ? void 0 : _c.extra) === null || _d === void 0 ? void 0 : _d.loginConfigVersion,
+            cssVarConfig: (_f = (_e = calses[0]) === null || _e === void 0 ? void 0 : _e.theme) === null || _f === void 0 ? void 0 : _f.cssVarConfig,
+        });
+        await (0, generateFiles_1.default)({
             'package.json': {
                 appId,
                 importJSSDK: endpointType === 'tcb-api',
                 extraDeps: resolveNpmDeps(weapps, materials),
-                cdnEndpoints,
             },
-        };
-        console.log(`Generating ${em('weda root')} files`);
-        await (0, generateFiles_1.default)(wedaRootFileData, templateDir, localWedaRoot);
+        }, templateDir, localWedaRoot);
         // 生成数据源
         const officialLib = materials.find((item) => item.name === cals_1.OFFICIAL_LIB_KEY);
         const datasourceFileData = {
@@ -236,9 +249,9 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                 appID: appId,
                 resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
                 isProd: (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.UPLOAD,
-                clientID: ((_o = mainAppData.extra) === null || _o === void 0 ? void 0 : _o.enableLoginStatusShare)
+                clientID: ((_g = mainAppData.extra) === null || _g === void 0 ? void 0 : _g.enableLoginStatusShare)
                     ? mainAppData.envId
-                    : (_p = mainAppData.extra) === null || _p === void 0 ? void 0 : _p.clientId,
+                    : (_h = mainAppData.extra) === null || _h === void 0 ? void 0 : _h.clientId,
                 cdnEndpoints,
                 builderVersion: core_1.version || '',
                 officialLibVersion: (officialLib === null || officialLib === void 0 ? void 0 : officialLib.version) || '',
@@ -288,8 +301,8 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
         projectConfigJson.setting = {
             ...projectConfigJson.setting,
             ...projConfig.setting,
-            packNpmRelationList: ((_q = projConfig.setting) === null || _q === void 0 ? void 0 : _q.packNpmRelationList) || ((_r = projectConfigJson.setting) === null || _r === void 0 ? void 0 : _r.packNpmRelationList)
-                ? (0, mp_config_1.mergePackNpmRelationList)(projConfig.setting.packNpmRelationList, (_s = projectConfigJson.setting) === null || _s === void 0 ? void 0 : _s.packNpmRelationList)
+            packNpmRelationList: ((_j = projConfig.setting) === null || _j === void 0 ? void 0 : _j.packNpmRelationList) || ((_k = projectConfigJson.setting) === null || _k === void 0 ? void 0 : _k.packNpmRelationList)
+                ? (0, mp_config_1.mergePackNpmRelationList)(projConfig.setting.packNpmRelationList, (_l = projectConfigJson.setting) === null || _l === void 0 ? void 0 : _l.packNpmRelationList)
                 : undefined,
         };
         const wedaRoot = path_1.default.posix.join('./', projectConfigJson.miniprogramRoot || '/', projectConfigJson.wedaRoot || '');
@@ -309,7 +322,7 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
         }
         const appJsonPath = path_1.default.join(miniprogramRoot, 'app.json');
         const appJson = await fs.readJson(appJsonPath);
-        appJson.subpackages = (0, mp_config_1.mergeSubPackages)(((_u = (_t = appJson.subpackages) === null || _t === void 0 ? void 0 : _t.filter) === null || _u === void 0 ? void 0 : _u.call(_t, (item) => item.name !== 'wd-sys-module' && item.name !== 'wd-sys-materials')) || [], appConfig.subpackages);
+        appJson.subpackages = (0, mp_config_1.mergeSubPackages)(((_o = (_m = appJson.subpackages) === null || _m === void 0 ? void 0 : _m.filter) === null || _o === void 0 ? void 0 : _o.call(_m, (item) => item.name !== 'wd-sys-module' && item.name !== 'wd-sys-materials')) || [], appConfig.subpackages);
         await (0, generateFiles_1.writeFile)(appJsonPath, JSON.stringify(appJson, undefined, 2));
     }
     else {
@@ -473,7 +486,7 @@ async function generatePkg(ctx, { cals, weapp }, appRoot, pageConfigs) {
     if (weapp.mpPkgUrl) {
         // 清空历史文件，使用zip覆盖
         console.log(`Removing ${appRoot}`);
-        await (0, generateFiles_1.cleanDir)(appRoot, ['materials']);
+        await (0, generateFiles_1.cleanDir)(appRoot, [config_1.materialsDirName]);
         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/lowcode.d.ts

@@ -1,9 +1,11 @@
 import { IWeAppCode, ICompositedComponent } from '@cloudbase/lowcode-generator/lib/weapps-core';
-import { IBuildContext } from './BuildContext';
-export declare function writeCode2file(ctx: IBuildContext, mod: IWeAppCode, lowcodeRootDir: string, opts?: {
+import { IBuildContext, IMpCommonBuildContext } from './BuildContext';
+export declare function writeCode2file(ctx: IBuildContext | (IMpCommonBuildContext & {
+    isMixMode?: undefined;
+}), mod: IWeAppCode, lowcodeRootDir: string, opts?: {
     pageId?: string;
     appDir?: string;
     comp?: ICompositedComponent;
-}, themeCode?: ''): Promise<void>;
+}, themeCode?: '', externalAPIImport?: boolean): Promise<void>;
 export declare function handle$page(code: string): string;
 export declare function handle$comp(code: string): string;

package/lib/builder/mp/lowcode.js

@@ -9,9 +9,16 @@ const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
 const style_1 = require("@cloudbase/lowcode-generator/lib/generator/util/style");
 const generateFiles_1 = require("../util/generateFiles");
 const cals_1 = require("@cloudbase/cals");
-async function writeCode2file(ctx, mod, lowcodeRootDir, opts = {}, themeCode) {
+async function writeCode2file(ctx, mod, lowcodeRootDir, opts = {}, themeCode, externalAPIImport) {
     const { pageId = 'global', appDir, comp } = opts;
     const file = path_1.default.join(lowcodeRootDir, (0, weapps_core_1.getCodeModuleFilePath)(pageId || 'global', mod, { style: '.wxss' }));
+    function importFromClientSDK(with$w) {
+        return [
+            `import { getWedaAPI } from '@cloudbase/weda-client';`,
+            'const app = new Proxy({}, { get: function(obj, prop){ return getWedaAPI()?.app?.[prop] }});',
+            'const $app = new Proxy({}, { get: function(obj, prop){ return app[prop] }});',
+        ].concat(with$w ? ['const $w = new Proxy({}, { get: function(obj, prop){ return getWedaAPI()?.$w?.[prop] }});'] : []);
+    }
     let { code } = mod;
     if (mod.type !== cals_1.ECodeType.STYLE && mod.type !== cals_1.ECodeType.THEME) {
         if (appDir) {
@@ -19,9 +26,9 @@ async function writeCode2file(ctx, mod, lowcodeRootDir, opts = {}, themeCode) {
             const baseDir = path_1.default.relative(path_1.default.dirname(file), appDir).replace(/\\/g, '/');
             // 子包混合模式需要添加相对索引到根目录
             const relativeRoot = (ctx === null || ctx === void 0 ? void 0 : ctx.isMixMode) && ctx.rootPath ? `${path_1.default.relative(`packages/${ctx.rootPath}`, '')}/` : '';
-            let weappsApiPrefix = [
-                `import { app, $app${pageId !== 'global' ? '' : ', $w'} } from '${relativeRoot}${baseDir}/app/weapps-api';`,
-            ]; // windows compatibility
+            let weappsApiPrefix = externalAPIImport
+                ? importFromClientSDK(pageId === 'global')
+                : [`import { app, $app${pageId !== 'global' ? '' : ', $w'} } from '${relativeRoot}${baseDir}/app/weapps-api';`]; // windows compatibility
             if (pageId !== 'global') {
                 weappsApiPrefix.push(`import { $page, $w } from '${baseDir}/pages/${pageId}/api';`);
             }
@@ -29,7 +36,9 @@ async function writeCode2file(ctx, mod, lowcodeRootDir, opts = {}, themeCode) {
         }
         else {
             // Generate component lowcode
-            code = `import { app, $app, $w } from '${mod.type === 'handler-fn' ? '../' : ''}../../../../app/weapps-api';\n${code.replace(/\$comp/g, weapps_core_1.COMPONENT_API_PREFIX)}`;
+            code = `${externalAPIImport
+                ? importFromClientSDK(true).join('\n')
+                : `import { app, $app, $w } from '${mod.type === 'handler-fn' ? '../' : ''}../../../../app/weapps-api';`}\n${code.replace(/\$comp/g, weapps_core_1.COMPONENT_API_PREFIX)}`;
         }
     }
     else {

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

@@ -1,11 +1,13 @@
-import { IWeAppComponentInstance, IWeAppData } from '@cloudbase/lowcode-generator/lib/weapps-core';
-import { IBuildContext } from './BuildContext';
+import { IWeAppComponentInstance } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { IBuildContext, IMpCommonBuildContext } from './BuildContext';
 import NameMangler from '@cloudbase/lowcode-generator/lib/generator/util/name-mangler';
 import { IUsedComps } from '../types/common';
-export declare function installMaterials(ctx: IBuildContext, outDir: string, usedMeta: {
+export declare function normalizeCompositeDependienciesForBuild(lib: any): any;
+declare type TInstallMaterialsType = 'lib' | 'inline';
+export declare function installMaterials(ctx: IMpCommonBuildContext, outDir: string, usedMeta?: {
     component: IUsedComps;
     action: IUsedComps;
-}, weapps: IWeAppData[]): Promise<void>;
+}, mode?: TInstallMaterialsType): Promise<void>;
 /**
  * 过滤组件库文件
  * @param src 源文件
@@ -13,10 +15,13 @@ export declare function installMaterials(ctx: IBuildContext, outDir: string, use
  * @returns boolean
  */
 export declare function filterMaterial(src: any, dest: any): boolean;
-export declare function getWxmlTag(ctx: IBuildContext, cmp: Required<IWeAppComponentInstance>['xComponent'], nameMangler?: NameMangler): {
+export declare function getWxmlTag(ctx: IMpCommonBuildContext & {
+    wedaRoot?: IBuildContext['wedaRoot'];
+}, cmp: Required<IWeAppComponentInstance>['xComponent'], nameMangler?: NameMangler): {
     tagName: string;
     path?: undefined;
 } | {
     tagName: string;
     path: any;
 };
+export {};