@cloudbase/lowcode-builder 1.9.2 → 1.9.4

package/lib/builder/config/dependencies.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generatePackageDependencies = void 0;
 const cals_1 = require("@cloudbase/cals");
+const CLOUDBASE_VERSION = '2.6.6-beta.0';
 const BASE_DEPS = {
     'miniprogram-gesture': '^1.0.6',
     mobx: '^5',
@@ -12,16 +13,15 @@ const BASE_DEPS = {
  * 注意锁版本
  */
 const CLOUDBASE_DEPS = {
-    '@cloudbase/oauth': '0.1.1-alpha.15',
+    '@cloudbase/auth': CLOUDBASE_VERSION,
     '@cloudbase/weda-client': '1.1.6',
-    '@cloudbase/weda-cloud-sdk': '1.0.70',
+    '@cloudbase/weda-cloud-sdk': '1.0.78',
 };
 function generatePackageDependencies({ importJSSDK, mode, officialLibVersion, uin, }) {
     const deps = {};
     if (importJSSDK) {
-        deps['@cloudbase/js-sdk'] = '2.5.47-beta.0';
+        deps['@cloudbase/js-sdk'] = CLOUDBASE_VERSION;
     }
-    const mod = uin ? Number(uin) % 10 : undefined;
     if (mode === 'lib') {
         // eslint-disable-next-line no-restricted-syntax
         for (const key in CLOUDBASE_DEPS) {

package/lib/builder/config/index.js

@@ -48,8 +48,8 @@ exports.materialsDirName = 'materials'; // materials diretory of current project
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-replace-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
 const COMP_PUBLIC_DOMAIN = 'comp-public-replace-1303824488-cos.weda.tencent.com';
-exports.miniprogramURL = `https://${COMP_PUBLIC_DOMAIN}/lcap-builder/miniprogram_npm.1.8.107.zip`;
-exports.cloudbaseMiniprogramURL = `https://${COMP_PUBLIC_DOMAIN}/lcap-builder/cloudbase_miniprogram_npm.1.8.107.zip`;
+exports.miniprogramURL = `https://${COMP_PUBLIC_DOMAIN}/lcap-builder/miniprogram_npm.1.9.4.zip`;
+exports.cloudbaseMiniprogramURL = `https://${COMP_PUBLIC_DOMAIN}/lcap-builder/cloudbase_miniprogram_npm.1.9.4.zip`;
 exports.systemSubpackageMiniprogramURL = `https://${COMP_PUBLIC_DOMAIN}/lcap-builder/wd_system_miniprogram_npm.zip`;
 exports.RUNTIME_CONFIG_URL = `https://${COMP_PUBLIC_DOMAIN}/release_config/runtime/exp_runtime.json`;
 /**

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

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

@@ -58,10 +58,10 @@ async function buildWedaConfig({ output, domain = undefined, isPrivateMode = und
     await (0, index_1.generateConfig)(data, outDir);
 }
 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 = {
+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 }, plugins = [], extraData = {
     isComposite: false,
     compProps: {},
-}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints: _cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, enableAd = false, account = {}, mpConfig = {}, privatelinkConfig = undefined, }, cb) {
+}, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints: _cdnEndpoints, isPrivateMode = false, endpointType = undefined, enableExpiredTag = false, enableAd = false, account = {}, mpConfig = {}, privatelinkConfig = undefined, __defaultLoginType__ = 'anonymous', }, cb) {
     var _a, _b, _c, _d, _e, _f;
     const cdnEndpoints = (0, config_1.generateCdnEndpoints)(_cdnEndpoints);
     if (!cals) {
@@ -191,12 +191,13 @@ async function buildWedaApp({ cals, subAppCalsList: _subAppCalsList = [], depend
                 enableLoading: (_e = cals === null || cals === void 0 ? void 0 : cals.extra) === null || _e === void 0 ? void 0 : _e.enableLoading,
                 enableAsyncMaterials: (_f = cals.extra) === null || _f === void 0 ? void 0 : _f.enableAsyncMaterials,
                 disablePageComponentInvoke,
+                __defaultLoginType__,
                 // enableAsyncMaterials: true,
             };
             const result = await (0, index_1.generateWxMp)({
+                buildContext: mpBuildContext,
                 weapps: apps,
                 calses,
-                buildContext: mpBuildContext,
                 plugins,
                 deployOptions,
                 options: {
@@ -485,25 +486,10 @@ async function patchMpComponentNPM({ packageDir, name, version, packageMiniprogr
         version: version || packageJSON.version || '0.0.1',
         miniprogram: `./${packageMiniprogramEntry}`,
         keywords: ['微搭', '小程序', '区块组件', 'cloudbase', 'cloudbase-module', 'cloudbase-component'],
-        scripts: {
-            ...packageJSON.scripts,
-            postinstall: 'node scripts/fixCloudSdk.js',
-        },
         dependencies: {
             ...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)),
-    ]);
+    await Promise.all([fs_extra_1.default.writeFile(packageJsonPath, JSON.stringify(packageJSON, undefined, 2))]);
 }

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

@@ -109,4 +109,9 @@ export interface IBuildContext extends IAppCommonBuildContext, IMpCommonBuildCon
      * app.json文件window配置
      */
     defaultAppWindowConfig?: IDefaultAppWindowConfig;
+    /**
+     * 内部定义，请勿使用
+     * 如必须使用 @rohyang
+     */
+    __defaultLoginType__?: 'openId' | 'anonymous';
 }

package/lib/builder/mp/index.js

@@ -243,6 +243,7 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                 privatelink: buildContext.privatelinkConfig
                     ? JSON.stringify(buildContext.privatelinkConfig, undefined, 2)
                     : undefined,
+                defaultLoginType: buildContext.__defaultLoginType__,
             },
             'datasources/datasource-profiles.js.tpl': {
                 datasourceProfiles: (0, util_3.JsonToStringWithVariableName)([], { EOL: false }),
@@ -427,7 +428,9 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
             else {
                 await (0, webpack_1.installDependencies)(meta.path, {
                     ignoreInstall,
-                    fixNodeModulesMap: { '@cloudbase/js-sdk': endpointType !== 'tcb-api', mobx: true },
+                    fixNodeModulesMap: {
+                        mobx: true,
+                    },
                 });
             }
         }
@@ -672,10 +675,8 @@ async function generateFramework(ctx, { cals, weapp: appData }, outDir, options)
                     subPackageName: appData.rootPath || '',
                     importor,
                     appConfig: (0, util_3.JsonToStringWithVariableName)({
-                        id: ctx.appId,
                         label: (appData === null || appData === void 0 ? void 0 : appData.label) || '',
                         version: (_a = options === null || options === void 0 ? void 0 : options.deployOptions) === null || _a === void 0 ? void 0 : _a.version,
-                        envId: appData.envId,
                         loginConfigVersion: (_b = cals.extra) === null || _b === void 0 ? void 0 : _b.loginConfigVersion,
                         basename: ctx.wedaRoot,
                         pages: appData.pageInstanceList

package/lib/builder/mp/util.js

@@ -213,12 +213,13 @@ function generateDataContainerListeners() {
 exports.generateDataContainerListeners = generateDataContainerListeners;
 function createTemplateQuery(ctx, query = {}) {
     return Object.entries(query).reduce((map, [key, item]) => {
+        var _a, _b;
         const { listeners = [], handler, data, args, ...rest } = item;
         const { staticProps, boundProps } = generatedDynamicData(generateArgsDynamicValueFromData(args, data) || {}, undefined, false);
         map[key] = {
             ...rest,
             handler: item.type === cals_1.EQueryType.GeneralFunc
-                ? `(__data__,__params__) => (${handler['code']})({params:__params__,data:__data__})`
+                ? `(__data__,__params__) => (${(_b = (_a = handler['code']) === null || _a === void 0 ? void 0 : _a.replace) === null || _b === void 0 ? void 0 : _b.call(_a, /;\s*$/, '')})({params:__params__,data:__data__})`
                 : `(...args) => $app.${handler === null || handler === void 0 ? void 0 : handler.name}(...args)`,
             data: staticProps,
             dataBinds: boundProps,
@@ -250,7 +251,7 @@ function getListenersHandlers(ctx, listeners = [], id, componentApi) {
     const { enableAsyncMaterials = false } = ctx;
     const eventHandlers = {};
     listeners.forEach((l) => {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         const handlerName = (0, wxml_1.getMpEventHandlerName)(id, l.trigger, l);
         const sourceKey = `${((_a = l.handler) === null || _a === void 0 ? void 0 : _a.moduleName) || ''}:${((_b = l.handler) === null || _b === void 0 ? void 0 : _b.name) || ''}`;
         eventHandlers[handlerName] = eventHandlers[handlerName] || [];
@@ -304,7 +305,7 @@ function getListenersHandlers(ctx, listeners = [], id, componentApi) {
                 break;
             }
             case weapps_core_1.ActionType.GeneralFunc: {
-                handler = `function({event, $w, params}) { return (\n${((_e = l.handler) === null || _e === void 0 ? void 0 : _e.code) || '()=>{}'}\n)({event}) }`;
+                handler = `function({event, $w, params}) { return (\n${((_g = (_f = (_e = l.handler) === null || _e === void 0 ? void 0 : _e.code) === null || _f === void 0 ? void 0 : _f.replace) === null || _g === void 0 ? void 0 : _g.call(_f, /;\s*$/, '')) || '()=>{}'}\n)({event}) }`;
                 break;
             }
         }

package/lib/builder/service/webpack.js

@@ -54,6 +54,7 @@ async function generateWebpackWebBuildParamsFile({ appId, allAppDataList, appBui
             : mode !== common_1.WebpackModeType.PRODUCTION
                 ? 'eval'
                 : false,
+        vueVersion,
     }, null, 2);
     const webpackConfigContent = `params = ${paramsString};\nmodule.exports = require('./web.prod.js')(params);`;
     await (0, generateFiles_1.writeFile)(webpackConfigPath, webpackConfigContent);
@@ -313,13 +314,6 @@ function fixNodeModules(projDir, options = { mobx: false, '@cloudbase/js-sdk': f
             }
         }
     }
-    if (jsSDK) {
-        const scriptPath = path_1.default.resolve(projDir, 'node_modules', '@cloudbase/weda-cloud-sdk/scripts/fix-wx-none-private.js');
-        if (fs_extra_1.default.existsSync(scriptPath)) {
-            const fix = require(scriptPath);
-            fix();
-        }
-    }
 }
 function getMaterialNodeModulesPathList(dependencies = [], materialsDir, base) {
     const localPkg = (0, util_1.getCurrentPackageJson)();