Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/TypeStrong/typedoc
Browse files Browse the repository at this point in the history
  • Loading branch information
aciccarello committed Feb 1, 2018
2 parents 5ce43cf + b6a99d2 commit db0cae5
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 5 deletions.
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion src/lib/utils/options/declaration.ts
Expand Up @@ -26,7 +26,6 @@ export interface DeclarationOption {
scope?: ParameterScope;
map?: {};
mapError?: string;
isArray?: boolean;
defaultValue?: any;
convert?: (param: OptionDeclaration, value?: any) => any;
}
Expand Down
3 changes: 1 addition & 2 deletions src/lib/utils/plugins.ts
Expand Up @@ -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[];

Expand Down
15 changes: 15 additions & 0 deletions 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'
]);
});
});

0 comments on commit db0cae5

Please sign in to comment.