@aiot-toolkit/aiotpack 2.0.3 → 2.0.4-beta.2

package/lib/afterCompile/ux/UxAfterCompile.js

@@ -172,13 +172,48 @@ class UxAfterCompile {
       if (!content.packageInfo) {
         content.packageInfo = _ZipUtil.default.createComment(compilerOption);
       }
-      if (completeFeature && translateCache?.featureCache.size) {
+
+      // feature
+      if (translateCache?.featureCache.size) {
+        // 消息提示
+        // 1. 获取未手动配置的 feature
+        // 2. 如果开启自动填充，则 info；否则 warn
         const featureSet = new Set([...Array.from(translateCache.featureCache), ...(content.features || []).map(item => item.name)]);
-        content.features = Array.from(featureSet).map(item => {
-          return {
-            name: item
+        const usedList = Array.from(featureSet).filter(Boolean);
+        const unSetList = usedList.filter(featureItem => !content.features?.find(item => item.name === featureItem));
+        if (unSetList?.length) {
+          const featureMessage = {
+            word: `\n${JSON.stringify(unSetList.map(item => ({
+              name: item
+            })), undefined, 2)}`,
+            style: _sharedUtils.ColorConsole.getStyle(_sharedUtils.Loglevel.INFO)
           };
-        });
+          if (completeFeature) {
+            _sharedUtils.ColorConsole.logger({
+              level: _sharedUtils.Loglevel.WARN,
+              message: [`missing feature (will auto set in rpk):`, featureMessage, {
+                word: '\n\nplease copy to `src/manifest.json`'
+              }]
+            });
+          } else {
+            _sharedUtils.ColorConsole.logger({
+              level: _sharedUtils.Loglevel.THROW,
+              message: [`missing feature:`, featureMessage, `\n\nthere are tow ways to set`, {
+                word: ['copy to `src/manifest.json`', 'add build option `--complete-feature`'].map((item, index) => `\n${index + 1}. ${item}`).join('')
+              }]
+            });
+            throw new Error(`missing feature`);
+          }
+        }
+
+        // 填充feature
+        if (completeFeature) {
+          content.features = usedList.map(item => {
+            return {
+              name: item
+            };
+          });
+        }
       }
       _fsExtra.default.writeJSONSync(_path.default.join(projectPath, outputPath, _UxFileUtils.default.CONFIG_FILE_NAME), content, {
         spaces: 2
@@ -314,7 +349,7 @@ class UxAfterCompile {
       return;
     }
     try {
-      const foldList = ['node_modules'];
+      const foldList = ['node_modules', '.git'];
       foldList.forEach(item => {
         const sourcePath = _path.default.join(context.projectPath, item);
         const targetPath = _path.default.join(compilerOption.projectPath, item);

package/lib/compiler/javascript/JavascriptCompiler.js

@@ -127,7 +127,13 @@ class JavascriptCompiler {
     if (configurator.hook) {
       configurator.hook(result);
     }
-    return _lodash.default.merge({}, result, quickAppConfig?.webpack);
+
+    // 数组，则全部数组(默认合并数组中相同序号的项)
+    return _lodash.default.mergeWith({}, result, quickAppConfig?.webpack, (source, target) => {
+      if (Array.isArray(target) && Array.isArray(source)) {
+        return [...target, ...source];
+      }
+    });
   }
   getConfigurator(param) {
     const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.3",
+  "version": "2.0.4-beta.2",
   "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.3",
-    "@aiot-toolkit/parser": "2.0.3",
-    "@aiot-toolkit/shared-utils": "2.0.3",
+    "@aiot-toolkit/generator": "2.0.4-beta.2",
+    "@aiot-toolkit/parser": "2.0.4-beta.2",
+    "@aiot-toolkit/shared-utils": "2.0.4-beta.2",
     "@hap-toolkit/aaptjs": "^2.0.0",
-    "@rspack/core": "^1.0.0",
+    "@rspack/core": "^1.1.8",
     "aiot-parse5": "^1.0.0",
     "archiver": "^7.0.1",
     "babel-loader": "^9.1.3",
     "fast-glob": "^3.3.2",
-    "file-lane": "2.0.3",
+    "file-lane": "2.0.4-beta.2",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -36,6 +36,7 @@
     "lodash": "^4.17.21",
     "ts-morph": "^19.0.0",
     "url-loader": "^4.1.1",
+    "webpack": "^5.97.1",
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-sources": "^3.2.3"
   },
@@ -45,5 +46,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "e29e61eb89c2559eb9f3a18c51fd5ce4c4196cc2"
+  "gitHead": "e9015685f29790709c420a9f8c41ade936a85300"
 }