aiot-toolkit 2.0.2-beta.13 → 2.0.2-beta.15

package/lib/bin.js

@@ -16,15 +16,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const semver_1 = __importDefault(require("semver"));
 // 支持的最低node版本
-const NODE_MINIMUM_VERSION = '16.0.0';
+const NODE_MINIMUM_VERSION = '18.0.0';
 checkVersion();
 const aiotpack_1 = require("@aiot-toolkit/aiotpack");
 const commander_1 = require("@aiot-toolkit/commander");
 const shared_utils_2 = require("@aiot-toolkit/shared-utils");
-const UxBuilder_1 = __importDefault(require("./builder/UxBuilder"));
+const AndroidUxBuilder_1 = __importDefault(require("./builder/AndroidUxBuilder"));
+const VelaUxBuilder_1 = __importDefault(require("./builder/VelaUxBuilder"));
 const XtsBuilder_1 = __importDefault(require("./builder/XtsBuilder"));
 const AndroidUxStart_1 = __importDefault(require("./starter/AndroidUxStart"));
-const UxStarter_1 = __importDefault(require("./starter/UxStarter"));
+const VelaUxStarter_1 = __importDefault(require("./starter/VelaUxStarter"));
 const XtsStarter_1 = __importDefault(require("./starter/XtsStarter"));
 const DeviceUtil_1 = __importDefault(require("./utils/DeviceUtil"));
 const VelaAvdUtils_1 = __importDefault(require("./utils/VelaAvdUtils"));
@@ -39,15 +40,15 @@ function checkVersion() {
 // 配置支持的 builder 类型，新增的项目类型，需在此处加上类型
 const projectMapper = {
     [shared_utils_2.ProjectType.VELA_UX]: {
-        builder: UxBuilder_1.default,
-        starter: UxStarter_1.default
+        builder: VelaUxBuilder_1.default,
+        starter: VelaUxStarter_1.default
     },
     [shared_utils_2.ProjectType.VELA_XTS]: {
         builder: XtsBuilder_1.default,
         starter: XtsStarter_1.default
     },
     [shared_utils_2.ProjectType.ANDDROID_UX]: {
-        builder: UxBuilder_1.default,
+        builder: AndroidUxBuilder_1.default,
         starter: AndroidUxStart_1.default
     }
 };
@@ -63,10 +64,17 @@ function build(command, description) {
         description,
         paramList,
         action: (option) => __awaiter(this, void 0, void 0, function* () {
-            // 获取对应的 build；如果存在，执行 build 函数，不存在，提示
-            option.mode = command === 'release' ? aiotpack_1.CompileMode.PRODUCTION : aiotpack_1.CompileMode.DEVELOPMENT;
-            const projectPath = process.cwd();
-            yield builder.build(projectPath, option);
+            try {
+                // 获取对应的 build；如果存在，执行 build 函数，不存在，提示
+                option.mode = command === 'release' ? aiotpack_1.CompileMode.PRODUCTION : aiotpack_1.CompileMode.DEVELOPMENT;
+                const projectPath = process.cwd();
+                yield builder.build(projectPath, option);
+            }
+            catch (error) {
+                shared_utils_1.ColorConsole.error('Build Error:', {
+                    word: (error === null || error === void 0 ? void 0 : error.toString()) || 'unknown error'
+                });
+            }
         })
     };
 }
@@ -84,16 +92,6 @@ function main() {
                 build('build', 'build project'),
                 build('release', 'release the project'),
                 findStarter('start', 'start project').getCommond(),
-                {
-                    name: 'watch',
-                    description: 'recompile project while file changes',
-                    action: (option) => __awaiter(this, void 0, void 0, function* () {
-                        const projectPath = process.cwd();
-                        const builder = findBuilder();
-                        option.watch = true;
-                        yield builder.build(projectPath, option);
-                    })
-                },
                 {
                     name: 'getConnectedDevices',
                     description: 'get all connected devices',

package/lib/builder/AndroidUxBuilder.d.ts

@@ -0,0 +1,10 @@
+import { IParam } from '@aiot-toolkit/commander';
+import UxBuilderBase from './UxBuilderBase';
+/**
+ * AndroidUxBuilder
+ */
+declare class AndroidUxBuilder extends UxBuilderBase {
+    params: IParam[];
+    match(projectPath: string): boolean;
+}
+export default AndroidUxBuilder;

package/lib/builder/AndroidUxBuilder.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const UxBuilderBase_1 = __importDefault(require("./UxBuilderBase"));
+/**
+ * AndroidUxBuilder
+ */
+class AndroidUxBuilder extends UxBuilderBase_1.default {
+    constructor() {
+        super(...arguments);
+        this.params = [];
+    }
+    match(projectPath) {
+        return shared_utils_1.ProjectType.getProjectType(projectPath) === shared_utils_1.ProjectType.ANDDROID_UX;
+    }
+}
+exports.default = AndroidUxBuilder;

package/lib/builder/UxBuilderBase.d.ts

@@ -0,0 +1,36 @@
+import { IJavascriptCompileOption } from '@aiot-toolkit/aiotpack';
+import { Dictionary } from '@aiot-toolkit/shared-utils';
+/**
+ * UxBuilderBase
+ */
+declare class UxBuilderBase<O extends Dictionary = any> {
+    events: {
+        onBuildSuccess?: (data: {
+            costTime: number;
+        }) => void;
+    };
+    /**
+     * 配置文件
+     */
+    readonly QUICKAPP_CONFIG = "quickapp.config.js";
+    constructor(events?: {
+        onBuildSuccess?: (data: {
+            costTime: number;
+        }) => void;
+    });
+    /**
+     * ux项目的build函数
+     * @param projectPath 项目路径
+     * @param options 命令参数
+     * @param watch 是否开启监听
+     */
+    build(projectPath: string, options: O): Promise<void>;
+    /**
+     * 获取build的编译配置
+     * @param projectPath 项目路径
+     * @param options 命令参数
+     */
+    getCompilerOption(projectPath: string, options: O): Partial<IJavascriptCompileOption>;
+    private readQuickAppConfig;
+}
+export default UxBuilderBase;

package/lib/builder/{UxBuilder.js → UxBuilderBase.js}

@@ -25,84 +25,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const aiotpack_1 = require("@aiot-toolkit/aiotpack");
 const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const shared_utils_2 = require("@aiot-toolkit/shared-utils");
-const file_lane_1 = require("file-lane");
+const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const lodash_1 = __importDefault(require("lodash"));
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const path_2 = __importDefault(require("path"));
+const file_lane_1 = __importDefault(require("file-lane"));
 /**
- * UxBuilder
+ * UxBuilderBase
  */
-class UxBuilder {
-    constructor(events) {
+class UxBuilderBase {
+    constructor(events = {
+        onBuildSuccess: (data) => shared_utils_1.ColorConsole.info(`build time: ${data.costTime}ms`)
+    }) {
         this.events = events;
+        /**
+         * 配置文件
+         */
         this.QUICKAPP_CONFIG = 'quickapp.config.js';
-        this.params = [
-            {
-                type: 'string',
-                name: 'devtool',
-                description: 'source map config'
-            },
-            {
-                name: 'disable-subpackages',
-                description: 'disable subpackages'
-            },
-            {
-                type: 'confirm',
-                name: 'disabled-jsc',
-                description: 'disabled jsc bundle',
-                defaultValue: false
-            },
-            {
-                type: 'confirm',
-                name: 'enable-protobuf',
-                description: 'enable protobuf',
-                defaultValue: false
-            },
-            {
-                type: 'confirm',
-                name: 'enable-e2e',
-                description: 'inject test-suite for current project',
-                defaultValue: false
-            },
-            {
-                type: 'confirm',
-                name: 'enable-stats',
-                description: 'analyse time and size of webpack output files',
-                defaultValue: false
-            },
-            {
-                type: 'confirm',
-                name: 'optimize-css-attr',
-                description: 'optimize css attr',
-                defaultValue: false
-            },
-            {
-                type: 'confirm',
-                name: 'complete-feature',
-                description: 'auto complete the features are used in the code into the features field of the manifest.json file',
-                defaultValue: false
-            }
-        ];
-    }
-    /**
-     * 获取build的编译配置
-     * @param projectPath 项目路径
-     * @param options 命令参数
-     */
-    getCompilerOption(projectPath, options) {
-        // 读取项目中文件的配置
-        const quickappConfig = this.readQuickAppConfig(projectPath);
-        const _a = quickappConfig || {}, { cli } = _a, otherConfig = __rest(_a, ["cli"]);
-        options = lodash_1.default.merge({}, options, cli);
-        // 项目配置
-        const uxProjectConfig = new aiotpack_1.UxConfig(projectPath);
-        // 编译配置
-        const compileMode = options.mode || aiotpack_1.CompileMode.DEVELOPMENT;
-        const compilerOption = lodash_1.default.merge(aiotpack_1.JavascriptDefaultCompileOption, Object.assign(Object.assign({}, options), { projectPath: path_1.default.join(projectPath, uxProjectConfig.output), mode: compileMode, enableProtobuf: options.enableProtobuf }), otherConfig);
-        return compilerOption;
     }
     /**
      * ux项目的build函数
@@ -117,8 +55,8 @@ class UxBuilder {
             const uxProjectConfig = new aiotpack_1.UxConfig(projectPath);
             // 编译配置
             const compilerOption = this.getCompilerOption(projectPath, options);
-            shared_utils_2.ColorConsole.info('start build: ', {
-                style: shared_utils_2.ColorConsole.getStyle(shared_utils_1.Loglevel.INFO),
+            shared_utils_1.ColorConsole.info('start build: ', {
+                style: shared_utils_1.ColorConsole.getStyle(shared_utils_1.Loglevel.INFO),
                 word: JSON.stringify({
                     projectPath,
                     options,
@@ -130,9 +68,26 @@ class UxBuilder {
                 }, null, 2)
             });
             // 开始编译项目
-            yield new file_lane_1.FileLane(uxProjectConfig, projectPath, compilerOption, this.events).start({ watch });
+            yield new file_lane_1.default(uxProjectConfig, projectPath, compilerOption, this.events).start({ watch });
         });
     }
+    /**
+     * 获取build的编译配置
+     * @param projectPath 项目路径
+     * @param options 命令参数
+     */
+    getCompilerOption(projectPath, options) {
+        // 读取项目中文件的配置
+        const quickappConfig = this.readQuickAppConfig(projectPath);
+        const _a = quickappConfig || {}, { cli } = _a, otherConfig = __rest(_a, ["cli"]);
+        options = lodash_1.default.merge({}, options, cli);
+        // 项目配置
+        const uxProjectConfig = new aiotpack_1.UxConfig(projectPath);
+        // 编译配置
+        const compileMode = options.mode || aiotpack_1.CompileMode.DEVELOPMENT;
+        const compilerOption = lodash_1.default.merge(aiotpack_1.JavascriptDefaultCompileOption, Object.assign(Object.assign({}, options), { projectPath: path_1.default.join(projectPath, uxProjectConfig.output), mode: compileMode }), otherConfig);
+        return compilerOption;
+    }
     readQuickAppConfig(projectPath) {
         const path = path_1.default.join(projectPath, this.QUICKAPP_CONFIG);
         if (fs_extra_1.default.existsSync(path)) {
@@ -141,15 +96,10 @@ class UxBuilder {
                 return data;
             }
             catch (error) {
-                shared_utils_2.ColorConsole.throw((error === null || error === void 0 ? void 0 : error.toString()) || '');
+                shared_utils_1.ColorConsole.throw((error === null || error === void 0 ? void 0 : error.toString()) || '');
             }
         }
         return;
     }
-    match(projectPath) {
-        // src/app.ux 存在视为ux项目
-        return fs_1.default.existsSync(path_2.default.resolve(projectPath, 'src/app.ux'));
-    }
 }
-UxBuilder.PROJECT_TYPE = 'ux quick app';
-exports.default = UxBuilder;
+exports.default = UxBuilderBase;

package/lib/builder/VelaUxBuilder.d.ts

@@ -0,0 +1,23 @@
+import { CompileMode } from '@aiot-toolkit/aiotpack';
+import { IParam } from '@aiot-toolkit/commander';
+import { Dictionary } from '@aiot-toolkit/shared-utils';
+import IBuilder from './IBuilder';
+import UxBuilderBase from './UxBuilderBase';
+interface IUxBuilderOption extends Dictionary {
+    watch?: boolean;
+    mode: CompileMode;
+    enableJsc: boolean;
+    enableE2e?: boolean;
+    /**
+     * 是否自动补全 manifest.json 中的 features 配置
+     */
+    completeFeature?: boolean;
+}
+/**
+ * VelaUxBuilder
+ */
+declare class VelaUxBuilder extends UxBuilderBase<IUxBuilderOption> implements IBuilder<IUxBuilderOption> {
+    params: IParam[];
+    match(projectPath: string): boolean;
+}
+export default VelaUxBuilder;

package/lib/builder/VelaUxBuilder.js

@@ -0,0 +1,66 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const UxBuilderBase_1 = __importDefault(require("./UxBuilderBase"));
+/**
+ * VelaUxBuilder
+ */
+class VelaUxBuilder extends UxBuilderBase_1.default {
+    constructor() {
+        super(...arguments);
+        this.params = [
+            {
+                type: 'string',
+                name: 'devtool',
+                description: 'source map config'
+            },
+            {
+                name: 'disable-subpackages',
+                description: 'disable subpackages'
+            },
+            {
+                type: 'confirm',
+                name: 'enable-jsc',
+                description: 'enable jsc bundle',
+                defaultValue: false
+            },
+            {
+                type: 'confirm',
+                name: 'enable-protobuf',
+                description: 'enable protobuf',
+                defaultValue: false
+            },
+            {
+                type: 'confirm',
+                name: 'enable-e2e',
+                description: 'inject test-suite for current project',
+                defaultValue: false
+            },
+            {
+                type: 'confirm',
+                name: 'enable-stats',
+                description: 'analyse time and size of webpack output files',
+                defaultValue: false
+            },
+            {
+                type: 'confirm',
+                name: 'optimize-css-attr',
+                description: 'optimize css attr',
+                defaultValue: false
+            },
+            {
+                type: 'confirm',
+                name: 'complete-feature',
+                description: 'auto complete the features are used in the code into the features field of the manifest.json file',
+                defaultValue: false
+            }
+        ];
+    }
+    match(projectPath) {
+        return shared_utils_1.ProjectType.getProjectType(projectPath) === shared_utils_1.ProjectType.VELA_UX;
+    }
+}
+exports.default = VelaUxBuilder;

package/lib/builder/XtsBuilder.js

@@ -58,7 +58,7 @@ class XtsBuilder {
             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);
-                const preWorks = config.preWorks || [];
+                const preWorks = config.beforeCompile || [];
                 for (let item of preWorks) {
                     try {
                         yield item(context, [], config, compilerOptions);
@@ -67,7 +67,7 @@ class XtsBuilder {
                         // 报错 prework的item error
                     }
                 }
-                const follWorks = config.followWorks || [];
+                const follWorks = config.afterCompile || [];
                 for (let item of follWorks) {
                     try {
                         yield item.worker(context, config, compilerOptions);

package/lib/starter/AndroidUxStart.d.ts

@@ -1,5 +1,5 @@
+import { IParam, PersistentCommand } from '@aiot-toolkit/commander';
 import IStarter from './IStarter';
-import { PersistentCommand } from '@aiot-toolkit/commander';
 /**
  * AndroidUxStart
  *
@@ -9,8 +9,9 @@ import { PersistentCommand } from '@aiot-toolkit/commander';
 declare class AndroidUxStart extends IStarter {
     private server?;
     private port?;
-    private builder?;
+    private builder;
     private projectPath;
+    params: IParam[];
     get waiter(): PersistentCommand;
     /**
      * 启动

package/lib/starter/AndroidUxStart.js

@@ -13,14 +13,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const aiotpack_1 = require("@aiot-toolkit/aiotpack");
+const commander_1 = require("@aiot-toolkit/commander");
 const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const http_1 = __importDefault(require("http"));
 const path_1 = __importDefault(require("path"));
-const UxBuilder_1 = __importDefault(require("../builder/UxBuilder"));
+const AndroidUxBuilder_1 = __importDefault(require("../builder/AndroidUxBuilder"));
 const IStarter_1 = __importDefault(require("./IStarter"));
 const PackageRouter_1 = __importDefault(require("./androidRouter/PackageRouter"));
-const commander_1 = require("@aiot-toolkit/commander");
 /**
  * AndroidUxStart
  *
@@ -30,7 +30,9 @@ const commander_1 = require("@aiot-toolkit/commander");
 class AndroidUxStart extends IStarter_1.default {
     constructor() {
         super(...arguments);
+        this.builder = new AndroidUxBuilder_1.default();
         this.projectPath = '';
+        this.params = [...this.builder.params];
     }
     get waiter() {
         return new commander_1.PersistentCommand({
@@ -115,13 +117,12 @@ class AndroidUxStart extends IStarter_1.default {
     }
     build(projectPath, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.builder) {
-                this.builder = new UxBuilder_1.default({
-                    onBuildSuccess: () => {
-                        this.noticeDeviceListUpdate(projectPath, options);
-                    }
-                });
-            }
+            this.builder.events = {
+                onBuildSuccess: (data) => {
+                    shared_utils_1.ColorConsole.info(`build time: ${data.costTime}ms`);
+                    this.noticeDeviceListUpdate(projectPath, options);
+                }
+            };
             yield this.builder.build(projectPath, Object.assign(Object.assign({}, options), { watch: true }));
         });
     }

package/lib/starter/{UxStarter.d.ts → VelaUxStarter.d.ts}

@@ -1,14 +1,15 @@
 import { IParam } from '@aiot-toolkit/commander';
-import { IStartOptions } from '@aiot-toolkit/emulator';
-import UxBuilder from '../builder/UxBuilder';
+import { IStartOptions, GoldfishInstance, MiwearInstance, OldGoldfishInstance } from '@aiot-toolkit/emulator';
+import VelaUxBuilder from '../builder/VelaUxBuilder';
 import IStarter from './IStarter';
 /**
- * UxStarter
+ * VelaUxStarter
  * ux快应用启动器
  */
-declare class UxStarter extends IStarter<IStartOptions> {
+declare class VelaUxStarter extends IStarter<IStartOptions> {
     private ws;
-    builder: UxBuilder;
+    currentGoldfishInstance: GoldfishInstance | MiwearInstance | OldGoldfishInstance | undefined;
+    builder: VelaUxBuilder;
     params: IParam[];
     start(projectPath: string, options: any): Promise<void>;
     /**
@@ -19,4 +20,4 @@ declare class UxStarter extends IStarter<IStartOptions> {
      */
     isAvailableEmulator(avdName: string): boolean;
 }
-export default UxStarter;
+export default VelaUxStarter;

package/lib/starter/{UxStarter.js → VelaUxStarter.js}

@@ -14,31 +14,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const aiotpack_1 = require("@aiot-toolkit/aiotpack");
 const emulator_1 = require("@aiot-toolkit/emulator");
-const constants_1 = require("@aiot-toolkit/emulator/lib/static/constants");
+const constants_1 = require("@aiot-toolkit/emulator/lib/emulatorutil/constants");
 const index_1 = require("@aiot-toolkit/emulator/lib/utils/index");
 const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const prompts_1 = require("@inquirer/prompts");
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const portfinder_1 = __importDefault(require("portfinder"));
-const UxBuilder_1 = __importDefault(require("../builder/UxBuilder"));
+const VelaUxBuilder_1 = __importDefault(require("../builder/VelaUxBuilder"));
 const VelaAvdUtils_1 = __importDefault(require("../utils/VelaAvdUtils"));
 const IStarter_1 = __importDefault(require("./IStarter"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const ws_1 = __importDefault(require("ws"));
 /**
- * UxStarter
+ * VelaUxStarter
  * ux快应用启动器
  */
-class UxStarter extends IStarter_1.default {
+class VelaUxStarter extends IStarter_1.default {
     constructor() {
         super(...arguments);
-        this.builder = new UxBuilder_1.default({
-            onBuildSuccess: () => {
+        this.builder = new VelaUxBuilder_1.default({
+            onBuildSuccess: (data) => {
                 var _a;
-                (_a = this.ws) === null || _a === void 0 ? void 0 : _a.send(JSON.stringify({
-                    type: 'restart'
-                }));
+                shared_utils_1.ColorConsole.info(`build time: ${data.costTime}ms`);
+                if (this.ws) {
+                    this.ws.send(JSON.stringify({
+                        type: 'restart'
+                    }));
+                }
+                else {
+                    (_a = this.currentGoldfishInstance) === null || _a === void 0 ? void 0 : _a.restart();
+                }
             }
         });
         this.params = [
@@ -115,9 +121,11 @@ class UxStarter extends IStarter_1.default {
                 compilerOption
             };
             // 寻找对应的模拟器instance
-            const goldfishInstance = (0, emulator_1.findInstance)(avdName, params);
-            if (!goldfishInstance)
+            this.currentGoldfishInstance = (0, emulator_1.findInstance)(avdName, params);
+            if (!this.currentGoldfishInstance) {
+                shared_utils_1.ColorConsole.throw('no corresponding emulator found, please recreate it');
                 return;
+            }
             let grpcPort;
             // 设置vncPort
             if (options.openVNC) {
@@ -129,7 +137,7 @@ class UxStarter extends IStarter_1.default {
             // 设置adbPort
             const adbPort = yield (0, index_1.getEvenPort)();
             if (!adbPort) {
-                shared_utils_1.ColorConsole.throw(`${adbPort},5555和5585之间的端口号已全部不占用,请解决端口冲突,再启动模拟器`);
+                shared_utils_1.ColorConsole.throw(`${adbPort},the port numbers between 5555 and 5585 are all occupied. please resolve the port conflict before starting the emulator`);
                 return;
             }
             // 设置debugPort
@@ -146,7 +154,7 @@ class UxStarter extends IStarter_1.default {
                 adbPort,
                 debugPort
             };
-            yield goldfishInstance.start(startOptions);
+            yield this.currentGoldfishInstance.start(startOptions);
             this.ws = new ws_1.default(`ws://localhost:${serverPort}`);
             // waiter
             // const startWaiter: PersistentCommand = new PersistentCommand({
@@ -187,4 +195,4 @@ class UxStarter extends IStarter_1.default {
         return true;
     }
 }
-exports.default = UxStarter;
+exports.default = VelaUxStarter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiot-toolkit",
-  "version": "2.0.2-beta.13",
+  "version": "2.0.2-beta.15",
   "description": "Tools for creating, developing, and packaging aiot applications.",
   "keywords": [
     "aiot"
@@ -21,33 +21,33 @@
     "test": "node ./__tests__/aiot-toolkit.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/commander": "2.0.2-beta.13",
-    "@aiot-toolkit/emulator": "2.0.2-beta.13",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.13",
-    "@miwt/adb": "^0.8.0",
+    "@aiot-toolkit/aiotpack": "2.0.2-beta.15",
+    "@aiot-toolkit/commander": "2.0.2-beta.15",
+    "@aiot-toolkit/emulator": "2.0.2-beta.15",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.15",
+    "@inquirer/prompts": "^5.3.0",
+    "@miwt/adb": "^0.9.0",
     "adb-commander": "^0.1.9",
     "adm-zip": "^0.5.10",
-    "axios": "^1.5.0",
+    "axios": "^1.7.4",
     "cli-progress": "^3.12.0",
-    "create-aiot": "2.0.2-beta.13",
     "dayjs": "^1.11.10",
-    "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2-beta.13",
+    "file-lane": "2.0.2-beta.15",
     "fs-extra": "^11.2.0",
+    "koa-router": "^12.0.1",
     "lodash": "^4.17.21",
+    "portfinder": "^1.0.32",
     "qr-image": "^3.2.0",
-    "semver": "^7.6.0",
+    "semver": "^7.6.3",
     "ws": "^8.15.1"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.4",
     "@types/fs-extra": "^11.0.4",
-    "@types/koa": "^2.15.0",
     "@types/koa-router": "^7.4.8",
-    "@types/koa-static": "^4.0.4",
     "@types/qr-image": "^3.2.9",
     "@types/semver": "^7.5.8",
     "@types/ws": "^8.5.10"
   },
-  "gitHead": "30bf14ae958b66937da1b79dcfcd7c436e08af50"
+  "gitHead": "61b4fe38ce1de8f7c6b484f0f5323143630e8cc0"
 }

package/lib/builder/UxBuilder.d.ts

@@ -1,42 +0,0 @@
-import { CompileMode, IJavascriptCompileOption } from '@aiot-toolkit/aiotpack';
-import { IParam } from '@aiot-toolkit/commander';
-import { Dictionary } from '@aiot-toolkit/shared-utils';
-import IBuilder from './IBuilder';
-interface IUxBuilderOption extends Dictionary {
-    watch?: boolean;
-    mode: CompileMode;
-    disabledJsc: boolean;
-    enableE2e?: boolean;
-    /**
-     * 是否自动补全 manifest.json 中的 features 配置
-     */
-    completeFeature?: boolean;
-}
-/**
- * UxBuilder
- */
-declare class UxBuilder implements IBuilder<IUxBuilderOption> {
-    private readonly events?;
-    readonly QUICKAPP_CONFIG = "quickapp.config.js";
-    constructor(events?: {
-        onBuildSuccess?: (() => void) | undefined;
-    } | undefined);
-    /**
-     * 获取build的编译配置
-     * @param projectPath 项目路径
-     * @param options 命令参数
-     */
-    getCompilerOption(projectPath: string, options: IUxBuilderOption): Partial<IJavascriptCompileOption>;
-    /**
-     * ux项目的build函数
-     * @param projectPath 项目路径
-     * @param options 命令参数
-     * @param watch 是否开启监听
-     */
-    build(projectPath: string, options: IUxBuilderOption): Promise<void>;
-    private readQuickAppConfig;
-    static readonly PROJECT_TYPE = "ux quick app";
-    params: IParam[];
-    match(projectPath: string): boolean;
-}
-export default UxBuilder;