@cloudbase/lowcode-builder 1.6.3 → 1.6.4-alpha.0

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

@@ -28,7 +28,7 @@ export declare function generateCdnEndpoints(endpoints?: ICDN_ENDPOINTS_COFIG):
  * 循环组件的信息
  */
 export declare const REPEATER: {
-    MODULE_NAME: string;
+    MODULE_NAME: any;
     REPEATER_NAME: string;
     REPEATER_ITEM_NAME: string;
 };

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

@@ -1,3 +1,3 @@
-import { IWebRuntimeAppData, II18nConfig, IMaterialItem } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { IWebRuntimeAppData, II18nConfig } from '@cloudbase/lowcode-generator/lib/weapps-core';
 export declare function runCopy(appBuildDir: string, webRuntimeAppData: IWebRuntimeAppData, i18nConfig?: II18nConfig): Promise<void>;
 export declare function copyMaterialLibraries(dependencies: IMaterialItem[] | undefined, materialsDir: string, appBuildDir: string): Promise<void[]>;

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

@@ -1,3 +1,2 @@
-import { IMaterialItem } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { RUNTIME } from '../../types';
 export declare function runHandleMaterial(appBuildDir: string, dependencies: IMaterialItem[] | undefined, materialsDir: string, runtime?: RUNTIME, ignoreInstall?: boolean): Promise<any[]>;

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

@@ -1,6 +1,6 @@
 import { IWeAppData, IPlugin } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IBuildContext } from './BuildContext';
-import { BuildType, IAppUsedComp, IUsedComps } from '../types/common';
+import { BuildType } from '../types/common';
 import { IBuildWedaApp } from '../core';
 export declare function generateWxMp({ buildContext, weapps, plugins, deployOptions, options, buildTypeList, ignoreInstall, }: {
     buildContext: IBuildContext;

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

@@ -19,9 +19,9 @@ export declare function extractUsedCompsRecursively(comps: IUsedComps, checkedCo
  * }
  */
 export declare function getWxmlTag(ctx: IBuildContext, cmp: Required<IWeAppComponentInstance>['xComponent'], nameMangler?: NameMangler): {
-    tagName: string;
+    tagName: any;
     path?: undefined;
 } | {
-    tagName: string;
+    tagName: any;
     path: any;
 };

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

@@ -1,4 +1,4 @@
-import { IDynamicValue, IWeAppComponentInstance, ActionType, ICompositedComponent, IWeAppPage, IEventListener } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { IDynamicValue, IWeAppComponentInstance, ICompositedComponent, IWeAppPage } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { IBuildContext } from './BuildContext';
 export declare function generatedDynamicData(data: {
     [key: string]: IDynamicValue;
@@ -16,7 +16,7 @@ export declare function generateSyncListeners(syncConfigs: any): IEventListener[
 export declare function generateDataContainerListeners(): {
     trigger: string;
     jsCode: string;
-    type: ActionType;
+    type: any;
     data: {};
 }[];
 export declare function createDataBinds(ctx: IBuildContext, widgets: {

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

@@ -1,4 +1,4 @@
-import { IMaterialItem, IWebRuntimeAppData } from '@cloudbase/lowcode-generator/lib/weapps-core';
+import { IWebRuntimeAppData } from '@cloudbase/lowcode-generator/lib/weapps-core';
 import { BuildType, WebpackModeType } from '../types/common';
 import { RUNTIME } from '../../types';
 export declare const PERSISTENT_DEPENDIENCES_MAP: {};
@@ -50,11 +50,11 @@ export declare function downloadAndWriteTabBarIcon(iconPath: any, pagePath: any,
 export declare function generateKbonePageConfig(mpConfig: Record<string, any>, mainAppData: IWebRuntimeAppData, subAppDataList?: IWebRuntimeAppData[]): Record<string, any>;
 export declare function generateKboneAppConfig(mpConfig: Record<string, any>, mainAppData: IWebRuntimeAppData): void;
 export declare function generateMpJsonConfigFile(allAppDataList: IWebRuntimeAppData[], userConfig: any, appBuildDir: string, options: IGenerateMpJsonConfigFileOpts): Promise<void>;
-export declare function getMainAppDataByList(allAppDataList: IWebRuntimeAppData[]): IWebRuntimeAppData | undefined;
+export declare function getMainAppDataByList(allAppDataList: IWebRuntimeAppData[]): any;
 export declare function getHomePageInstance(pageInstanceList: any): any;
 export declare function getPageName(name: string): string;
 export declare function getMpAllRouterConfig(allAppDataList: IWebRuntimeAppData[], getHome?: boolean): any;
-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?: any, buildTypeList?: any[], extraDefine?: {}, assets?: string[]): any;
 export declare function getWebpackMpBuildParams(appBuildDir: string, materialsDir: string, dependencies: IMaterialItem[] | undefined, nodeModulesPath: string, allAppDataList: IWebRuntimeAppData[], mode: string, watch: boolean, options: IGenerateMpJsonConfigFileOpts): any;
 export declare function getAllPageMpEntryPath(allAppDataList: IWebRuntimeAppData[], appBuildDir: string): Record<string, any>;
 export declare function downloadAndInstallDependencies(dependencies: IMaterialItem[] | undefined, materialsDir: string, installOptions?: IInstallOpts): Promise<void>;

package/lib/builder/types/common.js

@@ -1,10 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildAsXPageByBuildType = exports.buildAsAdminPortalByBuildType = exports.buildAsWebByBuildType = exports.WebpackModeType = exports.GenerateMpType = exports.BuildType = void 0;
+exports.IFileCodeMap = exports.IComponentInputProps = exports.ISyncProp = exports.IUsedComps = exports.IAppUsedComp = exports.buildAsXPageByBuildType = exports.buildAsAdminPortalByBuildType = exports.buildAsWebByBuildType = exports.IPackageJson = exports.WebpackBuildCallBack = exports.WebpackModeType = exports.GenerateMpType = exports.BuildType = void 0;
 var common_1 = require("@cloudbase/lowcode-generator/lib/generator/types/common");
 Object.defineProperty(exports, "BuildType", { enumerable: true, get: function () { return common_1.BuildType; } });
 Object.defineProperty(exports, "GenerateMpType", { enumerable: true, get: function () { return common_1.GenerateMpType; } });
 Object.defineProperty(exports, "WebpackModeType", { enumerable: true, get: function () { return common_1.WebpackModeType; } });
+Object.defineProperty(exports, "WebpackBuildCallBack", { enumerable: true, get: function () { return common_1.WebpackBuildCallBack; } });
+Object.defineProperty(exports, "IPackageJson", { enumerable: true, get: function () { return common_1.IPackageJson; } });
 Object.defineProperty(exports, "buildAsWebByBuildType", { enumerable: true, get: function () { return common_1.buildAsWebByBuildType; } });
 Object.defineProperty(exports, "buildAsAdminPortalByBuildType", { enumerable: true, get: function () { return common_1.buildAsAdminPortalByBuildType; } });
 Object.defineProperty(exports, "buildAsXPageByBuildType", { enumerable: true, get: function () { return common_1.buildAsXPageByBuildType; } });
+Object.defineProperty(exports, "IAppUsedComp", { enumerable: true, get: function () { return common_1.IAppUsedComp; } });
+Object.defineProperty(exports, "IUsedComps", { enumerable: true, get: function () { return common_1.IUsedComps; } });
+Object.defineProperty(exports, "ISyncProp", { enumerable: true, get: function () { return common_1.ISyncProp; } });
+Object.defineProperty(exports, "IComponentInputProps", { enumerable: true, get: function () { return common_1.IComponentInputProps; } });
+Object.defineProperty(exports, "IFileCodeMap", { enumerable: true, get: function () { return common_1.IFileCodeMap; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.6.3",
+  "version": "1.6.4-alpha.0",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -38,8 +38,8 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^1.0.3",
-    "@cloudbase/lowcode-generator": "^1.6.4",
+    "@cloudbase/cals": "workspace:^",
+    "@cloudbase/lowcode-generator": "workspace:^",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",
@@ -81,4 +81,4 @@
     "webpack-dev-server": "^4.7.3",
     "worker-loader": "^3.0.8"
   }
-}
+}

package/template/html/index.html.ejs

@@ -18,35 +18,14 @@
     />
     <% cssStyles.forEach(function(styleUrl){%>
     <link type="text/css" rel="stylesheet" href="<%=styleUrl %>" />
-    <% })%> <% if(cdnEndpoints.aegis){ %>
-    <script crossorigin="anonymous" src="<%= cdnEndpoints.aegis %>/aegis-sdk/latest/aegis.min.js"></script>
-    <script>
-      <% if(!isAdminPortal){ %>
-      const _aegis = new Aegis({
-        id: 'lXHFsBpTjIzNADiczY', // 项目ID，即上报key
-        reportApiSpeed: true, // 接口测速
-        reportAssetSpeed: true, // 静态资源测速
-        spa: true,
-        ext1: '<%=appId%>',
-      });
-      <% } else {%>
-      const _aegis = new Aegis({
-        id: 'lXHFsBpTrKcnOMqTRQ', // 项目ID，即上报key
-        reportApiSpeed: false, // 接口测速
-        reportAssetSpeed: false, // 静态资源测速
-        spa: true,
-        ext1: '<%=appId%>',
-      });
-      <% }%>
-      window._aegis = _aegis;
-      window._aegis_inited = Date.now()
-    </script>
-    <% }%>
+    <% })%>
+
     <title><%= title %></title>
-    <% if(mode !== 'production'){ %>
-    <!-- <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script>
-    <script>new VConsole()</script> -->
-    <% }%>
+
+    <!-- <% if(mode !== 'production'){ %>
+    <script src="https://cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script>
+    <script>new VConsole()</script>
+    <% }%> -->
 
     <!-- 重置浏览器样式 -->
     <style type="text/css">
@@ -455,13 +434,39 @@
       </div>
       <% }%>
     </div>
-    <% jsApis.forEach(function(jsApi){%>
+    <% if(cdnEndpoints.aegis){ %>
+    <script crossorigin="anonymous" src="<%= cdnEndpoints.aegis %>/aegis-sdk/latest/aegis.min.js"></script>
+    <script>
+      <% if(!isAdminPortal){ %>
+      const _aegis = new Aegis({
+        id: 'lXHFsBpTjIzNADiczY', // 项目ID，即上报key
+        reportApiSpeed: true, // 接口测速
+        reportAssetSpeed: true, // 静态资源测速
+        spa: true,
+        ext1: '<%=appId%>',
+      });
+      <% } else {%>
+      const _aegis = new Aegis({
+        id: 'lXHFsBpTrKcnOMqTRQ', // 项目ID，即上报key
+        reportApiSpeed: false, // 接口测速
+        reportAssetSpeed: false, // 静态资源测速
+        spa: true,
+        ext1: '<%=appId%>',
+      });
+      <% }%>
+      window._aegis = _aegis;
+      window._aegis_inited = Date.now()
+    </script>
+    <% }%> <% jsApis.forEach(function(jsApi){%>
     <script src="<%=jsApi %>"></script>
     <% })%> <% if(canUseVite){ %>
     <script type="module" src="/src/index.jsx"></script>
     <% } %> <% if(!isAdminPortal){ %>
     <script src="/weda-config/weda-private.js"></script>
-    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.4.7-beta.0/cloudbase.full.js?v=1"></script>
+    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.4.7-beta.0/cloudbase.js?v=1"></script>
+    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.4.7-beta.0/cloudbase.auth.js?v=1"></script>
+    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.4.7-beta.0/cloudbase.functions.js?v=1"></script>
+    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.4.7-beta.0/cloudbase.storage.js?v=1"></script>
     <% }%>
     <script>
       if (window.cloudbase && window._aegis) {
@@ -509,19 +514,17 @@
     ></script>
     <script
       crossorigin
-      src="<%=
-        cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/release/_npm/react-dom@16.14.0/umd/react-dom.production.min.js"
+      src="<%= cdnEndpoints.cdngo %>/lcap/lcap-resource-cdngo/-/release/_npm/react-dom@16.14.0/umd/react-dom.production.min.js"
     ></script>
     <script
-      src="<%= cdnEndpoints.cdngo %>/lcap/lcap-resource-cdngo/-/0.1.2/_url/ajax/libs/mobx/5.15.7/mobx.umd.js"
+      src="<%= cdnEndpoints.cdngo %>/lcap/lcap-resource-cdngo/-/602f2de5/_url/ajax/libs/mobx/5.15.7/mobx.umd.min.js"
       crossorigin="anonymous"
     ></script>
     <script
       crossorigin="anonymous"
       src="<%=
         cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.29/dist/h5.browser.js"
+      %>/lcap/lcap-resource-cdngo/-/83ec8058/_npm/@cloudbase/weda-cloud-sdk@1.0.30-alpha.0/dist/h5.browser.js"
     ></script>
     <script>
       // zxing polifill
@@ -529,21 +532,23 @@
         this.globalThis = this;
       }
     </script>
-    <script
-      crossorigin="anonymous"
-      src="<%= cdnEndpoints.cdngo %>/lcap/lcap-resource-cdngo/-/0.1.2/_url/npm/@zxing/library@0.18.6/umd/index.min.js"
-    ></script>
+    <script>
+      var script = document.createElement('script');
+      script.type = 'text/javascript';
+      script.crossorigin = 'anonymous';
+      script.src =
+        '<%= cdnEndpoints.cdngo %>/lcap/lcap-resource-cdngo/-/0.1.2/_url/npm/@zxing/library@0.18.6/umd/index.min.js';
+      setTimeout(function () {
+        document.getElementsByTagName('body')[0].appendChild(script);
+      }, 1000);
+    </script>
     <script
       crossorigin
-      src="<%=
-        cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/release/_url/qcloud/lowcode/static/ide/assets/js/babel.min.js"
+      src="<%= cdnEndpoints.cdngo %>/lcap/lcap-resource-cdngo/-/f8115605/_npm/@cloudbase/cals@1.0.3-alpha.8/lib/cloudbase.cals.umd.min.js"
     ></script>
     <script
       crossorigin
-      src="<%=
-      cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.413fc7788ab27e709449.bundle.js"
+      src="<%= cdnEndpoints.cdngo %>lcap/lcap-resource-cdngo/-/189f87d7/_files/static/weda-render/main.da12d9cfd372eee26888.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/util.js

@@ -95,12 +95,12 @@ export function createEventHandlers(
         } catch (e) {
           let eventName = l.key ? `${prefix}$${l.key}_fail` : '';
           if (self[eventName]) {
-            console.error(`Action error: [${trigger}:${l.key}]`, e);
             await self[eventName]({
               ...event,
               detail: e,
             });
           } else {
+            console.error(`Action error: [${trigger}:${l.key}]`, e);
             if (!looseError) {
               app.showToast({
                 icon: 'error',