re-enable removal of duplicated helpers

jrieken · jrieken · commit f8ea7320cffc · 2017-04-28T11:02:26.000+02:00
diff --git a/build/lib/bundle.js b/build/lib/bundle.js
@@ -116,7 +116,7 @@ function emitEntryPoints(modules, entryPoints) {
     });
     return {
         // TODO@TS 2.1.2
-        files: extractStrings(/*removeDuplicateTSBoilerplate(*/ result /*)*/),
+        files: extractStrings(removeDuplicateTSBoilerplate(result)),
         bundleData: bundleData
     };
 }
@@ -208,7 +208,7 @@ function extractStrings(destFiles) {
 function removeDuplicateTSBoilerplate(destFiles) {
     // Taken from typescript compiler => emitFiles
     var BOILERPLATE = [
-        { start: /^var __extends/, end: /^};$/ },
+        { start: /^var __extends/, end: /^}\)\(\);$/ },
         { start: /^var __assign/, end: /^};$/ },
         { start: /^var __decorate/, end: /^};$/ },
         { start: /^var __metadata/, end: /^};$/ },
diff --git a/build/lib/bundle.ts b/build/lib/bundle.ts
@@ -227,7 +227,7 @@ function emitEntryPoints(modules: IBuildModuleInfo[], entryPoints: IEntryPointMa
 
 	return {
 		// TODO@TS 2.1.2
-		files: extractStrings(/*removeDuplicateTSBoilerplate(*/result/*)*/),
+		files: extractStrings(removeDuplicateTSBoilerplate(result)),
 		bundleData: bundleData
 	};
 }
@@ -329,7 +329,7 @@ function extractStrings(destFiles: IConcatFile[]): IConcatFile[] {
 function removeDuplicateTSBoilerplate(destFiles: IConcatFile[]): IConcatFile[] {
 	// Taken from typescript compiler => emitFiles
 	let BOILERPLATE = [
-		{ start: /^var __extends/, end: /^};$/ },
+		{ start: /^var __extends/, end: /^}\)\(\);$/ },
 		{ start: /^var __assign/, end: /^};$/ },
 		{ start: /^var __decorate/, end: /^};$/ },
 		{ start: /^var __metadata/, end: /^};$/ },
