@cabloy/module-glob 5.0.13 → 5.0.15

package/dist/index.js

@@ -106,14 +106,9 @@ async function __loadPackage(context, modules) {
         const moduleName = modulesArray[i];
         const module = modules[moduleName];
         module.package = JSON.parse(modulesPackage[i].toString());
-        const moduleNode = getPackageModuleNode(context.projectMode);
+        const moduleNode = getPackageModuleNode(context.options.projectMode);
         const capabilities = module.package[moduleNode]?.capabilities;
-        if (capabilities?.icon)
-            module.info.icon = capabilities?.icon;
-        if (capabilities?.monkey)
-            module.info.monkey = capabilities?.monkey;
-        if (capabilities?.sync)
-            module.info.sync = capabilities?.sync;
+        module.info.capabilities = capabilities;
     }
 }
 function __orderModules(context, modules) {
@@ -148,7 +143,7 @@ function __pushModule(context, modules, moduleRelativeName) {
     }
     // push this
     context.modules[moduleRelativeName] = module;
-    const moduleNode = getPackageModuleNode(context.projectMode);
+    const moduleNode = getPackageModuleNode(context.options.projectMode);
     if (module.package && module.package[moduleNode] && module.package[moduleNode].last === true) {
         context.modulesLast.push(module);
     }
@@ -160,7 +155,7 @@ function __pushModule(context, modules, moduleRelativeName) {
 function __orderDependencies(context, modules, module, moduleRelativeName) {
     if (context.options.disableCheckDependencies)
         return true;
-    const moduleNode = getPackageModuleNode(context.projectMode);
+    const moduleNode = getPackageModuleNode(context.options.projectMode);
     if (!module.package[moduleNode] || !module.package[moduleNode].dependencies)
         return true;
     let enabled = true;
@@ -228,16 +223,16 @@ function __parseModules(context, projectPath) {
 function __logModules(context, log) {
     for (const module of context.modulesArray) {
         const relativeName = module.info.relativeName;
-        if (module.info.monkey) {
+        if (module.info.capabilities?.monkey) {
             context.modulesMonkey[relativeName] = module;
         }
-        if (module.info.sync) {
+        if (module.info.capabilities?.sync) {
             context.modulesSync[relativeName] = module;
         }
-        if (module.info.icon) {
+        if (module.info.capabilities?.icon) {
             context.modulesIcon[relativeName] = module;
         }
-        if (module.info.public) {
+        if (module.info.node_modules) {
             context.modulesGlobal[relativeName] = module;
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cabloy/module-glob",
-  "version": "5.0.13",
+  "version": "5.0.15",
   "description": "cabloy module-glob",
   "publishConfig": {
     "access": "public"
@@ -31,7 +31,7 @@
   "dependencies": {
     "boxen": "^4.2.0",
     "egg-born-utils": "^1.2.0",
-    "@cabloy/module-info": "^1.0.16"
+    "@cabloy/module-info": "^1.0.19"
   },
   "scripts": {
     "lint": "eslint ."