@aiot-toolkit/aiotpack 2.0.3-beta.10 → 2.0.3-beta.12

package/lib/utils/ux/UxLoaderUtils.d.ts

@@ -1,3 +1,4 @@
+import { IStyleNode } from '@aiot-toolkit/parser';
 import { ILog } from '@aiot-toolkit/shared-utils';
 import { IFileLaneContext, IFileParam } from 'file-lane';
 import { SourceFile } from 'ts-morph';
@@ -54,7 +55,7 @@ declare class UxLoaderUtils {
      * @returns
      */
     static wrapTempalte(templateTree: SourceFile, file: IFileParam, compilerOption: IJavascriptCompileOption): string;
-    static wrapStyle(code: string, file: IFileParam, compilerOption: IJavascriptCompileOption): string;
+    static wrapStyle(styleNodes: IStyleNode[], file: IFileParam, compilerOption: IJavascriptCompileOption): string;
     /**
      * 给script增加外层包裹内容
      * @param isPageUx

package/lib/utils/ux/UxLoaderUtils.js

@@ -114,8 +114,10 @@ class UxLoaderUtils {
     // app.ux解析结果中加上manifest.json的内容
     const manifestJson = `require('./manifest.json')`;
     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(JSON.stringify(appStyleTree), file, compilerOption)}`, `var $app_script$ = ${UxLoaderUtils.wrapScript(false, appScriptTree)}`, `$app_script$({}, $app_exports$, $app_require$);`, `$app_exports$.default.style = $app_style$;`, `$app_exports$.default.manifest = ${manifestJson}`] : [`${appImport.join('\n')}`, `var $app_style$ = ${UxLoaderUtils.wrapStyle(JSON.stringify(appStyleTree), file, compilerOption)}`, `var $app_script$ = ${UxLoaderUtils.wrapScript(isPageUx, appScriptTree)}`, `var $app_template$ = ${UxLoaderUtils.wrapTempalte(appTemplateTree, file, compilerOption)}`, `${UxLoaderUtils.getReturnType(isPageUx)} function ($app_exports$) {`, `$app_script$({}, $app_exports$, $app_require$);`, `$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}`] : [`${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,
@@ -302,10 +304,13 @@ class UxLoaderUtils {
     }
     return result;
   }
-  static wrapStyle(code, file, compilerOption) {
+  static wrapStyle(styleNodes, file, compilerOption) {
+    const code = JSON.stringify(styleNodes);
     if (compilerOption.enableProtobuf) {
-      const result = BinaryPlugin.addStyle(file.path, file.path, code);
-      return `['${result.name}', ${result.index}]`;
+      if (styleNodes?.length) {
+        const result = BinaryPlugin.addStyle(file.path, file.path, code);
+        return `['${result.name}', ${result.index}]`;
+      }
     }
     return code;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.3-beta.10",
+  "version": "2.0.3-beta.12",
   "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.3-beta.10",
-    "@aiot-toolkit/parser": "2.0.3-beta.10",
-    "@aiot-toolkit/shared-utils": "2.0.3-beta.10",
+    "@aiot-toolkit/generator": "2.0.3-beta.12",
+    "@aiot-toolkit/parser": "2.0.3-beta.12",
+    "@aiot-toolkit/shared-utils": "2.0.3-beta.12",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.0.0",
     "aiot-parse5": "^1.0.0",
     "archiver": "^7.0.1",
     "babel-loader": "^9.1.3",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.3-beta.10",
+    "file-lane": "2.0.3-beta.12",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -45,5 +45,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "e591934b19bc474453ce11b63f0c8bb0d8eb8bd9"
+  "gitHead": "a20d364161209141515de30555c800e7a4eff733"
 }