aiot-toolkit 2.0.2 → 2.0.3-beta.1

package/README.md

@@ -32,7 +32,6 @@ aiot-toolkit2.0目前支持的打包格式如下：
 | 命令                     | 说明                     |
 | ------------------------ | ------------------------ |
 | npm create aiot          | 创建并手动选择项目       |
-| npm create aiot xts      | 创建xts项目              |
 | npm create aiot ux       | 创建ux项目               |
 | aiot build               | 构建项目                 |
 | aiot release             | 构建项目-release模式     |

package/lib/builder/UxBuilderBase.d.ts

@@ -1,23 +1,17 @@
 import { IJavascriptCompileOption } from '@aiot-toolkit/aiotpack';
 import { Dictionary } from '@aiot-toolkit/shared-utils';
+import IFileLaneEvents, { IFileLaneSuccessData } from 'file-lane/lib/interface/IFileLaneEvents';
 /**
  * UxBuilderBase
  */
 declare class UxBuilderBase<O extends Dictionary = any> {
-    events: {
-        onBuildSuccess?: (data: {
-            costTime: number;
-        }) => void;
-    };
+    events: IFileLaneEvents;
     /**
      * 配置文件
      */
     readonly QUICKAPP_CONFIG = "quickapp.config.js";
-    constructor(events?: {
-        onBuildSuccess?: (data: {
-            costTime: number;
-        }) => void;
-    });
+    private fileLane?;
+    constructor(events?: IFileLaneEvents);
     /**
      * ux项目的build函数
      * @param projectPath 项目路径
@@ -25,6 +19,10 @@ declare class UxBuilderBase<O extends Dictionary = any> {
      * @param watch 是否开启监听
      */
     build(projectPath: string, options: O): Promise<void>;
+    /**
+     *
+     */
+    stop(): Promise<void>;
     /**
      * 获取build的编译配置
      * @param projectPath 项目路径
@@ -34,3 +32,4 @@ declare class UxBuilderBase<O extends Dictionary = any> {
     private readQuickAppConfig;
 }
 export default UxBuilderBase;
+export { IFileLaneEvents, IFileLaneSuccessData };

package/lib/builder/UxBuilderBase.js

@@ -50,6 +50,10 @@ class UxBuilderBase {
      */
     build(projectPath, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.fileLane) {
+                // 已经在运行中，请先停止
+                throw new Error('already running, please stop first: builder.stop()');
+            }
             const watch = options.watch || false;
             // 项目配置
             const uxProjectConfig = new aiotpack_1.UxConfig(projectPath);
@@ -68,7 +72,18 @@ class UxBuilderBase {
                 }, null, 2)
             });
             // 开始编译项目
-            yield new file_lane_1.default(uxProjectConfig, projectPath, compilerOption, this.events).start({ watch });
+            this.fileLane = new file_lane_1.default(uxProjectConfig, projectPath, compilerOption, this.events);
+            yield this.fileLane.start({ watch });
+        });
+    }
+    /**
+     *
+     */
+    stop() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            yield ((_a = this.fileLane) === null || _a === void 0 ? void 0 : _a.stop());
+            this.fileLane = undefined;
         });
     }
     /**

package/lib/builder/VelaUxBuilder.d.ts

@@ -8,6 +8,12 @@ interface IUxBuilderOption extends Dictionary {
     mode: CompileMode;
     enableJsc: boolean;
     enableE2e?: boolean;
+    /**
+     * 此选项控制是否生成，以及如何生成 source map
+     *
+     * @see https://www.webpackjs.com/configuration/devtool/#devtool
+     */
+    devtool?: string;
     /**
      * 是否自动补全 manifest.json 中的 features 配置
      */

package/lib/builder/XtsBuilder.js

@@ -54,7 +54,7 @@ class XtsBuilder {
             const compilerOptions = {
                 skip: shared_utils_1.StringUtil.string2arrayByComma(options.skip)
             };
-            const config = new aiotpack_1.XtsConfig();
+            const config = new aiotpack_1.XtsConfig(projectPath);
             if ((_a = compilerOptions.skip) === null || _a === void 0 ? void 0 : _a.includes('xts2ts')) {
                 shared_utils_1.ColorConsole.info("### skip compile xts to ts due to --skip ${compilerOptions?.skip.join(',')}");
                 const context = file_lane_1.FileLaneUtil.createContext(config.output, projectPath);

package/lib/index.d.ts

@@ -0,0 +1,6 @@
+import VelaUxBuilder from './builder/VelaUxBuilder';
+import AndroidUxBuilder from './builder/AndroidUxBuilder';
+import FileLaneTriggerType from 'file-lane/lib/enum/FileLaneTriggerType';
+import { CompileMode } from '@aiot-toolkit/aiotpack';
+import IFileLaneEvents, { IFileLaneSuccessData } from 'file-lane/lib/interface/IFileLaneEvents';
+export { VelaUxBuilder, AndroidUxBuilder, FileLaneTriggerType, CompileMode, IFileLaneEvents, IFileLaneSuccessData };

package/lib/index.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CompileMode = exports.FileLaneTriggerType = exports.AndroidUxBuilder = exports.VelaUxBuilder = void 0;
+const VelaUxBuilder_1 = __importDefault(require("./builder/VelaUxBuilder"));
+exports.VelaUxBuilder = VelaUxBuilder_1.default;
+const AndroidUxBuilder_1 = __importDefault(require("./builder/AndroidUxBuilder"));
+exports.AndroidUxBuilder = AndroidUxBuilder_1.default;
+const FileLaneTriggerType_1 = __importDefault(require("file-lane/lib/enum/FileLaneTriggerType"));
+exports.FileLaneTriggerType = FileLaneTriggerType_1.default;
+const aiotpack_1 = require("@aiot-toolkit/aiotpack");
+Object.defineProperty(exports, "CompileMode", { enumerable: true, get: function () { return aiotpack_1.CompileMode; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiot-toolkit",
-  "version": "2.0.2",
+  "version": "2.0.3-beta.1",
   "description": "Tools for creating, developing, and packaging aiot applications.",
   "keywords": [
     "aiot"
@@ -10,6 +10,7 @@
   "bin": {
     "aiot": "lib/bin.js"
   },
+  "main": "lib/index",
   "directories": {
     "lib": "lib",
     "test": "__tests__"
@@ -21,17 +22,17 @@
     "test": "node ./__tests__/aiot-toolkit.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.2",
-    "@aiot-toolkit/commander": "2.0.2",
-    "@aiot-toolkit/emulator": "2.0.2",
-    "@aiot-toolkit/shared-utils": "2.0.2",
+    "@aiot-toolkit/aiotpack": "2.0.3-beta.1",
+    "@aiot-toolkit/commander": "2.0.3-beta.1",
+    "@aiot-toolkit/emulator": "2.0.3-beta.1",
+    "@aiot-toolkit/shared-utils": "2.0.3-beta.1",
     "@inquirer/prompts": "^5.3.0",
     "@miwt/adb": "^0.9.0",
     "adm-zip": "^0.5.10",
     "axios": "^1.7.4",
     "cli-progress": "^3.12.0",
     "dayjs": "^1.11.10",
-    "file-lane": "2.0.2",
+    "file-lane": "2.0.3-beta.1",
     "fs-extra": "^11.2.0",
     "koa-router": "^13.0.1",
     "lodash": "^4.17.21",
@@ -48,5 +49,5 @@
     "@types/semver": "^7.5.8",
     "@types/ws": "^8.5.10"
   },
-  "gitHead": "8ca4bf2ed7bcf11911e5c514696951bdba4fc12d"
+  "gitHead": "77b1b0aab9b5c227b5cc355b585a7c93761cc9a3"
 }