From a881f09b7787a8ab8cf3119fbbbb27fc3f39d596 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Mon, 26 Oct 2015 17:23:01 -0700
Subject: [PATCH] chore(typings): don't expose es6-shim typing.

Also clean up unused typings generation; we publish the node tree, not browser tree.
Fixes #4882

Closes #4928
---
 tools/broccoli/trees/browser_tree.ts | 27 +++------------------------
 tools/broccoli/trees/node_tree.ts    | 19 ++++++++-----------
 2 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/tools/broccoli/trees/browser_tree.ts b/tools/broccoli/trees/browser_tree.ts
index bb02085405..8bb66a0ba8 100644
--- a/tools/broccoli/trees/browser_tree.ts
+++ b/tools/broccoli/trees/browser_tree.ts
@@ -127,8 +127,7 @@ module.exports = function makeBrowserTree(options, destinationPath) {
 
   // Use TypeScript to transpile the *.ts files to ES5
   var typescriptOptions = {
-    declaration: true,
-    stripInternal: true,
+    declaration: false,
     emitDecoratorMetadata: true,
     experimentalDecorators: true,
     mapRoot: '',  // force sourcemaps to use relative path
@@ -231,28 +230,8 @@ module.exports = function makeBrowserTree(options, destinationPath) {
 
   htmlTree = mergeTrees([htmlTree, scripts, polymer, react]);
 
-  var typingsTree = new Funnel(
-      'modules',
-      {include: ['angular2/typings/**/*.d.ts', 'angular2/manual_typings/*.d.ts'], destDir: '/'});
-
-  // Add a line to the end of our top-level .d.ts file.
-  // This HACK for transitive typings is a workaround for
-  // https://github.com/Microsoft/TypeScript/issues/5097
-  //
-  // This allows users to get our top-level dependencies like es6-shim.d.ts
-  // to appear when they compile against angular2.
-  //
-  // This carries the risk that the user brings their own copy of that file
-  // (or any other symbols exported here) and they will get a compiler error
-  // because of the duplicate definitions.
-  // TODO(alexeagle): remove this when typescript releases a fix
-  es5Tree = replace(es5Tree, {
-    files: ['angular2/angular2.d.ts'],
-    patterns: [{match: /$/, replacement: 'import "./manual_typings/globals.d.ts";\n'}]
-  });
-
-  es5Tree = mergeTrees([es5Tree, htmlTree, assetsTree, clientModules, typingsTree]);
-  es6Tree = mergeTrees([es6Tree, htmlTree, assetsTree, clientModules, typingsTree]);
+  es5Tree = mergeTrees([es5Tree, htmlTree, assetsTree, clientModules]);
+  es6Tree = mergeTrees([es6Tree, htmlTree, assetsTree, clientModules]);
 
   var mergedTree = mergeTrees([stew.mv(es6Tree, '/es6'), stew.mv(es5Tree, '/es5')]);
 
diff --git a/tools/broccoli/trees/node_tree.ts b/tools/broccoli/trees/node_tree.ts
index dab2506c1b..c45f914ea6 100644
--- a/tools/broccoli/trees/node_tree.ts
+++ b/tools/broccoli/trees/node_tree.ts
@@ -88,27 +88,24 @@ module.exports = function makeNodeTree(destinationPath) {
     patterns: [
       {
         match: /^/,
-        replacement: function() {
-          return `var parse5Adapter = require('angular2/src/core/dom/parse5_adapter');\n\r
-                  parse5Adapter.Parse5DomAdapter.makeCurrent();`;
-        }
+        replacement:
+            () => `var parse5Adapter = require('angular2/src/core/dom/parse5_adapter');\r\n` +
+                  `parse5Adapter.Parse5DomAdapter.makeCurrent();`
       },
-      {match: /$/, replacement: function(_, relativePath) { return "\r\n main(); \n\r"; }}
+      {match: /$/, replacement: (_, relativePath) => "\r\n main(); \r\n"}
     ]
   });
 
   // Prepend 'use strict' directive to all JS files.
   // See https://github.com/Microsoft/TypeScript/issues/3576
-  nodeTree = replace(nodeTree, {
-    files: ['**/*.js'],
-    patterns: [{match: /^/, replacement: function() { return `'use strict';` }}]
-  });
+  nodeTree = replace(
+      nodeTree, {files: ['**/*.js'], patterns: [{match: /^/, replacement: () => `'use strict';`}]});
 
   // Add a line to the end of our top-level .d.ts file.
   // This HACK for transitive typings is a workaround for
   // https://github.com/Microsoft/TypeScript/issues/5097
   //
-  // This allows users to get our top-level dependencies like es6-shim.d.ts
+  // This allows users to get our top-level dependencies like zone.d.ts
   // to appear when they compile against angular2.
   //
   // This carries the risk that the user brings their own copy of that file
@@ -117,7 +114,7 @@ module.exports = function makeNodeTree(destinationPath) {
   // TODO(alexeagle): remove this when typescript releases a fix
   nodeTree = replace(nodeTree, {
     files: ['angular2/angular2.d.ts'],
-    patterns: [{match: /$/, replacement: 'import "./manual_typings/globals.d.ts";\n'}]
+    patterns: [{match: /$/, replacement: 'import "./manual_typings/globals-es6.d.ts";\r\n'}]
   });
 
   return destCopy(nodeTree, destinationPath);