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

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -320,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

@@ -60,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/utils/ux/UxFileUtils.d.ts

@@ -48,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

@@ -135,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.15",
+  "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.15",
-    "@aiot-toolkit/parser": "2.0.5-beta.15",
-    "@aiot-toolkit/shared-utils": "2.0.5-beta.15",
+    "@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.3.9",
     "aiot-parse5": "^1.0.2",
     "babel-loader": "^9.1.3",
-    "file-lane": "2.0.5-beta.15",
+    "file-lane": "2.0.5-beta.16",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "hap-toolkit": "^2.0.0",
@@ -43,5 +43,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "6e39bae7f788a36a777e08545d862b87fab26a9b"
+  "gitHead": "66255b9d69f9b15db10283d662f94f3d1f2486c3"
 }