@cloudbase/lowcode-builder 1.8.110 → 1.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.110",
+  "version": "1.9.1",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -47,7 +47,7 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.1.10",
+    "@cloudbase/cals": "^1.1.12",
     "@cloudbase/lowcode-generator": "^1.8.34",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
@@ -56,7 +56,7 @@
     "compare-versions": "^3.6.0",
     "compressing": "^1.4.0",
     "constants-browserify": "^1.0.0",
-    "cross-spawn": "^6.0.5",
+    "cross-spawn": "^7.0.3",
     "crypto-browserify": "^3.12.0",
     "fs-extra": "^7.0.1",
     "jszip": "^3.7.1",

package/template/html/index.html.ejs

@@ -24,6 +24,12 @@
     <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>
+      // globalThis polifill
+      if (!this.globalThis) {
+        this.globalThis = this;
+      }
+    </script>
     <script>
       if (Aegis) {
         const _aegis = new Aegis({
@@ -458,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.41-beta.0/cloudbase.full.js?v=1"></script>
+    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.5.46-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"
@@ -522,7 +528,7 @@
       crossorigin="anonymous"
       src="<%=
         cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.63/dist/h5.browser.js"
+      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.67/dist/h5.browser.js"
     ></script>
     <script
       crossorigin
@@ -551,7 +557,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.8a77ddc977d9cca89eaa.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.666cbe2101327384c0ed.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/util.js

@@ -2,7 +2,7 @@
 'use strict';
 import { auth } from '@cloudbase/weda-client';
 const { checkAnonymous, __internal__ = {}} = auth;
-const { getAuthConfig, redirectToLogin, getAccessPermission, findLoginPage } = __internal__
+const { getAuthConfig, redirectToLogin, getAccessPermission, findLoginPage, cleanAccessPermissionCache } = __internal__
 import { getWedaAPI } from '@cloudbase/weda-client'
 
 let LOGIN_CONFIG = <%= customLoginConfig %>
@@ -66,10 +66,12 @@ export async function checkAuth(app, appId, $page) {
         if(hasOpenIdLoginType){
           // 开启了openId静默登录，则进行openid登录
           const result = await app.cloud.openIdLoginInWxApp();
+          cleanAccessPermissionCache?.()
           return result
         } else if (hasUnionIdLoginType) {
           // 开启了unionId静默登录，则进行unionId登录
           const result = await app.cloud.unionIdLoginInWxApp();
+          cleanAccessPermissionCache?.()
           return result
         }
         else if (loginPage) {
@@ -88,10 +90,12 @@ export async function checkAuth(app, appId, $page) {
       if (hasOpenIdLoginType) {
         // openId静默登录
         const result = await app.cloud.openIdLoginInWxApp();
+        cleanAccessPermissionCache?.()
         return result
       } else if (hasUnionIdLoginType) {
         // 开启了unionId静默登录
         const result = await app.cloud.unionIdLoginInWxApp();
+        cleanAccessPermissionCache?.()
         return result
       } else if (loginPage) {
         try {

package/template/mp/packages/$wd_system/pages/login/index.wxml

@@ -63,14 +63,14 @@
             </view>
           </view>
         </view>
-        <text class="weda-text weda-ui wd-event-tap" style="white-space: pre-line; margin:0px 5px;display:flex;align-items:center;color:rgb(68, 144, 238);text-align:center;white-space:pre-line;" wx:if="{{settingData.agreement.items[0].enable}}" data-index="0" bind:tap="showAgreement">
-          《{{settingData.agreement.items[0].label}}》
+        <text class="weda-text weda-ui wd-event-tap" style="white-space: pre-line; margin:0px 5px;display:flex;align-items:center;color:rgb(68, 144, 238);text-align:center;" wx:if="{{settingData.agreement.items[0].enable}}" data-index="0" bind:tap="showAgreement">
+          <text>《{{settingData.agreement.items[0].label}}》</text>
         </text>
         <text style="white-space: pre-warp; display:flex;align-items:center;white-space:pre-line;" class="weda-text weda-ui" wx:if="{{settingData.agreement.items[0].enable && settingData.agreement.items[1].enable}}">
-          和
+          <text>和</text>
         </text>
-        <text class="weda-text weda-ui wd-event-tap" style="white-space: pre-line; margin:0px 5px;display:flex;align-items:center;color:rgb(68, 144, 238);white-space:pre-line;" data-index="1" wx:if="{{settingData.agreement.items[1].enable}}" bind:tap="showAgreement">
-          《{{settingData.agreement.items[1].label}}》
+        <text class="weda-text weda-ui wd-event-tap" style="white-space: pre-line; margin:0px 5px;display:flex;align-items:center;color:rgb(68, 144, 238);" data-index="1" wx:if="{{settingData.agreement.items[1].enable}}" bind:tap="showAgreement">
+          <text>《{{settingData.agreement.items[1].label}}》</text>
         </text>
       </view>
     </view>

package/template/package.json

@@ -56,7 +56,9 @@
     "html-webpack-plugin": "^4.5.2",
     "ts-loader": "^8.3.0",
     "typescript": "^4.4.4",
-    "vue-loader": "15.9.8",
+    "veaury": "^2.4.2",
+    "vue-loader": "^17.4.2",
+    "vue-loader-for-vue2": "npm:vue-loader@15",
     "vue-template-compiler": "2.6.14",
     "webpack": "^4.47.0",
     "webpack-dev-server": "^3.11.3",

package/template/webpack/web.prod.js

@@ -5,7 +5,6 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 // const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-const { VueLoaderPlugin } = require('vue-loader');
 const themeVars = require('./themeVars');
 const getCSSModuleLocalIdent = require('./getCSSModuleLocalIdent');
 const HappyPack = require('happypack');
@@ -25,6 +24,7 @@ module.exports = function (options) {
     htmlTemplatePath,
     definePlugin = {},
     devtool = false,
+    vueVersion = 0,
   } = options;
 
   const babelLoader = {
@@ -126,9 +126,21 @@ module.exports = function (options) {
       SSR: false,
       WEBPACK_ENV: 'production',
     }),
-    new VueLoaderPlugin(),
     new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
   ];
+  if (vueVersion === 2) {
+    const { VueLoaderPlugin } = require('vue-loader-for-vue2');
+    plugins.push(new VueLoaderPlugin());
+  } else if (vueVersion === 3) {
+    plugins.push(new (require('veaury/webpack/VeauryVuePlugin'))());
+    plugins.push(
+      new webpack.DefinePlugin({
+        __VUE_OPTIONS_API__: 'true',
+        __VUE_PROD_DEVTOOLS__: 'false',
+        __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: 'false',
+      }),
+    );
+  }
 
   const commonCSSLoaders = [
     MiniCssExtractPlugin.loader,
@@ -144,6 +156,67 @@ module.exports = function (options) {
     },
   ];
 
+  const rules = [
+    {
+      test: /\.tsx?$/,
+      exclude: /node_modules\/(?!@cloudbase\/weda-ui)|gsd-kbone-react/,
+      use: [`happypack/loader?id=${TS_LOADER_ID}`],
+    },
+    {
+      test: /\.(js|jsx)$/,
+      exclude:
+        /node_modules\/(?!(@cloudbase\/weda-ui)|(@tcwd\/vuera)|(@tcwd\/weapps-core)|(@react-spring)|(@react-hookz))|gsd-kbone-react/,
+      use: ['happypack/loader?id=babel'],
+    },
+    {
+      test: /node_modules\/@loadable\/component\/.*\.mjs$/,
+      include: /node_modules/,
+      type: 'javascript/auto',
+    },
+    {
+      test: /\.(scss|sass)$/,
+      use: [
+        ...commonCSSLoaders,
+        {
+          loader: 'sass-loader',
+          options: {
+            implementation: require('sass'),
+          },
+        },
+      ],
+    },
+    {
+      test: /\.css$/,
+      use: [...commonCSSLoaders],
+    },
+    {
+      test: /\.less$/,
+      use: [
+        ...commonCSSLoaders,
+        {
+          loader: 'less-loader',
+          options: {
+            lessOptions: {
+              modifyVars: themeVars,
+              javascriptEnabled: true,
+            },
+          },
+        },
+      ],
+    },
+    {
+      test: /\.(jpe?g|png|gif|ttf|eot|svg|woff(2)?)(\?[a-z0-9=&.]+)?$/,
+      loader: 'base64-inline-loader',
+    },
+  ];
+
+  if (vueVersion === 2) {
+    rules.push({
+      test: /\.vue$/,
+      loader: require.resolve('vue-loader-for-vue2'),
+    });
+  }
+
   return {
     context,
     entry,
@@ -168,63 +241,7 @@ module.exports = function (options) {
       },
     },
     module: {
-      rules: [
-        {
-          test: /\.vue$/,
-          loader: require.resolve('vue-loader'),
-        },
-        {
-          test: /\.tsx?$/,
-          exclude: /node_modules\/(?!@cloudbase\/weda-ui)|gsd-kbone-react/,
-          use: [`happypack/loader?id=${TS_LOADER_ID}`],
-        },
-        {
-          test: /\.(js|jsx)$/,
-          exclude:
-            /node_modules\/(?!(@cloudbase\/weda-ui)|(@tcwd\/vuera)|(@tcwd\/weapps-core)|(@react-spring)|(@react-hookz))|gsd-kbone-react/,
-          use: ['happypack/loader?id=babel'],
-        },
-        {
-          test: /node_modules\/@loadable\/component\/.*\.mjs$/,
-          include: /node_modules/,
-          type: 'javascript/auto',
-        },
-        {
-          test: /\.(scss|sass)$/,
-          use: [
-            ...commonCSSLoaders,
-            {
-              loader: 'sass-loader',
-              options: {
-                implementation: require('sass'),
-              },
-            },
-          ],
-        },
-        {
-          test: /\.css$/,
-          use: [...commonCSSLoaders],
-        },
-        {
-          test: /\.less$/,
-          use: [
-            ...commonCSSLoaders,
-            {
-              loader: 'less-loader',
-              options: {
-                lessOptions: {
-                  modifyVars: themeVars,
-                  javascriptEnabled: true,
-                },
-              },
-            },
-          ],
-        },
-        {
-          test: /\.(jpe?g|png|gif|ttf|eot|svg|woff(2)?)(\?[a-z0-9=&.]+)?$/,
-          loader: 'base64-inline-loader',
-        },
-      ],
+      rules,
     },
     plugins,
     optimization: {