From acc52336716ae7ba69bcdfa2d3e8a91e899e9f49 Mon Sep 17 00:00:00 2001
From: Naomi Black <naomitraveller@gmail.com>
Date: Fri, 29 Apr 2016 21:37:31 -0700
Subject: [PATCH] chore(dgeni): update dgeni to handle repackaging changes

---
 tools/api-builder/angular.io-package/index.js | 33 ++++++++++---------
 .../templates/var.template.html               |  2 +-
 .../processors/readTypeScriptModules.js       |  2 +-
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/tools/api-builder/angular.io-package/index.js b/tools/api-builder/angular.io-package/index.js
index 5dcc407af0..08dc342957 100644
--- a/tools/api-builder/angular.io-package/index.js
+++ b/tools/api-builder/angular.io-package/index.js
@@ -7,7 +7,7 @@ var cheatsheetPackage = require('../cheatsheet-package');
 var PROJECT_PATH = path.resolve(__dirname, "../../..");
 var PUBLIC_PATH = path.resolve(PROJECT_PATH, 'public');
 var DOCS_PATH = path.resolve(PUBLIC_PATH, 'docs');
-var ANGULAR2_DOCS_PATH = path.resolve(__dirname, '../../../../angular/modules/angular2/docs');
+var ANGULAR2_DOCS_PATH = path.resolve(__dirname, '../../../../angular/modules/@angular/docs');
 
 
 module.exports = new Package('angular.io', [basePackage, targetPackage, cheatsheetPackage])
@@ -41,19 +41,22 @@ module.exports = new Package('angular.io', [basePackage, targetPackage, cheatshe
 .config(function(readTypeScriptModules, writeFilesProcessor, readFilesProcessor) {
 
   readTypeScriptModules.sourceFiles = [
-    'angular2/animate.ts',
-    'angular2/common.ts',
-    'angular2/compiler.ts',
-    'angular2/core.ts',
-    'angular2/http.ts',
-    'angular2/http/testing.ts',
-    'angular2/instrumentation.ts',
-    'angular2/platform/browser.ts',
-    'angular2/platform/common.ts',
-    'angular2/router.ts',
-    'angular2/router/testing.ts',
-    'angular2/upgrade.ts',
-    'angular2/testing.ts'
+    '@angular/common/index.ts',
+    '@angular/common/testing.ts',
+    '@angular/compiler/index.ts',
+    '@angular/compiler/testing.ts',
+    '@angular/core/index.ts',
+    '@angular/core/testing.ts',
+    '@angular/http/index.ts',
+    '@angular/http/testing.ts',
+    '@angular/platform-browser/index.ts',
+    '@angular/platform-browser/testing.ts',
+    '@angular/platform-browser-dynamic/index.ts',
+    '@angular/platform-browser-dynamic/testing.ts',
+    '@angular/platform-server/index.ts',
+    '@angular/platform-server/testing.ts',
+    '@angular/router/index.ts',
+    '@angular/upgrade/index.ts',
   ];
   readTypeScriptModules.hidePrivateMembers = true;
 
@@ -80,7 +83,7 @@ module.exports = new Package('angular.io', [basePackage, targetPackage, cheatshe
   computePathsProcessor.pathTemplates.push({
     docTypes: ['module'],
     getPath: function computeModulePath(doc) {
-      doc.moduleFolder = doc.id.replace(/^angular2\//, '');
+      doc.moduleFolder = doc.id.replace(/^@angular\//, '');
       return doc.moduleFolder + '/index.html';
     },
     getOutputPath: function computeModulePath(doc) {
diff --git a/tools/api-builder/angular.io-package/templates/var.template.html b/tools/api-builder/angular.io-package/templates/var.template.html
index b67006fe84..51a8056352 100644
--- a/tools/api-builder/angular.io-package/templates/var.template.html
+++ b/tools/api-builder/angular.io-package/templates/var.template.html
@@ -11,7 +11,7 @@ include {$ relativePath(doc.path, '_util-fns') $}
   div(class="code-links" flex="80" flex-xs="100")
     pre.prettyprint.no-bg
       code.
-        export {$ doc.name $}{$ returnType(doc.returnType) $}
+        export {$ doc.name $}
     :marked
       {%- if not doc.notYetDocumented %}
 {$ doc.description | indentForMarkdown(6) | trimBlankLines $}
diff --git a/tools/api-builder/typescript-package/processors/readTypeScriptModules.js b/tools/api-builder/typescript-package/processors/readTypeScriptModules.js
index 910b28d2dd..6e7b253351 100644
--- a/tools/api-builder/typescript-package/processors/readTypeScriptModules.js
+++ b/tools/api-builder/typescript-package/processors/readTypeScriptModules.js
@@ -27,7 +27,7 @@ module.exports = function readTypeScriptModules(tsParser, modules, getFileInfo,
     // We leave class members sorted in order of declaration
     sortClassMembers: false,
     // We can provide a collection of strings or regexes to ignore exports whose export names match
-    ignoreExportsMatching: ['___esModule'],
+    ignoreExportsMatching: ['___esModule', '___core_private_types__', '___platform_browser_private__', '___compiler_private__'],
 
     $process: function(docs) {