@aiot-toolkit/aiotpack 2.0.3-beta.2 → 2.0.3-beta.4

package/lib/beforeCompile/ux/UxBeforeCompile.js

@@ -22,10 +22,7 @@ class UxBeforeCompile {
 _a = UxBeforeCompile;
 UxBeforeCompile.validateManifest = (_b) => __awaiter(void 0, [_b], void 0, function* ({ context }) {
     const { projectPath } = context;
-    const errors = yield UxFileUtils_1.default.validateManifest(projectPath);
-    if (errors === null || errors === void 0 ? void 0 : errors.length) {
-        return Promise.reject(errors);
-    }
+    yield UxFileUtils_1.default.validateManifest(projectPath);
 });
 UxBeforeCompile.validateSitemap = (_b) => __awaiter(void 0, [_b], void 0, function* ({ context }) {
     const { projectPath } = context;

package/lib/utils/ux/UxFileUtils.d.ts

@@ -28,11 +28,11 @@ export declare class UxFileUtils {
      * @param sourceRoot 源码路径--相对项目根目录
      * @returns
      */
-    static validateManifest(projectPath: string, sourceRoot?: string): Error[] | undefined;
+    static validateManifest(projectPath: string, sourceRoot?: string): void;
     /**
      * 检查 sitemap.json 文件，并显示错误信息
      *
-     * 1. 当sitemap.json的 rules 中配置的page 不存在于 manifest.json 中时，报错并终止程序
+     * 1. 当sitemap.json的 rules 中配置的page 不存在于 manifest.json 中时，报错
      * @param projectPath
      * @param sourceRoot
      */

package/lib/utils/ux/UxFileUtils.js

@@ -4,8 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UxFileUtils = void 0;
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const ILog_1 = require("@aiot-toolkit/shared-utils/lib/interface/ILog");
 const CommonUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/CommonUtil"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
@@ -44,10 +42,7 @@ class UxFileUtils {
     static validateManifest(projectPath, sourceRoot = 'src') {
         const path = UxFileUtils.getManifestFilePath(projectPath, sourceRoot);
         if (!fs_extra_1.default.existsSync(path)) {
-            ColorConsole_1.default.throw(`file is missing`, {
-                word: path,
-                style: ColorConsole_1.default.getStyle(ILog_1.Loglevel.THROW)
-            });
+            throw new Error(`no such file: '${path}'`);
         }
         // 1
         const jsonData = this.getMainfestInfo(projectPath, sourceRoot);
@@ -59,41 +54,34 @@ class UxFileUtils {
             errors.push(new TypeError(`router.entry content:  ${entry}, is missing in router.pages`));
         }
         if (errors === null || errors === void 0 ? void 0 : errors.length) {
-            ColorConsole_1.default.warn(`Manefest.json error: `, ...errors.map((item, index) => {
-                return {
-                    word: `\r\n${index + 1}. ${item.message}`,
-                    style: item instanceof TypeError
-                        ? ColorConsole_1.default.getStyle(ILog_1.Loglevel.ERROR)
-                        : ColorConsole_1.default.getStyle(ILog_1.Loglevel.WARN)
-                };
-            }));
+            const message = `Manifest.json error: ${errors.map((item, index) => {
+                return `\r\n${index + 1}. ${item.message}`;
+            })}`;
+            throw new Error(message);
         }
-        return errors.length ? errors : undefined;
     }
     /**
      * 检查 sitemap.json 文件，并显示错误信息
      *
-     * 1. 当sitemap.json的 rules 中配置的page 不存在于 manifest.json 中时，报错并终止程序
+     * 1. 当sitemap.json的 rules 中配置的page 不存在于 manifest.json 中时，报错
      * @param projectPath
      * @param sourceRoot
      */
     static validateSitemap(projectPath, sourceRoot = 'src') {
         const sitemapPath = path_1.default.join(projectPath, sourceRoot, 'sitemap.json');
         if (fs_extra_1.default.existsSync(sitemapPath)) {
-            try {
-                const rules = fs_extra_1.default.readJSONSync(sitemapPath).rules;
-                const manifest = this.getMainfestInfo(projectPath, sourceRoot);
-                const pages = Object.keys(manifest.router.pages || {});
-                rules.forEach((item, index) => {
-                    const page = item.page;
-                    if (page !== '*' && !pages.includes(page)) {
-                        ColorConsole_1.default.throw(`The ${index + 1}th item of sitemap rules is configured incorrectly, the page ${page} does not exist`);
-                    }
-                    return page;
-                });
-            }
-            catch (error) {
-                ColorConsole_1.default.warn(error === null || error === void 0 ? void 0 : error.toString());
+            const rules = fs_extra_1.default.readJSONSync(sitemapPath).rules;
+            const manifest = this.getMainfestInfo(projectPath, sourceRoot);
+            const pages = Object.keys(manifest.router.pages || {});
+            const errorList = [];
+            rules.forEach((item, index) => {
+                const page = item.page;
+                if (page !== '*' && !pages.includes(page)) {
+                    errorList.push(`The ${index + 1}th item of sitemap rules is configured incorrectly, the page ${page} does not exist`);
+                }
+            });
+            if (errorList.length) {
+                throw new Error(errorList.join('\r\n'));
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.3-beta.2",
+  "version": "2.0.3-beta.4",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,16 +19,16 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.3-beta.2",
-    "@aiot-toolkit/parser": "2.0.3-beta.2",
-    "@aiot-toolkit/shared-utils": "2.0.3-beta.2",
+    "@aiot-toolkit/generator": "2.0.3-beta.4",
+    "@aiot-toolkit/parser": "2.0.3-beta.4",
+    "@aiot-toolkit/shared-utils": "2.0.3-beta.4",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.0.0",
     "aiot-parse5": "^1.0.0",
     "archiver": "^7.0.1",
     "babel-loader": "^9.1.3",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.3-beta.2",
+    "file-lane": "2.0.3-beta.4",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -45,5 +45,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "7776973f6a81d7f13eb330be8df5801d9143c83c"
+  "gitHead": "a79707d6a498ab01ac10ff3ba23d6271e2ac2ed8"
 }