From 3034bcf9b074b693afab9c62856346d6f305d0c0 Mon Sep 17 00:00:00 2001
From: Vojta Jina <vojta.jina@gmail.com>
Date: Fri, 12 Apr 2013 20:43:27 -0700
Subject: [PATCH] feat: allow inlined plugins

plugins = [
  'npm-module-plugin', {
  'launcher:inlinedLauncher': ['factory', ...]
];
---
 lib/server.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/server.js b/lib/server.js
index de92322cc..f8dae3f7e 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -16,6 +16,7 @@ var reporter = require('./reporter');
 var helper = require('./helper');
 var EventEmitter = require('./events').EventEmitter;
 
+var log = logger.create();
 
 
 // TODO(vojta): get this whole mess under test
@@ -28,7 +29,6 @@ var start = function(injector, config, launcher, globalEmitter, preprocess, file
     injector.get('framework:' + framework);
   });
 
-  var log = logger.create();
   var filesPromise = fileList.refresh();
 
   if (config.autoWatch) {
@@ -249,7 +249,13 @@ exports.start = function(cliOptions, done) {
 
   // register all plugins
   config.plugins.forEach(function(plugin) {
-    modules.push(require(plugin));
+    if (helper.isString(plugin)) {
+      modules.push(require(plugin));
+    } else if (helper.isObject(plugin)) {
+      modules.push(plugin);
+    } else {
+      log.warn('Invalid plugin %s', plugin);
+    }
   });
 
   var injector = new di.Injector(modules);