From 3168ef75daa0923195af23a9730b4142a42e2879 Mon Sep 17 00:00:00 2001
From: Jason Aden <jasonaden@users.noreply.github.com>
Date: Wed, 1 Mar 2017 15:59:09 -0800
Subject: [PATCH] build: fix secondary entry point es5 output and core Rx
 references (#14820)

Secondary entry points (testing, static, etc) are rolled up into a
single ESM/ES2015 file, then downleveled to ESM/ES2015. This downleveling
was not working and was producing ESM/ES2015. Also, the @angular/core
package's .babelrc file was missing reference to Rx Observable which
broke the UMD bundle.

Fixes #14730
---
 build.sh                       | 16 +++++++++-------
 modules/@angular/core/.babelrc | 11 ++++++++++-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/build.sh b/build.sh
index 02861fd8a2..ae0cdf911f 100755
--- a/build.sh
+++ b/build.sh
@@ -67,7 +67,7 @@ getPackageContents() {
 #   None
 #######################################
 downlevelES2015() {
-  echo '{"presets": [ ["es2015", { "modules": false }] ], "compact": true }' > ${1}/.babelrc
+  echo '{"presets": [ ["es2015", { "modules": false }] ], "compact": false }' > ${1}/.babelrc
   $BABELJS ${2} -o ${3}
   rm -f ${1}/.babelrc
 }
@@ -293,7 +293,7 @@ do
       rm -f ${DISTDIR}/.babelrc
       if [[ -d ${DEST_MODULE} ]]; then
         echo "======         Downleveling ES2015 to ESM/ES5"
-        downlevelES2015 ${DEST_MODULE} ${JS_PATH} ${JS_PATH_ES5}
+        downlevelES2015 ${DESTDIR} ${JS_PATH} ${JS_PATH_ES5}
       fi
 
       if [[ -d testing ]]; then
@@ -315,7 +315,7 @@ do
         getPackageContents "${PACKAGE}" "testing" "index" > ${DESTDIR}/testing/package.json
 
         mv ${DESTDIR}/testing.tmp.js ${JS_TESTING_PATH}
-        $BABELJS ${JS_TESTING_PATH} -o ${JS_TESTING_PATH_ES5}
+        downlevelES2015 ${DESTDIR} ${JS_TESTING_PATH} ${JS_TESTING_PATH_ES5}
         cat ${LICENSE_BANNER} > ${UMD_TESTING_ES5_PATH}.tmp
         cat ${UMD_TESTING_ES5_PATH} >> ${UMD_TESTING_ES5_PATH}.tmp
         mv ${UMD_TESTING_ES5_PATH}.tmp ${UMD_TESTING_ES5_PATH}
@@ -341,7 +341,7 @@ do
         getPackageContents "${PACKAGE}" "static"> ${DESTDIR}/static/package.json
 
         mv ${DESTDIR}/static.tmp.js ${JS_STATIC_PATH}
-        $BABELJS ${JS_STATIC_PATH} -o ${JS_STATIC_PATH_ES5}
+        downlevelES2015 ${DESTDIR} ${JS_STATIC_PATH} ${JS_STATIC_PATH_ES5}
         cat ${LICENSE_BANNER} > ${UMD_STATIC_ES5_PATH}.tmp
         cat ${UMD_STATIC_ES5_PATH} >> ${UMD_STATIC_ES5_PATH}.tmp
         mv ${UMD_STATIC_ES5_PATH}.tmp ${UMD_STATIC_ES5_PATH}
@@ -368,7 +368,7 @@ do
         getPackageContents "${PACKAGE}" "upgrade" > ${DESTDIR}/upgrade/package.json
 
         mv ${DESTDIR}/upgrade.tmp.js ${JS_UPGRADE_PATH}
-        $BABELJS ${JS_UPGRADE_PATH} -o ${JS_UPGRADE_PATH_ES5}
+        downlevelES2015 ${DESTDIR} ${JS_UPGRADE_PATH} ${JS_UPGRADE_PATH_ES5}
         cat ${LICENSE_BANNER} > ${UMD_UPGRADE_ES5_PATH}.tmp
         cat ${UMD_UPGRADE_ES5_PATH} >> ${UMD_UPGRADE_ES5_PATH}.tmp
         mv ${UMD_UPGRADE_ES5_PATH}.tmp ${UMD_UPGRADE_ES5_PATH}
@@ -408,9 +408,11 @@ do
         getPackageContents "${PACKAGE}" "animations" > ${DESTDIR}/animations/package.json
 
         echo '{"typings": "../../typings/animations/testing/index.d.ts", "main": "../../bundles/platform-browser-animations-testing.umd.js", "module": "../../@angular/platform-browser/animations/testing.es5.js", "es2015": "../../@angular/platform-browser/animations/testing.js"}' > ${DESTDIR}/animations/testing/package.json
+        # This is needed for Compiler to be able to find the bundle index.
+        echo '{"typings": "animations.d.ts"}' > ${DESTDIR}/typings/animations/package.json
 
         mv ${DESTDIR}/animations.tmp.js ${JS_ANIMATIONS_PATH}
-        $BABELJS ${JS_ANIMATIONS_PATH} -o ${JS_ANIMATIONS_PATH_ES5}
+        downlevelES2015 ${DESTDIR} ${JS_ANIMATIONS_PATH} ${JS_ANIMATIONS_PATH_ES5}
         cat ${LICENSE_BANNER} > ${UMD_ANIMATIONS_ES5_PATH}.tmp
         cat ${UMD_ANIMATIONS_ES5_PATH} >> ${UMD_ANIMATIONS_ES5_PATH}.tmp
         mv ${UMD_ANIMATIONS_ES5_PATH}.tmp ${UMD_ANIMATIONS_ES5_PATH}
@@ -419,7 +421,7 @@ do
         mkdir ${DEST_MODULE}/${PACKAGE}/animations
 
         mv ${DESTDIR}/animations-testing.tmp.js ${JS_ANIMATIONS_TESTING_PATH}
-        $BABELJS ${JS_ANIMATIONS_TESTING_PATH} -o ${JS_ANIMATIONS_TESTING_PATH_ES5}
+        downlevelES2015 ${DESTDIR} ${JS_ANIMATIONS_TESTING_PATH} ${JS_ANIMATIONS_TESTING_PATH_ES5}
         cat ${LICENSE_BANNER} > ${UMD_ANIMATIONS_TESTING_ES5_PATH}.tmp
         cat ${UMD_ANIMATIONS_TESTING_ES5_PATH} >> ${UMD_ANIMATIONS_TESTING_ES5_PATH}.tmp
         mv ${UMD_ANIMATIONS_TESTING_ES5_PATH}.tmp ${UMD_ANIMATIONS_TESTING_ES5_PATH}
diff --git a/modules/@angular/core/.babelrc b/modules/@angular/core/.babelrc
index 768be9d117..ab40eed7e1 100644
--- a/modules/@angular/core/.babelrc
+++ b/modules/@angular/core/.babelrc
@@ -4,7 +4,16 @@
   "plugins": [["transform-es2015-modules-umd", {
     "globals": {
       "@angular/core": "ng.core",
-      "rxjs/Subject": "Rx"
+      "rxjs/Subject": "Rx",
+      "rxjs/Observable": "Rx",
+      "rxjs/Observer": "Rx",
+      "rxjs/Subscription": "Rx",
+
+      "rxjs/symbol/observable": "Rx.Symbol.observable",
+
+      "rxjs/observable/merge": "Rx.Observable",
+
+      "rxjs/operator/share": "Rx.Observable.prototype"
     },
     "exactGlobals": true
   }]],