From 376d508934e4fbe6344313c6c61b95e626ef32cc Mon Sep 17 00:00:00 2001
From: Peter Bacon Darwin <pete@bacondarwin.com>
Date: Sat, 18 Apr 2015 08:35:38 +0100
Subject: [PATCH] chore(doc-gen): read `.es6` files as well as `.js` when
 generating docs

Closes #1429
---
 docs/dgeni-package/index.js            | 2 ++
 docs/dgeni-package/readers/atScript.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/dgeni-package/index.js b/docs/dgeni-package/index.js
index b520d8f970..8fa08261a5 100644
--- a/docs/dgeni-package/index.js
+++ b/docs/dgeni-package/index.js
@@ -60,6 +60,8 @@ module.exports = new Package('angular', [jsdocPackage, nunjucksPackage])
   readFilesProcessor.sourceFiles = [
     { include: 'modules/*/*.js', basePath: 'modules' },
     { include: 'modules/*/src/**/*.js', basePath: 'modules' },
+    { include: 'modules/*/*.es6', basePath: 'modules' },
+    { include: 'modules/*/src/**/*.es6', 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 b6dcfa9168..035c7e0813 100644
--- a/docs/dgeni-package/readers/atScript.js
+++ b/docs/dgeni-package/readers/atScript.js
@@ -10,7 +10,7 @@ var path = require('canonical-path');
 module.exports = function atScriptFileReader(log, atParser, modules) {
   var reader = {
     name: 'atScriptFileReader',
-    defaultPattern: /\.js$/,
+    defaultPattern: /\.js|\.es6$/,
     getDocs: function(fileInfo) {
 
       var moduleDoc = atParser.parseModule(fileInfo);