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

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -29,9 +29,10 @@ class UxAfterCompile {
   static compileJavascript = async params => {
     const {
       context,
-      compilerOption
+      compilerOption,
+      onLog
     } = params;
-    return new _JavascriptCompiler.default().compile({
+    return new _JavascriptCompiler.default(context, onLog).compile({
       projectPath: _path.default.join(context.projectPath, context.output),
       mode: _CompileMode.default.DEVELOPMENT,
       devtool: false,

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

@@ -1,9 +1,23 @@
+import { ILog } from '@aiot-toolkit/shared-utils';
+import { IFileLaneContext } from 'file-lane';
 import ICompileParam from '../interface/ICompileParam';
 import ICompiler from '../interface/ICompiler';
 import IJavascriptCompileOption from './interface/IJavascriptCompileOption';
 declare class JavascriptCompiler implements ICompiler {
+    private readonly context;
+    private readonly onLog?;
     readonly QUICKAPP_CONFIG = "quickapp.config.js";
+    constructor(context: IFileLaneContext, onLog?: ((log: ILog[]) => void) | undefined);
     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

@@ -8,12 +8,17 @@ var _sharedUtils = require("@aiot-toolkit/shared-utils");
 var _core = require("@rspack/core");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _path = _interopRequireDefault(require("path"));
+var _CompileMode = _interopRequireDefault(require("../enum/CompileMode"));
 var _AndroidWebpackConfigurator = _interopRequireDefault(require("./android/AndroidWebpackConfigurator"));
 var _VelaWebpackConfigurator = _interopRequireDefault(require("./vela/VelaWebpackConfigurator"));
 var _UxCompileUtil = _interopRequireDefault(require("./vela/utils/UxCompileUtil"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 class JavascriptCompiler {
   QUICKAPP_CONFIG = 'quickapp.config.js';
+  constructor(context, onLog) {
+    this.context = context;
+    this.onLog = onLog;
+  }
   async compile(param) {
     return new Promise(async (resolve, reject) => {
       try {
@@ -49,6 +54,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) {
@@ -82,17 +146,39 @@ class JavascriptCompiler {
         rules: [{
           test: /\.ux$/,
           // 匹配以 .ux 结尾的文件
+          exclude: /node_modules/,
           use: [{
             loader: _path.default.join(__dirname, '../javascript/vela/utils/webpackLoader/extractMapData.js')
           }]
+        },
+        // node_modules下的ux文件
+        {
+          test: /\.ux$/,
+          include: /node_modules/,
+          use: [{
+            loader: _path.default.join(__dirname, '../javascript/vela/utils/webpackLoader/WebpackUxLoader'),
+            options: {
+              compileParam: param,
+              context: this.context,
+              onLog: this.onLog
+            }
+          }]
+        }, {
+          test: /\.js$/,
+          include: /node_modules/,
+          use: [{
+            loader: _path.default.join(__dirname, '../javascript/vela/utils/webpackLoader/WebpackJsLoader'),
+            options: {
+              compileParam: param,
+              context: this.context,
+              onLog: this.onLog
+            }
+          }]
         }]
       },
       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

@@ -1,6 +1,6 @@
 import ICompileParam from '../../interface/ICompileParam';
 import BuildNameFormatType from '../vela/enum/BuildNameFormatType';
-export default interface IJavascriptCompileOption extends ICompileParam {
+interface IJavascriptCompileOption extends ICompileParam {
     devtool?: string | false;
     /**
      * 源码路径(相对项目根目录)
@@ -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;
     /**
      * 获取远程证书
      */
@@ -74,3 +85,4 @@ export default interface IJavascriptCompileOption extends ICompileParam {
         certificate: Buffer;
     }>;
 }
+export default IJavascriptCompileOption;

package/lib/compiler/javascript/interface/IJavascriptCompileOption.js

@@ -1 +1,5 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/compiler/javascript/vela/plugin/WrapPlugin.js

@@ -33,8 +33,7 @@ class WrapPlugin {
         const source = compilation.assets[entry];
         const isApp = entry === 'app.js';
         const createFuncnName = isApp ? 'createAppHandler' : 'createPageHandler';
-        compilation.assets[entry] = new _webpackSources.ConcatSource(`
-        export default function(global, globalThis, window, $app_exports$, $app_evaluate$){
+        compilation.assets[entry] = new _webpackSources.ConcatSource(`export default function(global, globalThis, window, $app_exports$, $app_evaluate$){
           var org_app_require = $app_require$;
         
           (function(global, globalThis, window, $app_exports$, $app_evaluate$){

package/lib/compiler/javascript/vela/utils/webpackLoader/IWebpackLoaderOption.d.ts

@@ -0,0 +1,11 @@
+import { IFileLaneContext } from 'file-lane';
+import IJavascriptCompileOption from '../../../interface/IJavascriptCompileOption';
+import { ILog } from '@aiot-toolkit/shared-utils';
+/**
+ * IWebpackLoaderOption
+ */
+export default interface IWebpackLoaderOption {
+    compileParam: IJavascriptCompileOption;
+    context: IFileLaneContext;
+    onLog: (log: ILog[]) => void;
+}

package/lib/compiler/javascript/vela/utils/webpackLoader/IWebpackLoaderOption.js

@@ -0,0 +1 @@
+"use strict";

package/lib/compiler/javascript/vela/utils/webpackLoader/WebpackJsLoader.d.ts

@@ -0,0 +1,2 @@
+import { LoaderContext } from '@rspack/core';
+export default function (this: LoaderContext<any>, source: string): Promise<void>;

package/lib/compiler/javascript/vela/utils/webpackLoader/WebpackJsLoader.js

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+var _parser = require("@aiot-toolkit/parser");
+var _sharedUtils = require("@aiot-toolkit/shared-utils");
+async function _default(source) {
+  const callback = this.async();
+  const options = this.getOptions();
+  const {
+    context,
+    onLog,
+    compileParam
+  } = options;
+  const result = await new _parser.ScriptToTypescript({
+    filePath: this.resourcePath,
+    content: source,
+    projectPath: this.rootContext,
+    onLog: log => onLog?.([log]),
+    projectType: _sharedUtils.ProjectType.VELA_UX
+  }, compileParam, context).translate({
+    content: source
+  }, []);
+  callback(null, result.targetTree.getFullText());
+}

package/lib/compiler/javascript/vela/utils/webpackLoader/WebpackUxLoader.d.ts

@@ -0,0 +1,2 @@
+import { LoaderContext } from '@rspack/core';
+export default function (this: LoaderContext<any>, source: string): Promise<void>;

package/lib/compiler/javascript/vela/utils/webpackLoader/WebpackUxLoader.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = _default;
+var _UxLoaderUtils = _interopRequireDefault(require("../../../../../utils/ux/UxLoaderUtils"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+async function _default(source) {
+  const options = this.getOptions();
+  const {
+    onLog,
+    compileParam,
+    context
+  } = options;
+  const callback = this.async();
+  const {
+    files: compiledFiles,
+    logs
+  } = await _UxLoaderUtils.default.compileUxToJavascript({
+    path: this.resourcePath,
+    content: source
+  }, context, false, compileParam);
+  onLog?.(logs);
+  callback(null, compiledFiles[0].content, compiledFiles[1].content);
+}

package/lib/utils/ux/ManifestSchema.js

@@ -9,13 +9,16 @@ const ManifestSchema = {
   required: ['package', 'name', 'icon', 'versionCode', 'config', 'router'],
   properties: {
     package: {
-      type: 'string'
+      type: 'string',
+      minLength: 1
     },
     name: {
-      type: 'string'
+      type: 'string',
+      minLength: 1
     },
     icon: {
-      type: 'string'
+      type: 'string',
+      minLength: 1
     },
     banner: {
       type: 'string'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.5-beta.15",
+  "version": "2.0.5-beta.17",
   "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.17",
+    "@aiot-toolkit/parser": "2.0.5-beta.17",
+    "@aiot-toolkit/shared-utils": "2.0.5-beta.17",
     "@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.17",
     "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": "1cff047e2550e845444857b475d63a01b8705768"
 }