From 23c09b488d3fdcad642d3b2e438c8a83ee0150a3 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Tue, 28 Nov 2017 19:34:54 +0100
Subject: [PATCH] build: fix invalid umd globals for rxjs operators (#8572)

Previously in `RxJS`, operators were part of the `Rx.Observable` namespace, but now since those will be imported separately from the `rxjs/operators` path, the UMD module name mapping needs to be updated to `Rx.operators` (https://unpkg.com/rxjs@5.5.2/bundles/Rx.js)

Fixes #8530
---
 package-lock.json                     | 31 ++++++---------------------
 tools/package-tools/rollup-globals.ts | 30 +++++++++++++-------------
 2 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c5400a2ac67..676d2415afa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12598,19 +12598,6 @@
         "walkdir": "0.0.11"
       },
       "dependencies": {
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "2.2.1",
-            "escape-string-regexp": "1.0.5",
-            "has-ansi": "2.0.0",
-            "strip-ansi": "3.0.1",
-            "supports-color": "2.0.0"
-          }
-        },
         "cli-cursor": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
@@ -12682,12 +12669,6 @@
             "log-symbols": "1.0.2"
           }
         },
-        "pluralize": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz",
-          "integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I=",
-          "dev": true
-        },
         "rc": {
           "version": "1.1.6",
           "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz",
@@ -12715,12 +12696,6 @@
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz",
           "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=",
           "dev": true
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
         }
       }
     },
@@ -14293,6 +14268,12 @@
       "integrity": "sha1-24XGgU9eXlo7Se/CjWBP7GKXUVY=",
       "dev": true
     },
+    "pluralize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz",
+      "integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I=",
+      "dev": true
+    },
     "portfinder": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-0.4.0.tgz",
diff --git a/tools/package-tools/rollup-globals.ts b/tools/package-tools/rollup-globals.ts
index 9fbf4106807..0707dfac8d4 100644
--- a/tools/package-tools/rollup-globals.ts
+++ b/tools/package-tools/rollup-globals.ts
@@ -71,19 +71,19 @@ export const rollupGlobals = {
   'rxjs/observable/fromEventPattern': 'Rx.Observable',
   'rxjs/observable/empty': 'Rx.Observable',
 
-  'rxjs/operators/debounceTime': 'Rx.Observable',
-  'rxjs/operators/takeUntil': 'Rx.Observable',
-  'rxjs/operators/first': 'Rx.Observable',
-  'rxjs/operators/take': 'Rx.Observable',
-  'rxjs/operators/filter': 'Rx.Observable',
-  'rxjs/operators/map': 'Rx.Observable',
-  'rxjs/operators/tap': 'Rx.Observable',
-  'rxjs/operators/startWith': 'Rx.Observable',
-  'rxjs/operators/auditTime': 'Rx.Observable',
-  'rxjs/operators/switchMap': 'Rx.Observable',
-  'rxjs/operators/finalize': 'Rx.Observable',
-  'rxjs/operators/catchError': 'Rx.Observable',
-  'rxjs/operators/share': 'Rx.Observable',
-  'rxjs/operators/delay': 'Rx.Observable',
-  'rxjs/operators/combineLatest': 'Rx.Observable',
+  'rxjs/operators/debounceTime': 'Rx.operators',
+  'rxjs/operators/takeUntil': 'Rx.operators',
+  'rxjs/operators/take': 'Rx.operators',
+  'rxjs/operators/first': 'Rx.operators',
+  'rxjs/operators/filter': 'Rx.operators',
+  'rxjs/operators/map': 'Rx.operators',
+  'rxjs/operators/tap': 'Rx.operators',
+  'rxjs/operators/startWith': 'Rx.operators',
+  'rxjs/operators/auditTime': 'Rx.operators',
+  'rxjs/operators/switchMap': 'Rx.operators',
+  'rxjs/operators/finalize': 'Rx.operators',
+  'rxjs/operators/catchError': 'Rx.operators',
+  'rxjs/operators/share': 'Rx.operators',
+  'rxjs/operators/delay': 'Rx.operators',
+  'rxjs/operators/combineLatest': 'Rx.operators',
 };