@cloudbase/lowcode-builder 1.9.0 → 1.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -47,27 +47,21 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.1.11",
-    "@cloudbase/lowcode-generator": "^1.8.34",
+    "@cloudbase/cals": "^1.1.13",
+    "@cloudbase/lowcode-generator": "^1.8.35",
     "axios": "^0.21.0",
-    "browserfs": "^1.4.3",
-    "browserify-zlib": "^0.2.0",
     "chalk": "^2.4.2",
     "compare-versions": "^3.6.0",
     "compressing": "^1.4.0",
-    "constants-browserify": "^1.0.0",
-    "cross-spawn": "^6.0.5",
-    "crypto-browserify": "^3.12.0",
+    "cross-spawn": "^7.0.3",
     "fs-extra": "^7.0.1",
+    "glob": "^7.2.3",
     "jszip": "^3.7.1",
     "lodash": "^4.17.11",
-    "os-browserify": "^0.3.0",
-    "stream-browserify": "^3.0.0",
     "webpack": "^4.41.4",
     "xml-js": "^1.6.11"
   },
   "devDependencies": {
-    "@rollup/plugin-alias": "^3.1.9",
     "@types/archiver": "^3.1.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -79,8 +73,14 @@
     "@types/react": "17.0.45",
     "@types/webpack": "^4.41.22",
     "@types/weixin-app": "^2.9.0",
+    "browserfs": "^1.4.3",
+    "browserify-zlib": "^0.2.0",
+    "constants-browserify": "^1.0.0",
     "cross-env": "^7.0.3",
-    "csstype": "^2.6.10",
+    "crypto-browserify": "^3.12.0",
+    "less": "^4.1.3",
+    "os-browserify": "^0.3.0",
+    "stream-browserify": "^3.0.0",
     "ts-loader": "^8.3.0",
     "ts-node": "^10.4.0",
     "tsc-watch": "^6.0.4",

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({
@@ -551,7 +557,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.6a48660bec73516bd718.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/package.json

@@ -6,59 +6,40 @@
     "dev": "webpack-dev-server --mode development --config ./webpack/web.dev.js --open"
   },
   "dependencies": {
-    "@cloudbase/js-sdk": "2.4.0-beta.0",
-    "@tcwd/weapps-core": "2.2.6",
-    "@tcwd/weapps-sdk": "1.2.12",
-    "@zxing/library": "^0.18.6",
-    "@cloudbase/weda-client": "^0.2.4",
-    "lodash": "^4.17.19",
-    "mobx": "^5.15.4",
-    "mobx-react-lite": "^2.0.7",
-    "path-to-regexp": "^1.7.0",
+    "@cloudbase/lowcode-render": "^1.1.3",
     "react": "^16.12.0",
-    "react-dom": "^16.8.6",
-    "react-router-dom": "^5.1.2",
-    "regenerator-runtime": "^0.13.5"
+    "react-dom": "^16.8.6"
   },
   "devDependencies": {
     "@types/react": "^16.9.49",
-    "autoprefixer": "^9.5.1",
     "babel-loader": "^8.1.0",
     "@babel/core": "^7.11.6",
     "@babel/polyfill": "^7.7.0",
     "@babel/preset-env": "^7.4.4",
     "@babel/preset-react": "^7.0.0",
-    "@babel/plugin-proposal-class-properties": "^7.13.0",
     "@babel/plugin-proposal-decorators": "^7.4.4",
+    "@babel/plugin-transform-class-properties": "^7.13.0",
     "@babel/plugin-proposal-export-default-from": "^7.5.2",
-    "@babel/plugin-proposal-export-namespace-from": "^7.5.2",
-    "@babel/plugin-proposal-optional-chaining": "^7.13.8",
-    "@babel/plugin-proposal-partial-application": "^7.4.4",
-    "@babel/plugin-proposal-pipeline-operator": "^7.5.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.10.4",
-    "babel-plugin-import": "^1.13.0",
     "base64-inline-loader": "^1.1.1",
     "copy-webpack-plugin": "^6.2.1",
     "css-loader": "^5",
-    "css-minimizer-webpack-plugin": "^1.2.0",
     "happypack": "^5.0.1",
     "sass": "^1.24.0",
-    "postcss": "^8.3.6",
-    "postcss-pxtorem": "^6.0.0",
-    "postcss-loader": "^4.0.3",
     "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",
-    "hard-source-webpack-plugin": "^0.13.1",
     "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-bundle-analyzer": "^4.10.2",
     "webpack-dev-server": "^3.11.3",
     "webpack-cli": "^3.3.12"
   }

package/template/webpack/web.prod.js

@@ -3,9 +3,8 @@ const webpack = require('webpack');
 const TerserPlugin = require('terser-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-// const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
+// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const CopyWebpackPlugin = require('copy-webpack-plugin');
-const { VueLoaderPlugin } = require('vue-loader');
 const themeVars = require('./themeVars');
 const getCSSModuleLocalIdent = require('./getCSSModuleLocalIdent');
 const HappyPack = require('happypack');
@@ -13,19 +12,10 @@ const core = 4;
 const happyThreadPool = HappyPack.ThreadPool({ size: core });
 
 const TS_LOADER_ID = 'ts-loader';
+
 module.exports = function (options) {
-  const {
-    context,
-    entry,
-    output,
-    mode,
-    watch,
-    externals,
-    resolveModules,
-    htmlTemplatePath,
-    definePlugin = {},
-    devtool = false,
-  } = options;
+  const { output, definePlugin = {}, devtool = false, vueVersion = 0 } = options;
+  const context = path.resolve(__dirname, '../');
 
   const babelLoader = {
     loader: 'babel-loader',
@@ -42,26 +32,14 @@ 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-import',
-          {
-            libraryName: '@govcloud/gsd-kbone-react',
-            libraryDirectory: 'lib/components',
-            camel2DashComponentName: false,
-          },
-        ],
-        '@babel/plugin-proposal-class-properties',
         ['@babel/plugin-proposal-decorators', { legacy: true }],
         '@babel/plugin-proposal-export-default-from',
-        '@babel/plugin-proposal-export-namespace-from',
-        '@babel/plugin-proposal-optional-chaining',
-        '@babel/plugin-proposal-partial-application',
-        ['@babel/plugin-proposal-pipeline-operator', { proposal: 'minimal' }],
       ].filter(Boolean),
     },
   };
@@ -90,7 +68,7 @@ module.exports = function (options) {
       threadPool: happyThreadPool,
     }),
     new HtmlWebpackPlugin({
-      template: htmlTemplatePath,
+      template: 'index.html',
       filename: 'index.html',
       cache: false,
     }),
@@ -101,8 +79,6 @@ module.exports = function (options) {
     new webpack.DefinePlugin(
       Object.assign(
         {
-          'process.env.isMiniprogram': false, // 注入环境变量，用于业务代码判断
-          'process.env.SSR': false,
           'process.env.compileTool': `'webpack'`,
         },
         definePlugin,
@@ -122,13 +98,22 @@ module.exports = function (options) {
       hashDigest: 'hex',
       hashDigestLength: 20,
     }),
-    new webpack.EnvironmentPlugin({
-      SSR: false,
-      WEBPACK_ENV: 'production',
-    }),
-    new VueLoaderPlugin(),
     new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
+    // new BundleAnalyzerPlugin(),
   ];
+  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,87 +129,110 @@ module.exports = function (options) {
     },
   ];
 
+  const rules = [
+    {
+      test: /\.tsx?$/,
+      exclude:
+        /node_modules\/(?!(@cloudbase\/weda-ui)|(@cloudbase\/lowcode-render)|(@cloudbase\/weda-client))|gsd-kbone-react/,
+      use: [`happypack/loader?id=${TS_LOADER_ID}`],
+    },
+    {
+      test: /\.(js|jsx)$/,
+      exclude:
+        /node_modules\/(?!(@cloudbase\/weda-ui)|(@cloudbase\/lowcode-render)|(@cloudbase\/weda-client)|(@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,
+    entry: './src/index.jsx',
     /**
      * 只要是构建都开启 production 以使用精简
      */
     mode: 'production',
-    watch,
-    output,
-    externals,
+    watch: false,
+    output: {
+      path: path.resolve(context, output.path),
+      filename: '[name].[hash].bundle.js',
+      chunkFilename: '[name].[contenthash].chunk.js',
+      publicPath: output.publicPath,
+      pathinfo: false,
+    },
+    externals: {
+      react: 'window.React',
+      'react-dom': 'window.ReactDOM',
+      mobx: 'window.mobx',
+      '@cloudbase/js-sdk': 'window.cloudbase',
+      '@cloudbase/weda-cloud-sdk/dist/h5': 'window.CloudSDK',
+      '@cloudbase/weda-cloud-sdk': 'window.CloudSDK',
+      '@cloudbase/weda-client': 'window.WedaClientSDK',
+      '@zxing/library': 'window.ZXing',
+      '@cloudbase/lowcode-render': 'window["weda-render"]',
+    },
     cache: {
       type: 'memory',
     },
     devtool: devtool,
     resolve: {
       extensions: ['.js', '.jsx', '.ts', '.tsx', '.json', '.mjs', '.scss', '.css'],
-      modules: [...resolveModules],
+      modules: [context, 'node_modules'],
       symlinks: false,
       cacheWithContext: false,
       alias: {
-        '@': path.resolve(__dirname, '../src'),
+        '@': path.resolve(context, './src'),
+        '@wdsrc': path.resolve(context, './src'),
       },
     },
     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: {

package/template/webpack/devServer.js

@@ -1,119 +0,0 @@
-const webpackDevServer = require('webpack-dev-server')
-const webpack = require('webpack')
-const os = require('os')
-const fs = require('fs')
-const path = require('path')
-const argv = require('yargs').argv
-const config = require('./webpack.web.prod')
-const { appConfig } = require('../mainAppData.json')
-const { window = {} } = appConfig
-const isApp = <%=isApp %>
-
-
-function getDevServerConf() {
-  if (!argv.devServerConf) {
-    return {}
-  }
-  if (!argv.devServerConf.endsWith('.js')) {
-    console.error('参数请输入 --devServerConf config.js')
-  } else {
-    const devServerConfPath = path.resolve(process.cwd(), argv.devServerConf || '')
-    if (!fs.existsSync(devServerConfPath)) {
-      console.error(devServerConfPath, 'does not exists')
-      return {}
-    }
-    let conf = require(devServerConfPath)
-    if (!conf || typeof conf !== 'object') {
-      console.error(devServerConfPath, 'must have module.exports={}')
-    } else {
-      return conf
-    }
-  }
-  return {}
-}
-
-// const openBrowser = require('open');
-function getIPAdress() {
-  const interfaces = os.networkInterfaces()
-  for (const devName in interfaces) {
-    const iface = interfaces[devName]
-    for (let i = 0; i < iface.length; i++) {
-      const alias = iface[i]
-      if (alias.family === 'IPv4' && alias.address !== '127.0.0.1' && !alias.internal) {
-        return alias.address
-      }
-    }
-  }
-}
-
-const port = 8001
-const ip = getIPAdress()
-let basename = ''
-let publicPath = ''
-if (!isApp) {
-  basename = window.basename || ''
-  if (basename.startsWith('/')) {
-    basename = basename.replace('/', '')
-  }
-  publicPath = window.publicPath || ''
-}
-
-console.log('>>>>>>>>>>>>>>>>>>>>> basename is ', basename)
-console.log('>>>>>>>>>>>>>>>>>>>>> publicPath is:', publicPath)
-const options = {
-  hot: true,
-  host: ip,
-  hotOnly: true,
-  historyApiFallback: {
-    verbose: true,
-    rewrites: [
-      {
-        from: /^\/(.*)\.(css|js)$/,
-        to: function(context) {
-          //  /^\/([^\.]*)\.(css|js)$/
-          console.log('>>>>>>>>>>>>>>>>> got in css|js!', context.parsedUrl.pathname)
-          const { assets = [] } = window
-          const isInAssets = assets.includes(context.parsedUrl.pathname)
-          return context.parsedUrl.pathname.replace(publicPath, '/')
-        },
-      },
-      {
-        from: new RegExp(`${basename}\/?(.*)$`),
-        to: function(context) {
-          console.log('>>>>>>>>>>>>>>>>> got in html!')
-          return 'index.html'
-        },
-      },
-    ],
-  },
-  contentBase: [path.join(__dirname, 'assets')],
-  watchOptions: {
-    poll: 600,
-    ignored: /node_modules|preview|dist|html|webpack|gsd-kbone-react/,
-  },
-  open: {
-    app: ['Google Chrome', '--incognito', '--other-flag'],
-  },
-  openPage: basename,
-  disableHostCheck: true,
-  compress: true
-}
-
-function startDevServer(conf) {
-  console.log('start startDevServer in webpack, env:', process.env.NODE_PATH)
-  let _options = Object.assign(options, conf)
-  console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>')
-  console.log('Current webpack-dev-server config is: ')
-  console.log(_options)
-  console.log('<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<')
-  webpackDevServer.addDevServerEntrypoints(config, _options)
-
-  const compiler = webpack(config)
-  const server = new webpackDevServer(compiler, _options)
-
-  server.listen(port, '0.0.0.0', () => {
-    console.log(`调试环境端口启动在  http://${ip}:${port}/${basename}`)
-  })
-}
-
-startDevServer(getDevServerConf())