Remove option defaultPlugins and simplify loading

1 files changed, 10 insertions, 14 deletions

diff --git a/lib/config/plugins.js b/lib/config/plugins.js
index c75cd55..5d98736 100644
--- a/lib/config/plugins.js
+++ b/lib/config/plugins.js
@@ -9,7 +9,7 @@ function isDefaultPlugin(name, version) {
 }
 
 // Normalize a list of plugins to use
-function normalizePluginsList(plugins, addDefaults) {
+function normalizePluginsList(plugins) {
     // Normalize list to an array
     plugins = _.isString(plugins) ? plugins.split(',') : (plugins || []);
 
@@ -25,8 +25,7 @@ function normalizePluginsList(plugins, addDefaults) {
         var version = parts[1];
         return {
             'name': name,
-            'version': version, // optional
-            'isDefault': isDefaultPlugin(name, version)
+            'version': version // optional
         };
     });
 
@@ -41,19 +40,15 @@ function normalizePluginsList(plugins, addDefaults) {
     .value();
 
     // Merge with defaults
-    if (addDefaults !== false) {
-        _.each(DEFAULT_PLUGINS, function(plugin) {
-            if (_.find(plugins, { name: plugin })) {
-                return;
-            }
+    _.each(DEFAULT_PLUGINS, function(plugin) {
+        if (_.find(plugins, { name: plugin })) {
+            return;
+        }
 
-            plugins.push({
-                'name': plugin,
-                'isDefault': true
-            });
+        plugins.push({
+            'name': plugin
         });
-    }
-
+    });
     // Remove plugin that start with '-'
     plugins = _.filter(plugins, function(plugin) {
         return !_.contains(toremove, plugin.name) && !(plugin.name.length > 0 && plugin.name[0] == '-');
@@ -66,6 +61,7 @@ function normalizePluginsList(plugins, addDefaults) {
 }
 
 module.exports = {
+    isDefaultPlugin: isDefaultPlugin,
     toList: normalizePluginsList
 };