backend-plus 2.6.8 → 2.6.9

package/lib/backend-plus.js

@@ -2063,6 +2063,18 @@ function require_resolve(moduleName){
     return resolved;
 }
 
+/* MEJORA:
+function module_root_dir(file){
+    var dir = Path.dirname(file);
+    while(!fs.existsSync(Path.join(dir,'package.json'))){
+        var parent = Path.dirname(dir);
+        if(parent==dir){ return Path.dirname(file); }
+        dir = parent;
+    }
+    return dir;
+}
+// */
+
 function resolve_module_dir(moduleName,path,fileToCheck){
     var baseDir;
     if(packagejson.name==moduleName){
@@ -2070,12 +2082,13 @@ function resolve_module_dir(moduleName,path,fileToCheck){
     }else{
         baseDir=require_resolve(moduleName);
     }
+//      var resultDir = Path.join(path?module_root_dir(baseDir):Path.dirname(baseDir),path||'');
     var resultDir = Path.join(Path.dirname(baseDir),path||'');
     if (fileToCheck) {
         fs.stat(Path.join(resultDir, fileToCheck)).then(function(status){
             if (!status) {
                 console.error('Error resolve_module_dir in:',resultDir,'no:',fileToCheck);
-            } else if(!status.isFile()) {
+            } else if(!status.isFile() && fileToCheck != '.') {
                 console.error('Error resolve_module_dir in:',resultDir,',',fileToCheck,'is not a file');
             }
         },function(err){
@@ -2276,6 +2289,7 @@ AppBackend.prototype.addUnloggedServices = function addUnloggedServices(mainApp,
             baseUrl='';
         }   
         let baseLib = baseUrl + '/' + (moduleDef.path ? moduleDef.path : be.esJavascript(moduleDef.type)? 'lib': 'css');
+        resolve_module_dir(moduleDef.module, moduleDef.modPath, moduleDef.file ?? '.')
         try {
             var allowedExts=(moduleDef.type=='js'?['js','map']:[moduleDef.type]);
             mainApp.use(baseLib, serveContent(resolve_module_dir(moduleDef.module, moduleDef.modPath), { allowedExts }));
@@ -2354,10 +2368,10 @@ AppBackend.prototype.clientIncludes = function clientIncludes(req, opts) {
     var list = [];
     if (!hideBEPlusInclusions) {
         list = [
-            { type: 'js', module: 'js-yaml', modPath: 'dist', file: 'js-yaml.js' },
             // { type: 'js', module: 'xlsx', modPath: 'dist', file: 'xlsx.core.min.js' },
             { type: 'js', module: 'xlsx', modPath: 'dist', file: 'xlsx.full.min.js' },
             { type: 'js', module: 'require-bro' },
+            { type: 'js', module: 'js-yaml', modPath: 'browser', file: 'js-yaml.umd.min.js' },
             { type: 'js', module: 'cast-error' },
             { type: 'js', module: 'lazy-some' },
             { type: 'js', module: 'like-ar' },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -69,7 +69,7 @@
     "pug": "^3.0.4",
     "read-yaml-promise": "^1.0.2",
     "regexplicit": "^0.1.3",
-    "require-bro": "^0.3.4",
+    "require-bro": "^0.3.5",
     "self-explain": "^0.11.0",
     "serve-content": "^1.0.4",
     "session-file-store": "^1.5.0",