From 31dd2ced0ed9d5abf9288a3b200c3f748e67c0cd Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Tue, 6 Jul 2021 16:01:39 +0300
Subject: [PATCH] RxJs 7 (#965)

* RxJs 7

* Bump deps

* rxjs 7.0.1

* Bump rxjs

* Bump to rxjs 7.2

* CHANGELOG
---
 CHANGELOG.md                     |  7 +++++++
 packages/x-rxjs/package.json     |  2 +-
 packages/x-rxjs/src/index.ts     |  2 +-
 packages/x-rxjs/src/operators.ts |  2 +-
 yarn.lock                        | 20 ++++++++++++++++++--
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd12e4a6c..242a4f194 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## master
+
+Changes:
+
+- Update `@polkadot/x-rxjs` to use 7.2.0 (operator & root imports the same)
+
+
 ## 6.11.1 Jul 5, 2021
 
 Changes:
diff --git a/packages/x-rxjs/package.json b/packages/x-rxjs/package.json
index 75ea3cae2..ceef99ce3 100644
--- a/packages/x-rxjs/package.json
+++ b/packages/x-rxjs/package.json
@@ -17,6 +17,6 @@
   "homepage": "https://github.com/polkadot-js/common/tree/master/packages/x-rxjs#readme",
   "dependencies": {
     "@babel/runtime": "^7.14.6",
-    "rxjs": "^6.6.7"
+    "rxjs": "^7.2.0"
   }
 }
diff --git a/packages/x-rxjs/src/index.ts b/packages/x-rxjs/src/index.ts
index 6abab1593..652cd6e29 100644
--- a/packages/x-rxjs/src/index.ts
+++ b/packages/x-rxjs/src/index.ts
@@ -1,4 +1,4 @@
 // Copyright 2017-2021 @polkadot/x-rxjs authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export * from './cjs/index.js';
+export * from 'rxjs';
diff --git a/packages/x-rxjs/src/operators.ts b/packages/x-rxjs/src/operators.ts
index 4ee67c5d2..c137d5dc3 100644
--- a/packages/x-rxjs/src/operators.ts
+++ b/packages/x-rxjs/src/operators.ts
@@ -1,4 +1,4 @@
 // Copyright 2017-2021 @polkadot/x-rxjs authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export * from './cjs/operators.js';
+export * from 'rxjs/operators';
diff --git a/yarn.lock b/yarn.lock
index 1c00ea8f9..95b48e8b4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2213,7 +2213,7 @@ __metadata:
   resolution: "@polkadot/x-rxjs@workspace:packages/x-rxjs"
   dependencies:
     "@babel/runtime": ^7.14.6
-    rxjs: ^6.6.7
+    rxjs: ^7.2.0
   languageName: unknown
   linkType: soft
 
@@ -9886,7 +9886,7 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
-"rxjs@npm:6, rxjs@npm:^6.6.6, rxjs@npm:^6.6.7":
+"rxjs@npm:6, rxjs@npm:^6.6.6":
   version: 6.6.7
   resolution: "rxjs@npm:6.6.7"
   dependencies:
@@ -9895,6 +9895,15 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
+"rxjs@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "rxjs@npm:7.2.0"
+  dependencies:
+    tslib: ~2.1.0
+  checksum: 92a3511035b3d51e97018247218183e5ef88d167ef271c1222be1b2d98b4a5daa5c3827e2b536c3f11f91ad435907820e7a91446d92f222430fd00e0b9f7dbba
+  languageName: node
+  linkType: hard
+
 "safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:~5.2.0":
   version: 5.2.1
   resolution: "safe-buffer@npm:5.2.1"
@@ -10885,6 +10894,13 @@ resolve@^2.0.0-next.3:
   languageName: node
   linkType: hard
 
+"tslib@npm:~2.1.0":
+  version: 2.1.0
+  resolution: "tslib@npm:2.1.0"
+  checksum: aa189c8179de0427b0906da30926fd53c59d96ec239dff87d6e6bc831f608df0cbd6f77c61dabc074408bd0aa0b9ae4ec35cb2c15f729e32f37274db5730cb78
+  languageName: node
+  linkType: hard
+
 "tsutils@npm:^3.21.0":
   version: 3.21.0
   resolution: "tsutils@npm:3.21.0"