diff --git a/docs/dgeni-package/index.js b/docs/dgeni-package/index.js index 8fa08261a5..20190d223d 100644 --- a/docs/dgeni-package/index.js +++ b/docs/dgeni-package/index.js @@ -49,7 +49,7 @@ module.exports = new Package('angular', [jsdocPackage, nunjucksPackage]) // Configure the log service .config(function(log) { - log.level = 'warning'; + log.level = 'warn'; }) @@ -62,6 +62,8 @@ module.exports = new Package('angular', [jsdocPackage, nunjucksPackage]) { include: 'modules/*/src/**/*.js', basePath: 'modules' }, { include: 'modules/*/*.es6', basePath: 'modules' }, { include: 'modules/*/src/**/*.es6', basePath: 'modules' }, + { include: 'modules/*/*.ts', basePath: 'modules' }, + { include: 'modules/*/src/**/*.ts', basePath: 'modules' }, { include: 'modules/*/docs/**/*.md', basePath: 'modules' }, { include: 'docs/content/**/*.md', basePath: 'docs/content' } ]; diff --git a/docs/dgeni-package/readers/atScript.js b/docs/dgeni-package/readers/atScript.js index 035c7e0813..762b7325dc 100644 --- a/docs/dgeni-package/readers/atScript.js +++ b/docs/dgeni-package/readers/atScript.js @@ -10,9 +10,8 @@ var path = require('canonical-path'); module.exports = function atScriptFileReader(log, atParser, modules) { var reader = { name: 'atScriptFileReader', - defaultPattern: /\.js|\.es6$/, + defaultPattern: /\.js|\.es6|\.ts$/, getDocs: function(fileInfo) { - var moduleDoc = atParser.parseModule(fileInfo); moduleDoc.docType = 'module'; moduleDoc.id = moduleDoc.moduleTree.moduleName;