Add command "serve"

2 files changed, 5 insertions, 4 deletions

diff --git a/lib/plugins/loadForBook.js b/lib/plugins/loadForBook.js
index 9494696..c1f19d0 100644
--- a/lib/plugins/loadForBook.js
+++ b/lib/plugins/loadForBook.js
@@ -33,7 +33,7 @@ function loadForBook(book) {
         });
 
         // Log state
-        logger.info.ln(installed.size + ' are installed');
+        logger.info.ln(installed.size + ' plugins are installed');
         if (requirements.size != installed.size) {
             logger.info.ln(requirements.size + ' explicitly listed');
         }
diff --git a/lib/plugins/loadPlugin.js b/lib/plugins/loadPlugin.js
index 39e2e33..a1c41b4 100644
--- a/lib/plugins/loadPlugin.js
+++ b/lib/plugins/loadPlugin.js
@@ -1,5 +1,6 @@
 var path = require('path');
 var resolve = require('resolve');
+var Immutable = require('immutable');
 
 var Promise = require('../utils/promise');
 var error = require('../utils/error');
@@ -9,7 +10,7 @@ var validatePlugin = require('./validatePlugin');
 // Return true if an error is a "module not found"
 // Wait on https://github.com/substack/node-resolve/pull/81 to be merged
 function isModuleNotFound(err) {
-    return err.message.indexOf('Cannot find module') >= 0;
+    return err.code == 'MODULE_NOT_FOUND' || err.message.indexOf('Cannot find module') >= 0;
 }
 
 /**
@@ -64,8 +65,8 @@ function loadPlugin(book, plugin) {
 
         // Update plugin
         return plugin.merge({
-            'package': packageContent,
-            'content': content
+            'package': Immutable.fromJS(packageContent),
+            'content': Immutable.fromJS(content)
         });
     })