From 01f16ece3e272512437b9e872249c0facc3b7b4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 26 Oct 2017 12:07:23 +0200
Subject: [PATCH] plugins: added backward compatible path for rxjs

---
 public/app/features/plugins/plugin_loader.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/app/features/plugins/plugin_loader.ts b/public/app/features/plugins/plugin_loader.ts
index 309cc8bf3d5..c450f2e474a 100644
--- a/public/app/features/plugins/plugin_loader.ts
+++ b/public/app/features/plugins/plugin_loader.ts
@@ -64,16 +64,21 @@ exposeToPlugin('lodash', _);
 exposeToPlugin('moment', moment);
 exposeToPlugin('jquery', jquery);
 exposeToPlugin('angular', angular);
+exposeToPlugin('d3', d3);
 exposeToPlugin('rxjs/Subject', Subject);
 exposeToPlugin('rxjs/Observable', Observable);
-exposeToPlugin('d3', d3);
+
+// backward compatible path
+exposeToPlugin('vendor/npm/rxjs/Rx', {
+  Subject: Subject,
+  Observable: Observable
+});
 
 exposeToPlugin('app/features/dashboard/impression_store', {
   impressions: impressions,
   __esModule: true
 });
 
-
 exposeToPlugin('app/plugins/sdk', sdk);
 exposeToPlugin('app/core/utils/datemath', datemath);
 exposeToPlugin('app/core/utils/file_export', fileExport);