aiot-toolkit 2.0.5-alpha.1 → 2.0.5-beta.1

package/README.md

@@ -1,3 +1,12 @@
+<!-- 此文档由 tools/createFile.ts 生成， 请勿手动修改 -->
+<!--
+
+生成方法
+1. 修改 tools/README.template.md
+2. 修改 tools/VelaBuilderParam.json
+3. 执行 tools/createFile.ts
+ -->
+
 # 项目介绍
 
 aiot-toolkit 2.0 是将 **源码项目** 转换为 **目标代码项目** 并生成 **目标代码应用** 的命令行工具，同时配备了 **模拟器** 相关功能供开发者使用。
@@ -29,17 +38,54 @@ aiot-toolkit2.0目前支持的打包格式如下：
 
 ## 常用命令
 
-| 命令                     | 说明                     |
-| ------------------------ | ------------------------ |
-| npm create aiot          | 创建并手动选择项目       |
-| npm create aiot ux       | 创建ux项目               |
-| aiot build               | 构建项目                 |
-| aiot release             | 构建项目-release模式     |
-| aiot start               | 构建项目并运行到模拟器   |
-| aiot getConnectedDevices | 获取已连接设备列表       |
-| aiot getPlatforms        | 获取设置平台             |
-| aiot installDbgAndMkp    | 在真机上安装快应用调试器 |
-| aiot createVelaAvd       | 创建 vela 模拟器         |
-| aiot deleteVelaAvd       | 删除 vela 模拟器         |
-
-## 函数调用
+| 命令                     | 说明                                           |
+| ------------------------ | ---------------------------------------------- |
+| npm create aiot          | 创建并手动选择项目                             |
+| npm create aiot ux       | 创建ux项目                                     |
+| aiot build               | 构建项目                                       |
+| aiot release             | 构建项目-release模式                           |
+| aiot start               | 构建项目并运行到模拟器                         |
+| aiot getConnectedDevices | 获取已连接设备列表                             |
+| aiot getPlatforms        | 获取设置平台                                   |
+| aiot installDbgAndMkp    | 在真机上安装快应用调试器                       |
+| aiot createVVD           | 创建 vela 模拟器                               |
+| aiot deleteVVD           | 删除 vela 模拟器                               |
+| aiot resign              | build目录重新生成rpk, 详情： [resign](#resign) |
+
+## build 参数
+
+
+| 参数 | 类型 | 描述 | 默认值 | 参考 |
+| --- | --- | --- | --- | --- |
+| *devtool* | string | source map 配置 |  | https://www.webpackjs.com/configuration/devtool/#devtool |
+| *enable-jsc* | confirm | 是否启用 jsc bundle | `false` |  |
+| *enable-protobuf* | confirm | 是否启用 `protobuf` | `false` |  |
+| *enable-e2e* | confirm | 是否为当前项目注入测试套件 | `false` | https://doc.quickapp.cn/tutorial/others/testing.html |
+| *enable-stats* | confirm | 分析 webpack 输出文件的大小 | `false` |  |
+| *optimize-css-attr* | confirm | 优化压缩css名称 | `false` |  |
+| *complete-feature* | confirm | 自动将代码中使用的功能，补全到 manifest.json 的 features 字段中 | `false` |  |
+| *start-page* | string | 启动页面，示例：`--start-page 'pages/index?a=1&b=2'` |  |  |
+| *~~enable-custom-component~~* | confirm | **已废弃** |  |  |
+| *~~stats~~* | confirm | **已废弃** |  |  |
+
+## resign
+
+build目录重新生成rpk
+
+步骤
+
+1. 创建任意名称的空目录, 例如 `folder`
+2. 将 `build` 复制到 `folder`
+3. (可跳过)如需自定义证书，将证书复制到 `folder/sign`
+4. 进入 `folder` 目录，执行 `aiot resign`，会在`foler/dist`中生成rpk
+5. 目录结构如下
+
+```sh
+folder
+  build // 用户复制
+  sign  // 用户复制，可选
+     certificate.pem
+     private.pem
+  dist  // 生成
+     ***.rpk
+```

package/lib/bin.js

@@ -13,6 +13,8 @@ var _VelaUxStarter = _interopRequireDefault(require("./starter/VelaUxStarter"));
 var _XtsStarter = _interopRequireDefault(require("./starter/XtsStarter"));
 var _DeviceUtil = _interopRequireDefault(require("./utils/DeviceUtil"));
 var _VelaAvdUtils = _interopRequireDefault(require("./utils/VelaAvdUtils"));
+var _ZipUtil = _interopRequireDefault(require("@aiot-toolkit/aiotpack/lib/compiler/javascript/vela/utils/ZipUtil"));
+var _BuildNameFormatType = _interopRequireDefault(require("@aiot-toolkit/aiotpack/lib/compiler/javascript/vela/enum/BuildNameFormatType"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 // 支持的最低node版本
 const NODE_MINIMUM_VERSION = '18.0.0';
@@ -169,6 +171,22 @@ async function main() {
       action: async () => {
         _VelaAvdUtils.default.initEmulatorEnv();
       }
+    }, {
+      name: 'resign',
+      description: 'resign build folder to dist/rpk',
+      action: () => {
+        const projectPath = process.cwd();
+        const param = {
+          signRoot: 'sign',
+          mode: _aiotpack.CompileMode.DEVELOPMENT,
+          outputPath: 'build',
+          releasePath: 'dist',
+          projectPath,
+          buildNameFormat: _BuildNameFormatType.default.DEFAULT,
+          sourceRoot: 'build'
+        };
+        return _ZipUtil.default.createRpk(projectPath + '/build', param);
+      }
     }]
   };
   _commander.Command.registeProgram(config);

package/lib/builder/VelaUxBuilder.d.ts

@@ -1,25 +1,7 @@
 import { IParam } from '@aiot-toolkit/commander';
 import IBuilder from './IBuilder';
-import UxBuilderBase, { IUxBuildOption } from './UxBuilderBase';
-export interface IVelaUxBuilderOption extends IUxBuildOption {
-    watch?: boolean;
-    enableJsc?: boolean;
-    enableE2e?: boolean;
-    enableStats?: boolean;
-    optimizeCssAttr?: boolean;
-    /**
-     * 是否自动补全 manifest.json 中的 features 配置
-     */
-    completeFeature?: boolean;
-    /**
-     * 此选项控制是否生成，以及如何生成 source map
-     *
-     * @see https://www.webpackjs.com/configuration/devtool/#devtool
-     */
-    devtool?: string;
-    enableProtobuf?: boolean;
-}
-export declare const velaUxBuilderParams: IParam[];
+import UxBuilderBase from './UxBuilderBase';
+import IVelaUxBuilderOption from '../interface/IVelaUxBuilderOption';
 /**
  * VelaUxBuilder
  */

package/lib/builder/VelaUxBuilder.js

@@ -3,70 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.velaUxBuilderParams = exports.default = void 0;
+exports.default = void 0;
 var _sharedUtils = require("@aiot-toolkit/shared-utils");
 var _UxBuilderBase = _interopRequireDefault(require("./UxBuilderBase"));
+var _IVelaUxBuilderOption = require("../interface/IVelaUxBuilderOption");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const velaUxBuilderParams = exports.velaUxBuilderParams = [{
-  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
-}, {
-  type: 'confirm',
-  name: 'enable-custom-component',
-  description: 'deprecated',
-  deprecated: 'please remove it now',
-  deprecatedVersion: '2.1.0'
-}, {
-  type: 'confirm',
-  name: 'stats',
-  description: 'deprecated',
-  deprecated: 'please use `enable-stats` instead',
-  deprecatedVersion: '2.1.0'
-}, {
-  type: 'string',
-  name: 'e2e-config-path',
-  description: 'e2e config file path, example: absolute=`/Desktop/e2e.config.js`  relative project=`./test2/e2e.config.js`'
-}];
-
 /**
  * VelaUxBuilder
  */
 class VelaUxBuilder extends _UxBuilderBase.default {
-  params = (() => velaUxBuilderParams)();
+  params = (() => _IVelaUxBuilderOption.velaUxBuilderParams)();
   match(projectPath) {
     return _sharedUtils.ProjectType.getProjectType(projectPath) === _sharedUtils.ProjectType.VELA_UX;
   }

package/lib/interface/IVelaUxBuilderOption.d.ts

@@ -0,0 +1,56 @@
+/*****
+ *  由 tools/createFile.ts 生成， 请勿手动修改
+ *
+ *  生成方法
+ *  1. 修改 tools/VelaBuilderParam.json
+ *  2. 执行 tools/createFile.ts
+ */
+import { IParam } from '@aiot-toolkit/commander';
+import { IUxBuildOption } from '../builder/UxBuilderBase';
+interface IVelaUxBuilderOption extends IUxBuildOption {
+    /**
+     * source map 配置
+     * @see https://www.webpackjs.com/configuration/devtool/#devtool
+     */
+    devtool?: string;
+    /**
+     * 是否启用 jsc bundle
+     */
+    enableJsc?: boolean;
+    /**
+     * 是否启用 `protobuf`
+     */
+    enableProtobuf?: boolean;
+    /**
+     * 是否为当前项目注入测试套件
+     * @see https://doc.quickapp.cn/tutorial/others/testing.html
+     */
+    enableE2e?: boolean;
+    /**
+     * 分析 webpack 输出文件的大小
+     */
+    enableStats?: boolean;
+    /**
+     * 优化压缩css名称
+     */
+    optimizeCssAttr?: boolean;
+    /**
+     * 自动将代码中使用的功能，补全到 manifest.json 的 features 字段中
+     */
+    completeFeature?: boolean;
+    /**
+     * 已废弃，请删除
+     */
+    enableCustomComponent?: boolean;
+    /**
+     * 已废弃，请使用 `enable-stats` 代替
+     */
+    stats?: boolean;
+    /**
+     * 启动页面，示例：`--start-page 'pages/index?a=1&b=2'`
+     */
+    startPage?: string;
+}
+declare const velaUxBuilderParams: IParam[];
+export { velaUxBuilderParams };
+export default IVelaUxBuilderOption;

package/lib/interface/IVelaUxBuilderOption.js

@@ -0,0 +1,65 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.velaUxBuilderParams = void 0;
+/*****
+ *  由 tools/createFile.ts 生成， 请勿手动修改
+ *
+ *  生成方法
+ *  1. 修改 tools/VelaBuilderParam.json
+ *  2. 执行 tools/createFile.ts
+ */
+
+const velaUxBuilderParams = exports.velaUxBuilderParams = [{
+  "type": "string",
+  "name": "devtool",
+  "description": "source map config"
+}, {
+  "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
+}, {
+  "type": "confirm",
+  "name": "enable-custom-component",
+  "description": "deprecated",
+  "deprecated": "please remove it now",
+  "deprecatedVersion": "2.1.0"
+}, {
+  "type": "confirm",
+  "name": "stats",
+  "description": "deprecated",
+  "deprecated": "please use `enable-stats` instead",
+  "deprecatedVersion": "2.1.0"
+}, {
+  "type": "string",
+  "name": "start-page",
+  "description": "start page of current project, example: --start-page 'pages/index?a=1&b=2'"
+}];

package/lib/starter/VelaUxStarter.js

@@ -10,15 +10,14 @@ var _sharedUtils = require("@aiot-toolkit/shared-utils");
 var _prompts = require("@inquirer/prompts");
 var _path = _interopRequireDefault(require("path"));
 var _portfinder = _interopRequireDefault(require("portfinder"));
-var _VelaUxBuilder = _interopRequireWildcard(require("../builder/VelaUxBuilder"));
+var _VelaUxBuilder = _interopRequireDefault(require("../builder/VelaUxBuilder"));
 var _VelaAvdUtils = _interopRequireDefault(require("../utils/VelaAvdUtils"));
 var _IStarter = _interopRequireDefault(require("./IStarter"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _aiotpack = require("@aiot-toolkit/aiotpack");
 var _events = _interopRequireDefault(require("events"));
 var _FileLaneTriggerType = _interopRequireDefault(require("file-lane/lib/enum/FileLaneTriggerType"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var _IVelaUxBuilderOption = require("../interface/IVelaUxBuilderOption");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * VelaUxStarter
@@ -61,7 +60,7 @@ class VelaUxStarter extends _IStarter.default {
     description: 'deprecated',
     deprecated: 'please remove it now',
     deprecatedVersion: '2.1.0'
-  }, ..._VelaUxBuilder.velaUxBuilderParams])();
+  }, ..._IVelaUxBuilderOption.velaUxBuilderParams])();
   async start(projectPath, options) {
     const check = await _VelaAvdUtils.default.checkEmulatorEnv();
     if (!check) {
@@ -126,7 +125,7 @@ class VelaUxStarter extends _IStarter.default {
     if (!this.emulatorInstance) {
       throw new Error('emulatorInstance is undefined');
     }
-    const projectInfo = _aiotpack.UxFileUtils.getMainfestInfo(projectPath, compilerOption.sourceRoot);
+    const projectInfo = _aiotpack.UxFileUtils.getManifestInfo(projectPath, compilerOption.sourceRoot);
     if (this.lastRpk && _fsExtra.default.existsSync(this.lastRpk)) {
       const targetPath = await this.emulatorInstance?.pushRpk(this.lastRpk, projectInfo.package);
       await this.emulatorInstance?.install(targetPath, projectInfo.package);

package/lib/utils/VelaAvdUtils.js

@@ -61,7 +61,7 @@ class VelaVvdUtils {
       let width = '466';
       let height = '466';
       // vela4.0不允许自定义分辨率
-      if (velaImage === _emulator.VelaImageType.REL) {
+      if ((0, _emulator.isMiwearImageType)(velaImage)) {
         const needSkin = await (0, _prompts.confirm)({
           message: 'need vvd skin?',
           default: true
@@ -94,6 +94,7 @@ class VelaVvdUtils {
       });
       if ((await vvdManager.hasSDKPartUpdate()).length > 0) {
         const downloder = await vvdManager.downloadSDK({
+          imageTypeArr: [velaImage],
           force: false,
           cliProgress: true,
           parallelDownloads: 6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiot-toolkit",
-  "version": "2.0.5-alpha.1",
+  "version": "2.0.5-beta.1",
   "description": "Tools for creating, developing, and packaging aiot applications.",
   "keywords": [
     "aiot"
@@ -22,14 +22,14 @@
     "test": "node ./__tests__/aiot-toolkit.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/aiotpack": "2.0.5-alpha.1",
-    "@aiot-toolkit/commander": "2.0.5-alpha.1",
-    "@aiot-toolkit/emulator": "2.0.5-alpha.1",
-    "@aiot-toolkit/shared-utils": "2.0.5-alpha.1",
+    "@aiot-toolkit/aiotpack": "2.0.5-beta.1",
+    "@aiot-toolkit/commander": "2.0.5-beta.1",
+    "@aiot-toolkit/emulator": "2.0.5-beta.1",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.1",
     "@inquirer/prompts": "^5.3.0",
     "@miwt/adb": "^0.9.0",
     "axios": "^1.7.4",
-    "file-lane": "2.0.5-alpha.1",
+    "file-lane": "2.0.5-beta.1",
     "fs-extra": "^11.2.0",
     "koa-router": "^13.0.1",
     "lodash": "^4.17.21",
@@ -43,5 +43,5 @@
     "@types/qr-image": "^3.2.9",
     "@types/semver": "^7.5.8"
   },
-  "gitHead": "8c8033a7a52e7cdb83606298ed8c4d6a585ba3ec"
+  "gitHead": "44f8c6ee763bc01bd53c655b93e09c698057fc3e"
 }