Fix plugin resolution for multiple directories and plugins in plugin …

…directory roots. Correctly handle plugins at absolute paths.
speckleworks · Jan 20, 2019 · d0da053 · d0da053
1 parent 903cddc
commit d0da053
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugins.js b/plugins.js
@@ -14,7 +14,7 @@ module.exports = ( ) => {
   rootDirs.forEach( dir => {
     if ( fs.existsSync( dir ) ) {
       let dirs = getDirectories( dir )
-      pluginDirs = [ ...dirs, pluginDirs ]
+      pluginDirs.push( ...dirs, dir )
     } else
       winston.warn( `specified plugin directory does not exist: ${dir}` )
   } )

diff --git a/server.js b/server.js
@@ -100,7 +100,7 @@ if ( cluster.isMaster ) {
 
   // register plugins with express
   plugins.forEach( plugin => {
-    app.use( plugin.serveFrom, express.static( path.join( __dirname, plugin.serveSource ? plugin.serveSource : plugin.sourceDir ) ) )
+    app.use( plugin.serveFrom, express.static( path.join( plugin.serveSource ? plugin.serveSource : plugin.sourceDir ) ) )
   } )
 
   // expose an api