From 5b8ce1e42a74c23473413e6e7eca229b48011fa5 Mon Sep 17 00:00:00 2001
From: Misko Hevery <misko@hevery.com>
Date: Tue, 1 Sep 2015 11:38:36 -0700
Subject: [PATCH] chore(http.d.ts): have http properly reexport core types

---
 docs/typescript-definition-package/index.js | 57 ++++++++-------------
 modules/angular2/http.ts                    |  1 -
 2 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/docs/typescript-definition-package/index.js b/docs/typescript-definition-package/index.js
index b6262eea87..a062a2c191 100644
--- a/docs/typescript-definition-package/index.js
+++ b/docs/typescript-definition-package/index.js
@@ -47,44 +47,27 @@ module.exports = new Package('angular-v2-docs', [jsdocPackage, nunjucksPackage,
   readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname, '../../modules'));
 
   createTypeDefinitionFile.typeDefinitions = [
-      {
-        id: 'angular2/angular2',
-        references: ['../es6-promise/es6-promise.d.ts', '../rx/rx.d.ts'],
-        modules: {
-          'angular2/angular2': {
-            namespace: 'ng',
-            id: 'angular2/angular2'
-          },
-          'angular2/web_worker/worker': {
-            namespace: 'ngWorker',
-            id: 'angular2/web_worker/worker'
-          },
-          'angular2/web_worker/ui': {
-            namespace: 'ngUi',
-            id: 'angular2/web_worker/ui'
-          }
-        }
-      },
-      {
-        id: 'angular2/router',
-        references: ['./angular2.d.ts'],
-        remapTypes: {Type: 'ng.Type'},
-        modules: {
-          'angular2/router': {
-            namespace: 'ngRouter',
-            id: 'angular2/router'
-          }
-        }
-      },
-      {
-        id: 'angular2/http',
-        modules: {
-          'angular2/http': {
-            namespace: 'ngHttp',
-            id: 'angular2/http'
-          }
-        }
+    {
+      id: 'angular2/angular2',
+      references: ['../es6-promise/es6-promise.d.ts', '../rx/rx.d.ts'],
+      modules: {
+        'angular2/angular2': {namespace: 'ng', id: 'angular2/angular2'},
+        'angular2/web_worker/worker': {namespace: 'ngWorker', id: 'angular2/web_worker/worker'},
+        'angular2/web_worker/ui': {namespace: 'ngUi', id: 'angular2/web_worker/ui'}
       }
+    },
+    {
+      id: 'angular2/router',
+      references: ['./angular2.d.ts'],
+      remapTypes: {Type: 'ng.Type'},
+      modules: {'angular2/router': {namespace: 'ngRouter', id: 'angular2/router'}}
+    },
+    {
+      id: 'angular2/http',
+      references: ['./angular2.d.ts'],
+      remapTypes: {Type: 'ng.Type', Observable: 'ng.Observable', EventEmitter: 'ng.EventEmitter'},
+      modules: {'angular2/http': {namespace: 'ngHttp', id: 'angular2/http'}}
+    }
   ];
 })
 
diff --git a/modules/angular2/http.ts b/modules/angular2/http.ts
index fbbf55c168..8388833168 100644
--- a/modules/angular2/http.ts
+++ b/modules/angular2/http.ts
@@ -43,7 +43,6 @@ export {
   RequestModesOpts
 } from './src/http/enums';
 export {URLSearchParams} from './src/http/url_search_params';
-export {EventEmitter, Observable} from './src/core/facade/async';
 
 /**
  * Provides a basic set of injectables to use the {@link Http} service in any application.