@cloudbase/lowcode-builder 1.8.45-beta.3 → 1.8.45-ide.1

package/lib/utils/transform.d.ts

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

package/lib/utils/transform.js

@@ -1,69 +1,75 @@
 "use strict";
+/* eslint-disable no-new-func */
+// import { transformSync } from '@babel/core';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BabelTransform = void 0;
-/* eslint-disable no-new-func */
-const core_1 = require("@babel/core");
+// 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;
+//   }
+// }
 function BabelTransform(code, options = {}) {
-    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;
-    }
+    return '';
 }
 exports.BabelTransform = BabelTransform;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.45-beta.3",
+  "version": "1.8.45-ide.1",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -31,21 +31,16 @@
     "build": "tsc",
     "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": "rm -rf dist && cross-env NODE_ENV=development webpack --config ./webpack/web.config.js",
-    "build:web": "rm -rf dist && cross-env NODE_ENV=production webpack --config ./webpack/web.config.js && cp -Rf dist/ lib/",
-    "build:template": "./scripts/buildTemplate.sh",
-    "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",
-    "release": "yarn npm whoami --publish && npm run build && npm run build:web && yarn set version 1.22.19 && yarn config set version-tag-prefix '@cloudbase/lowcode-builder@' && yarn version --no-commit-hooks --message 'chore(builder): v%s' && yarn config set version-tag-prefix v && yarn set version 3.6.2 && yarn npm publish"
+    "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"
   },
   "bugs": {
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@babel/core": "7.21.4",
-    "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.0.31-beta.2",
-    "@cloudbase/lowcode-generator": "^1.8.15-beta.2",
+    "@cloudbase/cals": "^1.0.29",
+    "@cloudbase/lowcode-generator": "^1.8.14",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",
@@ -81,7 +76,6 @@
     "jest": "^27.5.1",
     "ts-loader": "^8.3.0",
     "ts-node": "^10.4.0",
-    "tsc-watch": "^6.0.4",
     "typescript": "^4.7.4",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "webpack-cli": "^4.9.1",

package/template/mp/common/merge-renderer.js

@@ -14,7 +14,7 @@ export default {
     }
     for (const id in widgets) {
       const props = widgets[id]
-      dataFactory['<%= dataPropNames.widgetProp %>' + id] = () => resolveWidgetData(props, id)
+      dataFactory['<%= dataPropNames.widgetProp %>' + id] = () => resolveWidgetData(props)
     }
     const disposers = []
     for (const k in dataFactory) {

package/template/mp/common/widget.js

@@ -51,7 +51,7 @@ const EXTRA_PROPS_MAP = [
   return map;
 }, {});
 
-function resolveWidgetProp(props, widgetId) {
+function resolveWidgetProp(props) {
   let { classList = [], _staticResourceAttribute = ['src'], ...restProps } = props;
   const data = {};
   Object.keys(restProps).forEach((key) => {
@@ -64,7 +64,7 @@ function resolveWidgetProp(props, widgetId) {
     data[key] = restProps[key];
   });
   data.style = styleToCss(restProps.style);
-  data.className = `${widgetId ? `wd-comp-id-${widgetId}` : ''} ${classList.join ? classList.join(' ') : classList}`;
+  data.className = classList.join ? classList.join(' ') : classList;
 
   _staticResourceAttribute?.forEach?.((property) => {
     processStaticResourceAttribute(data, undefined, property);
@@ -73,11 +73,11 @@ function resolveWidgetProp(props, widgetId) {
 }
 
 // widget prop -> wxml data
-export function resolveWidgetData(props, widgetId) {
+export function resolveWidgetData(props) {
   if (!Array.isArray(props)) {
-    return resolveWidgetProp(props, widgetId);
+    return resolveWidgetProp(props);
   }
-  return props.map(prop => resolveWidgetData(prop, widgetId));
+  return props.map(resolveWidgetData);
 }
 
 export function createWidgets(widgetProps, dataBinds, ownerMpInst, widgetHolder) {
@@ -591,7 +591,7 @@ export function disposeWidget(widget, noRecursive = false) {
 export function createInitData(widgets, dataBinds, keyPrefix = '') {
   return Object.keys(widgets).reduce((result, id) => {
     if (!isWidgetInFor(id, widgets, dataBinds)) {
-      result[keyPrefix + id] = resolveWidgetData(widgets[id], id);
+      result[keyPrefix + id] = resolveWidgetData(widgets[id]);
     } else {
       result[keyPrefix + id] = [];
     }