@aiot-toolkit/aiotpack 2.0.2-beta.3 → 2.0.2-beta.5

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

@@ -36,9 +36,17 @@ export default interface IJavascriptCompileOption extends ICompileParam {
     /**
      * 禁用 jsc
      */
-    disabledJSC?: boolean;
+    disabledJsc?: boolean;
     /**
      * 启用 protobuf
      */
     enableProtobuf?: boolean;
+    /**
+     * 启用应用自动化测试
+     */
+    enableE2e?: boolean;
+    /**
+     * 启用代码体积分析，会生成 report.html 文件，可查看打包后各模块占用体积
+     */
+    enableStats?: boolean;
 }

package/lib/compiler/javascript/vela/VelaWebpackConfigurator.js

@@ -10,10 +10,20 @@ const WrapPlugin_1 = __importDefault(require("./plugin/WrapPlugin"));
 const UxCompileUtil_1 = __importDefault(require("./utils/UxCompileUtil"));
 class VelaWebpackConfigurator {
     createPlugins() {
-        return [
+        const result = [
             // 给 入口js 添加包裹
             new WrapPlugin_1.default()
         ];
+        // 如果开启 stats 参数，则添加 webpack-bundle-analyzer 插件
+        if (this.param.enableStats) {
+            const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
+            result.push(new BundleAnalyzerPlugin({
+                analyzerMode: 'static',
+                openAnalyzer: false,
+                excludeAssets: /^@(system|service)\./
+            }));
+        }
+        return result;
     }
     /**
      * 通过读取 manifest.json 生成 entry
@@ -40,7 +50,6 @@ class VelaWebpackConfigurator {
                     {
                         loader: require.resolve('babel-loader'),
                         options: {
-                            // configFile: getBabelConfigJsPath(cwd),
                             cwd: this.param.projectPath,
                             cacheDirectory: true
                         }

package/lib/config/UxConfig.d.ts

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

package/lib/followWorks/ux/UxFollowWorks.js

@@ -78,7 +78,7 @@ UxFollowWorks.protobuf = (context, config, compilerOption) => __awaiter(void 0,
     }
 });
 UxFollowWorks.jsc = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
-    if (compilerOption && compilerOption.disabledJSC === false) {
+    if (compilerOption && compilerOption.disabledJsc === false) {
         return new Jsc_1.default(context.projectPath, path_1.default.join(context.projectPath, context.output, compilerOption.outputPath)).jsc();
     }
 });

package/lib/loader/ux/JsLoader.d.ts

@@ -1,9 +1,11 @@
 import { IFileLaneContext, IFileParam, ILoader } from 'file-lane';
+import IJavascriptCompileOption from '../../compiler/javascript/interface/IJavascriptCompileOption';
 /**
  * JsLoader
  */
 declare class JsLoader implements ILoader {
     context: IFileLaneContext;
+    compilerOption: IJavascriptCompileOption;
     parser(files: IFileParam<any>[]): IFileParam<any>[] | Promise<IFileParam<any>[]>;
 }
 export default JsLoader;

package/lib/loader/ux/JsLoader.js

@@ -27,7 +27,7 @@ class JsLoader {
             };
             return {
                 path: item.path,
-                content: new ScriptToTypescript_1.default(project, options)
+                content: new ScriptToTypescript_1.default(project, options, this.compilerOption)
                     .translate({
                     content: new ScriptParser_1.default(options).parser(item.content.toString()).ast.content
                 }, [])

package/lib/utils/ux/UxLoaderUtils.js

@@ -40,10 +40,11 @@ const UxParser_1 = __importDefault(require("@aiot-toolkit/parser/lib/ux/parser/U
 const UxToTypescript_1 = __importDefault(require("@aiot-toolkit/parser/lib/ux/translate/vela/UxToTypescript"));
 const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
 const FileUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/FileUtil"));
-const StringUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/StringUtil"));
 const parse5 = __importStar(require("parse5"));
 const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
 const ts_morph_1 = require("ts-morph");
+const CommonUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/CommonUtil"));
 const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/BinaryPlugin');
 const { extractFunctions } = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobuf/protobufControl');
 /**
@@ -74,28 +75,45 @@ class UxLoaderUtils {
                     logs
                 };
             }
+            // 区分页面组件和子组件
+            const isPageUx = UxLoaderUtils.isPageUx(context, filePath);
             // 配置转换参数
             const options = {
                 projectPath: context.projectPath,
                 filePath,
+                fileType: isAppUx ? 'app' : isPageUx ? 'page' : '',
                 onLog: (log) => {
                     logs.push(log);
                 }
             };
+            // 收集图片资源
+            const ImageResources = [];
+            const collectImageResource = (originFilePath) => {
+                const assetDir = 'dynamicAssets';
+                const sourcePath = path_1.default.resolve(options.projectPath, compilerOption.sourceRoot);
+                const assetPath = path_1.default.resolve(sourcePath, assetDir);
+                const { name, ext } = path_1.default.parse(originFilePath);
+                const hashName = CommonUtil_1.default.calcImageDigest(originFilePath);
+                const newFilePath = path_1.default.join(assetPath, `${name}-${hashName}${ext}`);
+                const relativePath = path_1.default.posix.sep + path_1.default.relative(sourcePath, newFilePath);
+                ImageResources.push({
+                    path: newFilePath,
+                    content: fs_extra_1.default.readFileSync(originFilePath)
+                });
+                return relativePath;
+            };
             // 开始转换
             const globalVar = ('globalVar' in context && context.globalVar) || {};
-            const parserResult = yield new UxParser_1.default(options, globalVar).parser(content.toString(), fullName);
+            const parserResult = yield new UxParser_1.default(options, compilerOption, globalVar, collectImageResource).parser(content.toString(), fullName);
             // 区分app.ux和一般ux
             // app.ux解析结果中加上manifest.json的内容
             const manifestJson = `require('./manifest.json')`;
-            // 区分页面组件和子组件
-            const isPageUx = UxLoaderUtils.isPageUx(context, filePath);
             const integrateFunction = (appImport, appStyleTree, appTemplateTree, appScriptTree) => {
                 // script代码放在第三个位置不能变化，影响更新source map
                 return isAppUx
                     ? [
                         `${appImport.join('\n')}`,
-                        `var $app_style$ = ${UxLoaderUtils.wrapStyle(StringUtil_1.default.arrayTostring(appStyleTree, true), file, compilerOption)}`,
+                        `var $app_style$ = ${UxLoaderUtils.wrapStyle(JSON.stringify(appStyleTree), file, compilerOption)}`,
                         `var $app_script$ = ${UxLoaderUtils.handleScriptContent(false, appScriptTree)}\n`,
                         `$app_script$({}, $app_exports$, $app_require$);\n\n`,
                         `$app_exports$.default.style = $app_style$;`,
@@ -103,7 +121,7 @@ class UxLoaderUtils {
                     ]
                     : [
                         `${appImport.join('\n')}`,
-                        `var $app_style$ = ${UxLoaderUtils.wrapStyle(StringUtil_1.default.arrayTostring(appStyleTree, true), file, compilerOption)}\n`,
+                        `var $app_style$ = ${UxLoaderUtils.wrapStyle(JSON.stringify(appStyleTree), file, compilerOption)}\n`,
                         `var $app_script$ = ${UxLoaderUtils.handleScriptContent(isPageUx, appScriptTree)}`,
                         `var $app_template$ = ${UxLoaderUtils.wrapTempalte(appTemplateTree, file, compilerOption)}\n`,
                         `${UxLoaderUtils.getReturnType(isPageUx)} function ($app_exports$) {`,
@@ -130,7 +148,8 @@ class UxLoaderUtils {
                     {
                         path: FileUtil_1.default.updatePath(filePath, `${name}.js.map`),
                         content: sourceMap.toString()
-                    }
+                    },
+                    ...ImageResources
                 ],
                 logs
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.2-beta.3",
+  "version": "2.0.2-beta.5",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,13 +19,13 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.2-beta.3",
-    "@aiot-toolkit/parser": "2.0.2-beta.3",
+    "@aiot-toolkit/generator": "2.0.2-beta.5",
+    "@aiot-toolkit/parser": "2.0.2-beta.5",
     "@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-beta.3",
+    "file-lane": "2.0.2-beta.5",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^7.2.2",
@@ -33,11 +33,13 @@
     "source-map": "^0.7.4",
     "url-loader": "^4.1.1",
     "webpack": "^5.89.0",
+    "webpack-bundle-analyzer": "^4.10.1",
     "webpack-sources": "^3.2.3"
   },
   "devDependencies": {
+    "@types/fs-extra": "^11.0.4",
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "8bfdd8895ffd8fc4aa1465779def5ab4392a7a4b"
+  "gitHead": "8c18753992c453c6569a3125378e75fbf4760a1f"
 }