From 873e2615ad2cbe8335d5a847166fa9cc96e13506 Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Wed, 29 Jul 2015 11:21:44 +0300
Subject: [PATCH 1/2] Stop __extends function output

---
 gruntfile.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gruntfile.js b/gruntfile.js
index 25bf0c282..4a4f2dd1e 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -312,7 +312,8 @@ module.exports = function(grunt) {
                     removeComments: "<%= !grunt.option('leavecomments') || '' %>",
                     compiler: "node_modules/typescript/bin/tsc",
                     noEmitOnError: true,
-                    experimentalDecorators: true
+                    experimentalDecorators: true,
+                    noEmitHelpers: true
                 }
             },
             buildNodeTests: {

From e427fd5422809d1d343709860d9141efbb5c80cb Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Wed, 29 Jul 2015 11:44:34 +0300
Subject: [PATCH 2/2] Fix module package.json file copying

The package.json files in the module dirs were not copied
properly due to the grunt-contrib-copy update. Fix that
by adding an expand clause to the copy tasks.
---
 gruntfile.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gruntfile.js b/gruntfile.js
index 4a4f2dd1e..53f50f3d7 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -231,6 +231,7 @@ module.exports = function(grunt) {
                 }
             },
             modulesPackageDef: {
+                expand: true,
                 src: localCfg.packageJsonFilePath,
                 dest: localCfg.outModulesDir + "/",
                 options: {
@@ -254,6 +255,7 @@ module.exports = function(grunt) {
                 }
             },
             childPackageFiles: {
+                expand: true,
                 src: [
                     localCfg.srcDir + "/**/package.json",
                     "!./package.json",