@aiot-toolkit/aiotpack 2.0.5-beta.22 → 2.0.5-beta.23

package/lib/afterCompile/ux/UxAfterCompile.d.ts

@@ -49,9 +49,6 @@ declare class UxAfterCompile {
     /**
      * 编译轻卡ux
      * 1. 使用hap-toolkit编译项目，编译结果存储在build文件夹
-     *   1.1 重写stdout以捕获hap-toolkit中的正常日志，错误日志正常输出
-     *   1.2 使用hap-toolkit编译项目
-     *   1.3 还原stdout
      * 2. 取widgets中配置的轻卡内容，将build文件夹中对应的产物复制到临时文件夹
      * @param params
      */

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -16,11 +16,10 @@ var _ZipUtil = _interopRequireDefault(require("../../compiler/javascript/vela/ut
 var _UxFileUtils = _interopRequireDefault(require("../../utils/ux/UxFileUtils"));
 var _FileLaneTriggerType = _interopRequireDefault(require("file-lane/lib/enum/FileLaneTriggerType"));
 var _ZipFileUtil = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/utils/ZipFileUtil"));
-var _process = require("process");
 var _ImageIcu = _interopRequireDefault(require("../../compiler/tools/icu/ImageIcu"));
+var _LiteCard = _interopRequireDefault(require("../../compiler/javascript/vela/utils/LiteCard"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
-const HapToolkit = require('hap-toolkit');
 
 /**
  * UxAfterCompile
@@ -259,9 +258,9 @@ class UxAfterCompile {
       _fsExtra.default.outputFileSync(_path.default.join(outputAbsPath, _ZipUtil.default.CERT_PATH), buffer);
     };
     if (compilerOption) {
-      await copyResourceFiles(compilerOption);
-      await updateManifest(compilerOption);
-      await genDeviceManifests(compilerOption);
+      copyResourceFiles(compilerOption);
+      updateManifest(compilerOption);
+      genDeviceManifests(compilerOption);
       await genMetaFiles(compilerOption);
     }
   };
@@ -406,9 +405,6 @@ class UxAfterCompile {
   /**
    * 编译轻卡ux
    * 1. 使用hap-toolkit编译项目，编译结果存储在build文件夹
-   *   1.1 重写stdout以捕获hap-toolkit中的正常日志，错误日志正常输出
-   *   1.2 使用hap-toolkit编译项目
-   *   1.3 还原stdout
    * 2. 取widgets中配置的轻卡内容，将build文件夹中对应的产物复制到临时文件夹
    * @param params
    */
@@ -420,29 +416,20 @@ class UxAfterCompile {
     try {
       if (context?.liteCards?.length > 0 && compilerOption) {
         const {
-          projectPath,
-          outputPath
+          projectPath: tempProjectPath,
+          outputPath: LITE_OUTPUT_PATH
         } = compilerOption;
-        const LITE_OUTPUT_PATH = outputPath;
-        // 1.1
-        const originalStdout = _process.stdout.write;
-        _process.stdout.write = function () {
-          return true;
-        };
-        // 1.2
-        await HapToolkit.compile('native', 'dev', false, {
-          cwd: context.projectPath,
-          signMode: 'BUILD',
-          enableCustomComponent: true
-        });
-        // 1.3
-        _process.stdout.write = originalStdout;
+        const {
+          projectPath
+        } = context;
+        // 1.
+        await new _LiteCard.default(projectPath).compileLiteCard();
         // 2.
         context.liteCards.forEach(card => {
           // hap-toolkit的产物在项目的build文件夹下
-          const fromPath = _path.default.join(context.projectPath, LITE_OUTPUT_PATH, card);
+          const fromPath = _path.default.join(projectPath, LITE_OUTPUT_PATH, card);
           // aiot-toolkit的产物在临时项目的build文件夹下
-          const toPath = _path.default.join(projectPath, LITE_OUTPUT_PATH, card);
+          const toPath = _path.default.join(tempProjectPath, LITE_OUTPUT_PATH, card);
           //确定目标目录存在，若不存在则创建到父目录
           _fsExtra.default.ensureDirSync(_path.default.dirname(toPath));
           // 复制文件

package/lib/compiler/javascript/vela/utils/LiteCard.d.ts

@@ -0,0 +1,13 @@
+declare class LiteCard {
+    readonly projectPath: string;
+    constructor(projectPath: string);
+    /**
+     * 编译轻量级卡片
+     * 1. 重写stdout以捕获hap-toolkit中的正常日志，错误日志正常输出
+     * 2. 使用hap-toolkit编译项目
+     * 3. 还原stdout
+     * @returns Promise<void>
+     */
+    compileLiteCard(): Promise<void>;
+}
+export default LiteCard;

package/lib/compiler/javascript/vela/utils/LiteCard.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+var _process = require("process");
+class LiteCard {
+  constructor(projectPath) {
+    this.projectPath = projectPath;
+  }
+  /**
+   * 编译轻量级卡片
+   * 1. 重写stdout以捕获hap-toolkit中的正常日志，错误日志正常输出
+   * 2. 使用hap-toolkit编译项目
+   * 3. 还原stdout
+   * @returns Promise<void>
+   */
+  async compileLiteCard() {
+    const {
+      projectPath
+    } = this;
+    const originalStdout = _process.stdout.write;
+    _process.stdout.write = function () {
+      return true;
+    };
+    return _sharedUtils.CommonUtil.requireNodeModule(projectPath, 'hap-toolkit').then(async module => {
+      await module.compile('native', 'dev', false, {
+        cwd: projectPath,
+        signMode: 'BUILD'
+      });
+    }).catch(error => {
+      _sharedUtils.ColorConsole.throw(error.message);
+      return Promise.reject(error);
+    }).finally(() => {
+      _process.stdout.write = originalStdout;
+    });
+  }
+}
+var _default = exports.default = LiteCard;

package/lib/utils/ux/UxFileUtils.js

@@ -145,7 +145,7 @@ class UxFileUtils {
         // 比较文件内容
         const {
           isEqual
-        } = (0, _FileCompare.compareFiles)(oldFilePath, newFileList[index]);
+        } = (0, _FileCompare.compareFiles)(oldFilePath, remainingNewFiles[index]);
         if (!isEqual) {
           diffList.push(_path.default.relative(newDir, remainingNewFiles[index]));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.5-beta.22",
+  "version": "2.0.5-beta.23",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,17 +19,16 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.5-beta.22",
-    "@aiot-toolkit/parser": "2.0.5-beta.22",
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.22",
+    "@aiot-toolkit/generator": "2.0.5-beta.23",
+    "@aiot-toolkit/parser": "2.0.5-beta.23",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.23",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.3.9",
     "aiot-parse5": "^1.0.2",
     "babel-loader": "^9.1.3",
-    "file-lane": "2.0.5-beta.22",
+    "file-lane": "2.0.5-beta.23",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
-    "hap-toolkit": "^2.0.0",
     "jsrsasign": "^11.1.0",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
@@ -43,5 +42,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "cb8b82107dd1d8e977a529fcd334095627bd5d7c"
+  "gitHead": "f4991bcb0dcaab6853597ca07d21a7999649a1cc"
 }