repos-javascript
diff --git a/‎build/tasks/doc.js
Lines changed: 26 additions & 7 deletions b/‎build/tasks/doc.js
Lines changed: 26 additions & 7 deletions
@@ -1,14 +1,33 @@
 var gulp = require('gulp');
-var tools = require('aurelia-tools');
 var paths = require('../paths');
-var yuidoc = require('gulp-yuidoc');
+var typedoc = require("gulp-typedoc");
+var typedocExtractor = require("gulp-typedoc-extractor");
+var runSequence = require('run-sequence');
 
 gulp.task('doc-generate', function(){
-  return gulp.src(paths.source)
-    .pipe(yuidoc.parser(null, 'api.json'))
-    .pipe(gulp.dest(paths.doc));
+  return gulp.src([paths.output + '*.d.ts', paths.doc + '/core-js.d.ts', './jspm_packages/github/aurelia/*/*.d.ts'])
+    .pipe(typedoc({
+            target: "es6",
+            includeDeclarations: true,
+            json: paths.doc + '/api.json',
+            name: paths.packageName + '-docs', 
+						mode: 'modules',
+						excludeExternals: true,
+            ignoreCompilerErrors: false,
+            version: true
+        }));
 });
 
-gulp.task('doc', ['doc-generate'], function(){
-  tools.transformAPIModel(paths.doc);
+gulp.task('doc-extract', function(){
+	return gulp.src([paths.doc + '/api.json'])
+		.pipe(typedocExtractor(paths.packageName))
+		.pipe(gulp.dest(paths.doc));
 });
+
+gulp.task('doc', function(callback){
+  return runSequence(
+  	'doc-generate',
+  	'doc-extract',
+    callback
+  );
+});