From ae1df1cf899c37c36bc6279d0a1934ad5868fb4d Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Sat, 18 May 2019 08:31:25 -0700
Subject: [PATCH] Plugins: expose rxjs matching 6.4.0 (#17148)

* expose rxjs

* remove super old observable export
---
 public/app/features/plugins/plugin_loader.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/public/app/features/plugins/plugin_loader.ts b/public/app/features/plugins/plugin_loader.ts
index 2ee31a7b6aa..55531559d1d 100644
--- a/public/app/features/plugins/plugin_loader.ts
+++ b/public/app/features/plugins/plugin_loader.ts
@@ -75,6 +75,10 @@ exposeToPlugin('angular', angular);
 exposeToPlugin('d3', d3);
 exposeToPlugin('rxjs/Subject', Subject);
 exposeToPlugin('rxjs/Observable', Observable);
+exposeToPlugin('rxjs', {
+  Subject: Subject,
+  Observable: Observable,
+});
 
 // Experimental modules
 exposeToPlugin('prismjs', prismjs);
@@ -84,12 +88,6 @@ exposeToPlugin('slate-plain-serializer', slatePlain);
 exposeToPlugin('react', react);
 exposeToPlugin('react-dom', reactDom);
 
-// backward compatible path
-exposeToPlugin('vendor/npm/rxjs/Rx', {
-  Subject: Subject,
-  Observable: Observable,
-});
-
 exposeToPlugin('app/features/dashboard/impression_store', {
   impressions: impressionSrv,
   __esModule: true,