@cloudbase/lowcode-builder 1.8.110 → 1.9.1

package/lib/builder/config/dependencies.js

@@ -12,23 +12,24 @@ const BASE_DEPS = {
  * 注意锁版本
  */
 const CLOUDBASE_DEPS = {
-    '@cloudbase/oauth': '0.1.1-alpha.11',
-    '@cloudbase/weda-client': '1.1.4',
-    '@cloudbase/weda-cloud-sdk': '1.0.64',
+    '@cloudbase/oauth': '0.1.1-alpha.15',
+    '@cloudbase/weda-client': '1.1.6',
+    '@cloudbase/weda-cloud-sdk': '1.0.68',
 };
 function generatePackageDependencies({ importJSSDK, mode, officialLibVersion, uin, }) {
     const deps = {};
     if (importJSSDK) {
-        deps['@cloudbase/js-sdk'] = '2.5.45-beta.0';
+        deps['@cloudbase/js-sdk'] = '2.5.47-beta.0';
     }
     const mod = uin ? Number(uin) % 10 : undefined;
     if (mode === 'lib') {
         // eslint-disable-next-line no-restricted-syntax
         for (const key in CLOUDBASE_DEPS) {
+            const version = CLOUDBASE_DEPS[key];
             /**
              * lib 模式下采用松散的引用
              */
-            deps[key] = /^\d/.test(CLOUDBASE_DEPS[key]) ? CLOUDBASE_DEPS[key] : `^${CLOUDBASE_DEPS[key]}`;
+            deps[key] = /^\d/.test(version) ? `^${version}` : version;
         }
         if (officialLibVersion) {
             deps[cals_1.OFFICIAL_LIB_MP_NPM_PACKAGENAME] = officialLibVersion;
@@ -36,10 +37,7 @@ function generatePackageDependencies({ importJSSDK, mode, officialLibVersion, ui
     }
     else {
         for (const key in CLOUDBASE_DEPS) {
-            deps[key] =
-                mode !== undefined && !isNaN(mod) && mod <= 1 && key === '@cloudbase/weda-cloud-sdk'
-                    ? '1.0.65'
-                    : CLOUDBASE_DEPS[key];
+            deps[key] = CLOUDBASE_DEPS[key];
         }
     }
     return {

package/lib/builder/core/index.js

@@ -476,14 +476,15 @@ async function patchMpComponentNPM({ packageDir, name, version, packageMiniprogr
     }
     packageJSON = {
         ...packageJSON,
-        name: `@tcwd/weda-component-${name || 'lib'}`,
+        name: `@cloudbase-module/${name || 'components'}`,
         version: version || packageJSON.version || '0.0.1',
         miniprogram: `./${packageMiniprogramEntry}`,
+        keywords: ['微搭', '小程序', '区块组件', 'cloudbase', 'cloudbase-module', 'cloudbase-component'],
         scripts: {
             ...packageJSON.scripts,
             postinstall: 'node scripts/fixCloudSdk.js',
         },
-        peerDependencies: {
+        dependencies: {
             ...packageJSON.peerDependencies,
             ...BASE_DEPS,
         },

package/lib/builder/h5/index.js

@@ -45,6 +45,7 @@ const config_1 = require("../config");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const junk = __importStar(require("../util/junk"));
 const url_1 = require("url");
+const semver = __importStar(require("semver"));
 let BabelTransform = (code, options) => code;
 if (!process.env.IS_WEB_WORKER) {
     let transform = require('../../utils/transform');
@@ -106,6 +107,45 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
             // 注意需要包涵官方的(gsd)，部分平台方法需要由其补充
             return lib.name === config_1.OFFICIAL_LIB_KEY || !!(((_a = used.component) === null || _a === void 0 ? void 0 : _a[lib.name]) || ((_b = used.action) === null || _b === void 0 ? void 0 : _b[lib.name]));
         }), materialsDir, runtime, ignoreInstall);
+        const h5LibDirPath = path_1.default.resolve(h5BuildDir, 'src', 'libraries');
+        const libNames = fs_extra_1.default.readdirSync(h5LibDirPath).filter((name) => name !== '.DS_Store');
+        let libNameWithVue;
+        const vueVersions = libNames.map((libName) => {
+            var _a, _b;
+            try {
+                const v = (_b = (_a = require(path_1.default.resolve(h5LibDirPath, libName, 'package.json'))) === null || _a === void 0 ? void 0 : _a.dependencies) === null || _b === void 0 ? void 0 : _b.vue;
+                if (v == null) {
+                    return 0;
+                }
+                const minValidVersion = semver.valid(semver.minVersion(v));
+                if (minValidVersion == null) {
+                    return 0;
+                }
+                libNameWithVue = libName;
+                return semver.gt(minValidVersion, '2.7.16') ? 3 : 2;
+            }
+            catch (e) {
+                console.log(e, `no package.json for ${libName}`);
+                return 0;
+            }
+        });
+        let vueVersion;
+        const vueVersionSet = new Set(vueVersions.filter((v) => v !== 0));
+        if (vueVersionSet.size === 0) {
+            vueVersion = 0;
+        }
+        else if (vueVersionSet.size === 1) {
+            vueVersion = vueVersionSet.has(3) ? 3 : 2;
+        }
+        else {
+            const lib2vueVersionMap = libNames.reduce((map, libName, index) => {
+                map[libName] = vueVersions[index];
+                return map;
+            }, {});
+            throw new Error(`Libraries' vue versions conflict!
+        Vue2 and Vue3 should not be present at the same time!
+        detail: ${JSON.stringify(lib2vueVersionMap, null, 2)}`);
+        }
         console.timeEnd(runHandleMaterialTag);
         // // 获取 generate 需要的构建文件
         const runGenerateTag = '🚥  buildWebApp-generateProjectFiles';
@@ -142,6 +182,7 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
             mode,
             devTool,
             ignoreInstall,
+            vueVersion,
         });
         // 生成主题文件
         await (0, generate_1.generateThemeVarsFile)(mainAppData.themeVars, h5BuildDir);
@@ -160,7 +201,11 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals: _cals, bu
             publicPath,
             domain,
             cdnEndpoints,
+            vueVersion,
         });
+        if (typeof libNameWithVue === 'string' && !fs_extra_1.default.existsSync(path_1.default.resolve(h5BuildDir, 'node_modules', 'vue'))) {
+            fs_extra_1.default.symlinkSync(path_1.default.resolve(h5BuildDir, 'src', 'libraries', libNameWithVue, 'node_modules', 'vue'), path_1.default.resolve(h5BuildDir, 'node_modules', 'vue'));
+        }
         await new Promise((resolve, reject) => {
             // 开始编译前清理一下 lowcode 内容
             (0, compile_1.startCompile)({

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

@@ -1,5 +1,5 @@
 import { IMaterialItem, IWebRuntimeAppData } from '@cloudbase/lowcode-generator/lib/weapps-core';
-export declare function handleNPM({ mainAppData, subAppDataList, dependencies, appKey, appBuildDir, mode, devTool, ignoreInstall, }: {
+export declare function handleNPM({ mainAppData, subAppDataList, dependencies, appKey, appBuildDir, mode, devTool, ignoreInstall, vueVersion, }: {
     appKey: string;
     appBuildDir: string;
     mode: string;
@@ -8,5 +8,6 @@ export declare function handleNPM({ mainAppData, subAppDataList, dependencies, a
     dependencies: IMaterialItem[];
     devTool: string;
     ignoreInstall?: boolean;
+    vueVersion?: number;
 }): Promise<void>;
-export declare function generatePackageJSON(dependencies: object | undefined, appBuildDir: string, appKey: string, mode: string, devTool: string): Promise<boolean>;
+export declare function generatePackageJSON(dependencies: object | undefined, appBuildDir: string, appKey: string, mode: string, devTool: string, vueVersion?: number): Promise<boolean>;

package/lib/builder/h5/npm.js

@@ -12,7 +12,7 @@ const config_1 = require("../config");
 const generateFiles_1 = require("../util/generateFiles");
 const lodash_1 = require("lodash");
 const util_1 = require("../util");
-async function handleNPM({ mainAppData, subAppDataList = [], dependencies = [], appKey, appBuildDir, mode, devTool, ignoreInstall = false, }) {
+async function handleNPM({ mainAppData, subAppDataList = [], dependencies = [], appKey, appBuildDir, mode, devTool, ignoreInstall = false, vueVersion = 0, }) {
     const allAppDataList = subAppDataList.concat(mainAppData);
     // 安装 NPM 依赖
     const deps = {};
@@ -37,7 +37,7 @@ async function handleNPM({ mainAppData, subAppDataList = [], dependencies = [],
     //     Object.assign(deps, comp.npmDependencies);
     //   });
     // });
-    const isChange = await generatePackageJSON(deps, appBuildDir, appKey, mode, devTool);
+    const isChange = await generatePackageJSON(deps, appBuildDir, appKey, mode, devTool, vueVersion);
     if (!isChange) {
         (0, console_1.notice)('package.json dependencies 已经安装，如出现未安装成功或找不到依赖，请重启wa watch');
     }
@@ -47,7 +47,7 @@ async function handleNPM({ mainAppData, subAppDataList = [], dependencies = [],
     });
 }
 exports.handleNPM = handleNPM;
-async function generatePackageJSON(dependencies = {}, appBuildDir, appKey, mode, devTool) {
+async function generatePackageJSON(dependencies = {}, appBuildDir, appKey, mode, devTool, vueVersion = 0) {
     const templatePath = path_1.default.join(config_1.appTemplateDir, 'package.json');
     const dstFilePath = path_1.default.join(appBuildDir, 'package.json');
     const dstTempPath = path_1.default.join(appBuildDir, '.temp', 'package.json');
@@ -57,6 +57,7 @@ async function generatePackageJSON(dependencies = {}, appBuildDir, appKey, mode,
         canUseVite: (0, util_1.canUseVite)(mode, devTool),
         appKey,
         appId: appKey,
+        vueVersion: vueVersion === 3 ? '^3' : '^2',
     }));
     const packageInfo = await fs_extra_1.default.readJSON(dstTempPath);
     // weapps-sdk 要与 builder template 版本一致

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

@@ -11,6 +11,7 @@ interface IWebpackCoreProps extends BuildAppProps {
     subAppDataList: IWebRuntimeAppData[];
     assets: string[];
     cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
+    vueVersion?: number;
 }
-export declare function runWebpackCore({ buildContext, cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode, appKey, buildTypeList, assets, devTool, generateMpType, cdnEndpoints, }: IWebpackCoreProps): Promise<string>;
+export declare function runWebpackCore({ buildContext, cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode, appKey, buildTypeList, assets, devTool, generateMpType, cdnEndpoints, vueVersion, }: IWebpackCoreProps): Promise<string>;
 export {};

package/lib/builder/h5/webpack.js

@@ -5,7 +5,7 @@ const common_1 = require("../types/common");
 const webpack_1 = require("../service/webpack");
 const generate_1 = require("./generate");
 const cals_1 = require("@cloudbase/cals");
-async function runWebpackCore({ buildContext, cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode = common_1.WebpackModeType.NONE, appKey, buildTypeList = [common_1.BuildType.WEB], assets = [], devTool = 'vite', generateMpType = common_1.GenerateMpType.APP, cdnEndpoints, }) {
+async function runWebpackCore({ buildContext, cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode = common_1.WebpackModeType.NONE, appKey, buildTypeList = [common_1.BuildType.WEB], assets = [], devTool = 'vite', generateMpType = common_1.GenerateMpType.APP, cdnEndpoints, vueVersion = 0, }) {
     var _a;
     console.time('runWebpackCore');
     console.time('webpackGenerate');
@@ -18,6 +18,7 @@ async function runWebpackCore({ buildContext, cals, mainAppData, subAppDataList,
         mode,
         buildTypeList,
         assets,
+        vueVersion,
     });
     console.timeEnd('webpackGenerate');
     await (0, generate_1.generateHTML)({

package/lib/builder/mp/materials.js

@@ -301,7 +301,7 @@ async function generateCompositeComponent(compositeCtx, compositedComp, lowcalWe
     //     path: 'index',
     //   });
     // }
-    codes.map((mod) => {
+    await Promise.all(codes.map((mod) => {
         let themeCode;
         if (mod.type === cals_1.ECodeType.STYLE && compLibCommonResource) {
             themeCode = `
@@ -317,7 +317,7 @@ async function generateCompositeComponent(compositeCtx, compositedComp, lowcalWe
             return;
         }
         return (0, lowcode_1.writeCode2file)(compositeCtx, mod, path.join(componentDir, LOWCODE_DIR_NAME), { comp: compositedComp }, themeCode, mode === 'lib' ? true : false);
-    });
+    }));
     // await writeLowCodeFiles(weapp, appRoot)
     // await generateFramework(weapp, appRoot)
 }

package/lib/builder/mp/util.js

@@ -557,13 +557,13 @@ function generateScopedStyleText(widgets, weightPrefix = '#wd-page-root') {
                     // 移除换行及其前后的空白符
                     .replace(/\s*\n\s*/g, '')
                     // 添加 `#wd-page-root` 前缀以增加样式权重
-                    .replace(/(:scope.*?{)/g, `\n${weightPrefix} $1`)
+                    .replace(/(:scope.*?[,{])/g, `\n${weightPrefix} $1`)
                     // 替换 `:scope`
                     .replace(/:scope/g, `.wd-comp-id-${id}`)
                     // `: ` => `:`
-                    .replace(/\s*:\s*/g, ':')
+                    // `, ` => `,`
                     // ` {` => `{`
-                    .replace(/\s*{\s*/g, '{')
+                    .replace(/\s*([:,{])\s*/g, '$1')
                     // `;}` => `}`
                     .replace(/;\s*}/g, '}');
                 cssTextList.push(cssText.trim());

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

@@ -31,7 +31,7 @@ export interface IMpConfig {
     };
 }
 export declare function fixAppJson(appBuildDir: string): Promise<void>;
-export declare function generateWebpackWebBuildParamsFile({ appId, allAppDataList, appBuildDir, publicPath, mode, buildTypeList, assets, }: {
+export declare function generateWebpackWebBuildParamsFile({ appId, allAppDataList, appBuildDir, publicPath, mode, buildTypeList, assets, vueVersion, }: {
     appId: string;
     allAppDataList: IWebRuntimeAppData[];
     appBuildDir: string;
@@ -39,6 +39,7 @@ export declare function generateWebpackWebBuildParamsFile({ appId, allAppDataLis
     mode: WebpackModeType;
     buildTypeList: BuildType[];
     assets: string[];
+    vueVersion?: number;
 }): Promise<string>;
 export interface IGenerateMpJsonConfigFileOpts {
     appKey?: string;
@@ -49,7 +50,7 @@ export declare function downloadAndWriteTabBarIcon(iconPath: any, pagePath: any,
 export declare function getMainAppDataByList(allAppDataList: IWebRuntimeAppData[]): IWebRuntimeAppData | undefined;
 export declare function getHomePageInstance(pageInstanceList: any): any;
 export declare function getPageName(name: string): string;
-export declare function getWebpackWebBuildParams(appId: string, appBuildDir: string, publicPath?: string, mode?: WebpackModeType, buildTypeList?: BuildType[], extraDefine?: {}, assets?: string[]): any;
+export declare function getWebpackWebBuildParams(appId: string, appBuildDir: string, publicPath?: string, mode?: WebpackModeType, buildTypeList?: BuildType[], extraDefine?: {}, assets?: string[], vueVersion?: number): any;
 export declare function downloadAndInstallDependencies(dependencies: IMaterialItem[] | undefined, materialsDir: string, installOptions?: IInstallOpts): Promise<void>;
 export declare function downloadDependencies(targetDir: string, srcZipUrl: string): Promise<void>;
 /**

package/lib/builder/service/webpack.js

@@ -39,12 +39,12 @@ async function fixAppJson(appBuildDir) {
     await fs_extra_1.default.writeFile(appJsonPath, JSON.stringify(appJson, null, 2));
 }
 exports.fixAppJson = fixAppJson;
-async function generateWebpackWebBuildParamsFile({ appId, allAppDataList, appBuildDir, publicPath, mode, buildTypeList, assets = [], }) {
+async function generateWebpackWebBuildParamsFile({ appId, allAppDataList, appBuildDir, publicPath, mode, buildTypeList, assets = [], vueVersion = 0, }) {
     let mainAppData = getMainAppDataByList(allAppDataList);
     let extraDefine = {
         'process.env.historyType': `"${mainAppData.historyType || types_1.HISTORY_TYPE.BROWSER}"`,
     };
-    const params = getWebpackWebBuildParams(appId, appBuildDir, publicPath, mode, buildTypeList, extraDefine, assets);
+    const params = getWebpackWebBuildParams(appId, appBuildDir, publicPath, mode, buildTypeList, extraDefine, assets, vueVersion);
     const webpackConfigPath = path_1.default.resolve(appBuildDir, './webpack/webpack.web.prod.js');
     const paramsString = JSON.stringify(params, null, 2);
     const webpackConfigContent = `const params = ${paramsString};\nmodule.exports = require('./web.prod.js')(params);`;
@@ -119,7 +119,7 @@ function getPageName(name) {
     return `${name}`;
 }
 exports.getPageName = getPageName;
-function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = common_1.WebpackModeType.NONE, buildTypeList = [common_1.BuildType.WEB], extraDefine = {}, assets = []) {
+function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = common_1.WebpackModeType.NONE, buildTypeList = [common_1.BuildType.WEB], extraDefine = {}, assets = [], vueVersion = 0) {
     return {
         context: appBuildDir,
         mode: mode !== common_1.WebpackModeType.PRODUCTION ? 'development' : mode,
@@ -155,6 +155,7 @@ function getWebpackWebBuildParams(appId, appBuildDir, publicPath = '/', mode = c
             : mode !== common_1.WebpackModeType.PRODUCTION
                 ? 'eval'
                 : false,
+        vueVersion,
     };
 }
 exports.getWebpackWebBuildParams = getWebpackWebBuildParams;