@aiot-toolkit/aiotpack 2.0.2-beta.17 → 2.0.2-beta.18

package/lib/compiler/javascript/JavascriptCompiler.js

@@ -87,6 +87,15 @@ class JavascriptCompiler {
                     }
                 ]
             },
+            optimization: {
+                minimizer: [
+                    new core_1.rspack.SwcJsMinimizerRspackPlugin({
+                        minimizerOptions: {
+                            module: true
+                        }
+                    })
+                ]
+            },
             resolve: {
                 extensions: ['.js', '.ts', '.ux']
             },

package/lib/compiler/javascript/vela/model/Package.d.ts

@@ -63,6 +63,7 @@ declare class Package {
      * @returns
      */
     include(filePath: string): boolean;
+    getResource(filePath: string): IFileResource | undefined;
     /**
      * 添加资源
      * @param data

package/lib/compiler/javascript/vela/model/Package.js

@@ -27,6 +27,9 @@ class Package {
     include(filePath) {
         return this.resourceDic[filePath];
     }
+    getResource(filePath) {
+        return this.resourceList.find((item) => item.fileBuildPath === filePath);
+    }
     /**
      * 添加资源
      * @param data

package/lib/compiler/javascript/vela/utils/ZipUtil.d.ts

@@ -2,6 +2,7 @@ import { Dictionary } from '@aiot-toolkit/shared-utils';
 import JSZip from 'jszip';
 import IJavascriptCompileOption from '../../interface/IJavascriptCompileOption';
 import IManifest from '../interface/IManifest';
+import Package from '../model/Package';
 /**
  * Zip 用于将打包成功的 build 目录按特定规则压缩成 rpk
  *
@@ -51,7 +52,9 @@ declare class ZipUtil {
      * @param files
      * @returns
      */
-    private static createPackagesDefinition;
+    static createPackagesDefinition(param: IJavascriptCompileOption, config: IManifest, files: string[]): Promise<{
+        fullPackage: Package;
+    }>;
     /**
      * 获取有序的文件列表
      *

package/lib/compiler/javascript/vela/utils/ZipUtil.js

@@ -54,10 +54,9 @@ class ZipUtil {
             }
             // 2
             const { fullPackage } = yield this.createPackagesDefinition(param, config, files);
-            const zipBuffer = yield this.packageToZipBuffer(fullPackage);
             // 生产出带签名的rpk文件buffer
             const signConfig = SignUtil_1.default.getProjectSignConfig(param);
-            const rpkBuffer = yield _a.buildProjectAndOutput(zipBuffer, signConfig);
+            const rpkBuffer = yield _a.buildProjectAndOutput(fullPackage, signConfig);
             // 3
             this.generateDistFile(rpkBuffer, param, this.getFileName(param, config, 'rpk'));
         });
@@ -241,12 +240,12 @@ class ZipUtil {
      * @param signConfig 证书信息
      * @returns
      */
-    static buildProjectAndOutput(zipBuffer, signConfig) {
+    static buildProjectAndOutput(target, signConfig) {
         return __awaiter(this, void 0, void 0, function* () {
-            let result = zipBuffer;
+            let result;
             if (signConfig) {
                 const { privatekey, certificate } = signConfig;
-                const fullPackageBuffer = yield SignUtil_1.default.signZipBufferForPackage(zipBuffer, privatekey, certificate);
+                const fullPackageBuffer = yield SignUtil_1.default.signPackage(target, privatekey, certificate);
                 if (fullPackageBuffer === false) {
                     shared_utils_1.ColorConsole.throw('Fullpackage signature failed');
                 }
@@ -254,6 +253,9 @@ class ZipUtil {
                     result = fullPackageBuffer;
                 }
             }
+            if (!result) {
+                result = yield this.packageToZipBuffer(target);
+            }
             return result;
         });
     }

package/lib/compiler/javascript/vela/utils/signature/SignUtil.d.ts

@@ -1,4 +1,5 @@
 import IJavascriptCompileOption from '../../../interface/IJavascriptCompileOption';
+import Package from '../../model/Package';
 /**
  * SignUtil
  */
@@ -15,16 +16,15 @@ declare class SignUtil {
     /**
      * 对二进制zipBuffer签名
      *
-     * 1. 解压 zip 流，获取文件列表
-     * 2. 对`META-INF/CERT`做签名，并生成新的`META-INF/CERT` buffer
-     * 3. "新`META-INF/CERT` + 其它文件"生成新的 zipBuffer
-     * 4. 对“新zipBuffer”，做整体签名
+     * 1. 对`META-INF/CERT`做签名，并生成新的`META-INF/CERT` buffer
+     * 2. "新`META-INF/CERT` + 其它文件"生成新的 zipBuffer
+     * 3. 对“新zipBuffer”，做整体签名
      * @param zipBuffer
      * @param privatekey
      * @param certificate
      * @returns
      */
-    static signZipBufferForPackage(zipBuffer: Buffer, privatekey: Buffer, certificate: Buffer): Promise<false | Buffer>;
+    static signPackage(target: Package, privatekey: Buffer, certificate: Buffer): Promise<false | Buffer>;
     /**
      * 根据ZIP流获取文件实例
      *

package/lib/compiler/javascript/vela/utils/signature/SignUtil.js

@@ -99,24 +99,25 @@ class SignUtil {
     /**
      * 对二进制zipBuffer签名
      *
-     * 1. 解压 zip 流，获取文件列表
-     * 2. 对`META-INF/CERT`做签名，并生成新的`META-INF/CERT` buffer
-     * 3. "新`META-INF/CERT` + 其它文件"生成新的 zipBuffer
-     * 4. 对“新zipBuffer”，做整体签名
+     * 1. 对`META-INF/CERT`做签名，并生成新的`META-INF/CERT` buffer
+     * 2. "新`META-INF/CERT` + 其它文件"生成新的 zipBuffer
+     * 3. 对“新zipBuffer”，做整体签名
      * @param zipBuffer
      * @param privatekey
      * @param certificate
      * @returns
      */
-    static signZipBufferForPackage(zipBuffer, privatekey, certificate) {
+    static signPackage(target, privatekey, certificate) {
         return __awaiter(this, void 0, void 0, function* () {
-            // 1
-            const zipInstWrap = yield SignUtil.createFileListFromZipBuffer(zipBuffer);
+            var _a;
+            const getFileBuffer = (path) => {
+                return target.getResource(path);
+            };
             // 摘要 和 文件列表
             const fileDigestHash = [];
             const fileList = [];
-            // 2.1
-            const metaBuffer = zipInstWrap.getFileBuffer(ZipUtil_1.default.CERT_PATH);
+            // 1
+            const metaBuffer = (_a = getFileBuffer(ZipUtil_1.default.CERT_PATH)) === null || _a === void 0 ? void 0 : _a.fileContentBuffer;
             if (metaBuffer) {
                 const metaHash = {
                     name: ZipUtil_1.default.DIGEST_HASH_JSON,
@@ -138,9 +139,17 @@ class SignUtil {
                     });
                 }
             }
-            // 2.2
-            const files = zipInstWrap.fileList;
-            files.filter(SignUtil.fileFilter).map((item) => {
+            // 2
+            const files = target.resourceList;
+            files
+                .map((item) => {
+                return {
+                    path: item.fileBuildPath,
+                    content: item.fileContentBuffer
+                };
+            })
+                .filter(SignUtil.fileFilter)
+                .map((item) => {
                 fileList.push(item);
                 fileDigestHash.push({
                     name: item.path,
@@ -148,8 +157,8 @@ class SignUtil {
                 });
             });
             // 因为META变化，重新创建ZIP流
-            const newZipBuffer = yield ZipUtil_1.default.createZipBufferFromFileList(fileList, zipInstWrap.comment);
-            // 对新ZIP流重新签名
+            const newZipBuffer = yield ZipUtil_1.default.createZipBufferFromFileList(fileList, target.comment);
+            // 3
             const signedZipBuffer = SignUtil.doSign(newZipBuffer, fileDigestHash, privatekey, certificate);
             if (signedZipBuffer === false) {
                 // 签名失败

package/lib/loader/ux/vela/UxLoader.js

@@ -23,7 +23,15 @@ class UxLoader {
             for (const file of files) {
                 // 转换每个文件
                 const { files: compiledFiles, logs } = yield UxLoaderUtils_1.default.compileUxToJavascript(file, this.context, false, this.compilerOption);
-                shared_utils_1.CommonUtil.processingLogsInTerminal(logs.map((item) => (Object.assign(Object.assign({}, item), { filePath: item.filePath ? path_1.default.relative(projectPath, item.filePath) : '' }))));
+                // style报错中，@import导入的文件报错路径存储在item.position.source中
+                shared_utils_1.CommonUtil.processingLogsInTerminal(logs.map((item) => {
+                    var _a;
+                    return (Object.assign(Object.assign({}, item), { filePath: ((_a = item.position) === null || _a === void 0 ? void 0 : _a.source)
+                            ? item.position.source
+                            : item.filePath
+                                ? path_1.default.relative(projectPath, item.filePath)
+                                : '' }));
+                }));
                 resultFiles.push(...compiledFiles);
             }
             return resultFiles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.2-beta.17",
+  "version": "2.0.2-beta.18",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,16 +19,16 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.2-beta.17",
-    "@aiot-toolkit/parser": "2.0.2-beta.17",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.17",
+    "@aiot-toolkit/generator": "2.0.2-beta.18",
+    "@aiot-toolkit/parser": "2.0.2-beta.18",
+    "@aiot-toolkit/shared-utils": "2.0.2-beta.18",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.0.0",
     "aiot-parse5": "^1.0.0",
     "archiver": "^7.0.1",
     "babel-loader": "^9.1.3",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2-beta.17",
+    "file-lane": "2.0.2-beta.18",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -45,5 +45,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "4b2b3395e77e91b0c00a524dcf89b9dc0db689bf"
+  "gitHead": "b73a79ef04edac808f316bf8b8fb1718422daa1c"
 }