Add options for imports and plugins

index.js

@@ -1,27 +1,67 @@
 var stylus  = require('stylus');
+var path    = require('path');
+var fs      = require('fs');
+
+var stylusUtils = require('stylus/lib/utils');
+
+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);
+  }
+  if (!found) {
+    console.warn('[derby-stylus] Could not find ' + name + ' in ' + paths.join(', '));
+  }
+  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);
+    if (fs.existsSync(stylusModulePath)) {
+      acc.push(stylusModulePath);
+    }
+     return 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

@@ -1,10 +1,10 @@
 {
-  "name": "derby-stylus",
-  "version": "0.3.0",
+  "name": "@derbyjs/derby-stylus",
+  "version": "1.0.0-beta.2",
   "description": "Derby plugin to add Stylus support",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 0"
   },
   "repository": {
     "type": "git",
@@ -16,14 +16,17 @@
     "stylus",
     "plugin"
   ],
-  "author": "Artur Zayats <[email protected]>",
+  "contributors": [
+    "Artur Zayats <[email protected]>",
+    "Craig Beck <[email protected]>"
+  ],
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/derbyjs/derby-stylus/issues"
   },
   "homepage": "https://github.com/derbyjs/derby-stylus",
-  "dependencies": {
-    "stylus": "^0.54.5"
+  "peerDependencies": {
+    "stylus": "~0.59.0"
   },
   "directories": {
     "example": "example"