@cloudbase/lowcode-builder 1.8.44-alpha.2 → 1.8.45-alpha.0

package/lib/utils/transform.d.ts

@@ -1,3 +1,3 @@
 export declare function BabelTransform(code: any, options?: {
     IIFE?: boolean;
-}): string;
+}): any;

package/lib/utils/transform.js

@@ -1,75 +1,69 @@
 "use strict";
-/* eslint-disable no-new-func */
-// import { transformSync } from '@babel/core';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BabelTransform = void 0;
-// export function BabelTransform(
-//   code,
-//   options: {
-//     IIFE?: boolean;
-//   } = {},
-// ) {
-//   const { IIFE = false } = options;
-//   /**
-//    * 如果 trim 完为空
-//    * 则原样不用再编译了
-//    */
-//   if (!code?.trim?.()) {
-//     return code;
-//   }
-//   try {
-//     /**
-//      * 如果是基础字面量的话
-//      * 可以直接使用原值，不用过babel
-//      */
-//     if (typeof code === 'string' && JSON.parse(code?.trim?.())) {
-//       return code;
-//     }
-//   } catch (e) {}
-//   try {
-//     const simpleWrapped = `(\n${code || 'undefined'}\n)`;
-//     const { code: expression } =
-//       transformSync(IIFE ? `(()=>${simpleWrapped})()` : simpleWrapped, {
-//         cwd: __dirname,
-//         sourceType: 'script',
-//         comments: false,
-//         // minified: true,
-//         presets: [
-//           [
-//             '@babel/preset-env',
-//             {
-//               targets: {
-//                 /**
-//                  * 支持 proxy 的版本
-//                  * 低于这个版本完全无法支持
-//                  */
-//                 // browsers: ['chrome >= 49', 'iOS >= 10', 'safari >= 10'],
-//                 /**
-//                  * 一个相对较高的版本，包涵解构赋值，这样不用注入太多 polifill
-//                  * 但是不包涵 options chain
-//                  * 基本上是 es2019
-//                  */
-//                 browsers: ['chrome >= 67', 'iOS >= 12', 'safari >= 12'],
-//               },
-//               include: [
-//                 // es2015
-//                 '@babel/plugin-transform-arrow-functions',
-//               ],
-//             },
-//           ],
-//         ],
-//       }) || {};
-//     const res = expression?.replace?.(/;$/, '') || code;
-//     if (expression) {
-//       new Function(`return (\n${res}\n)`);
-//     }
-//     return res;
-//   } catch (e: any) {
-//     console.error(`transform [${code}] fail:`, e?.message);
-//     return code;
-//   }
-// }
+/* eslint-disable no-new-func */
+const core_1 = require("@babel/core");
 function BabelTransform(code, options = {}) {
-    return '';
+    var _a, _b, _c;
+    const { IIFE = false } = options;
+    /**
+     * 如果 trim 完为空
+     * 则原样不用再编译了
+     */
+    if (!((_a = code === null || code === void 0 ? void 0 : code.trim) === null || _a === void 0 ? void 0 : _a.call(code))) {
+        return code;
+    }
+    try {
+        /**
+         * 如果是基础字面量的话
+         * 可以直接使用原值，不用过babel
+         */
+        if (typeof code === 'string' && JSON.parse((_b = code === null || code === void 0 ? void 0 : code.trim) === null || _b === void 0 ? void 0 : _b.call(code))) {
+            return code;
+        }
+    }
+    catch (e) { }
+    try {
+        const simpleWrapped = `(\n${code || 'undefined'}\n)`;
+        const { code: expression } = (0, core_1.transformSync)(IIFE ? `(()=>${simpleWrapped})()` : simpleWrapped, {
+            cwd: __dirname,
+            sourceType: 'script',
+            comments: false,
+            // minified: true,
+            presets: [
+                [
+                    '@babel/preset-env',
+                    {
+                        targets: {
+                            /**
+                             * 支持 proxy 的版本
+                             * 低于这个版本完全无法支持
+                             */
+                            // browsers: ['chrome >= 49', 'iOS >= 10', 'safari >= 10'],
+                            /**
+                             * 一个相对较高的版本，包涵解构赋值，这样不用注入太多 polifill
+                             * 但是不包涵 options chain
+                             * 基本上是 es2019
+                             */
+                            browsers: ['chrome >= 67', 'iOS >= 12', 'safari >= 12'],
+                        },
+                        include: [
+                            // es2015
+                            '@babel/plugin-transform-arrow-functions',
+                        ],
+                    },
+                ],
+            ],
+        }) || {};
+        const res = ((_c = expression === null || expression === void 0 ? void 0 : expression.replace) === null || _c === void 0 ? void 0 : _c.call(expression, /;$/, '')) || code;
+        if (expression) {
+            new Function(`return (\n${res}\n)`);
+        }
+        return res;
+    }
+    catch (e) {
+        console.error(`transform [${code}] fail:`, e === null || e === void 0 ? void 0 : e.message);
+        return code;
+    }
 }
 exports.BabelTransform = BabelTransform;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.44-alpha.2",
+  "version": "1.8.45-alpha.0",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -33,7 +33,8 @@
     "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": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=development webpack --config ./webpack/web.config.js && node ./webpack/scripts/web.post.js",
     "build:web": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=production webpack --config ./webpack/web.config.js && node ./webpack/scripts/web.post.js",
-    "build:template": "./scripts/buildTemplate.sh"
+    "build:template": "./scripts/buildTemplate.sh",
+    "publish:web": "node ./scripts/publish.ide.js"
   },
   "bugs": {
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
@@ -41,7 +42,7 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.0.29",
+    "@cloudbase/cals": "^1.0.32",
     "@cloudbase/lowcode-generator": "^1.8.14",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",

package/template/mp/common/util.js

@@ -419,8 +419,15 @@ export async function getAuthConfig() {
 
 let _AUTH_CACHE_MAP = {};
 
-async function getAccessPermission(app, appId, pageId) {
-  const cacheKey = `${appId}-${pageId}`;
+async function getAccessPermission(app, appId, packageName = "", pageId) {
+  let cacheKey = `${appId}-${pageId}`;
+  if (packageName) {
+    const matched = packageName.match(/packages\/(.*)$/);
+    if (matched?.[1]) {
+      cacheKey = `${appId}-${matched?.[1]}-${pageId}`
+    }
+  }
+
   if (_AUTH_CACHE_MAP[cacheKey] !== undefined) {
     return _AUTH_CACHE_MAP[cacheKey];
   }
@@ -482,7 +489,7 @@ export async function checkAuth(app, appId, $page) {
     return true;
   }
   wx.showNavigationBarLoading();
-  const requestList = [getAccessPermission(app, appId, $page.id)];
+  const requestList = [getAccessPermission(app, appId, $page.packageName, $page.id)];
   // 暂时先认为有登录页则自定义登录功能开启且生效
   if (loginPage) {
     requestList.push(getAuthConfig(app));
@@ -541,6 +548,7 @@ export function redirectToLogin(currentPage) {
     app.redirectTo({
       pageId: loginPage.id,
       params: {
+        packageName: currentPage.packageName || undefined,
         sourcePageId: currentPage.id,
         sourcePageParams: currentPage.params || currentPage.dataset?.params,
       },

package/template/mp/page/api.js

@@ -2,8 +2,9 @@ import { $w as baseAPI } from '<%= subLevelPath %>../../app/weapps-api'
 
 export const $page = {
   __internal__: {
-    active: false
+    active: false,
   },
+  packageName: '<%= packageName %>',
   uuid: '<%= uuid %>',
   label: '<%= label %>',