@cloudbase/lowcode-builder 1.9.3 → 1.9.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.9.3",
+  "version": "1.9.5",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -27,13 +27,15 @@
   "scripts": {
     "dev": "tsc -w",
     "develop": "tsc -w",
-    "clean": "rm -rf lib && rm -rf dist",
+    "clean": "rm -rf lib && rm -rf dist && rm -rf .worker",
     "build": "yarn clean && tsc && yarn build:web",
     "test:build": "ts-node ./__tests__/build.ts",
     "dev:web:serve": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=development  webpack-dev-server --config ./webpack/web.config.js",
     "dev:web": "cross-env NODE_ENV=development  webpack --config ./webpack/web.config.js",
     "build:web": "yarn build:template && yarn run set:NODE_OPTIONS cross-env NODE_ENV=production  webpack --config ./webpack/web.config.js",
     "build:template": "node ./scripts/generateTemplate.js",
+    "build:webworker": "yarn build && webpack --config ./webpack/worker.config.js",
+    "deploy": "yarn build:webworker && node ./scripts/deploy.mjs",
     "dev:template": "npm run build:template --watch",
     "dev:debug": "tsc-watch --onSuccess 'npm run build-dev-web-and-push'",
     "build-dev-web-and-push": "npm run dev:web && clear && yalc publish --push",
@@ -47,8 +49,8 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.1.13",
-    "@cloudbase/lowcode-generator": "^1.8.36",
+    "@cloudbase/cals": "^1.1.14",
+    "@cloudbase/lowcode-generator": "^1.8.37",
     "axios": "^0.21.0",
     "chalk": "^2.4.2",
     "compare-versions": "^3.6.0",
@@ -62,6 +64,7 @@
     "xml-js": "^1.6.11"
   },
   "devDependencies": {
+    "@tcwd/dev-tools": "^1.0.1",
     "@types/archiver": "^3.1.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -86,6 +89,7 @@
     "tsc-watch": "^6.0.4",
     "typescript": "4.7.4",
     "uglifyjs-webpack-plugin": "^2.2.0",
+    "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^4.9.1",
     "webpack-dev-server": "^4.7.3",
     "worker-loader": "^3.0.8"

package/template/html/index.html.ejs

@@ -464,7 +464,7 @@
     <script type="module" src="/src/index.jsx"></script>
     <% } %> <% if(!isAdminPortal){ %>
     <script src="<%= wedaPrivateConfigEndpoint ? wedaPrivateConfigEndpoint : '' %>/weda-config/weda-private.js"></script>
-    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.5.46-beta.0/cloudbase.full.js?v=1"></script>
+    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.8.2-beta.0/cloudbase.full.js?v=1"></script>
     <script
       crossorigin
       src="<%= cdnEndpoints.cdngo %>/lcap/lcap-resource-cdngo/-/release/_npm/cloudbase-adapter-privatelink@0.0.2/dist/index.js"
@@ -557,7 +557,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.c741964cba433b7def51.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.dfcfc20fa55fb52e639f.bundle.js"
     ></script>
   </body>
 </html>

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

@@ -42,6 +42,11 @@ const CLOUD_CONFIG =  {
       return tcbPrivatelinkAdapter
     })
   },
+  __asyncRequire__: async function(name) {
+    return require.async('../packages/$wd_system/index.js').then(({ load }) => {
+      return load(name)
+    })
+  },
   __defaultLoginType__: '<%= defaultLoginType %>'
 }
 

package/template/mp/package.json

@@ -1,8 +1,6 @@
 {
   "name": "lcap-<%= appId%>",
   "version": "1.0.8",
-  "scripts": {
-    "fix:cloud": "node -e 'try{const fix = require(\"@cloudbase/weda-cloud-sdk/scripts/fix-wx-none-private.js\");fix()}catch(e){}'"
-  },
+  "scripts": {},
   "dependencies": <%= JSON.stringify(extraDeps, undefined, 2) %>
 }

package/template/mp/packages/$wd_system/index.js.tpl

@@ -1,3 +1,5 @@
+import { registerAi, createAi } from "@cloudbase/ai";
+import { generateAuthInstance, registerAuth } from "@cloudbase/auth";
 <% if(cdnEndpoints.aegis){ %>import Aegis from 'aegis-mp-sdk';<%} else {%> class Aegis {
   constructor() {
     return new Proxy({}, {
@@ -8,5 +10,31 @@
   }
 }<% } %>
 <% if(privatelink){ %>import { tcbPrivatelinkAdapter } from './privatelink/index';<%} else {%>const tcbPrivatelinkAdapter = undefined<% } %>
+<% if(importJSSDK){ %>import cloudbase from "@cloudbase/js-sdk/app";
+import { registerFunctions } from "@cloudbase/js-sdk/functions";
+import { registerStorage } from "@cloudbase/js-sdk/storage";<% } %>
 
-export { Aegis, tcbPrivatelinkAdapter }
+const loadMap = {
+  <% if(importJSSDK){ %>"@cloudbase/js-sdk/app": {
+    default: cloudbase,
+  },
+  "@cloudbase/js-sdk/functions": {
+    registerFunctions,
+  },
+  "@cloudbase/js-sdk/storage": {
+    registerStorage,
+  },<% } %>
+  "@cloudbase/ai": {
+    registerAi,
+    createAi,
+  },
+  "@cloudbase/auth": {
+    generateAuthInstance,
+    registerAuth,
+  },
+  "@cloudbase/adapter-wx_mp": require('@cloudbase/adapter-wx_mp')
+};
+
+const load = (name) => loadMap[name];
+
+export { Aegis, tcbPrivatelinkAdapter, load }

package/template/mp/packages/$wd_system/package.json

@@ -6,7 +6,8 @@
     ...(cdnEndpoints.aegis && { "aegis-mp-sdk": "~1.38.1" }),
     ...(privatelink && {
       "polyfill-crypto.getrandomvalues": "^1.0.0",
-      "cloudbase-adapter-privatelink": "0.0.1"
+      "cloudbase-adapter-privatelink": "0.0.1",
     }),
+    ...extraDeps
   }, undefined, 2) %>
 }

package/template/mp/packages/$wd_system/pages/login/methods/loginBySms.js

@@ -7,14 +7,11 @@ export default async function loginBySms(
   instance,
   { callback, verificationInfo, verificationCode, phoneNum, bindInfo },
 ) {
-  wx.showLoading();
+  wx.showLoading({ mask: true });
   const { usedCount = 0 } = wx.getStorageSync(phoneVerifyInfoKey) || {};
   try {
     const cloud = await app.cloud.getCloudInstance();
     const auth = cloud.auth;
-    const endpointType =
-      app.__internal__ && app.__internal__.getCloudSdkConfig && app.__internal__.getCloudSdkConfig('endpointType');
-    const isTcbApi = endpointType === 'tcb-api';
     const isV2 = false;
 
     // 验证码使用次数超过限制，直接提示错误

package/template/webpack/web.prod.js

@@ -32,12 +32,12 @@ module.exports = function (options) {
               // esmodules: true,
               browsers: ['defaults', 'iOS >= 10', 'safari >= 10', 'chrome >= 53'],
             },
-            include: ['@babel/plugin-transform-class-properties'],
           },
         ],
         '@babel/preset-react',
       ],
       plugins: [
+        '@babel/plugin-transform-class-properties',
         ['@babel/plugin-proposal-decorators', { legacy: true }],
         '@babel/plugin-proposal-export-default-from',
       ].filter(Boolean),