@cloudbase/lowcode-builder 1.1.5-alpha.0 → 1.1.5-alpha.2

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

@@ -18,7 +18,7 @@ export declare const miniprogramURL = "https://comp-public-1303824488.cos.ap-sha
 export declare const miniprogramDir: string;
 export interface ICDN_ENDPOINTS_COFIG {
     common?: string;
-    cloudbase: string;
+    cloudbase?: string;
     cdngo?: string;
     aegis?: string;
 }

package/lib/builder/config/index.js

@@ -62,7 +62,7 @@ exports.CDN_ENDPONTS_CONFIG = {
 };
 function generateCdnEndpoints(endpoints = exports.CDN_ENDPONTS_CONFIG) {
     for (const key in exports.CDN_ENDPONTS_CONFIG) {
-        if (!endpoints[key]) {
+        if (!Object.prototype.hasOwnProperty.call(endpoints, key)) {
             endpoints[key] = endpoints.common ? endpoints.common : exports.CDN_ENDPONTS_CONFIG[key];
         }
     }

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

@@ -3,7 +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';
-export interface IBaseAppProps {
+interface IBaseAppProps {
     appKey: string;
     dependencies?: IMaterialItem[];
     publicPath?: string;
@@ -37,8 +37,9 @@ export interface IBuildWedaApp extends IBaseAppProps {
     };
     isBrowserMpBuilder?: boolean;
     cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
+    isPrivateMode?: boolean;
 }
-export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, }: 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, cdnEndpoints, isPrivateMode, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<string | undefined>;
 export declare function cleanComponentDir(): Promise<void>;
 export declare const version: any;
 export { getFiles, fileToZip, strToBuf } from '../util/generateFiles';

package/lib/builder/core/index.js

@@ -20,7 +20,7 @@ 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, isBrowserMpBuilder = false, cdnEndpoints, }, cb) {
+}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints, isPrivateMode = false, }, cb) {
     var _a, _b;
     if (!cals) {
         console.error('无效的应用配置');
@@ -28,6 +28,17 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
     }
     const { mode: deployMode = types_1.DEPLOY_MODE.PREVIEW } = deployOptions;
     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);
+    const buildContext = {
+        projDir: appBuildDir,
+        appId: appKey,
+        isProduction: mode === common_1.WebpackModeType.PRODUCTION,
+        materialLibs: dependencies,
+        debugMode: mode !== common_1.WebpackModeType.PRODUCTION && !!process.env.WEAPPS_DEBUG,
+        isMixMode: generateMpType === common_1.GenerateMpType.SUBPACKAGE,
+        domain,
+        isBrowserMpBuilder,
+        isPrivateMode,
+    };
     console.log('domain', domain);
     console.log('应用名', appKey);
     console.log('生成模式', generateMpType);
@@ -37,43 +48,40 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
         if (buildTypeList.includes(common_1.BuildType.MP)) {
             const mainAppSerializeData = (0, common_2.processCals2WeappsData)(cals, dependencies);
             const subAppSerializeDataList = (subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.map((item) => (0, common_2.processCals2WeappsData)(item, dependencies))) || [];
-            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 === null || output === void 0 ? void 0 : output.path);
             }
+            const mpBuildContext = {
+                ...buildContext,
+                projDir: (output === null || output === void 0 ? void 0 : output.path) || path_1.default.join(appBuildDir, 'mp'),
+                mainAppData: mainAppSerializeData,
+            };
             const result = await (0, index_1.generateWxMp)({
                 weapps: apps,
-                projDir: appBuildDir,
-                appId: appKey,
-                domain,
-                materials: dependencies,
+                buildContext: mpBuildContext,
                 plugins,
-                isProduction: mode === common_1.WebpackModeType.PRODUCTION,
                 deployMode,
-                isMixMode,
                 options: {
                     isCrossAccount: resourceAppId !== deployOptions.targetMpAppId,
                     mpAppId: deployOptions.mpAppId || '',
                     resourceAppId,
                 },
                 buildTypeList,
-                isBrowserMpBuilder,
             });
             // 如果是混合模式，则将特定的目录复制到工程下
             // 针对 app.json / package.json 则采用 merge 的操作
-            if (isMixMode) {
-                console.log(chalk_1.default.green('【混合模式】'), appBuildDir);
+            if (buildContext.isMixMode) {
+                console.log(chalk_1.default.green('【混合模式】'), mpBuildContext.projDir);
                 await (0, mixMode_1.handleMixMode)({
+                    buildContext: mpBuildContext,
                     apps,
-                    generateMpPath: appBuildDir,
                     miniprogramRoot: result.miniprogramRoot,
                     plugins,
                 });
             }
-            const outDir = appBuildDir;
+            const outDir = mpBuildContext.projDir;
             let projectJsonPath = path_1.default.resolve(outDir, 'project.config.json');
             await (0, postProcess_1.postprocessProjectConfig)(projectJsonPath, {
                 appid: deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mpAppId,
@@ -95,9 +103,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
         }
         else {
             const h5BuildDir = await (0, index_2.buildH5App)({
-                appKey,
-                buildDir: appBuildDir,
-                dependencies,
+                buildContext: { ...buildContext, isMixMode: false },
                 cals,
                 subAppCalsList,
                 extraData,
@@ -107,7 +113,6 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                 runtime,
                 deployMode,
                 ignoreInstall,
-                domain,
                 cdnEndpoints,
             });
             await (cb === null || cb === void 0 ? void 0 : cb(null, {
@@ -194,7 +199,7 @@ function normalizeInputs(inputs, { envId, getWebRootPath, }) {
             ...deployOptions,
             mpAppId: deployOptions.mpAppId || mpAppId,
         };
-        if (inputs.deployOptions.targetMpAppId === undefined) {
+        if (!inputs.deployOptions.targetMpAppId) {
             inputs.deployOptions.targetMpAppId = inputs.deployOptions.mpAppId;
         }
     }

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

@@ -1,14 +1,13 @@
-import { IMaterialItem, II18nConfig, IExtraData } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { II18nConfig, IExtraData } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { BuildType, WebpackModeType } from '../types/common';
 import { DEPLOY_MODE, RUNTIME } from '../../types';
 import { IPlatformApp } from '@cloudbase/cals';
 import { ICDN_ENDPOINTS_COFIG } from '../config';
-export declare function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraData, cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployMode, ignoreInstall, domain, cdnEndpoints, }: {
-    appKey: string;
-    buildDir: string;
+import { IBuildContext } from '../mp/BuildContext';
+export declare function buildH5App({ buildContext, i18nConfig, extraData, cals, buildTypeList, subAppCalsList, mode, devTool, runtime, deployMode, ignoreInstall, cdnEndpoints, }: {
+    buildContext: Omit<IBuildContext, 'mainAppData'>;
     cals: IPlatformApp;
     subAppCalsList: IPlatformApp[];
-    dependencies: IMaterialItem[];
     i18nConfig?: II18nConfig;
     buildTypeList: BuildType[];
     extraData: IExtraData;
@@ -17,6 +16,5 @@ export declare function buildH5App({ appKey, buildDir, dependencies, i18nConfig,
     runtime?: RUNTIME;
     deployMode?: DEPLOY_MODE;
     ignoreInstall?: boolean;
-    domain: string;
     cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
 }): Promise<string>;

package/lib/builder/h5/index.js

@@ -20,8 +20,9 @@ const mp_1 = require("../mp");
 const common_2 = require("../../utils/common");
 const config_1 = require("../config");
 const fs_extra_1 = __importDefault(require("fs-extra"));
-async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraData, cals, buildTypeList = [common_1.BuildType.WEB], subAppCalsList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployMode = types_1.DEPLOY_MODE.PREVIEW, ignoreInstall = false, domain = '', cdnEndpoints, }) {
+async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildTypeList = [common_1.BuildType.WEB], subAppCalsList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployMode = types_1.DEPLOY_MODE.PREVIEW, ignoreInstall = false, cdnEndpoints, }) {
     var _a, _b, _c;
+    const { projDir: buildDir, domain, materialLibs: dependencies, appId: appKey, isPrivateMode } = buildContext;
     try {
         const { materialsDir } = runtime === types_1.RUNTIME.CI ? (0, util_1.getCompileDirs)(appKey) : (0, util_1.getCompileDirs)('app');
         const h5BuildDir = path_1.default.join(buildDir, 'h5');
@@ -35,19 +36,9 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
         }
         const mainAppSerializeData = (0, common_2.processCals2WeappsData)(cals, dependencies);
         const subAppSerializeDataList = (subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.map((item) => (0, common_2.processCals2WeappsData)(item, dependencies))) || [];
-        const buildContext = {
-            projDir: buildDir,
-            appId: appKey,
-            isProduction: mode === common_1.WebpackModeType.PRODUCTION,
-            materialLibs: dependencies,
-            isMixMode: false,
-            mainAppData: mainAppSerializeData,
-            domain,
-        };
         const { allAppUsedComps } = (0, mp_1.handleUsedComponents)({
-            buildContext,
+            buildContext: { ...buildContext, mainAppData: mainAppSerializeData },
             weapps: [mainAppSerializeData, ...subAppSerializeDataList],
-            materials: dependencies,
         });
         // 处理应用数据
         const mainAppData = (0, weapps_core_1.deserialize)(mainAppSerializeData);
@@ -97,6 +88,7 @@ async function buildH5App({ appKey, buildDir, dependencies, i18nConfig, extraDat
             runtime,
             deployMode,
             _indexPage,
+            isPrivateMode,
         });
         console.timeEnd(runGenerateTag);
         // // 构建 NPM 包

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

@@ -3,6 +3,9 @@ import { IMaterialItem, IWeAppData, IMiniprogramPlugin } from '@cloudbase/lowcod
  * All build parameters and intermediate data to be share across processes
  */
 export interface IBuildContext {
+    /**
+     * 应用id
+     */
     appId: string;
     domain: string;
     projDir: string;
@@ -14,4 +17,5 @@ export interface IBuildContext {
     miniprogramPlugins?: IMiniprogramPlugin[];
     debugMode?: boolean;
     isBrowserMpBuilder?: boolean;
+    isPrivateMode?: boolean;
 }

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

@@ -1,24 +1,18 @@
-import { IMaterialItem, IWeAppData, IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { IWeAppData, IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
 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, isMixMode, options, buildTypeList, isBrowserMpBuilder, }: {
+export declare function generateWxMp({ buildContext, weapps, plugins, deployMode, options, buildTypeList, }: {
+    buildContext: IBuildContext;
     weapps: IWeAppData[];
-    projDir: string;
-    appId: string;
-    domain: string;
-    materials: IMaterialItem[];
     plugins: IPlugin[];
-    isProduction: boolean;
     deployMode: DEPLOY_MODE;
-    isMixMode: boolean;
     options: {
         mpAppId: string;
         resourceAppId?: string;
         isCrossAccount: boolean;
     };
     buildTypeList: BuildType[];
-    isBrowserMpBuilder: boolean;
 }): Promise<{
     miniprogramRoot: string;
 }>;
@@ -27,10 +21,9 @@ export declare function writeLowCodeFiles(appData: IWeAppData, outDir: string, c
  * TODO: 与 cals 里的实现进行整合
  * 关键点在于 appUsedComps 分组， 与 generic componen 的实现
  */
-export declare function handleUsedComponents({ buildContext, weapps, materials, }: {
+export declare function handleUsedComponents({ buildContext, weapps }: {
     buildContext: IBuildContext;
     weapps: IWeAppData[];
-    materials: IMaterialItem[];
 }): {
     appUsedComps: IAppUsedComp[];
     allAppUsedComps: IUsedComps;

package/lib/builder/mp/index.js

@@ -54,29 +54,13 @@ const cals_1 = require("@cloudbase/cals");
 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, isMixMode, options, buildTypeList, isBrowserMpBuilder = false, }) {
+async function generateWxMp({ buildContext, weapps, plugins, deployMode, options, buildTypeList, }) {
     var _a;
+    const { appId, projDir, materialLibs: materials, isProduction, mainAppData, domain, isBrowserMpBuilder, isPrivateMode = false, } = buildContext;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
     console.log(`Generating ${em('Wexin MiniProgram')} to ${projDir}`);
-    console.log(em('domain') + domain);
-    let mainAppData = weapps[0];
-    const buildContext = {
-        projDir,
-        appId,
-        isProduction,
-        materialLibs: materials,
-        debugMode: !isProduction && !!process.env.WEAPPS_DEBUG,
-        isMixMode,
-        mainAppData,
-        domain,
-        isBrowserMpBuilder,
-    };
-    const { allAppUsedComps } = handleUsedComponents({
-        buildContext,
-        weapps,
-        materials,
-    });
+    const { allAppUsedComps } = handleUsedComponents({ buildContext, weapps });
     buildContext.miniprogramPlugins = (mainAppData.miniprogramPlugins || []).filter((plugin) => allAppUsedComps[plugin.name]);
     // 安装依赖库，生成 materials 目录
     await (0, materials_1.installMaterials)(projDir, allAppUsedComps, weapps, buildContext);
@@ -153,7 +137,6 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         const importor = (0, util_3.generateLowcodeImportor)(mainAppData.lowCodes || []);
         appFileData = {
             ...appFileData,
-            'common/wx_yypt_report_v2.js': {},
             'app.js': { appConfig, importor },
             'app.json': { content: appConfig },
             'app.wxss': {
@@ -166,6 +149,7 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
             },
             'package.json': {
                 appId,
+                isPrivateMode,
                 extraDeps: resolveNpmDeps(),
             },
         };
@@ -187,6 +171,7 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
                 resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
                 isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
                 clientID: (_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.clientId,
+                isPrivateMode,
             },
             'datasources/datasource-profiles.js.tpl': {
                 datasourceProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasourceProfiles)(
@@ -221,6 +206,7 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
                 await (0, generateFiles_1.default)({
                     'package.json': {
                         appId,
+                        isPrivateMode,
                         extraDeps: resolveNpmDeps(),
                     },
                 }, templateDir, subpackageRootPath, buildContext);
@@ -228,7 +214,9 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         }
     }));
     if (!isBrowserMpBuilder && fs.existsSync(path_1.default.join(miniprogramRoot, 'package.json'))) {
-        await (0, webpack_1.installDependencies)(miniprogramRoot);
+        await (0, webpack_1.installDependencies)(miniprogramRoot, {
+            fixNodeModulesMap: { '@cloudbase/js-sdk': !isPrivateMode, mobx: true },
+        });
     }
     await handleMpPlugins();
     console.timeEnd(operationLabel);
@@ -240,7 +228,7 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
         var _a;
         const deps = [
             {
-                deps: ((_a = weapps.find((a) => !a.rootPath)) === null || _a === void 0 ? void 0 : _a.npmDependencies) || [],
+                deps: ((_a = weapps.find((a) => !a.rootPath)) === null || _a === void 0 ? void 0 : _a.npmDependencies) || {},
                 name: '主包',
             },
         ];
@@ -427,7 +415,7 @@ async function writeLowCodeFiles(appData, outDir, ctx) {
     // 混合模式，子包不生成顶级（应用级）的 lowcodes
     if (!(ctx.isMixMode && appData.rootPath)) {
         await Promise.all(lowCodes
-            .filter((mod) => mod.type !== 'renderer')
+            .filter((mod) => mod.type !== cals_1.ECodeType.RENDERER)
             .map((m) => {
             (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { appDir: outDir }, themeStyle.code);
         }));
@@ -435,7 +423,7 @@ async function writeLowCodeFiles(appData, outDir, ctx) {
     await Promise.all((0, weapps_core_1.loopDealWithFn)(appData.pageInstanceList, async (page) => {
         const codes = (0, cals_1.processRuntimeCodeResources)({ id: page.id }, page.lowCodes || page.codeModules, 'page');
         await codes
-            .filter((mod) => mod.type !== 'renderer')
+            .filter((mod) => mod.type !== cals_1.ECodeType.RENDERER)
             .forEach((m) => {
             (0, lowcode_1.writeCode2file)(m, lowcodeRootDir, { pageId: page.id, appDir: outDir }, themeStyle.code, ctx);
         });
@@ -463,7 +451,8 @@ function getAppendableJson(json) {
  * TODO: 与 cals 里的实现进行整合
  * 关键点在于 appUsedComps 分组， 与 generic componen 的实现
  */
-function handleUsedComponents({ buildContext, weapps, materials, }) {
+function handleUsedComponents({ buildContext, weapps }) {
+    const { materialLibs: materials } = buildContext;
     const appUsedComps = weapps.map((app) => {
         var _a;
         const usedComps = {};

package/lib/builder/mp/materials.js

@@ -327,6 +327,12 @@ async function generateCompositeComponent(compositedComp, ctx, compLibCommonReso
          ${compLibCommonResource.theme.class || ''}
       `;
         }
+        /**
+         * 低码没有开放 index 类别，直接去掉
+         */
+        if (mod.name === 'index') {
+            return;
+        }
         return (0, lowcode_1.writeCode2file)(mod, path.join(outDir, LOWCODE_DIR_NAME), { comp: compositedComp }, themeCode, ctx);
     });
     // await writeLowCodeFiles(weapp, appRoot)

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

@@ -1,8 +1,9 @@
 import { IWeAppData, IPlugin, IMaterialItem } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IAppUsedComp } from '../types/common';
-export declare function handleMixMode({ apps, generateMpPath, miniprogramRoot, plugins, }: {
+import { IBuildContext } from '../mp/BuildContext';
+export declare function handleMixMode({ buildContext, apps, miniprogramRoot, plugins, }: {
+    buildContext: IBuildContext;
     apps: IWeAppData[];
-    generateMpPath: string;
     miniprogramRoot: string;
     plugins: IPlugin[];
 }): Promise<void>;

package/lib/builder/mp/mixMode.js

@@ -36,13 +36,16 @@ const chalk_1 = __importDefault(require("chalk"));
 const generateFiles_1 = require("../util/generateFiles");
 const webpack_1 = require("../service/webpack");
 // 将 BUILD 目录往混合模式移动
-async function handleMixMode({ apps = [], generateMpPath, miniprogramRoot, plugins = [], }) {
+async function handleMixMode({ buildContext, apps = [], miniprogramRoot, plugins = [], }) {
+    const { projDir: generateMpPath, isPrivateMode } = buildContext;
     // await handleMainApp()
     // await handleAppPages()
     await handleSubApps();
     // await handleAppJson()
     // await handlePkgJson()
-    await (0, webpack_1.installDependencies)(miniprogramRoot);
+    await (0, webpack_1.installDependencies)(miniprogramRoot, {
+        fixNodeModulesMap: { mobx: true, '@cloudbase/js-sdk': !isPrivateMode },
+    });
     await handlePlugins();
     // 复制框架公用内容
     async function handleMainApp() {

package/lib/builder/mp/mp_config.js

@@ -167,7 +167,7 @@ function transformDynamicData(originData) {
     const temp = {};
     for (const key in originData) {
         const target = originData[key];
-        if (target && target.value) {
+        if (target === null || target === void 0 ? void 0 : target.value) {
             temp[key] = target.value;
         }
     }

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

@@ -75,11 +75,17 @@ export interface IInstallOpts {
         version: string;
         downloadUrl: string;
     };
+    fixNodeModulesMap?: IFixNodeModulesMap;
 }
 export declare function installDependencies(targetDir: string, options?: IInstallOpts): Promise<void>;
+interface IFixNodeModulesMap {
+    mobx?: boolean;
+    '@cloudbase/js-sdk'?: boolean;
+}
 export declare function getMaterialNodeModulesPathList(dependencies: IMaterialItem[] | undefined, materialsDir: string, base?: string): string[];
 export declare function generateWebpackWebDevServerFile({ appBuildDir, buildTypeList }: {
     appBuildDir: any;
     buildTypeList: any;
 }): Promise<void>;
 export declare function downloadAssets(targetDir: string, assetUrl: string): Promise<unknown>;
+export {};

package/lib/builder/service/webpack.js

@@ -480,20 +480,25 @@ async function installDependencies(targetDir, options = {}) {
             };
         }
     }
-    let installProcess;
     // 云端构建, 选用 npm
-    const installlProcessOptions = {
+    const installProcessOptions = {
         cwd: targetDir,
         // NODE_ENV="production"时，devDependencies里的包不会下载，兼容h5在线编译
         env: { ...process.env, NODE_ENV: '' },
         stdio: 'inherit',
     };
+    let installprocess;
+    // TODO: install 失败 应该终止进程
     if (yarnExists && (options === null || options === void 0 ? void 0 : options.runtime) !== types_1.RUNTIME.CI) {
         const addPackage = packageName ? ['add', packageName] : [];
-        installProcess = cross_spawn_1.default.sync('yarn', [...addPackage, registry], installlProcessOptions);
+        installprocess = cross_spawn_1.default.sync('yarn', [...addPackage, registry], installProcessOptions);
     }
     else {
-        installProcess = cross_spawn_1.default.sync('npm', ['install', packageName, ...npmOptions], installlProcessOptions);
+        installprocess = cross_spawn_1.default.sync('npm', ['install', packageName, ...npmOptions], installProcessOptions);
+    }
+    // TODO: 确认 process.status 语义来判断是否标识进程正常退出
+    if (installprocess.status) {
+        throw new Error(`安装依赖失败 ${installprocess.error || ''}`);
     }
     fixNodeModules(targetDir);
     try {
@@ -504,14 +509,24 @@ async function installDependencies(targetDir, options = {}) {
     console.timeEnd(operationTag);
 }
 exports.installDependencies = installDependencies;
-function fixNodeModules(projDir) {
-    // # fix mobx/package.json: "main": "lib/index.js" -> "main": "lib/index.js"
-    const mobxPackageFile = path_1.default.join(projDir, 'node_modules', 'mobx/package.json');
-    if (fs_extra_1.default.existsSync(mobxPackageFile)) {
-        const mobxPackageFileContent = fs_extra_1.default.readJSONSync(mobxPackageFile);
-        if (fs_extra_1.default.existsSync(path_1.default.join(projDir, 'node_modules', 'mobx/lib/mobx.min.js'))) {
-            mobxPackageFileContent.main = 'lib/mobx.min.js';
-            fs_extra_1.default.writeJSONSync(mobxPackageFile, mobxPackageFileContent);
+function fixNodeModules(projDir, options = { mobx: false, '@cloudbase/js-sdk': false }) {
+    const { mobx = false, ['@cloudbase/js-sdk']: jsSDK = false } = options;
+    if (mobx) {
+        // # fix mobx/package.json: "main": "lib/index.js" -> "main": "lib/index.js"
+        const mobxPackageFile = path_1.default.join(projDir, 'node_modules', 'mobx/package.json');
+        if (fs_extra_1.default.existsSync(mobxPackageFile)) {
+            const mobxPackageFileContent = fs_extra_1.default.readJSONSync(mobxPackageFile);
+            if (fs_extra_1.default.existsSync(path_1.default.join(projDir, 'node_modules', 'mobx/lib/mobx.min.js'))) {
+                mobxPackageFileContent.main = 'lib/mobx.min.js';
+                fs_extra_1.default.writeJSONSync(mobxPackageFile, mobxPackageFileContent);
+            }
+        }
+    }
+    if (jsSDK) {
+        const scriptPath = path_1.default.resolve(projDir, 'node_modules', '@cloudbase/weda-cloud-sdk/scripts/fix-wx-none-private');
+        if (fs_extra_1.default.existsSync(scriptPath)) {
+            const fix = require(scriptPath);
+            fix();
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.1.5-alpha.0",
+  "version": "1.1.5-alpha.2",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@cloudbase/cals": "^0.4.10",
-    "@cloudbase/lowcode-generator": "^1.1.2-alpha.0",
+    "@cloudbase/lowcode-generator": "^1.1.2-alpha.1",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/mp/datasources/config.js.tpl

@@ -22,4 +22,5 @@ export default {
    *  key 为页面ID(全局为$global), val 为变量配置数组
    */
   datasetProfiles: datasetProfiles,
+  isPrivate: <%= isPrivateMode %>
 }

package/template/mp/package.json

@@ -2,18 +2,18 @@
 	"name": "lcap-<%= appId%>",
 	"version": "1.0.8",
 	"scripts": {},
-	"dependencies": {
-		"@cloudbase/weda-client": "0.2.25",
-		"@cloudbase/weda-cloud-sdk": "1.0.19",
+	"dependencies": {<% if(isPrivateMode) {%>
+		"@cloudbase/js-sdk": "2.5.2-beta.0",<% } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
+		"@cloudbase/weda-client": "0.2.25",
+		"@cloudbase/weda-cloud-sdk": "1.0.24-alpha.0",
 		"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"<% Object.keys(extraDeps).map(depName => {%>,
-      "<%= depName%>": "<%= extraDeps[depName]%>"<%
-    })
-    %>
+    "<%= depName%>": "<%= extraDeps[depName]%>"<%
+    })%>
 	}
 }
 

package/template/mp/common/wx_yypt_report_v2.js

@@ -1,460 +0,0 @@
-/*
-* 使用方法
-const wxReportSdk = require('./components/gsd-lib/report/index.js');
-new wxReportSdk({
-    reportUrl:'http://www.qq.com',
-})
-*/
-export default class wxReportSdk {
-  constructor (opt) {
-    this.originPage = Page;
-    this.originApp = App;
-    this.logTimer = null;
-    this.idxKey = '_monitor_idx';
-    this.config = {
-      mp_appid: '', // 填入小程序的appid
-      appKey: '', // 填入你的应用key
-      stopReport: false, // 停止上报
-      isNet: true, // 是否上报网络信息（默认：true）
-      isSys: true, // 是否上报系统信息（默认：true）
-      isError: true, // 是否开启错误上报 （默认：false）
-      autoReportPV: false, // 是否自动上报页面PV
-      commonPageEId: 'MP_ALLPAGES_ONSHOW', // 统一的页面上报标志
-      getRemoteParamsUrl: '',// 获取远程参数url
-      reportUrl: '', // 上报url
-      intervalTime: 3, // 间隔多久执行一次上报，默认3秒
-      reportLogsNum: 5, // 每次合并上报记录条数，默认5次
-    };
-
-    this.reportData = {
-      ky: '',//app key，应用的身份标识
-      pf: 'MiniProgram',// 平台类型
-      id: '',// 平台型相关的ID字段，如微信平台中则是open_id
-      cui: '',// custom user id，自定义用户id,用户上报的自定义用户id，也就是app业务方统计用户的身份标识,用于多平台帐号打通。
-      geo: '',// 地理位置
-      scene: '', // 入口场景,小程序的场景值
-      ev: {
-        'cn': '',//connect type，设备连接方式
-        'lg': '',//anguage，系统语言类型
-        'sr': '',//screen resolution，屏幕分辨率
-        'tz': '',//time zone，系统的时区
-        'os': '',//操作系统,
-        'ua': '-', //
-      },
-      ui: '',// 一个随机生成的id，因为大多数没有id,cui，所以用ui计算uv
-      si: '',//session id，会话id,一串随机产生的数字，标识一个新的会话
-      ts: '',//timestamp，时间戳
-      pi: '',// page id，页面id
-      rf: '',// refer page id,来源页面id
-      et: '1',// eventtype，事件类型,PAGE_VIEW(1),PAGE_HIDE(3001),SESSION_ENV(2),ERROR(3),CUSTOM(1000),ADDITION(1001),MONITOR_STAT(1002);SPECIAL_CUSTON(),小程序onshow使用PAGE_VIEW，关闭或隐藏时使用PAGE_HIDE,事件使用1000
-      ht: '',// 	hot tag	string	屏幕的点击事件ID
-      htx: '',// 	hot tag x	string	点击位置的X坐标
-      hty: '',// 	hot tag y	string	点击位置的Y坐标
-      ei: '',//	event id，自定义事件id	string	自定义事件id
-      kv: '',//	Key-Value,自定义事件Key-Value参数对	map	JSON格式
-      er: '',//	error，错误、异常信息	string	错误字符串或堆栈异常信息
-      ea: '',//error attribute	uint 共有4种错误类型：USER_MSG(0)、USER_EXCEPTION(1)、AUTO_EXCEPTION(2)、NATIVE_CRASH(3)、SDK_EXCEPTION(99)
-      ext: '',//扩展字段，不进行计算，可存储更细的用户信息
-      region: '', // 城市码
-      mp_appid: '', // 小程序appid
-      adt: "", // 自定义渠道来源
-    };
-
-    this.config = Object.assign(this.config, opt || {});
-    this.reportLogs = [];
-    this.pagePrams = {};//存储每个页面自定义上报的数据，例如kv
-    this.cusSid = this._getCusSid();
-    this._init();
-  }
-
-  // 获取自定义session
-  _getCusSid(len = 10) {
-    const $chars = "ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz123456789";
-    const maxPos = $chars.length;
-    let pwd = "";
-    for (let i = 0; i < len; i++) {
-      pwd = pwd + $chars.charAt(Math.floor(Math.random() * maxPos));
-    }
-    return pwd + new Date().getTime();
-  }
-
-  // 获取用户唯一标示
-  _getUuid () {
-    let uuidKey = "_mp_monitor_uuid_v2";
-    let uuid = wx.getStorageSync(uuidKey);
-    if (uuid) {
-      return uuid;
-    }
-    let s = [];
-    let hexDigits = '0123456789abcdef';
-    for (let i = 0; i < 36; i++) {
-      s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
-    }
-    s[14] = '4'; // bits 12-15 of the time_hi_and_version field to 0010
-    s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
-    s[8] = s[13] = s[18] = s[23] = '-';
-    uuid = "mc_" + s.join('');
-    wx.setStorageSync(uuidKey, uuid);
-    return uuid;
-  };
-
-  startReport () {
-    if (this.config.stopReport || !this._isAllowReport()) return;
-    const _this = this;
-    _this._logRequest();
-    _this.logTimer = setInterval(function () {
-      _this._logRequest();
-    }, _this.config.intervalTime * 1000);
-  }
-
-  /*点击流上报
-  * eid 事件id
-  * kv Key-Value,自定义事件Key-Value参数对
-  * event 事件对象
-  * */
-  eventClick (eid, params = {}, event) {
-    let cookiedObj = {};
-    // 兼容老版本事项直接传入kv值
-    if (eid === 'MP_SHIXIANG' && !params.kv) {
-      cookiedObj.kv = params;
-    }
-    else {
-      cookiedObj = params;
-    }
-    this._statpid(Object.assign({
-      et: '1000',// eventtype 事件使用1000
-      ei: eid, // 事件id
-      htx: event ? event.detail.x : '',
-      hty: event ? event.detail.y : '',
-      ht: event ? event.target.id : '',// 	hot tag	string	屏幕的点击事件ID
-    }, cookiedObj));
-  }
-
-  logInfo (msg, params = {}) {
-    params.type = 'info';
-    params.msg = msg;
-    this._logReport(params);
-  }
-
-  logWarn (msg, params = {}) {
-    params.type = 'warn';
-    params.msg = msg;
-    this._logReport(params);
-  }
-
-  logError (msg, params = {}) {
-    params.type = 'error';
-    params.msg = msg;
-    this._logReport(params);
-  }
-
-  // 日志上报
-  _logReport (params = {}) {
-    let cookiedObj = { kv: params };
-    this._statpid(Object.assign({
-      et: '2000',//
-    }, cookiedObj));
-  }
-
-  /*页面pv上报
- * pageId 页面标识id
- * params 额外参数，比如城市码
- * */
-  pagePV (pageId, params = {}) {
-    this._statpid(Object.assign({
-      et: '3001',// eventtype，事件类型,PAGE_VIEW(1),PAGE_HIDE(3001),SESSION_ENV(2),ERROR(3),CUSTOM(1000),ADDITION(1001),MONITOR_STAT(1002);SPECIAL_CUSTON(),小程序onshow使用PAGE_VIEW，关闭或隐藏时使用PAGE_HIDE,事件使用1000å
-      ei: pageId, // 事件id
-    }, params));
-  }
-
-  // 设置页面参数
-  setPagePrams (params) {
-    let pagePath = this._getPagePath();
-    if (pagePath && params) {
-      this.pagePrams[pagePath] = params;
-    }
-  }
-
-  // 是否允许上报
-  _isAllowReport () {
-    if (!this.config.reportUrl || !this.config.appKey) {
-      console.error('reportUrl、appKey，存在没传的参数，不允许上报');
-      return false;
-    }
-    return true;
-  }
-
-  _init () {
-    if (this.config.stopReport || !this._isAllowReport()) return;
-    this._spyApp();
-    this._spyPage();
-    if (this.config.isNet) this._network();
-    if (this.config.isSys) this._system();
-  }
-
-  // 包装App对象
-  _spyApp () {
-    const _this = this;
-    App = (app) => {
-      const _onError = app.onError || function () { };
-      const _onLaunch = app.onLaunch || function () { };
-      const _onHide = app.onHide || function () { };
-      app.onLaunch = function (opt) {
-        _this.reportData.adt = opt.query.ysschannel || '';
-        // _this.reportData.mp_appid = opt.referrerInfo &&
-        //   opt.referrerInfo.appId ||
-        //   '';
-        _this.reportData.sense = opt.scene;
-        wx.setStorageSync(_this.idxKey, 1);
-        if (_this.config.getRemoteParamsUrl) {
-          wx.request({
-            url: _this.config.getRemoteParamsUrl,
-            data: {},
-          }).then((res) => {
-            if (res.open) {
-              _this.config = Object.assign(_this.config,
-                {
-                  intervalTime: res.sec || _this.config.intervalTime,
-                  reportLogsNum: res.num || _this.config.reportLogsNum,
-                  stopReport: !!res.stop,
-                });
-            }
-          });
-        }
-        return _onLaunch.apply(this, arguments);
-      };
-      if (this.config.isError) {
-        // 错误捕获并上报
-        app.onError = function (err) {
-          let errspit = err.split(/\n/) || [];
-          let src, col, line;
-          let errs = err.match(/\(.+?\)/);
-          if (errs && errs.length) errs = errs[0];
-          errs = (errs || '').replace(/\w.+js/g, $1 => {
-            src = $1;
-            return '';
-          });
-          errs = errs.split(':');
-          if (errs && errs.length > 1) line = parseInt(errs[1] || 0);
-          col = parseInt(errs[2] || 0);
-          _this._reportError(JSON.stringify({
-            col: col,
-            line: line,
-            name: src,
-            msg: `${errspit[0]};${errspit[1]};${errspit[2]};`,
-            type: 'js',
-          }));
-          return _onError.apply(this, arguments);
-        };
-      }
-      app.onHide = function () {
-        if (_this.logTimer) {
-          clearInterval(_this.logTimer);
-        }
-        _this._logRequest(true);
-        return _onHide.apply(this, arguments);
-      };
-      _this.originApp(app);
-    };
-  }
-
-  _wrapPagePV (pageOnShowTime) {
-    const _this = this;
-    if (_this.config.autoReportPV) {
-      _this.pagePV(_this.config.commonPageEId,
-        { du: Math.ceil((Date.now() - pageOnShowTime) / 1000) });
-    }
-  }
-
-  // 包装page对象
-  _spyPage () {
-    const _this = this;
-    Page = (page) => {
-      const _onShow = page.onShow || function () { };
-      const _onHide = page.onHide || function () { };
-      const _onUnload = page.onUnload || function () { };
-      let pageOnShowTime = 0;
-      page.onShow = function () {
-        pageOnShowTime = Date.now();
-        if (_this.config.autoReportPV) {
-          _this.pagePV(_this.config.commonPageEId, { et: '1' });
-        }
-        return _onShow.apply(this, arguments);
-      };
-      page.onHide = function () {
-        _this._wrapPagePV(pageOnShowTime);
-        return _onHide.apply(this, arguments);
-      };
-      page.onUnload = function () {
-        _this._wrapPagePV(pageOnShowTime);
-        return _onUnload.apply(this, arguments);
-      };
-      _this.originPage(page);
-    };
-
-    Component = (component) => {
-      if (component._componentType === 'page') {
-        const _this = this
-        const _onShow = component.pageLifetimes.show || function() { }
-        const _onHide = component.pageLifetimes.hide || function() { }
-        let pageOnShowTime = 0
-        component.pageLifetimes.show = function() {
-          pageOnShowTime = Date.now()
-          if (_this.config.autoReportPV) {
-            _this.pagePV(_this.config.commonPageEId, { et: '1' })
-          }
-          return _onShow.apply(this, arguments)
-        }
-        component.pageLifetimes.hide = function() {
-          _this._wrapPagePV(pageOnShowTime)
-          return _onHide.apply(this, arguments)
-        }
-      }
-      _this.originComponent(component)
-    };
-  }
-
-  // 集中收集 logs 方法
-  // type = 'memory' | 'storage'
-  _collectLogs (item) {
-    let nData = [];
-    let oData = this.reportLogs;
-    Array.isArray(item) ? nData = item : nData.push(item);
-    // 剔除掉无值的字段，减少体积
-    nData.forEach(tempItem => {
-      for (let tempKey in tempItem) {
-        let tempVal = tempItem[tempKey];
-        if (tempVal === '' ||
-          (typeof tempVal === 'object' && Object.keys(tempVal).length === 0)) {
-          delete tempItem[tempKey];
-        }
-      }
-    });
-    // 内存不能超过 100 条
-    let rule = oData.length > 100;
-    if (rule) {
-      oData.splice(0, nData.length);
-    }
-    this.reportLogs = oData.concat(nData);
-  }
-
-  // 获取页面路径
-  _getPagePath () {
-    let currentPages = getCurrentPages();
-    if (currentPages && currentPages.length) {
-      const length = currentPages.length;
-      const lastpage = currentPages[length - 1];
-      return lastpage.__route__;
-    }
-    else {
-      return '';
-    }
-  }
-
-  // 埋点上报
-  _statpid (opt) {
-    let currentPages = getCurrentPages();
-    if (currentPages && currentPages.length) {
-      const length = currentPages.length;
-      const lastpage = currentPages[length - 1];
-      opt.pi = lastpage.__route__;
-      if (length >= 2) {
-        opt.rf = currentPages[length - 2].__route__;
-      }
-      opt.ext = lastpage.options || {};
-      // 合并用户传入的自定义参数
-      opt = Object.assign(opt, this.pagePrams[opt.pi]);
-    }
-    let idx = Number(wx.getStorageSync(this.idxKey) || '0') + 1;
-    wx.setStorageSync(this.idxKey, idx);
-    opt.idx = idx;
-    const _statpid2 = this._getCookiedReportData(opt);
-    this._collectLogs(_statpid2);
-  }
-
-  /*错误上报
-  * desc 错误信息
-  * */
-  _reportError (desc) {
-    this._logReport({ type: 'error', msg: desc });
-  }
-
-  _getCookiedReportData (opt) {
-    const realUserId = wx.getStorageSync('wx-openid') || wx.getStorageSync('tif-openid') ||
-      wx.getStorageSync('openid') || opt.openid || this._getUuid();
-    return Object.assign({}, this.reportData, {
-      ts: Date.now(),//timestamp，时间戳
-      ky: this.config.appKey, // app key，应用的身份标识
-      si: wx.getStorageSync('wx-sessionid') || wx.getStorageSync('tif-sid') || this.cusSid,
-      id: realUserId, // 平台型相关的ID字段，如微信平台中则是open_id
-      cui: realUserId, // custom user
-      ui: wx.getStorageSync('tif-unionid') || realUserId, // id，自定义用户id,用户上报的自定义用户id，也就是app业务方统计用户的身份标识,用于多平台帐号打通。
-      region: wx.getStorageSync('reportRegion') || '',
-      mp_appid: this.config.mp_appid || '',
-    }, opt);
-  }
-
-  /*
-  * cycle:是否循环上报
-  * */
-  _logRequest (cycle = false) {
-    // 过滤掉开发者工具、测试环境的logs
-    let _this = this;
-    // 停止上报
-    if (_this.config.stopReport) return;
-    const reportLogs = _this.reportLogs;
-    if (reportLogs.length === 0) {
-      return;
-    }
-    let data = reportLogs.splice(0, _this.config.reportLogsNum);
-    let sessionid = wx.getStorageSync('wx-sessionid') || wx.getStorageSync('tif-sid')
-    wx.request({
-      url: _this.config.reportUrl,
-      header: {
-        'x-tif-sid': sessionid,
-        'x-tif-did': wx.getStorageSync('tif-did'),
-        'wx-sessionid': sessionid,
-        'content-type': 'application/x-www-form-urlencoded',
-      },
-      data: {reportInfo: JSON.stringify(data)},
-      method: 'POST',
-      complete (res) {
-        if (cycle && res.data && Number(res.data.errcode) === 0 &&
-          reportLogs.length > 0) {
-          _this._logRequest(true);
-        }
-        if (res.data && (Number(res.data.errcode) !== 0)) {
-          if (data && data.length !== 0) {
-            _this._collectLogs(data);
-          }
-        }
-      },
-    });
-  }
-
-  // 获取网络类型
-  _network () {
-    wx.getNetworkType({
-      success: res => {
-        this.reportData.ev.cn = res.networkType;//connect type，设备连接方式
-      },
-    });
-  }
-
-  // 获取系统信息
-  _system () {
-    wx.getSystemInfo({
-      success: res => {
-        this.reportData.ev = {
-          'lg': res.language,//anguage，系统语言类型
-          'sr': res.screenWidth + '*' + res.screenHeight,//screen resolution，屏幕分辨率
-          'tz': new Date().getTimezoneOffset(),//time zone，系统的时区
-          'os': res.system,//操作系统,
-          'version': res.version,//微信版本号
-          'SDKVersion': res.SDKVersion,//客户端基础库版本
-          'ua': `oa=${res.system},mp_version=${res.version},mp_sdk=${res.SDKVersion}`,
-        };
-      },
-    });
-  }
-}