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

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -242,23 +242,25 @@ class UxAfterCompile {
       }
 
       // e2e
-      // 1. 修改entry
-      // 2. 设置launchMode
-      if (compilerOption.enableE2e) {
+      //
+      if (compilerOption.e2eConfigPath && compilerOption.enableE2e) {
         const testConfig = _UxUtil.default.getE2eConfig({
           projectPath: compilerOption.projectPath,
           e2eConfigPath: compilerOption.e2eConfigPath
         });
-        const entryName = testConfig.entry?.name;
+        const testPagePath = _path.default.parse(_path.default.relative(_path.default.join(compilerOption.projectPath, sourceRoot), _path.default.join(testConfig.dir, testConfig.entry.path)));
+        // 1. 修改entry
+        const entryName = testPagePath.dir;
         const launchMode = testConfig.entry?.launchMode;
         if (entryName) {
           content.router.entry = entryName;
         }
-        if (launchMode) {
-          const entryPage = content.router.pages?.[content.router.entry];
-          if (entryPage) {
-            entryPage.launchMode = launchMode;
-          }
+        // 2. 添加测试页到router.pages
+        if (content.router.pages) {
+          content.router.pages[entryName] = {
+            component: testPagePath.name,
+            launchMode
+          };
         }
       }
       _fsExtra.default.writeJSONSync(_path.default.join(projectPath, outputPath, _UxFileUtils.default.CONFIG_FILE_NAME), content, {

package/lib/compiler/javascript/vela/VelaWebpackConfigurator.d.ts

@@ -8,7 +8,9 @@ declare class VelaWebpackConfigurator implements IWebpackConfigurator {
     protected createWrapPlugin(): RspackPluginInstance;
     protected createBundleAnalyzerPlugin(): any;
     /**
-     * 通过读取 manifest.json 生成 entry
+     * 生成entry
+     * 1. 通过读取 manifest.json 生成 entry
+     * 2. 通过自动化测试的entry配置生成entry
      * @returns
      */
     createEntry(): string | EntryObject | string[];

package/lib/compiler/javascript/vela/VelaWebpackConfigurator.js

@@ -9,6 +9,7 @@ var _path = _interopRequireDefault(require("path"));
 var _UxFileUtils = _interopRequireDefault(require("../../../utils/ux/UxFileUtils"));
 var _WrapPlugin = _interopRequireDefault(require("./plugin/WrapPlugin"));
 var _UxCompileUtil = _interopRequireDefault(require("./utils/UxCompileUtil"));
+var _UxUtil = _interopRequireDefault(require("@aiot-toolkit/parser/lib/ux/utils/UxUtil"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class VelaWebpackConfigurator {
   createPlugins() {
@@ -34,7 +35,9 @@ class VelaWebpackConfigurator {
   }
 
   /**
-   * 通过读取 manifest.json 生成 entry
+   * 生成entry
+   * 1. 通过读取 manifest.json 生成 entry
+   * 2. 通过自动化测试的entry配置生成entry
    * @returns
    */
   createEntry() {
@@ -44,7 +47,19 @@ class VelaWebpackConfigurator {
     } = this.param;
     const configFilePath = _UxFileUtils.default.getManifestFilePath(this.param.projectPath, this.param.sourceRoot);
     if (_fsExtra.default.existsSync(configFilePath)) {
+      // 1
       const config = _fsExtra.default.readJSONSync(configFilePath);
+      // 2
+      if (this.param.e2eConfigPath && this.param.enableE2e) {
+        const e2eConfig = _UxUtil.default.getE2eConfig({
+          projectPath: this.param.projectPath,
+          e2eConfigPath: this.param.e2eConfigPath
+        });
+        const testPagePath = _path.default.parse(_path.default.relative(_path.default.join(this.param.projectPath, sourceRoot), _path.default.join(e2eConfig.dir, e2eConfig.entry.path)));
+        config.router.pages[testPagePath.dir] = {
+          component: testPagePath.name
+        };
+      }
       return _UxCompileUtil.default.resolveEntries(config, _path.default.resolve(projectPath, sourceRoot), projectPath);
     } else {
       throw new Error(`Configuration file does not exist: ${configFilePath}`);

package/lib/compiler/javascript/vela/interface/IManifest.d.ts

@@ -29,13 +29,19 @@ export default interface IManifest {
         entry: string;
         pages: Dictionary<{
             component?: string;
-            launchMode: string;
+            launchMode?: string;
         }>;
+        floatingWindows?: any;
     };
     services: IService[] | Record<string, IService>;
     minAPILevel?: number;
     packageInfo?: Dictionary<string | number>;
     icon: string;
+    workers?: {
+        entries: {
+            file: string;
+        }[];
+    };
 }
 export interface IFeatures {
     name: string;

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

@@ -1,4 +1,5 @@
 import { Dictionary } from '@aiot-toolkit/shared-utils';
+import IManifest from '../interface/IManifest';
 declare class UxCompileUtil {
     static readonly DIGEST_ZIP_DIR = "META-INF";
     static clean(dirList: string[]): void;
@@ -7,9 +8,9 @@ declare class UxCompileUtil {
      * @param config 项目配置文件的内容，应为json对象
      * @param codeDir 源码目录
      * @param projectPath 项目目录
-     * @returns {[入口名]:源文件路径}
+     * @returns `{[entryName]:entryPath}`
      */
-    static resolveEntries(config: any, codeDir: string, projectPath: string): Dictionary<string>;
+    static resolveEntries(config: IManifest, codeDir: string, projectPath: string): Dictionary<string>;
     /**
      * 通过无后缀的文件名路径获取存在的文件路径
      *

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

@@ -36,7 +36,7 @@ class UxCompileUtil {
    * @param config 项目配置文件的内容，应为json对象
    * @param codeDir 源码目录
    * @param projectPath 项目目录
-   * @returns {[入口名]:源文件路径}
+   * @returns `{[entryName]:entryPath}`
    */
   static resolveEntries(config, codeDir, projectPath) {
     const {

package/lib/utils/BeforeCompileUtils.d.ts

@@ -10,7 +10,7 @@ declare class BeforeCompileUtils {
      * @param fileList
      * @returns
      */
-    static getEntries: PreWork;
+    static getEntries: PreWork<IJavascriptCompileOption>;
     static clean: PreWork;
     /**
      * 获取项目的全局样式变量配置

package/lib/utils/BeforeCompileUtils.js

@@ -11,6 +11,7 @@ var _path = _interopRequireDefault(require("path"));
 var _TranslateCache = _interopRequireDefault(require("@aiot-toolkit/parser/lib/ux/translate/vela/TranslateCache"));
 var _UxFileUtils = _interopRequireDefault(require("./ux/UxFileUtils"));
 var _IManifest = require("../compiler/javascript/vela/interface/IManifest");
+var _UxUtil = _interopRequireDefault(require("@aiot-toolkit/parser/lib/ux/utils/UxUtil"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
 
@@ -88,6 +89,15 @@ class BeforeCompileUtils {
       // 没有router配置
       _sharedUtils.ColorConsole.throw(`### manifest ### No router configuration`);
     }
+
+    // e2e测试入口
+    if (compilerOption?.enableE2e && compilerOption?.e2eConfigPath) {
+      const e2eConfig = _UxUtil.default.getE2eConfig({
+        projectPath: context.projectPath,
+        e2eConfigPath: compilerOption.e2eConfigPath
+      });
+      entryList.push(_path.default.join(e2eConfig.dir, e2eConfig.entry.path));
+    }
     if (services) {
       serviceList = Array.isArray(services) ? services : Object.values(services);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.6-beta.10",
+  "version": "2.0.6-beta.12",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,14 +19,14 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.6-beta.10",
-    "@aiot-toolkit/parser": "2.0.6-beta.10",
-    "@aiot-toolkit/shared-utils": "2.0.6-beta.10",
+    "@aiot-toolkit/generator": "2.0.6-beta.12",
+    "@aiot-toolkit/parser": "2.0.6-beta.12",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.12",
     "@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.6-beta.10",
+    "file-lane": "2.0.6-beta.12",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -42,5 +42,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "b6a63385af95a6ba445e65225a92014026ce3144"
+  "gitHead": "cada1b3423f7842ea243bb1535592ed7f7e5d4a2"
 }