npm - @aiot-toolkit/aiotpack - Versions diffs - 2.0.2-beta.4 → 2.0.2-beta.5 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

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

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

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

@@ -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/utils/ux/UxLoaderUtils.js CHANGED Viewed

@@ -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');
 /**
@@ -85,9 +86,25 @@ class UxLoaderUtils {
                     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')`;
@@ -96,7 +113,7 @@ class UxLoaderUtils {
                 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$;`,
@@ -104,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$) {`,
@@ -131,7 +148,8 @@ class UxLoaderUtils {
                     {
                         path: FileUtil_1.default.updatePath(filePath, `${name}.js.map`),
                         content: sourceMap.toString()
-                    }
+                    },
+                    ...ImageResources
                 ],
                 logs
             };

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.2-beta.4",
+  "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.4",
-    "@aiot-toolkit/parser": "2.0.2-beta.4",
+    "@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.4",
+    "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": "656add8e64d8101b9f3886957c5b9ae23e2e854f"
+  "gitHead": "8c18753992c453c6569a3125378e75fbf4760a1f"
 }