feat(root-array): add support to list of 'root' directories

IvaRoSoft · Mar 23, 2020 · b63fced · b63fced
1 parent 2346fbc
commit b63fced
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/lib/ejs.js b/lib/ejs.js
@@ -140,9 +140,24 @@ function getIncludePath(path, options) {
   var views = options.views;
   var match = /^[A-Za-z]+:\\|^\//.exec(path);
 
+  // Try to resolve on multiple directories
+  var tryPathsList = function(paths) {
+    if (paths.some(function (v) {
+      filePath = exports.resolveInclude(path, v, true);
+      return fs.existsSync(filePath);
+    })) {
+      includePath = filePath;
+    }
+  }
+
   // Abs path
   if (match && match.length) {
-    includePath = exports.resolveInclude(path.replace(/^\/*/,''), options.root || '/', true);
+    path = path.replace(/^\/*/, '');
+    if (Array.isArray(options.root)) {
+      tryPathsList(options.root);
+    } else {
+      includePath = exports.resolveInclude(path, options.root || '/', true);
+    }
   }
   // Relative paths
   else {
@@ -154,13 +169,8 @@ function getIncludePath(path, options) {
       }
     }
     // Then look in any views directories
-    if (!includePath) {
-      if (Array.isArray(views) && views.some(function (v) {
-        filePath = exports.resolveInclude(path, v, true);
-        return fs.existsSync(filePath);
-      })) {
-        includePath = filePath;
-      }
+    if (!includePath && Array.isArray(views)) {
+      tryPathsList(views);
     }
     if (!includePath) {
       throw new Error('Could not find the include file "' +