From c349eb4fa48acd4ded6b3ec6d5fcd6fabaf0115c Mon Sep 17 00:00:00 2001
From: Rado Kirov <radokirov@google.com>
Date: Mon, 6 Apr 2015 16:43:53 -0700
Subject: [PATCH] fix(bundles): remove work-around rx.js module detection.

Updates rx to the newest version, because a fix is needed.

Closes #1245
---
 gulpfile.js           | 17 +++++++++++++----
 package.json          |  2 +-
 tools/build/bundle.js |  1 -
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index b760fbed3a..148b501f17 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -872,7 +872,13 @@ var bundleConfig = {
   paths: {
     "*": "dist/js/prod/es6/*.es6",
     "rx/*": "node_modules/rx/*.js"
-  }
+  },
+  meta: {
+    // auto-detection fails to detect properly here - https://github.com/systemjs/builder/issues/123
+    'rx/dist/rx.all': {
+        format: 'cjs'
+      }
+    }
 };
 
 // production build
@@ -901,10 +907,13 @@ gulp.task('bundle.js.min', ['build.js.prod'], function() {
 
 // development build
 gulp.task('bundle.js.dev', ['build.js.dev'], function() {
-  return bundler.bundle(
-      merge(true, bundleConfig, {
+  var devBundleConfig = merge(true, bundleConfig);
+  devBundleConfig.paths =
+      merge(true, devBundleConfig.paths, {
        "*": "dist/js/dev/es6/*.es6"
-      }),
+      });
+  return bundler.bundle(
+      devBundleConfig,
       'angular2/angular2',
       './dist/build/angular2.dev.js',
       {
diff --git a/package.json b/package.json
index 231dae7ece..468a0c35bd 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "gulp-modify": "0.0.4",
     "gulp-replace": "^0.5.3",
     "node-uuid": "1.4.x",
-    "rx": "2.4.6",
+    "rx": "2.5.1",
     "selenium-webdriver": "2.45.1",
     "systemjs": "^0.9.1",
     "traceur": "0.0.87",
diff --git a/tools/build/bundle.js b/tools/build/bundle.js
index cfc5b3814f..555dbf06a8 100644
--- a/tools/build/bundle.js
+++ b/tools/build/bundle.js
@@ -15,6 +15,5 @@ module.exports.bundle = function(buildConfig, moduleName, outputFile, outputConf
 module.exports.modify = function(srcs, concatName) {
   return gulp.src(srcs)
     .pipe(concat(concatName))
-    .pipe(replace('use strict', ''))  // remove after https://github.com/systemjs/builder/issues/123 is fixed.
     .pipe(replace('sourceMappingURL', 'sourceMappingURLDisabled'))  // TODO: add concat for sourceMaps
 }