@aiot-toolkit/aiotpack 2.0.5-beta.4 → 2.0.5-beta.5

package/lib/compiler/javascript/vela/plugin/WrapPlugin.js

@@ -45,8 +45,6 @@ class WrapPlugin {
             var $app_require$ = global.$app_require$ || org_app_require
 
             ${enableE2e ? `globalThis = undefined; \n global = typeof window === "undefined" ? global.__proto__  : window;` : ''}
-            // 转换动态 style 的函数
-            ${isApp ? this.translateStyleFunc() : ''}
             var ${createFuncnName} = function() {
               return `, source, `
             }

package/lib/utils/ux/UxLoaderUtils.js

@@ -115,11 +115,38 @@ class UxLoaderUtils {
     // 区分app.ux和一般ux
     // app.ux解析结果中加上manifest.json的内容
     const manifestJson = `require('./manifest.json')`;
+    function translateStyleFunc() {
+      return `
+  var $translateStyle$ = function (value) {
+    if (typeof value === 'string') {
+      return Object.fromEntries(
+        value
+          .split(';')
+          .filter((item) => Boolean(item && item.trim()))
+          .map((item) => {
+            const matchs = item.match(/([^:]+):(.*)/);
+            if (matchs && matchs.length > 2) {
+              return [
+                matchs[1]
+                  .trim()
+                  .replace(/-([a-z])/g, (_, match) => match.toUpperCase()),
+                matchs[2].trim(),
+              ];
+            }
+            return [];
+          })
+      );
+    }
+    return value;
+  };
+  global.$translateStyle$ = $translateStyle$
+  `;
+    }
     const integrateFunction = (appImport, appStyleTree, appTemplateTree, appScriptTree) => {
       const scriptCode = appScriptTree.getText();
       const hasScript = Boolean(scriptCode) && scriptCode !== '""';
       // script代码放在第三个位置不能变化，影响更新source map
-      return isAppUx ? [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(appStyleTree, file, compilerOption)}`, hasScript ? `var $app_script$ = ${UxLoaderUtils.wrapScript(false, appScriptTree)}` : '', hasScript ? `$app_script$({}, $app_exports$, $app_require$);` : `$app_exports$.default = {}`, `$app_exports$.default.style = $app_style$;`, `$app_exports$.default.manifest = ${manifestJson}`] : [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(appStyleTree, file, compilerOption)}`, hasScript ? `var $app_script$ = ${UxLoaderUtils.wrapScript(isPageUx, appScriptTree)}` : '', `var $app_template$ = ${UxLoaderUtils.wrapTempalte(appTemplateTree, file, compilerOption)}`, `${UxLoaderUtils.getReturnType(isPageUx)} function ($app_exports$) {`, hasScript ? `$app_script$({}, $app_exports$, $app_require$);` : `$app_exports$.default = {}`, `$app_exports$.default.template = $app_template$;`, `$app_exports$.default.style = $app_style$;`, `}`];
+      return isAppUx ? [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(appStyleTree, file, compilerOption)}`, hasScript ? `var $app_script$ = ${UxLoaderUtils.wrapScript(false, appScriptTree)}` : '', hasScript ? `$app_script$({}, $app_exports$, $app_require$);` : `$app_exports$.default = {}`, `$app_exports$.default.style = $app_style$;`, `$app_exports$.default.manifest = ${manifestJson}`, translateStyleFunc()] : [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(appStyleTree, file, compilerOption)}`, hasScript ? `var $app_script$ = ${UxLoaderUtils.wrapScript(isPageUx, appScriptTree)}` : '', `var $app_template$ = ${UxLoaderUtils.wrapTempalte(appTemplateTree, file, compilerOption)}`, `${UxLoaderUtils.getReturnType(isPageUx)} function ($app_exports$) {`, hasScript ? `$app_script$({}, $app_exports$, $app_require$);` : `$app_exports$.default = {}`, `$app_exports$.default.template = $app_template$;`, `$app_exports$.default.style = $app_style$;`, `}`];
     };
     const {
       targetTree,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.5-beta.4",
+  "version": "2.0.5-beta.5",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,16 +19,16 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.5-beta.4",
-    "@aiot-toolkit/parser": "2.0.5-beta.4",
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.4",
+    "@aiot-toolkit/generator": "2.0.5-beta.5",
+    "@aiot-toolkit/parser": "2.0.5-beta.5",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.5",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.1.8",
     "aiot-parse5": "^1.0.2",
     "archiver": "^7.0.1",
     "babel-loader": "^9.1.3",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.5-beta.4",
+    "file-lane": "2.0.5-beta.5",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -46,5 +46,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "cfa77c8f2d3916b703ac23a93a9dcc0df1bc261a"
+  "gitHead": "c90b16e8706edad7825777a1b40d367b28d76ed3"
 }