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

package/lib/afterCompile/ux/UxAfterCompile.d.ts

@@ -15,6 +15,13 @@ declare class UxAfterCompile {
      * @param compilerOption
      */
     static copyResource: FollowWork<IJavascriptCompileOption>;
+    /**
+     * 对比 临时项目build文件夹 和 项目build文件夹，生成diff.json
+     * @param context
+     * @param config
+     * @param compilerOption
+     */
+    static generateDiff: FollowWork<IJavascriptCompileOption>;
     /**
      * 打包结果移回源码项目，并删除中间项目
      *

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -30,7 +30,8 @@ const BinaryPlugin = require('@aiot-toolkit/parser/lib/ux/translate/vela/protobu
 class UxAfterCompile {
 }
 _a = UxAfterCompile;
-UxAfterCompile.webpack = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+UxAfterCompile.webpack = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const { context, compilerOption } = params;
     return new JavascriptCompiler_1.default()
         .compile(Object.assign(Object.assign({ projectPath: path_1.default.join(context.projectPath, context.output), mode: CompileMode_1.default.DEVELOPMENT, devtool: false, platform: 'vela' }, JavascriptDefaultCompileOption_1.default), compilerOption))
         .then(() => {
@@ -68,17 +69,20 @@ UxAfterCompile.webpack = (context, config, compilerOption) => __awaiter(void 0,
         }
     });
 });
-UxAfterCompile.protobuf = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+UxAfterCompile.protobuf = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const { compilerOption } = params;
     if (compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.enableProtobuf) {
         BinaryPlugin.createBinFiles();
     }
 });
-UxAfterCompile.jsc = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+UxAfterCompile.jsc = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const { context, compilerOption } = params;
     if (compilerOption && compilerOption.enableJsc === true) {
         return new Jsc_1.default(context.projectPath, path_1.default.join(context.projectPath, context.output, compilerOption.outputPath)).jsc();
     }
 });
-UxAfterCompile.toRpk = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+UxAfterCompile.toRpk = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const { compilerOption } = params;
     if (compilerOption) {
         return ZipUtil_1.default.createRpk(path_1.default.join(compilerOption.projectPath, compilerOption.outputPath), compilerOption);
     }
@@ -89,7 +93,8 @@ UxAfterCompile.toRpk = (context, config, compilerOption) => __awaiter(void 0, vo
  * @param config
  * @param compilerOption
  */
-UxAfterCompile.copyResource = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+UxAfterCompile.copyResource = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const { context, compilerOption } = params;
     const genDeviceManifests = (compilerOption) => {
         const { projectPath, sourceRoot, outputPath } = compilerOption;
         const manifest = fs_extra_1.default.readJSONSync(path_1.default.join(projectPath, sourceRoot, 'manifest.json'));
@@ -197,6 +202,24 @@ UxAfterCompile.copyResource = (context, config, compilerOption) => __awaiter(voi
         yield genMetaFiles(compilerOption);
     }
 });
+/**
+ * 对比 临时项目build文件夹 和 项目build文件夹，生成diff.json
+ * @param context
+ * @param config
+ * @param compilerOption
+ */
+UxAfterCompile.generateDiff = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const { compilerOption, compalition } = params;
+    if (!compilerOption || !compalition) {
+        return;
+    }
+    const { outputPath, projectPath } = compilerOption;
+    // 读取临时项目build文件夹中所有文件路径
+    const tempBuildPath = path_1.default.join(projectPath, outputPath);
+    // 待优化，map文件跟随源文件变化，与时间戳有关文件无需对比
+    const tempFileList = shared_utils_1.FileUtil.readAlldirSync(tempBuildPath).map((filePath) => path_1.default.relative(tempBuildPath, filePath));
+    UxFileUtils_1.default.getDiffJSON(compalition, tempFileList, tempBuildPath);
+});
 /**
  * 打包结果移回源码项目，并删除中间项目
  *
@@ -206,7 +229,8 @@ UxAfterCompile.copyResource = (context, config, compilerOption) => __awaiter(voi
  * @param config
  * @param compilerOption
  */
-UxAfterCompile.moveBackResult = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+UxAfterCompile.moveBackResult = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const { context, compilerOption } = params;
     if (!compilerOption) {
         return;
     }
@@ -232,7 +256,8 @@ UxAfterCompile.moveBackResult = (context, config, compilerOption) => __awaiter(v
  * @param config
  * @param compilerOption
  */
-UxAfterCompile.symlinkNodeModule = (context, config, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+UxAfterCompile.symlinkNodeModule = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const { context, compilerOption } = params;
     if (!compilerOption) {
         return;
     }

package/lib/afterCompile/xts/entryTemplate.js

@@ -122,11 +122,12 @@ exports.XtsEntryFileName = '__entry__.ts';
  * 生成 __entry__.ts 文件
  * @param context
  */
-const generateEntryFile = function generateEntryFile(context, _, compilerOptions) {
-    var _a, _b;
+const generateEntryFile = function generateEntryFile(params) {
     return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const { context, compilerOption } = params;
         const { projectPath, output } = context;
-        if ((_a = compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.skip) === null || _a === void 0 ? void 0 : _a.includes('xts2ts')) {
+        if ((_a = compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.skip) === null || _a === void 0 ? void 0 : _a.includes('xts2ts')) {
             shared_utils_1.ColorConsole.info(`### skip generate entry file due to --skip xts2ts}`);
             return;
         }

package/lib/afterCompile/xts/generateRpk.js

@@ -40,10 +40,11 @@ const path_1 = __importDefault(require("path"));
 const XtsFollowWorks_1 = __importDefault(require("../../utils/xts/XtsFollowWorks"));
 const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const ts2wasm_1 = require("./ts2wasm");
-const generateRpk = (context, _, compilerOptions) => __awaiter(void 0, void 0, void 0, function* () {
+const generateRpk = (params) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    if ((_a = compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.skip) === null || _a === void 0 ? void 0 : _a.includes('package')) {
-        shared_utils_1.ColorConsole.info(`### skip package due to --skip ${compilerOptions.skip.join(',')}`);
+    const { context, compilerOption } = params;
+    if ((_a = compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.skip) === null || _a === void 0 ? void 0 : _a.includes('package')) {
+        shared_utils_1.ColorConsole.info(`### skip package due to --skip ${compilerOption.skip.join(',')}`);
         return;
     }
     const manifestPath = path_1.default.resolve(context.projectPath, 'app', 'manifest.json');

package/lib/afterCompile/xts/ts2wasm.js

@@ -24,8 +24,9 @@ exports.wasmPackageName = 'wasmUnpacked';
  * 将 __entry__.ts 文件打包成 warm 文件
  * @param context
  */
-const ts2wasm = (context, _, compilerOptions) => __awaiter(void 0, void 0, void 0, function* () {
+const ts2wasm = (params) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
+    const { context, compilerOption } = params;
     /** 1. 生成 app.wasm 文件 */
     const { projectPath, output } = context;
     const buildDir = path_1.default.resolve(projectPath, output);
@@ -43,8 +44,8 @@ const ts2wasm = (context, _, compilerOptions) => __awaiter(void 0, void 0, void
         });
         shared_utils_1.ColorConsole.info(`### ts2wasm ### ${res.toString()}`);
     }
-    if ((_a = compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.skip) === null || _a === void 0 ? void 0 : _a.includes('ts2wasm')) {
-        shared_utils_1.ColorConsole.info(`### skip compile ts to wasm due to --skip ${compilerOptions === null || compilerOptions === void 0 ? void 0 : compilerOptions.skip.join(',')}`);
+    if ((_a = compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.skip) === null || _a === void 0 ? void 0 : _a.includes('ts2wasm')) {
+        shared_utils_1.ColorConsole.info(`### skip compile ts to wasm due to --skip ${compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.skip.join(',')}`);
     }
     else {
         compile();

package/lib/afterWorks/ux/UxAfterWorks.js

@@ -8,18 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const file_lane_1 = require("file-lane");
-const fs_extra_1 = __importDefault(require("fs-extra"));
 class UxAfterWorks {
     static cleanOutput(context) {
         return __awaiter(this, void 0, void 0, function* () {
             const outputPath = file_lane_1.FileLaneUtil.getOutputPath(context);
-            // 建议在支持es写法后使用del库替换fs
-            fs_extra_1.default.removeSync(outputPath);
+            shared_utils_1.FileUtil.del(outputPath);
         });
     }
 }

package/lib/beforeCompile/ux/UxBeforeCompile.js

@@ -20,11 +20,11 @@ const UxFileUtils_1 = __importDefault(require("../../utils/ux/UxFileUtils"));
 class UxBeforeCompile {
 }
 _a = UxBeforeCompile;
-UxBeforeCompile.validateManifest = (context) => __awaiter(void 0, void 0, void 0, function* () {
+UxBeforeCompile.validateManifest = (_b) => __awaiter(void 0, [_b], void 0, function* ({ context }) {
     const { projectPath } = context;
     return UxFileUtils_1.default.validateManifest(projectPath);
 });
-UxBeforeCompile.validateSitemap = (context) => __awaiter(void 0, void 0, void 0, function* () {
+UxBeforeCompile.validateSitemap = (_b) => __awaiter(void 0, [_b], void 0, function* ({ context }) {
     const { projectPath } = context;
     UxFileUtils_1.default.validateSitemap(projectPath);
 });

package/lib/beforeCompile/xts/preInstall.js

@@ -17,8 +17,9 @@ const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const preInstall = (context, _, __, compilerOption) => __awaiter(void 0, void 0, void 0, function* () {
+const preInstall = (params) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
+    const { context, compilerOption } = params;
     if ((_a = compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.skip) === null || _a === void 0 ? void 0 : _a.includes('install')) {
         shared_utils_1.ColorConsole.info(`### skip install pre-dependencies due to --skip ${compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.skip.join(',')}`);
         return;

package/lib/beforeWorks/ux/UxBeforeWorks.js

@@ -8,17 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const del_1 = __importDefault(require("del"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const file_lane_1 = require("file-lane");
 class UxBeforeWorks {
     static cleanOutput(context) {
         return __awaiter(this, void 0, void 0, function* () {
             const outputPath = file_lane_1.FileLaneUtil.getOutputPath(context);
-            yield (0, del_1.default)(outputPath, { force: true });
+            shared_utils_1.FileUtil.del(outputPath);
         });
     }
 }

package/lib/compiler/interface/ISignConfig.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /**
  * ISignConfig
  */

package/lib/compiler/javascript/JavascriptCompiler.js

@@ -13,9 +13,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const shared_utils_1 = require("@aiot-toolkit/shared-utils");
+const core_1 = require("@rspack/core");
 const lodash_1 = __importDefault(require("lodash"));
 const path_1 = __importDefault(require("path"));
-const webpack_1 = require("webpack");
 const AndroidWebpackConfigurator_1 = __importDefault(require("./android/AndroidWebpackConfigurator"));
 const VelaWebpackConfigurator_1 = __importDefault(require("./vela/VelaWebpackConfigurator"));
 const UxCompileUtil_1 = __importDefault(require("./vela/utils/UxCompileUtil"));
@@ -28,12 +28,12 @@ class JavascriptCompiler {
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
                 yield this.clean(param);
                 const config = this.createWebpackConfig(param);
-                (0, webpack_1.webpack)(config, (error, stats) => {
+                (0, core_1.rspack)(config, (error, stats) => {
                     if (error) {
                         reject({ errors: [error] });
                     }
                     else {
-                        const statsObj = stats === null || stats === void 0 ? void 0 : stats.toJson();
+                        const statsObj = stats === null || stats === void 0 ? void 0 : stats.toJson({});
                         if (statsObj) {
                             const { errors, warnings } = statsObj;
                             if ((errors === null || errors === void 0 ? void 0 : errors.length) || (warnings === null || warnings === void 0 ? void 0 : warnings.length)) {
@@ -68,7 +68,7 @@ class JavascriptCompiler {
         const result = {
             context: projectPath,
             mode,
-            devtool,
+            devtool: devtool,
             output: {
                 globalObject: 'window',
                 filename: '[name].js',
@@ -78,7 +78,7 @@ class JavascriptCompiler {
             module: {
                 rules: [
                     {
-                        test: /\.ux$/,
+                        test: /\.ux$/, // 匹配以 .ux 结尾的文件
                         use: [
                             {
                                 loader: path_1.default.join(__dirname, '../javascript/vela/utils/webpackLoader/extractMapData.js')
@@ -115,7 +115,7 @@ class JavascriptCompiler {
             // 判断devtool类型 inline-source-map时，添加第0列关系映射
             if (devtool === 'inline-source-map') {
                 result.module.rules.unshift({
-                    test: /\.ux$/,
+                    test: /\.ux$/, // 匹配以 .ux 结尾的文件
                     use: [
                         {
                             loader: path_1.default.join(__dirname, '../javascript/vela/utils/webpackLoader/addColSourceMap.js')

package/lib/compiler/javascript/JavascriptDefaultCompileOption.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setServerPort = void 0;
+exports.setServerPort = setServerPort;
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const clientRecordPath = path_1.default.join(os_1.default.homedir(), 'hap-toolkit-client-records.json');
@@ -19,5 +19,4 @@ const JavascriptDefaultCompileOption = {
 function setServerPort(port) {
     JavascriptDefaultCompileOption.server.port = port;
 }
-exports.setServerPort = setServerPort;
 exports.default = JavascriptDefaultCompileOption;

package/lib/compiler/javascript/android/plugin/WrapPlugin.d.ts

@@ -1,4 +1,4 @@
-import { Compiler } from 'webpack';
+import { Compiler } from '@rspack/core';
 import IJavascriptCompileOption from '../../interface/IJavascriptCompileOption';
 /**
  * WrapPlugin

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const webpack_1 = require("webpack");
+const core_1 = require("@rspack/core");
 const webpack_sources_1 = require("webpack-sources");
 const UxFileUtils_1 = __importDefault(require("../../../../utils/ux/UxFileUtils"));
 /**
@@ -17,7 +17,7 @@ class WrapPlugin {
         compiler.hooks.compilation.tap('WrapPlugin', (compilation) => {
             compilation.hooks.processAssets.tap({
                 name: 'WrapPlugin',
-                stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE
+                stage: core_1.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE
             }, () => {
                 this.wrap(compilation);
             });
@@ -46,7 +46,20 @@ class WrapPlugin {
         return new webpack_sources_1.ConcatSource(`
 (function () {
   var createPageHandler = function () {
-    return`, source, `;
+  // 转换动态 style 的函数
+  var $translateStyle$ = function (value) {
+    if (typeof value === 'string') {
+      return Object.fromEntries(value.split(';').filter(item => Boolean(item && item.trim())).map(
+        item => {
+          const matchs = item.match(/([^:]+):(.*)/)
+          if (matchs && matchs.lenth> 2) {
+            return [matchs[1].trim().replace(/-([a-z])/g, (_, match) => match.toUpperCase()), matchs[2].trim()]
+          }
+          return []
+        }))}
+    return value
+  }
+  return`, source, `;
   };
   if (typeof window === "undefined") {
     return createPageHandler();

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

@@ -1,5 +1,5 @@
-import { Configuration, EntryObject, RuleSetRule, WebpackPluginInstance } from "webpack";
-import ICompileParam from "../../interface/ICompileParam";
+import { Configuration, EntryObject, RspackOptions, RspackPluginInstance, RuleSetRule } from '@rspack/core';
+import ICompileParam from '../../interface/ICompileParam';
 /**
  * webpack配置器
  *
@@ -18,11 +18,11 @@ interface IWebpackConfigurator {
      *
      * 如实现此函数，则其它函数无效
      */
-    create?(): Configuration;
+    create?(): RspackOptions;
     /**
      * 创建 webpack 的 plugins
      */
-    createPlugins?(): WebpackPluginInstance[];
+    createPlugins?(): RspackPluginInstance[];
     /**
      * 创建 webpack 的 entry
      */

package/lib/compiler/javascript/vela/VelaWebpackConfigurator.d.ts

@@ -1,11 +1,11 @@
-import { EntryObject, RuleSetRule, WebpackPluginInstance } from 'webpack';
 import ICompileParam from '../../interface/ICompileParam';
 import IJavascriptCompileOption from '../interface/IJavascriptCompileOption';
 import IWebpackConfigurator from '../interface/IWebpackConfigurator';
+import { EntryObject, RuleSetRule, RspackPluginInstance } from '@rspack/core';
 declare class VelaWebpackConfigurator implements IWebpackConfigurator {
     param: ICompileParam & IJavascriptCompileOption;
-    createPlugins(): WebpackPluginInstance[];
-    protected createWrapPlugin(): WebpackPluginInstance;
+    createPlugins(): RspackPluginInstance[];
+    protected createWrapPlugin(): RspackPluginInstance;
     protected createBundleAnalyzerPlugin(): any;
     /**
      * 通过读取 manifest.json 生成 entry

package/lib/compiler/javascript/vela/interface/IChunk.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /**
  * IChunk
  */

package/lib/compiler/javascript/vela/interface/IQuickAppConfig.d.ts

@@ -1,4 +1,4 @@
-import { Configuration } from 'webpack';
+import { Configuration } from '@rspack/core';
 import IJavascriptCompileOption from '../../interface/IJavascriptCompileOption';
 /**
  * IQuickAppConfig

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Dictionary } from '@aiot-toolkit/shared-utils';
 /**
  * 文件资源

package/lib/compiler/javascript/vela/plugin/WrapPlugin.d.ts

@@ -1,4 +1,4 @@
-import { Compiler } from 'webpack';
+import { Compiler } from '@rspack/core';
 declare class WrapPlugin {
     apply(compiler: Compiler): void;
     private wrap;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const webpack_1 = require("webpack");
+const core_1 = require("@rspack/core");
 const webpack_sources_1 = require("webpack-sources");
 class WrapPlugin {
     apply(compiler) {
@@ -8,7 +8,7 @@ class WrapPlugin {
         compiler.hooks.compilation.tap('WrapPlugin', (compilation) => {
             compilation.hooks.processAssets.tap({
                 name: 'WrapPlugin',
-                stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE
+                stage: core_1.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE
             }, () => {
                 this.wrap(compilation);
             });

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

@@ -5,6 +5,6 @@ declare class Jsc {
     readonly projectPath: string;
     readonly buildPath: string;
     constructor(projectPath: string, buildPath: string);
-    jsc(): Promise<void | string[]>;
+    jsc(): Promise<boolean | void>;
 }
 export default Jsc;

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

@@ -8,12 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const del_1 = __importDefault(require("del"));
 /**
  * Jsc
  */
@@ -32,7 +28,7 @@ class Jsc {
             }
         }))
             .then(() => {
-            return (0, del_1.default)(`${buildPath}/**/*.js`, { force: true });
+            return shared_utils_1.FileUtil.del(`${buildPath}/**/*.js`);
         })
             .catch((error) => {
             shared_utils_1.ColorConsole.throw(error.message);

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Dictionary } from '@aiot-toolkit/shared-utils';
 import JSZip from 'jszip';
 import IJavascriptCompileOption from '../../interface/IJavascriptCompileOption';

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

@@ -57,7 +57,7 @@ class ZipUtil {
             const zipBuffer = yield this.packageToZipBuffer(fullPackage);
             // 生产出带签名的rpk文件buffer
             const signConfig = SignUtil_1.default.getProjectSignConfig(param);
-            const rpkBuffer = yield ZipUtil.buildProjectAndOutput(zipBuffer, signConfig);
+            const rpkBuffer = yield _a.buildProjectAndOutput(zipBuffer, signConfig);
             // 3
             this.generateDistFile(rpkBuffer, param, this.getFileName(param, config, 'rpk'));
         });
@@ -131,9 +131,9 @@ class ZipUtil {
             for (let fileBuildPath of files) {
                 const absPath = path_1.default.join(projectPath, outputPath, fileBuildPath);
                 let fileContentBuffer = fs_extra_1.default.readFileSync(absPath);
-                if (fileBuildPath === ZipUtil.CERT_PATH) {
+                if (fileBuildPath === _a.CERT_PATH) {
                     let metaZip = yield jszip_1.default.loadAsync(fileContentBuffer);
-                    fileContentBuffer = (yield metaZip.generateAsync(Object.assign(Object.assign({}, ZipUtil.ZIP_OPTION), { comment: null })));
+                    fileContentBuffer = (yield metaZip.generateAsync(Object.assign(Object.assign({}, _a.ZIP_OPTION), { comment: null })));
                 }
                 const fileContentDigest = shared_utils_1.CommonUtil.calcDataDigest(fileContentBuffer);
                 const resourceInfo = {
@@ -212,7 +212,7 @@ class ZipUtil {
             ...entrySkFiles,
             new RegExp(`^${entry}/$`),
             new RegExp(`^${entry}/.+`),
-            /^common\//i,
+            /^common\//i, // 静态资源
             /.+\.js/,
             'META-INF/build.txt'
         ];

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /**
  * Base64
  */

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import IJavascriptCompileOption from '../../../interface/IJavascriptCompileOption';
 /**
  * SignUtil

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

@@ -426,7 +426,7 @@ class SignUtil {
         const cert = Buffer.from(Base64_1.default.unarmor(certificate));
         const c = new jsrsasign_1.default.X509();
         c.readCertPEM(certificate.toString());
-        const pubKey = jsrsasign_1.default.KEYUTIL.getPEM(c.subjectPublicKeyRSA);
+        const pubKey = jsrsasign_1.default.KEYUTIL.getPEM(c.getPublicKey());
         // 摘要块
         const digestBuf = Buffer.alloc(sign.length + 12);
         digestBuf.writeInt32LE(sign.length + 8, 0);

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /**
  * Signer
  */

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

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

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

@@ -1,3 +1,3 @@
-import { LoaderContext } from 'webpack';
+import { LoaderContext } from '@rspack/core';
 declare function extractMapData(this: LoaderContext<any>, source: string, map: any): void;
 export default extractMapData;

package/lib/config/UxConfig.d.ts

@@ -7,19 +7,21 @@ import HmlLoader from '../loader/ux/vela/HmlLoader';
 import UxLoader from '../loader/ux/vela/UxLoader';
 import UxBeforeWorks from '../beforeWorks/ux/UxBeforeWorks';
 import UxAfterWorks from '../afterWorks/ux/UxAfterWorks';
+import { IChangedFile } from 'file-lane/lib/interface/IChangedFile';
 declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
     readonly projectPath: string;
     constructor(projectPath: string);
     /**
      * 1. 取项目中所有的真实文件
-     *  1.1 无entryFileList时，
+     *  1.1 无entryFileList时
      *  1.2 有entryFileList且文件列表中有 与其他文件相关 的文件时
+     *  1.3 有entryFileList且文件列表中有文件为 删除 操作时
      * 2. 返回符合条件的文件列表
      *  2.1 有entryFileList且文件列表中 只有 不影响其他文件 的文件时
      * @param entryFileList
      * @returns
      */
-    collectFile: (entryFileList?: string[]) => string[];
+    collectFile: (entryFileList?: IChangedFile[]) => string[];
     exclude: (RegExp | ((filePath: string) => boolean))[];
     get output(): string;
     beforeWorks: (typeof UxBeforeWorks.cleanOutput)[];
@@ -29,7 +31,7 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
         workerDescribe: string;
     }[];
     afterWorks: (typeof UxAfterWorks.cleanOutput)[];
-    watchIgnores: (string | RegExp)[];
+    watchIgnores: RegExp[];
     /**
      * 通过项目类型，返回模块配置
      */

package/lib/config/UxConfig.js

@@ -18,13 +18,15 @@ const UxAfterWorks_1 = __importDefault(require("../afterWorks/ux/UxAfterWorks"))
 const UxAfterCompile_1 = __importDefault(require("../afterCompile/ux/UxAfterCompile"));
 const UxBeforeCompile_1 = __importDefault(require("../beforeCompile/ux/UxBeforeCompile"));
 const BeforeCompileUtils_1 = __importDefault(require("../utils/BeforeCompileUtils"));
+const IChangedFile_1 = require("file-lane/lib/interface/IChangedFile");
 class UxConfig {
     constructor(projectPath) {
         this.projectPath = projectPath;
         /**
          * 1. 取项目中所有的真实文件
-         *  1.1 无entryFileList时，
+         *  1.1 无entryFileList时
          *  1.2 有entryFileList且文件列表中有 与其他文件相关 的文件时
+         *  1.3 有entryFileList且文件列表中有文件为 删除 操作时
          * 2. 返回符合条件的文件列表
          *  2.1 有entryFileList且文件列表中 只有 不影响其他文件 的文件时
          * @param entryFileList
@@ -38,8 +40,13 @@ class UxConfig {
                 return files;
             };
             // 2.
-            if ((entryFileList === null || entryFileList === void 0 ? void 0 : entryFileList.findIndex((file) => !/\.(ux|json|js)$/.test(file))) === -1) {
-                return entryFileList.filter((filePath) => shared_utils_1.FileUtil.include(filePath, undefined, this.exclude));
+            if (entryFileList) {
+                let isGetAll = entryFileList.every((item) => item.type === IChangedFile_1.HandlerType.UNLINK || !/\.(ux|json|js)$/.test(item.path));
+                if (!isGetAll) {
+                    return entryFileList
+                        .filter((filePath) => shared_utils_1.FileUtil.include(filePath.path, undefined, this.exclude))
+                        .map((item) => item.path);
+                }
             }
             // 1.
             return getProjectFiles();
@@ -94,13 +101,17 @@ class UxConfig {
                 worker: UxAfterCompile_1.default.toRpk,
                 workerDescribe: 'Package the project into an RPK file'
             },
+            {
+                worker: UxAfterCompile_1.default.generateDiff,
+                workerDescribe: 'Generate diff json'
+            },
             {
                 worker: UxAfterCompile_1.default.moveBackResult,
                 workerDescribe: 'Migrate temporary project'
             }
         ];
         this.afterWorks = [UxAfterWorks_1.default.cleanOutput];
-        this.watchIgnores = [/node_modules/, '/build/', '/dist/'];
+        this.watchIgnores = [/node_modules/, /build/, /dist/];
     }
     get output() {
         const name = path_1.default.basename(this.projectPath);

package/lib/utils/BeforeCompileUtils.d.ts

@@ -10,8 +10,8 @@ declare class BeforeCompileUtils {
      * @param fileList
      * @returns
      */
-    static getEntries: PreWork<IJavascriptCompileOption>;
-    static clean: PreWork<IJavascriptCompileOption>;
+    static getEntries: PreWork;
+    static clean: PreWork;
     /**
      * 获取项目的全局样式变量配置
      * @param context

package/lib/utils/BeforeCompileUtils.js

@@ -15,7 +15,6 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const parser_1 = require("@aiot-toolkit/parser");
 const shared_utils_1 = require("@aiot-toolkit/shared-utils");
-const del_1 = __importDefault(require("del"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const TranslateCache_1 = __importDefault(require("@aiot-toolkit/parser/lib/ux/translate/vela/TranslateCache"));
@@ -33,7 +32,8 @@ _a = BeforeCompileUtils;
  * @param fileList
  * @returns
  */
-BeforeCompileUtils.getEntries = (context, fileList, config, compilerOption) => {
+BeforeCompileUtils.getEntries = (params) => {
+    const { context, compilerOption } = params;
     const { projectPath } = context;
     const srcPath = path_1.default.join(projectPath, compilerOption.sourceRoot);
     // 判断路径是否真实存在
@@ -70,27 +70,42 @@ BeforeCompileUtils.getEntries = (context, fileList, config, compilerOption) => {
     context['entries'] = entryList;
     return Promise.resolve();
 };
-BeforeCompileUtils.clean = (context, _, config, compileOption) => __awaiter(void 0, void 0, void 0, function* () {
-    if (compileOption) {
-        yield (0, del_1.default)(path_1.default.join(context.projectPath, compileOption.outputPath));
-        yield (0, del_1.default)(path_1.default.join(context.projectPath, compileOption.releasePath));
+BeforeCompileUtils.clean = (params) => __awaiter(void 0, void 0, void 0, function* () {
+    const { context, compilerOption, compalition } = params;
+    if (compilerOption) {
+        // 存储build中的文件列表
+        const buildPath = path_1.default.join(context.projectPath, compilerOption.outputPath);
+        const buildFileList = fs_extra_1.default.existsSync(buildPath)
+            ? shared_utils_1.FileUtil.readAlldirSync(buildPath).map((filePath) => {
+                const relativePath = path_1.default.relative(buildPath, filePath);
+                const fileContent = fs_extra_1.default.readFileSync(filePath);
+                return { path: relativePath, content: fileContent };
+            })
+            : [];
+        if (compalition) {
+            compalition.buildFileList = buildFileList;
+        }
+        // 清空build文件夹、dist文件夹
+        yield shared_utils_1.FileUtil.del(path_1.default.join(context.projectPath, compilerOption.outputPath));
+        yield shared_utils_1.FileUtil.del(path_1.default.join(context.projectPath, compilerOption.releasePath));
     }
     context.translateCache = new TranslateCache_1.default();
     BinaryPlugin.reset();
     BinaryPlugin.config = {
         projectPath: context.projectPath,
         outputProjectPath: path_1.default.join(context.projectPath, context.output),
-        source: compileOption === null || compileOption === void 0 ? void 0 : compileOption.sourceRoot,
-        output: compileOption === null || compileOption === void 0 ? void 0 : compileOption.outputPath
+        source: compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.sourceRoot,
+        output: compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.outputPath
     };
 });
 /**
  * 获取项目的全局样式变量配置
  * @param context
  */
-BeforeCompileUtils.getGlobalVar = (context, fileList, config, compilerOption) => {
+BeforeCompileUtils.getGlobalVar = (params) => {
+    const { context, compilerOption } = params;
     const { projectPath } = context;
-    const filePath = path_1.default.join(projectPath, compilerOption.sourceRoot, 'globalVar.json');
+    const filePath = path_1.default.join(projectPath, (compilerOption === null || compilerOption === void 0 ? void 0 : compilerOption.sourceRoot) || '', 'globalVar.json');
     let globalVar = {};
     // 判断文件是否存在
     if (fs_extra_1.default.existsSync(filePath)) {

package/lib/utils/ux/UxFileUtils.d.ts

@@ -1,4 +1,5 @@
 import IManifest from '../../compiler/javascript/vela/interface/IManifest';
+import FileLaneCompilation from 'file-lane/lib/FileLaneCompilation';
 export declare class UxFileUtils {
     static readonly CONFIG_FILE_NAME = "manifest.json";
     /**
@@ -35,5 +36,16 @@ export declare class UxFileUtils {
      * @param sourceRoot
      */
     static validateSitemap(projectPath: string, sourceRoot?: string): void;
+    /**
+     * 1. 遍历旧文件列表
+     *  1.1 若文件路径在新文件列表newFileList中，且内容一致时，从newFileList中移除该项
+     *  1.2 若文件路径在新文件列表newFileList中，且内容不一致时，添加到diffList中表示待更新，从newFileList中移除该项
+     *  1.3 若文件路径不在新文件列表中，表示该文件待删除(热更新时，可以不做删除，删除耗费性能)
+     * 2. 若遍历完旧文件列表后，newFileList长度不为0，表示有文件待新增
+     * @param oldFileList 旧文件列表
+     * @param newFileList 新文件列表
+     * @returns
+     */
+    static getDiffJSON(compilation: FileLaneCompilation, newFileList: string[], buildPath: string): void;
 }
 export default UxFileUtils;

package/lib/utils/ux/UxFileUtils.js

@@ -97,6 +97,39 @@ class UxFileUtils {
             }
         }
     }
+    /**
+     * 1. 遍历旧文件列表
+     *  1.1 若文件路径在新文件列表newFileList中，且内容一致时，从newFileList中移除该项
+     *  1.2 若文件路径在新文件列表newFileList中，且内容不一致时，添加到diffList中表示待更新，从newFileList中移除该项
+     *  1.3 若文件路径不在新文件列表中，表示该文件待删除(热更新时，可以不做删除，删除耗费性能)
+     * 2. 若遍历完旧文件列表后，newFileList长度不为0，表示有文件待新增
+     * @param oldFileList 旧文件列表
+     * @param newFileList 新文件列表
+     * @returns
+     */
+    static getDiffJSON(compilation, newFileList, buildPath) {
+        var _a;
+        const oldFileList = compilation.buildFileList;
+        let diffList = [];
+        // 1.
+        for (let i = 0; i < oldFileList.length; i++) {
+            const index = newFileList.findIndex((file) => file === oldFileList[i].path);
+            // 1.3
+            if (index !== -1) {
+                // 1.2
+                const oldContent = (_a = oldFileList[i].content) === null || _a === void 0 ? void 0 : _a.toString('utf-8');
+                const newContent = fs_extra_1.default.readFileSync(path_1.default.join(buildPath, newFileList[index]), 'utf-8');
+                if (oldContent !== newContent) {
+                    diffList.push(newFileList[index]);
+                }
+                // 从newFileList中移除该项
+                newFileList.splice(index, 1);
+            }
+        }
+        // 2.
+        newFileList.length > 0 && newFileList.forEach((file) => diffList.push(file));
+        compilation.diffJson = diffList;
+    }
 }
 exports.UxFileUtils = UxFileUtils;
 UxFileUtils.CONFIG_FILE_NAME = 'manifest.json';

package/lib/utils/ux/UxLoaderUtils.d.ts

@@ -25,7 +25,7 @@ declare class UxLoaderUtils {
      * @param context
      */
     static compileAppUxToJavascript(file: IFileParam, context: IFileLaneContext, compileOption: IJavascriptCompileOption): Promise<{
-        files: IFileParam<any>[];
+        files: IFileParam[];
         logs: ILog[];
     }>;
     /**

package/lib/utils/xts/XtsFollowWorks.js

@@ -57,8 +57,8 @@ class XtsFollowWorks {
      * @param context
      */
     static zipDistributedQuickApp(context) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const deviceList = [
                 {
                     device: 'phone',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.2-beta.16",
+  "version": "2.0.2-beta.17",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,24 +19,23 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.2-beta.16",
-    "@aiot-toolkit/parser": "2.0.2-beta.16",
-    "@aiot-toolkit/shared-utils": "2.0.2-beta.16",
+    "@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",
     "@hap-toolkit/aaptjs": "^2.0.0",
+    "@rspack/core": "^1.0.0",
     "aiot-parse5": "^1.0.0",
-    "archiver": "^6.0.1",
+    "archiver": "^7.0.1",
     "babel-loader": "^9.1.3",
-    "del": "^4.1.1",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.2-beta.16",
+    "file-lane": "2.0.2-beta.17",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
-    "jsrsasign": "^7.2.2",
+    "jsrsasign": "^11.1.0",
     "jszip": "^3.10.1",
     "lodash": "^4.17.21",
     "ts-morph": "^19.0.0",
     "url-loader": "^4.1.1",
-    "webpack": "^5.89.0",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-sources": "^3.2.3"
   },
@@ -46,5 +45,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "785701c64914f50acd18ab71ea41b2f5a2cd161c"
+  "gitHead": "4b2b3395e77e91b0c00a524dcf89b9dc0db689bf"
 }