@aiot-toolkit/aiotpack 2.0.2-dev.1 → 2.0.2-dev.3

package/lib/compiler/javascript/JavascriptCompiler.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const CommonUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/CommonUtil"));
+const lodash_1 = __importDefault(require("lodash"));
 const path_1 = __importDefault(require("path"));
 const webpack_1 = require("webpack");
 const VelaWebpackConfigurator_1 = __importDefault(require("./vela/VelaWebpackConfigurator"));
@@ -31,12 +32,18 @@ class JavascriptCompiler {
                         reject([error]);
                     }
                     else {
-                        const errors = stats === null || stats === void 0 ? void 0 : stats.toJson().errors;
-                        if (errors && errors.length) {
-                            reject(errors);
-                        }
-                        else {
-                            resolve();
+                        const statsObj = stats === null || stats === void 0 ? void 0 : stats.toJson();
+                        if (statsObj) {
+                            const { errors, warnings } = statsObj;
+                            if ((errors === null || errors === void 0 ? void 0 : errors.length) || (warnings === null || warnings === void 0 ? void 0 : warnings.length)) {
+                                reject({
+                                    errors,
+                                    warnings
+                                });
+                            }
+                            else {
+                                resolve();
+                            }
                         }
                     }
                 });
@@ -57,13 +64,18 @@ class JavascriptCompiler {
         const { projectPath, mode, devtool, outputPath, sourceRoot } = param;
         const buildPath = path_1.default.resolve(projectPath, outputPath);
         const quickAppConfig = CommonUtil_1.default.requireModule(path_1.default.join(param.projectPath, this.QUICKAPP_CONFIG));
-        const result = Object.assign(Object.assign({}, quickAppConfig === null || quickAppConfig === void 0 ? void 0 : quickAppConfig.webpack), { context: projectPath, mode,
-            devtool, output: {
+        const result = {
+            context: projectPath,
+            mode,
+            devtool,
+            output: {
                 globalObject: 'window',
                 filename: '[name].js',
                 publicPath: './',
                 path: buildPath
-            }, module: {}, stats: {
+            },
+            module: {},
+            stats: {
                 builtAt: false,
                 entrypoints: false,
                 children: false,
@@ -73,11 +85,8 @@ class JavascriptCompiler {
                 modules: false,
                 version: false,
                 assets: false
-            }, resolve: {
-                alias: {
-                    '/Common': `${path_1.default.join(projectPath, sourceRoot)}/Common`
-                }
-            } });
+            }
+        };
         if (configurator.createEntry) {
             result.entry = configurator.createEntry();
         }
@@ -90,7 +99,7 @@ class JavascriptCompiler {
         if (configurator.hook) {
             configurator.hook(result);
         }
-        return result;
+        return lodash_1.default.merge({}, result, quickAppConfig === null || quickAppConfig === void 0 ? void 0 : quickAppConfig.webpack);
     }
     getConfigurator() {
         return new VelaWebpackConfigurator_1.default();

package/lib/config/UxConfig.d.ts

@@ -1,7 +1,6 @@
 import { IFileLaneConfig } from 'file-lane';
 import IJavascriptCompileOption from '../compiler/javascript/interface/IJavascriptCompileOption';
 import AppUxLoader from '../loader/ux/AppUxLoader';
-import ImageCompressLoader from '../loader/ux/ImageCompressLoader';
 import JsLoader from '../loader/ux/JsLoader';
 import UxLoader from '../loader/ux/UxLoader';
 declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
@@ -22,10 +21,6 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
             test: RegExp[];
             loader: (typeof JsLoader)[];
             exclude?: undefined;
-        } | {
-            test: RegExp[];
-            loader: (typeof ImageCompressLoader)[];
-            exclude: RegExp[];
         })[];
     };
     preWorks: import("file-lane/lib/interface/IFileLaneConfig").PreWork<IJavascriptCompileOption>[];

package/lib/config/UxConfig.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const AppUxLoader_1 = __importDefault(require("../loader/ux/AppUxLoader"));
-const ImageCompressLoader_1 = __importDefault(require("../loader/ux/ImageCompressLoader"));
 const JsLoader_1 = __importDefault(require("../loader/ux/JsLoader"));
 const PngLoader_1 = __importDefault(require("../loader/ux/PngLoader"));
 const UxLoader_1 = __importDefault(require("../loader/ux/UxLoader"));
@@ -34,12 +33,12 @@ class UxConfig {
                 {
                     test: [/.+\.9.png/],
                     loader: [PngLoader_1.default]
-                },
-                {
-                    test: [/.+\.(png|jpg|jpeg|gif)/],
-                    loader: [ImageCompressLoader_1.default],
-                    exclude: [/.+\.9.png/]
                 }
+                // {
+                //   test: [/.+\.(png|jpg|jpeg|gif)/],
+                //   loader: [ImageCompressLoader],
+                //   exclude: [/.+\.9.png/]
+                // }
             ]
         };
         this.preWorks = [

package/lib/utils/ux/UxFollowWorks.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const TranslateCache_1 = __importDefault(require("@aiot-toolkit/parser/lib//ux/translate/vela/TranslateCache"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const CommonUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/CommonUtil"));
 const FileUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/FileUtil"));
@@ -39,10 +40,36 @@ UxFollowWorks.webpack = (context, config, compilerOption) => __awaiter(void 0, v
         .then(() => {
         ColorConsole_1.default.info(`webpack complete`);
     })
-        .catch((errors) => {
-        ColorConsole_1.default.warn(`webpack error: \r\n`, {
-            word: errors.map((item, index) => `${index + 1}. ${item.message}`).join('\r\n\r\n')
-        });
+        .catch(({ errors, warnings }) => {
+        const errorLength = (errors === null || errors === void 0 ? void 0 : errors.length) || 0;
+        const messages = [`webpack error:\r\n`];
+        if (errors === null || errors === void 0 ? void 0 : errors.length) {
+            messages.push({
+                word: errors
+                    .map((item, index) => {
+                    return `${index + 1}. ${item.message}`;
+                })
+                    .join('\r\n'),
+                style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Throw)
+            });
+        }
+        if (warnings === null || warnings === void 0 ? void 0 : warnings.length) {
+            messages.push({
+                word: warnings
+                    .map((item, index) => {
+                    return `${errorLength + index + 1}. ${item.message}`;
+                })
+                    .join('\r\n'),
+                style: ColorConsole_1.default.getStyle(shared_utils_1.LOG_LEVEL.Warn)
+            });
+        }
+        if (errors === null || errors === void 0 ? void 0 : errors.length) {
+            ColorConsole_1.default.throw(...messages);
+            throw new Error();
+        }
+        else {
+            ColorConsole_1.default.warn(...messages);
+        }
     });
 });
 UxFollowWorks.protobuf = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.2-dev.1",
+  "version": "2.0.2-dev.3",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
   ],
-  "author": "徐俊杰 <xujunjie1@xiaomi.com>",
   "homepage": "",
   "license": "ISC",
   "main": "lib/index.js",
@@ -16,21 +15,17 @@
   "files": [
     "lib"
   ],
-  "repository": {
-    "type": "git",
-    "url": "ssh://xujunjie1@git.mioffice.cn:29418/vela/aiot-toolkit"
-  },
   "scripts": {
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.2-dev.1",
-    "@aiot-toolkit/parser": "2.0.2-dev.1",
+    "@aiot-toolkit/generator": "2.0.2-dev.3",
+    "@aiot-toolkit/parser": "2.0.2-dev.3",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "babel-loader": "^9.1.3",
     "del": "^4.1.0",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2-dev.1",
+    "file-lane": "2.0.2-dev.3",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^7.2.2",
@@ -44,5 +39,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "0beecc786c41b73ab2dabeaad06fb4ad19115f4b"
+  "gitHead": "e143a7038d5efaa59f01b2e2eb98422b1ec01097"
 }