Add options for imports and plugins

index.js

@@ -1,27 +1,81 @@
 var stylus  = require('stylus');
+var path    = require('path');
+var fs      = require('fs');
+
+var stylusUtils = require('stylus/lib/utils');
+var join = path.join;
+var dirname = path.dirname;
+var basename = path.basename;
+var relative = path.relative;
+
+var stylusLookupIndex = stylusUtils.lookupIndex;
+
+stylusUtils.lookupIndex = function(name, paths, filename){
+  var nodeModuleMatch = paths.find(includePath => includePath.endsWith(name));
+
+  var found = stylusLookupIndex(name, paths, filename);
+
+  // check for node_modules/<name>
+  if (!found && nodeModuleMatch) {
+    found = stylusLookupIndex(nodeModuleMatch, paths, filename);
+  }
+  return found;
+
+  function lookupPackage(dir) {
+    var pkg = stylusUtils.lookup(join(dir, 'package.json'), paths, filename);
+    if (!pkg) {
+      return /\.styl$/i.test(dir) ? stylusUtils.lookupIndex(dir, paths, filename) : lookupPackage(dir + '.styl');
+    }
+    var main = require(relative(__dirname, pkg)).main;
+    if (main) {
+      found = stylusUtils.find(join(dir, main), paths, filename);
+    } else {
+      found = stylusUtils.lookupIndex(dir, paths, filename);
+    }
+    return found;
+  }
+};
+
+
+module.exports = function(app, options = {}) {
+  var { includes = [], plugins = [], ...opts } = options;
+
+  var stylusRequirePath = require.resolve('stylus');
+  var nodeModulesRoot = stylusRequirePath.substring(0, stylusRequirePath.indexOf('/stylus'));
+
+  var includePaths = includes.reduce((acc, moduleId) => {
+    var stylusModulePath = path.join(nodeModulesRoot, moduleId);
+    return fs.existsSync(stylusModulePath)
+      ? [...acc, stylusModulePath]
+      : acc;
+  }, []);
+
+  function stylusCompiler(file, filename, options) {
+    var options = { _imports: [], ...options, ...opts };
+    var out = {};
+    var compiler = stylus(file, options)
+      .set('paths', includePaths)
+      .set('filename', filename)
+      .set('compress', options.compress)
+      .set('include css', true)
+
+    plugins.forEach(plugin => {
+      var pluginFn = require(plugin);
+      compiler.use(pluginFn());
+    });
+
+    compiler.render(function(err, value) {
+        if (err) throw err;
+        out.css = value;
+      });
+
+    out.files = options._imports.map(function(item) {
+      return item.path;
+    });
+    out.files.push(filename);
+    return out;
+  }
 
-module.exports = function(app) {
   app.styleExtensions.push('.styl');
   app.compilers['.styl'] = stylusCompiler;
 };
-
-function stylusCompiler(file, filename, options) {
-  options || (options = {});
-  options._imports || (options._imports = []);
-  var out = {};
-  var s = stylus(file, options)
-    .set('filename', filename)
-    .set('compress', options.compress)
-    .set('include css', true);
-
-
-  s.render(function(err, value) {
-    if (err) throw err;
-    out.css = value;
-  });
-  out.files = options._imports.map(function(item) {
-    return item.path;
-  });
-  out.files.push(filename);
-  return out;
-}

package.json

@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/derbyjs/derby-stylus",
   "dependencies": {
-    "stylus": "^0.54.5"
+    "stylus": "~0.59.0"
   },
   "directories": {
     "example": "example"