mirror of
https://github.com/jsdoc/jsdoc.git
synced 2025-12-08 19:46:11 +00:00
Fix bug that caused failing tests when no conf.json file is present. Closes #206
This commit is contained in:
parent
46959b53a1
commit
570a585f4e
@ -14,10 +14,14 @@ var util = require('common/util');
|
||||
|
||||
// required config values, override these defaults in your config.json if necessary
|
||||
const defaults = {
|
||||
"tags": {
|
||||
"allowUnknownTags": true
|
||||
},
|
||||
"source": {
|
||||
"includePattern": ".+\\.js(doc)?$",
|
||||
"excludePattern": "(^|\\/)_"
|
||||
},
|
||||
"plugins": [],
|
||||
"jsVersion": 180
|
||||
};
|
||||
|
||||
@ -28,7 +32,6 @@ const defaults = {
|
||||
*/
|
||||
function Config(json) {
|
||||
json = JSON.parse( (json || "{}") );
|
||||
|
||||
this._config = util.mergeRecurse(defaults, json);
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user