@aiot-toolkit/aiotpack 2.0.5-beta.14 → 2.0.5-beta.16

package/lib/afterCompile/ux/UxAfterCompile.d.ts

@@ -4,7 +4,7 @@ import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavas
  * UxAfterCompile
  */
 declare class UxAfterCompile {
-    static webpack: FollowWork<IJavascriptCompileOption>;
+    static compileJavascript: FollowWork<IJavascriptCompileOption>;
     static protobuf: FollowWork<IJavascriptCompileOption>;
     static jsc: FollowWork<IJavascriptCompileOption>;
     static toRpk: FollowWork<IJavascriptCompileOption>;
@@ -15,6 +15,13 @@ declare class UxAfterCompile {
      * @param compilerOption
      */
     static copyResource: FollowWork<IJavascriptCompileOption>;
+    /**
+     * 压缩资源文件
+     * 1. png8
+     * 2. bin
+     * @param params
+     */
+    static compressResource: FollowWork<IJavascriptCompileOption>;
     /**
      * 如果是更新触发，则对比临时项目build文件夹 和 项目build文件夹，生成diff.json
      * @param context

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -17,6 +17,7 @@ var _UxFileUtils = _interopRequireDefault(require("../../utils/ux/UxFileUtils"))
 var _FileLaneTriggerType = _interopRequireDefault(require("file-lane/lib/enum/FileLaneTriggerType"));
 var _ZipFileUtil = _interopRequireDefault(require("@aiot-toolkit/shared-utils/lib/utils/ZipFileUtil"));
 var _process = require("process");
+var _ImageIcu = _interopRequireDefault(require("../../compiler/tools/icu/ImageIcu"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
 const HapToolkit = require('hap-toolkit');
@@ -25,7 +26,7 @@ const HapToolkit = require('hap-toolkit');
  * UxAfterCompile
  */
 class UxAfterCompile {
-  static webpack = async params => {
+  static compileJavascript = async params => {
     const {
       context,
       compilerOption
@@ -146,7 +147,7 @@ class UxAfterCompile {
         sourceRoot,
         outputPath
       } = compilerOption;
-      const includeList = [/sitemap\.json$/, /i18n(.+)\.json/];
+      const includeList = [/sitemap\.json$/, /i18n(.+)\.json/, /web\/*/];
       const excludeExtList = ['js', 'jsx', 'coffee', 'ts', 'tsx', 'vue', 'css', 'less', 'sass', 'styl', 'html', 'md', 'ux', 'mix', 'DS_Store', 'map'];
       const excludeReg = `\\.(${excludeExtList.join('|')})$`;
       _sharedUtils.FileUtil.copyFiles(_path.default.join(projectPath, sourceRoot), _path.default.join(projectPath, outputPath), new RegExp(excludeReg));
@@ -253,6 +254,37 @@ class UxAfterCompile {
       await genMetaFiles(compilerOption);
     }
   };
+
+  /**
+   * 压缩资源文件
+   * 1. png8
+   * 2. bin
+   * @param params
+   */
+  static compressResource = async params => {
+    const {
+      compilerOption
+    } = params;
+    if (compilerOption) {
+      const {
+        enableImagePng8,
+        projectPath,
+        outputPath
+      } = compilerOption;
+      if (enableImagePng8) {
+        const format = 'png';
+        const files = _sharedUtils.FileUtil.readAlldirSync(_path.default.join(projectPath, outputPath));
+        const compressFiles = files.filter(filePath => _ImageIcu.default.canTranslate(filePath, format));
+        if (compressFiles.length) {
+          const icu = new _ImageIcu.default();
+          compressFiles.forEach(item => {
+            icu.translate(item, _path.default.dirname(item), format);
+          });
+        }
+      }
+    }
+  };
+
   /**
    * 如果是更新触发，则对比临时项目build文件夹 和 项目build文件夹，生成diff.json
    * @param context
@@ -288,8 +320,8 @@ class UxAfterCompile {
       const diffFileName = `.diff.rpk`;
       const diffPath = _path.default.join(distFold, diffFileName);
       await _ZipFileUtil.default.createZipFile(diffPath, diffList.map(item => ({
-        filePath: _path.default.join(buildFold, item),
-        zipFilePath: item
+        filePath: _path.default.join(buildFold, item.path),
+        zipFilePath: item.path
       })));
       compalition.info.diffList = diffList;
       compalition.info.diffFile = _path.default.join(context.projectPath, compilerOption.releasePath, diffFileName);

package/lib/afterWorks/ux/UxAfterWorks.js

@@ -9,7 +9,7 @@ var _fileLane = require("file-lane");
 class UxAfterWorks {
   static async cleanOutput(context) {
     const outputPath = _fileLane.FileLaneUtil.getOutputPath(context);
-    _sharedUtils.FileUtil.del(outputPath);
+    await _sharedUtils.FileUtil.del(outputPath);
   }
 }
 var _default = exports.default = UxAfterWorks;

package/lib/compiler/javascript/JavascriptCompiler.d.ts

@@ -4,6 +4,15 @@ import IJavascriptCompileOption from './interface/IJavascriptCompileOption';
 declare class JavascriptCompiler implements ICompiler {
     readonly QUICKAPP_CONFIG = "quickapp.config.js";
     compile(param: IJavascriptCompileOption): Promise<void>;
+    /**
+     * 压缩插件
+     *
+     * dev模式，只处理console，其它禁用
+     * prod模式，其它使用默认值
+     * @param mode
+     * @returns
+     */
+    private createMinimizerRspackPlugin;
     private createWebpackConfig;
     private getConfigurator;
     clean(param: ICompileParam & IJavascriptCompileOption): Promise<void>;

package/lib/compiler/javascript/JavascriptCompiler.js

@@ -11,6 +11,7 @@ var _path = _interopRequireDefault(require("path"));
 var _AndroidWebpackConfigurator = _interopRequireDefault(require("./android/AndroidWebpackConfigurator"));
 var _VelaWebpackConfigurator = _interopRequireDefault(require("./vela/VelaWebpackConfigurator"));
 var _UxCompileUtil = _interopRequireDefault(require("./vela/utils/UxCompileUtil"));
+var _CompileMode = _interopRequireDefault(require("../enum/CompileMode"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class JavascriptCompiler {
   QUICKAPP_CONFIG = 'quickapp.config.js';
@@ -49,6 +50,65 @@ class JavascriptCompiler {
       }
     });
   }
+
+  /**
+   * 压缩插件
+   *
+   * dev模式，只处理console，其它禁用
+   * prod模式，其它使用默认值
+   * @param mode
+   * @returns
+   */
+  createMinimizerRspackPlugin(compileOption) {
+    const {
+      mode,
+      dropConsole
+    } = compileOption;
+    const translateDropConsole = () => {
+      let dropConsoleValue;
+      if (dropConsole === undefined) {
+        dropConsoleValue = false;
+      } else if (dropConsole === 'true') {
+        dropConsoleValue = true;
+      } else if (dropConsole === 'false') {
+        dropConsoleValue = false;
+      } else {
+        dropConsoleValue = dropConsole;
+      }
+      return dropConsoleValue;
+    };
+    const createCompressValue = dropConsoleValue => {
+      const result = {};
+      if (typeof dropConsoleValue === 'boolean') {
+        result.drop_console = dropConsoleValue;
+      } else if (typeof dropConsoleValue === 'string') {
+        result.pure_funcs = dropConsoleValue.split(',').map(item => item.trim()).filter(Boolean).map(item => `console.${item}`);
+      }
+      return result;
+    };
+    if (mode === _CompileMode.default.DEVELOPMENT) {
+      return new _core.rspack.SwcJsMinimizerRspackPlugin({
+        minimizerOptions: {
+          module: true,
+          minify: false,
+          mangle: false,
+          compress: {
+            defaults: false,
+            ...createCompressValue(translateDropConsole())
+          }
+        }
+      });
+    } else {
+      return new _core.rspack.SwcJsMinimizerRspackPlugin({
+        minimizerOptions: {
+          module: true,
+          compress: {
+            ...createCompressValue(translateDropConsole())
+          }
+        }
+      });
+    }
+  }
   createWebpackConfig(param) {
     const configurator = this.getConfigurator(param);
     if (!configurator) {
@@ -88,11 +148,8 @@ class JavascriptCompiler {
         }]
       },
       optimization: {
-        minimizer: [new _core.rspack.SwcJsMinimizerRspackPlugin({
-          minimizerOptions: {
-            module: true
-          }
-        })]
+        minimize: true,
+        minimizer: [this.createMinimizerRspackPlugin(param)]
       },
       resolve: {
         extensions: ['.js', '.ts', '.ux']

package/lib/compiler/javascript/interface/IJavascriptCompileOption.d.ts

@@ -48,6 +48,10 @@ export default interface IJavascriptCompileOption extends ICompileParam {
      * 启用应用自动化测试
      */
     enableE2e?: boolean;
+    /**
+     * 启用 png8 压缩
+     */
+    enableImagePng8?: boolean;
     /**
      * 启用代码体积分析，会生成 report.html 文件，可查看打包后各模块占用体积
      */
@@ -56,6 +60,17 @@ export default interface IJavascriptCompileOption extends ICompileParam {
      * 是否自动补全 manifest.json 中的 features 配置
      */
     completeFeature?: boolean;
+    /**
+     * 是否删除 console
+     *
+     * true：删除全部 console
+     * string: 指定要去除的console，如'log'、'warn'、'error'
+     *
+     * @example true
+     *
+     * @example log,warn
+     */
+    dropConsole?: boolean | string;
     /**
      * 获取远程证书
      */

package/lib/compiler/tools/icu/ImageIcu.d.ts

@@ -0,0 +1,37 @@
+declare class ImageIcu {
+    static EXT: string;
+    static INCLUDE_LIST: string[];
+    /**
+     * @private
+     * @returns
+     */
+    getBinPath(): string;
+    /**
+     * 文件转换为 bin 格式
+     * @param {*} resourcePath 源文件
+     * @param {*} folder 产物目录
+     * @param {'lvgl'|'png'} format
+     * @returns
+     */
+    translate(resourcePath: string, folder: string, format?: string): string | undefined;
+    /**
+     * 资源转换为 bin 文件路径
+     *
+     * 如果是 png, jpg，jpeg, webp, bmp，则转换为 .bin 后缀；其它类型不处理
+     *
+     * **此方法仅返回转换后的路径， 不会实际转换文件**
+     * @param {string} path
+     * @example assetsToBinPath('images/test.png') // images/test.bin
+     *
+     * @return {string} 可转则返回对应的 bin 路径；否则返回''
+     */
+    static assetsToBinPath(assetsPath: string): string;
+    /**
+     * 是否可转换
+     * @param {string} assetsPath
+     * @param {'lvgl'|'png'} format
+     * @returns
+     */
+    static canTranslate(assetsPath: string, format?: string): boolean;
+}
+export default ImageIcu;

package/lib/compiler/tools/icu/ImageIcu.js

@@ -0,0 +1,110 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _path = _interopRequireDefault(require("path"));
+var _os = _interopRequireDefault(require("os"));
+var _fs = _interopRequireDefault(require("fs"));
+var _child_process = require("child_process");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+class ImageIcu {
+  static EXT = '.bin';
+  static INCLUDE_LIST = ['.png', '.jpg', '.jpeg', '.webp', '.bmp'];
+  /**
+   * @private
+   * @returns
+   */
+  getBinPath() {
+    const platform = _os.default.platform();
+    const arch = _os.default.arch();
+    let result = _path.default.join(__dirname, `icu_${platform}_${arch}`);
+    if (platform === 'win32') {
+      result += '.exe';
+    }
+    return result;
+  }
+
+  /**
+   * 文件转换为 bin 格式
+   * @param {*} resourcePath 源文件
+   * @param {*} folder 产物目录
+   * @param {'lvgl'|'png'} format
+   * @returns
+   */
+  translate(resourcePath, folder) {
+    let format = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'lvgl';
+    if (!_fs.default.existsSync(resourcePath) || !ImageIcu.canTranslate(resourcePath)) {
+      return;
+    }
+    const binPath = this.getBinPath();
+    if (_fs.default.existsSync(binPath)) {
+      const pathParse = _path.default.parse(resourcePath);
+
+      // 后缀，lvgl格式的后缀为"bin", 其它保持原后缀
+      const extDic = {
+        lvgl: ImageIcu.EXT,
+        png: pathParse.ext
+      };
+      const ext = extDic[format];
+      if (!_fs.default.existsSync(folder)) {
+        _fs.default.mkdirSync(folder, {
+          recursive: true
+        });
+      }
+      const command = `${binPath} convert ${resourcePath} -O ${folder} -F ${format} -C i8 -r`;
+      const message = (0, _child_process.execSync)(command).toString('utf-8');
+      if (message) {
+        console.log(`convert error: path=${resourcePath} message=${message}`);
+        return '';
+      }
+      const result = _path.default.join(pathParse.dir, `${pathParse.name}${ext}`);
+      return result;
+    } else {
+      return resourcePath;
+    }
+  }
+
+  /**
+   * 资源转换为 bin 文件路径
+   *
+   * 如果是 png, jpg，jpeg, webp, bmp，则转换为 .bin 后缀；其它类型不处理
+   *
+   * **此方法仅返回转换后的路径， 不会实际转换文件**
+   * @param {string} path
+   * @example assetsToBinPath('images/test.png') // images/test.bin
+   *
+   * @return {string} 可转则返回对应的 bin 路径；否则返回''
+   */
+  static assetsToBinPath(assetsPath) {
+    if (!assetsPath) {
+      return '';
+    }
+    const pathParse = _path.default.parse(assetsPath);
+    if (ImageIcu.canTranslate(assetsPath)) {
+      return _path.default.join(pathParse.dir, `${pathParse.name}${ImageIcu.EXT}`);
+    }
+    return '';
+  }
+
+  /**
+   * 是否可转换
+   * @param {string} assetsPath
+   * @param {'lvgl'|'png'} format
+   * @returns
+   */
+  static canTranslate(assetsPath) {
+    let format = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'lvgl';
+    if (!assetsPath) {
+      return false;
+    }
+    const pathParse = _path.default.parse(assetsPath);
+    const ext = pathParse.ext.toLowerCase();
+    if (format === 'png') {
+      return ext === '.png';
+    }
+    return ImageIcu.INCLUDE_LIST.includes(ext);
+  }
+}
+var _default = exports.default = ImageIcu;

package/lib/config/UxConfig.js

@@ -78,11 +78,14 @@ class UxConfig {
     worker: _UxAfterCompile.default.symlinkNodeModule,
     workerDescribe: 'Create a soft link to the node_modules folder'
   }, {
-    worker: _UxAfterCompile.default.webpack,
-    workerDescribe: 'Compile the project using webpack'
+    worker: _UxAfterCompile.default.compileJavascript,
+    workerDescribe: 'Compile javascript project'
   }, {
     worker: _UxAfterCompile.default.copyResource,
     workerDescribe: 'Copy resource files'
+  }, {
+    worker: _UxAfterCompile.default.compressResource,
+    workerDescribe: 'Compress resource files'
   }, {
     worker: _UxAfterCompile.default.jsc,
     workerDescribe: 'Generate jsc bytecode'

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

@@ -23,6 +23,7 @@ export declare class UxFileUtils {
      *    1. TypeError: Error
      *    2. 其它: Warn
      * 2. 检查 router.entry 是否存在于 router.pages
+     * 3. 检查icon是否存在
      *
      * @param projectPath 项目路径
      * @param sourceRoot 源码路径--相对项目根目录
@@ -47,6 +48,9 @@ export declare class UxFileUtils {
      * @param newFileList 新文件列表
      * @returns
      */
-    static getDiffJSON(compilation: FileLaneCompilation, newFileList: string[], buildPath: string): string[];
+    static getDiffJSON(compilation: FileLaneCompilation, newFileList: string[], buildPath: string): {
+        path: string;
+        content: Buffer;
+    }[];
 }
 export default UxFileUtils;

package/lib/utils/ux/UxFileUtils.js

@@ -42,6 +42,7 @@ class UxFileUtils {
    *    1. TypeError: Error
    *    2. 其它: Warn
    * 2. 检查 router.entry 是否存在于 router.pages
+   * 3. 检查icon是否存在
    *
    * @param projectPath 项目路径
    * @param sourceRoot 源码路径--相对项目根目录
@@ -60,15 +61,25 @@ class UxFileUtils {
     const errors = _CommonUtil.default.validateJson(jsonData, schema) || [];
 
     // 2
-    const {
-      entry,
-      pages
-    } = jsonData.router;
-    if (!pages[entry]) {
-      errors.push(new TypeError(`router.entry content:  ${entry}, is missing in router.pages`));
+    if (jsonData.router) {
+      const {
+        entry,
+        pages
+      } = jsonData.router;
+      if (!pages[entry]) {
+        errors.push(new TypeError(`router.entry content:  ${entry}, is missing in router.pages`));
+      }
+    }
+
+    // 3
+    if (jsonData.icon) {
+      const iconPath = _path.default.join(projectPath, sourceRoot, jsonData.icon);
+      if (!_fsExtra.default.existsSync(iconPath)) {
+        errors.push(new Error(`icon: "${jsonData.icon}" is missing in project`));
+      }
     }
     if (errors?.length) {
-      const message = `Manifest.json error: ${errors.map((item, index) => {
+      const message = `error in ${path}: ${errors.map((item, index) => {
         return `\r\n${index + 1}. ${item.message}`;
       })}`;
       throw new Error(message);
@@ -124,16 +135,22 @@ class UxFileUtils {
       if (index !== -1) {
         // 1.2
         const oldContent = oldFileList[i].content?.toString('utf-8');
-        const newContent = _fsExtra.default.readFileSync(_path.default.join(buildPath, newFileList[index]), 'utf-8');
-        if (oldContent !== newContent) {
-          diffList.push(newFileList[index]);
+        const newContent = _fsExtra.default.readFileSync(_path.default.join(buildPath, newFileList[index]));
+        if (oldContent !== newContent.toString()) {
+          diffList.push({
+            path: newFileList[index],
+            content: newContent
+          });
         }
         // 从newFileList中移除该项
         newFileList.splice(index, 1);
       }
     }
     // 2.
-    newFileList.length > 0 && newFileList.forEach(file => diffList.push(file));
+    newFileList.length > 0 && newFileList.forEach(file => diffList.push({
+      path: file,
+      content: _fsExtra.default.readFileSync(_path.default.join(buildPath, file))
+    }));
     return diffList;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.5-beta.14",
+  "version": "2.0.5-beta.16",
   "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.5-beta.14",
-    "@aiot-toolkit/parser": "2.0.5-beta.14",
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.14",
+    "@aiot-toolkit/generator": "2.0.5-beta.16",
+    "@aiot-toolkit/parser": "2.0.5-beta.16",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.16",
     "@hap-toolkit/aaptjs": "^2.0.0",
-    "@rspack/core": "^1.1.8",
+    "@rspack/core": "^1.3.9",
     "aiot-parse5": "^1.0.2",
     "babel-loader": "^9.1.3",
-    "file-lane": "2.0.5-beta.14",
+    "file-lane": "2.0.5-beta.16",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "hap-toolkit": "^2.0.0",
@@ -35,7 +35,6 @@
     "lodash": "^4.17.21",
     "ts-morph": "^19.0.0",
     "url-loader": "^4.1.1",
-    "webpack": "^5.97.1",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-sources": "^3.2.3"
   },
@@ -44,5 +43,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "63c6564afe9bedd9c034f03e8e457b6cfa6960ae"
+  "gitHead": "66255b9d69f9b15db10283d662f94f3d1f2486c3"
 }