Merge branch 'master' of https://github.com/TypeStrong/typedoc

Author: aciccarello

package.json

@@ -32,12 +32,12 @@
   "dependencies": {
     "@types/fs-extra": "4.0.0",
     "@types/handlebars": "4.0.31",
-    "@types/highlight.js": "9.1.8",
+    "@types/highlight.js": "9.12.0",
     "@types/lodash": "4.14.74",
     "@types/marked": "0.3.0",
     "@types/minimatch": "2.0.29",
     "@types/shelljs": "0.7.0",
-    "fs-extra": "^4.0.0",
+    "fs-extra": "^5.0.0",
     "handlebars": "^4.0.6",
     "highlight.js": "^9.0.0",
     "lodash": "^4.13.1",

src/lib/utils/options/declaration.ts

@@ -26,7 +26,6 @@ export interface DeclarationOption {
     scope?: ParameterScope;
     map?: {};
     mapError?: string;
-    isArray?: boolean;
     defaultValue?: any;
     convert?: (param: OptionDeclaration, value?: any) => any;
 }

src/lib/utils/plugins.ts

@@ -11,8 +11,7 @@ export class PluginHost extends AbstractComponent<Application> {
     @Option({
         name: 'plugin',
         help: 'Specify the npm plugins that should be loaded. Omit to load all installed plugins, set to \'none\' to load no plugins.',
-        type: ParameterType.String,
-        isArray: true
+        type: ParameterType.Array
     })
     plugins: string[];
 

src/test/plugin-host.ts

@@ -0,0 +1,15 @@
+import { Application } from '..';
+import Assert = require('assert');
+
+describe('PluginHost', function () {
+  it('parses plugins correctly', function () {
+    let app = new Application({
+      plugin: 'typedoc-plugin-1,typedoc-plugin-2'
+    });
+
+    Assert.deepEqual(app.plugins.plugins, [
+      'typedoc-plugin-1',
+      'typedoc-plugin-2'
+    ]);
+  });
+});