@cloudbase/lowcode-builder 1.8.109 → 1.9.0

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

@@ -1,7 +1,8 @@
-export declare function generatePackageDependencies({ importJSSDK, mode, officialLibVersion, }: {
+export declare function generatePackageDependencies({ importJSSDK, mode, officialLibVersion, uin, }: {
     importJSSDK: boolean;
     mode: 'lib' | string;
     officialLibVersion?: string;
+    uin?: string;
 }): {
     'miniprogram-gesture': string;
     mobx: string;

package/lib/builder/config/dependencies.js

@@ -12,22 +12,24 @@ const BASE_DEPS = {
  * 注意锁版本
  */
 const CLOUDBASE_DEPS = {
-    '@cloudbase/oauth': '0.1.1-alpha.11',
-    '@cloudbase/weda-client': '1.1.1',
-    '@cloudbase/weda-cloud-sdk': '1.0.64',
+    '@cloudbase/oauth': '0.1.1-alpha.14',
+    '@cloudbase/weda-client': '1.1.5',
+    '@cloudbase/weda-cloud-sdk': '1.0.68',
 };
-function generatePackageDependencies({ importJSSDK, mode, officialLibVersion, }) {
+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.46-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;

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/mp/index.js

@@ -212,7 +212,11 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
             'package.json': {
                 appId,
                 extraDeps: {
-                    ...(0, index_1.generatePackageDependencies)({ importJSSDK: endpointType === 'tcb-api', mode: 'app' }),
+                    ...(0, index_1.generatePackageDependencies)({
+                        importJSSDK: endpointType === 'tcb-api',
+                        mode: 'app',
+                        uin: buildContext.uin,
+                    }),
                     ...resolveNpmDeps(weapps, materials),
                 },
             },
@@ -382,7 +386,11 @@ async function generateWxMp({ buildContext: _buildContext, weapps, calses, deplo
                     'package.json': {
                         appId,
                         extraDeps: {
-                            ...(0, index_1.generatePackageDependencies)({ importJSSDK: endpointType === 'tcb-api', mode: 'app' }),
+                            ...(0, index_1.generatePackageDependencies)({
+                                importJSSDK: endpointType === 'tcb-api',
+                                mode: 'app',
+                                uin: buildContext.uin,
+                            }),
                             ...resolveNpmDeps(weapps, materials),
                         },
                         cdnEndpoints,

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/mp/wxml.js

@@ -327,7 +327,7 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
             /**
              * 来自外部引用的组件，添加系统系别的事件绑定
              */
-            if ((componentGenerics[tagName] || usingComponents[tagName]) && !ctx.disablePageComponentInvoke) {
+            if (componentGenerics[tagName] || usingComponents[tagName] /*  && !ctx.disablePageComponentInvoke */) {
                 node.attributes['bind:attached'] = '__mnt__';
                 node.attributes['bind:detached'] = '__unmnt__';
             }