@cloudbase/lowcode-builder 0.1.26 → 1.0.2

package/lib/index.d.ts

@@ -7,3 +7,7 @@
  */
 export * from './builder/core/index';
 export * from './types';
+/**
+ * cache map
+ */
+export { PERSISTENT_DEPENDIENCES_MAP } from './builder/service/webpack';

package/lib/index.js

@@ -10,6 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PERSISTENT_DEPENDIENCES_MAP = void 0;
 /**
  * Tencent is pleased to support the open source community by making CloudBaseFramework - 云原生一体化部署工具 available.
  *
@@ -19,3 +20,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 __exportStar(require("./builder/core/index"), exports);
 __exportStar(require("./types"), exports);
+/**
+ * cache map
+ */
+var webpack_1 = require("./builder/service/webpack");
+Object.defineProperty(exports, "PERSISTENT_DEPENDIENCES_MAP", { enumerable: true, get: function () { return webpack_1.PERSISTENT_DEPENDIENCES_MAP; } });

package/lib/types.d.ts

@@ -12,3 +12,4 @@ export declare enum HISTORY_TYPE {
     HASH = "HASH"
 }
 export { PropBindType } from '@cloudbase/cals';
+export * from './builder/types/common';

package/lib/types.js

@@ -1,4 +1,14 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PropBindType = exports.HISTORY_TYPE = exports.RUNTIME = exports.DEPLOY_MODE = void 0;
 var DEPLOY_MODE;
@@ -19,3 +29,4 @@ var HISTORY_TYPE;
 })(HISTORY_TYPE = exports.HISTORY_TYPE || (exports.HISTORY_TYPE = {}));
 var cals_1 = require("@cloudbase/cals");
 Object.defineProperty(exports, "PropBindType", { enumerable: true, get: function () { return cals_1.PropBindType; } });
+__exportStar(require("./builder/types/common"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "0.1.26",
+  "version": "1.0.2",
   "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": "^0.3.29",
-    "@cloudbase/lowcode-generator": "^0.6.26",
+    "@cloudbase/cals": "^0.3.31",
+    "@cloudbase/lowcode-generator": "^1.0.1",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",
@@ -52,11 +52,6 @@
     "fs-extra": "^7.0.1",
     "jszip": "^3.7.1",
     "lodash": "^4.17.11",
-    "lodash.clone": "^4.5.0",
-    "lodash.get": "^4.4.2",
-    "lodash.set": "^4.3.2",
-    "lodash.template": "^4.5.0",
-    "lodash.uniqby": "^4.7.0",
     "os-browserify": "^0.3.0",
     "stream-browserify": "^3.0.0",
     "webpack": "^4.41.4",

package/template/html/index.html.ejs

@@ -10,24 +10,37 @@
     />
     <meta name="format-detection" content="telephone=no" />
     <meta name="description" content="<%= desc %>" />
-    <% if(!isAdminPortal){ %>
-    <script src="https://cdn-go.cn/aegis/aegis-sdk/latest/aegis.min.js"></script>
+    <link
+      rel="stylesheet"
+      href="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.0278b2e1cf17b7972959.css"
+    />
+    <script crossorigin="anonymous" src="https://cdn-go.cn/aegis/aegis-sdk/latest/aegis.min.js?v=1"></script>
     <script>
-      const aegis = new Aegis({
+      <% 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> -->
-    <% }%> <% Array.isArray(jsApis) && jsApis.filter(function(item){return
-    !!item}).forEach(function(jsApi){%>
+    <% }%> <% Array.isArray(jsApis) && jsApis.filter(function(item){return !!item}).forEach(function(jsApi){%>
     <script src="<%=jsApi %>"></script>
     <% })%>
 
@@ -53,15 +66,14 @@
       body {
         margin: 0;
         font-size: 14px;
-        font-family: 'Helvetica Neue', Helvetica, 'Microsoft Yahei', STHeiTi,
-          Arial, sans-serif;
+        font-family: 'Helvetica Neue', Helvetica, 'Microsoft Yahei', STHeiTi, Arial, sans-serif;
         line-height: 1.5;
         color: #333;
         background-color: #fff;
         min-height: 100%;
       }
 
-      body > #root {
+      body > #react {
         height: 100%;
       }
 
@@ -374,7 +386,8 @@
     <% if(canUseVite){ %>
     <script type="module" src="/src/index.jsx"></script>
     <% } %> <% if(!isAdminPortal){ %>
-    <script src="https://imgcache.qq.com/qcloud/cloudbase-js-sdk/1.5.3-alpha.0/cloudbase.full.js"></script>
+    <script src="/weda-config/weda-private.js"></script>
+    <script src="//static.cloudbase.net/cloudbase-js-sdk/2.4.0-alpha.0/cloudbase.full.js?v=1"></script>
     <% }%>
     <script>
       if (window.cloudbase) {
@@ -383,18 +396,12 @@
           let promise = _callFunction.call(window.cloudbase, ...arguments);
           if (promise instanceof Promise) {
             return promise
-              .then((res) => {
+              .then(function (res) {
                 const { name, data = {} } = args || {};
                 try {
                   if (res.result && res.result.code) {
-                    aegis.report({
-                      msg:
-                        '[' +
-                        name +
-                        ':' +
-                        data.methodName +
-                        ']: ' +
-                        (res.result.message || '函数调用失败'),
+                    _aegis.report({
+                      msg: '[' + name + ':' + data.methodName + ']: ' + (res.result.message || '函数调用失败'),
                       level: '16',
                       ext2: res.result.code,
                       ext3: res.requestId,
@@ -404,16 +411,10 @@
                 } catch (e) {}
                 return res;
               })
-              .catch((e) => {
+              .catch(function (e) {
                 try {
-                  aegis.report({
-                    msg:
-                      '[' +
-                      name +
-                      ':' +
-                      data.methodName +
-                      ']: ' +
-                      (e.message || '函数调用失败'),
+                  _aegis.report({
+                    msg: '[' + name + ':' + data.methodName + ']: ' + (e.message || '函数调用失败'),
                     level: '16',
                     ext2: e.code,
                     ext3: e.requestId,
@@ -428,10 +429,39 @@
         };
       }
     </script>
+    <script
+      crossorigin
+      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/react@16.14.0/umd/react.production.min.js"
+    ></script>
+    <script
+      crossorigin
+      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/react-dom@16.14.0/umd/react-dom.production.min.js"
+    ></script>
     <script
       src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/ajax/libs/mobx/5.15.7/mobx.umd.js"
       crossorigin="anonymous"
     ></script>
-    <script src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/npm/@zxing/library@0.18.6/umd/index.min.js"></script>
+    <script
+      crossorigin="anonymous"
+      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.12/dist/h5.browser.js"
+    ></script>
+    <script>
+      // zxing polifill
+      if (!this.globalThis) {
+        this.globalThis = this;
+      }
+    </script>
+    <script
+      crossorigin="anonymous"
+      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/npm/@zxing/library@0.18.6/umd/index.min.js"
+    ></script>
+    <script
+      crossorigin
+      src="https://qbase.cdn-go.cn//lcap/lcap-resource-cdngo/-/release/_url/qcloud/lowcode/static/ide/assets/js/babel.min.js"
+    ></script>
+    <script
+      crossorigin
+      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.6096c46cbcf1ae46ae72.bundle.js"
+    ></script>
   </body>
 </html>

package/template/mp/common/weapp-page.js

@@ -19,7 +19,8 @@ export function createPage(
   app,
   handler,
   pageContext = {},
-  context
+  context,
+  pageAttributes
 ) {
   const evtHandlers = createEventHandlers(evtListeners, context);
 
@@ -39,6 +40,27 @@ export function createPage(
     //     delete result[e[1]];
     //   }
     // });
+    result['onShareAppMessage'] = (res) => {
+      if (res?.from === 'button' && res?.target?.dataset?.weda_share_info) {
+        return res?.target?.dataset?.weda_share_info;
+      }
+      else if (pageAttributes?.appShareMessage) {
+        let {pageId, params, imageUrl, title} = pageAttributes.appShareMessage;
+        pageId = pageId ? pageId.replace(/^(\.)?\//,'') : pageId;
+        let realPath = `/pages/${pageId}/index` + (params ? '?'+params.map(pair => pair.key + '=' + pair.value).join('&'):'');
+        return {
+            path:realPath,
+            imageUrl,
+            title
+        };
+      }
+      try {
+        return lifecycle?.['onShareAppMessage']?.() || {};
+      } catch (error) {
+        console.log(error);
+        return {};
+      }
+    }
     return result;
   }
 

package/template/mp/common/weapp-sdk.js

@@ -15,6 +15,12 @@ function createNavigatorFn(fnName) {
       ? `/${packageName}/pages/${pageId}/index`
         : `/pages/${pageId}/index`
     }
+
+    if (fnName === 'navigateTo') {
+      navigateToFn(urlJoinParams(url, params), { events, success, fail, complete});
+      return;
+    }
+
     wx[fnName]({
       url: urlJoinParams(url, params),
       events,
@@ -25,6 +31,35 @@ function createNavigatorFn(fnName) {
   }
 }
 
+/**
+ * 页面堆栈10以内使用wx.navigateTo，超过10则使用wx.redirectTo
+ * @param url
+ * @param param1
+ * @returns
+ */
+ function navigateToFn(url, { events, success, fail, complete}) {
+  const pages = getCurrentPages();
+  if(pages && pages.length >= 10) {
+    wx.redirectTo({
+      url,
+      success,
+      fail,
+      complete
+    });
+    return;
+  }
+
+  wx.navigateTo({
+    url,
+    // @types/weixin-app@2.9.3没有events的定义，但实际上官方文档有：https://developers.weixin.qq.com/miniprogram/dev/api/route/wx.navigateTo.html
+    // @ts-ignore
+    events,
+    success,
+    fail,
+    complete
+  });
+}
+
 const navigateTo = createNavigatorFn('navigateTo')
 const reLaunch = createNavigatorFn('reLaunch')
 const redirectTo = createNavigatorFn('redirectTo')

package/template/mp/package.json

@@ -3,7 +3,7 @@
 	"version": "1.0.8",
 	"scripts": {},
 	"dependencies": {
-		"@cloudbase/weda-client": "^0.2.12",
+		"@cloudbase/weda-client": "^0.2.15",
     "@cloudbase/oauth": "0.1.1-alpha.5",
 		"mobx": "^5.15.4",
 		"lodash.get": "^4.4.2",

package/template/mp/page/index.js

@@ -35,4 +35,5 @@ const dataBinds = {<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
   },<%}) %>
 }
 
-createPage('<%= pageName %>', '<%= pageUUID %>', widgetProps, {}, lifecyle, state, computed, evtListeners, dataBinds, app, handlers, $page, context)
+
+createPage('<%= pageName %>', '<%= pageUUID %>', widgetProps, {}, lifecyle, state, computed, evtListeners, dataBinds, app, handlers, $page, context, <%= pageAttributes?JSON.stringify(pageAttributes):'{}' %>)

package/template/package.json

@@ -2,7 +2,7 @@
   "name": "lcap-<%= appId%>",
   "version": "1.0.0",
   "scripts": {
-    "build-web": "rm -rf ./preivew && webpack --config ./webpack/webpack.web.prod.js"
+    "build-web": "webpack --config ./webpack/webpack.web.prod.js"
   },
   "dependencies": {
     "@cloudbase/js-sdk": "2.4.0-beta.0",
@@ -39,7 +39,7 @@
     "babel-plugin-import": "^1.13.0",
     "base64-inline-loader": "^1.1.1",
     "copy-webpack-plugin": "^6.2.1",
-    "css-loader": "^3.4.0",
+    "css-loader": "^5",
     "css-minimizer-webpack-plugin": "^1.2.0",
     "happypack": "^5.0.1",
     "dart-sass": "^1.24.0",
@@ -49,6 +49,7 @@
     "postcss-css-variables": "^0.16.0",
     "less": "^4.0.0",
     "less-loader": "^7.0.1",
+    "loader-utils": "^3.2.0",
     "sass-loader": "^8.0.0",
     "terser-webpack-plugin": "^3.0.2",
     "mini-css-extract-plugin": "^0.8.0",
@@ -56,6 +57,8 @@
     "html-webpack-plugin": "^3.2.0",
     "ts-loader": "^8.3.0",
     "typescript": "^4.4.4",
+    "vue-loader": "14",
+    "vue-template-compiler": "^2.6.14",
     "webpack": "^4.41.4",
     "webpack-cli": "^4.2.0",
     "webpack-dev-server": "^3.11.0"

package/template/webpack/getCSSModuleLocalIdent.js

@@ -0,0 +1,28 @@
+// Stolen from https://github.com/facebook/create-react-app/blob/cee26589ff919e946030a5651a93ccba78a93293/packages/react-dev-utils/getCSSModuleLocalIdent.js
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+const loaderUtils = require('loader-utils');
+const path = require('path');
+
+module.exports = function getLocalIdent(context, localIdentName, localName, options) {
+  // Use the filename or folder name, based on some uses the index.js / index.module.(css|scss|sass) project style
+  const fileNameOrFolder = context.resourcePath.match(/index\.module\.(css|scss|sass)$/) ? '[folder]' : '[name]';
+  // Create a hash based on a the file location and class name. Will be unique across a project, and close to globally unique.
+  const hash = loaderUtils.getHashDigest(
+    path.posix.relative(context.rootContext, context.resourcePath) + localName,
+    'md5',
+    'base64',
+    5,
+  );
+  // Use loaderUtils to find the file or folder name
+  const className = loaderUtils.interpolateName(context, fileNameOrFolder + '_' + localName + '__' + hash, options);
+  // Remove the .module that appears in every classname when based on the file and replace all "." with "_".
+  return className.replace('.module_', '_').replace(/\./g, '_');
+};