@aiot-toolkit/aiotpack 2.0.6-beta.21 → 2.0.6-beta.23

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

@@ -42,6 +42,10 @@ export default interface IManifest {
             file: string;
         }[];
     };
+    widgetProvider?: {
+        name: string;
+        path: string;
+    }[];
 }
 export interface IFeatures {
     name: string;

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

@@ -129,6 +129,15 @@ class UxCompileUtil {
         }
       }
     }
+    // 5. 添加 widget_provider
+    const {
+      widgetProvider
+    } = config;
+    if (widgetProvider?.length) {
+      for (const widgetItem of widgetProvider) {
+        result[widgetItem.path] = './src/' + widgetItem.path;
+      }
+    }
     return result;
   }
 

package/lib/config/UxConfig.d.ts

@@ -29,10 +29,12 @@ declare class UxConfig implements IFileLaneConfig<IJavascriptCompileOption> {
     beforeCompile: import("file-lane").PreWork<IJavascriptCompileOption>[];
     afterCompile: ({
         worker: import("file-lane").FollowWork<IJavascriptCompileOption>;
+        workDescribe: string;
         workerDescribe?: undefined;
     } | {
         worker: import("file-lane").FollowWork<IJavascriptCompileOption>;
         workerDescribe: string;
+        workDescribe?: undefined;
     })[];
     afterWorks: (typeof UxAfterWorks.cleanOutput)[];
     watchIgnores: string[];

package/lib/config/UxConfig.js

@@ -75,7 +75,8 @@ class UxConfig {
   beforeWorks = (() => [_UxBeforeWorks.default.cleanOutput])();
   beforeCompile = (() => [_UxBeforeCompile.default.validateManifest, _UxBeforeCompile.default.validateSitemap, _BeforeCompileUtils.default.clean, _BeforeCompileUtils.default.getEntries, _BeforeCompileUtils.default.getGlobalVar])();
   afterCompile = (() => [{
-    worker: _UxAfterCompile.default.writeGitIgnore
+    worker: _UxAfterCompile.default.writeGitIgnore,
+    workDescribe: 'Write .gitignore'
   }, {
     worker: _UxAfterCompile.default.symlinkNodeModule,
     workerDescribe: 'Create a soft link to the node_modules folder'

package/lib/utils/BeforeCompileUtils.js

@@ -66,9 +66,6 @@ class BeforeCompileUtils {
             _sharedUtils.ColorConsole.throw(`### manifest ### path '${_path.default.join(entryDir, entryPages.join(' | '))}' does not exist`);
           }
         });
-      } else {
-        // 没有pages配置
-        _sharedUtils.ColorConsole.throw(`### manifest ### No pages configuration`);
       }
       //获取轻卡路由
       if (widgets) {

package/lib/utils/ux/ManifestSchema.js

@@ -69,7 +69,6 @@ const ManifestSchema = {
     router: {
       // TODO 更详细的后台运行配置信息，
       type: 'object',
-      required: ['entry', 'pages'],
       properties: {
         entry: {
           type: 'string'

package/lib/utils/ux/UxFileUtils.js

@@ -67,7 +67,7 @@ class UxFileUtils {
         entry,
         pages
       } = jsonData.router;
-      if (!pages[entry]) {
+      if (entry && !pages?.[entry]) {
         errors.push(new TypeError(`router.entry content:  ${entry}, is missing in router.pages`));
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiot-toolkit/aiotpack",
-  "version": "2.0.6-beta.21",
+  "version": "2.0.6-beta.23",
   "description": "The process tool for packaging aiot projects.",
   "keywords": [
     "aiotpack"
@@ -19,14 +19,14 @@
     "test": "node ./__tests__/aiotpack.test.js"
   },
   "dependencies": {
-    "@aiot-toolkit/generator": "2.0.6-beta.21",
-    "@aiot-toolkit/parser": "2.0.6-beta.21",
-    "@aiot-toolkit/shared-utils": "2.0.6-beta.21",
+    "@aiot-toolkit/generator": "2.0.6-beta.23",
+    "@aiot-toolkit/parser": "2.0.6-beta.23",
+    "@aiot-toolkit/shared-utils": "2.0.6-beta.23",
     "@hap-toolkit/aaptjs": "^2.0.0",
     "@rspack/core": "^1.3.9",
     "aiot-parse5": "^1.0.2",
     "babel-loader": "^9.1.3",
-    "file-lane": "2.0.6-beta.21",
+    "file-lane": "2.0.6-beta.23",
     "file-loader": "^6.2.0",
     "fs-extra": "^11.2.0",
     "jsrsasign": "^11.1.0",
@@ -42,5 +42,5 @@
     "@types/jsrsasign": "^10.5.12",
     "@types/webpack-sources": "^3.2.3"
   },
-  "gitHead": "9294502171d727985c7a28a4a6f0c4a291623309"
+  "gitHead": "9de83750ab05714a26c3f23c22619605ebea720b"
 }