From ec8c0d3e8bc383ca9c816aef3e1e8c1fb0dfc34e Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 19 Jan 2021 22:08:03 +0100 Subject: [PATCH] Move x-rxjs into common (#3078) * Moe x-rxjs into common * yarn * jest config * Pull in new pubslished x-rxjs --- jest.config.js | 6 +- packages/api-contract/package.json | 2 +- packages/api-derive/package.json | 6 +- packages/api/package.json | 6 +- packages/metadata/package.json | 6 +- packages/rpc-core/package.json | 4 +- packages/rpc-provider/package.json | 10 +- packages/typegen/package.json | 2 +- packages/types-known/package.json | 2 +- packages/types/package.json | 6 +- packages/x-rxjs/LICENSE | 201 ----------------------------- packages/x-rxjs/README.md | 5 - packages/x-rxjs/package.json | 18 --- packages/x-rxjs/src/index.d.ts | 4 - packages/x-rxjs/src/index.js | 74 ----------- packages/x-rxjs/src/index.mjs | 4 - packages/x-rxjs/src/operators.d.ts | 4 - packages/x-rxjs/src/operators.js | 117 ----------------- packages/x-rxjs/src/operators.mjs | 4 - tsconfig.json | 4 +- yarn.lock | 153 +++++++++++----------- 21 files changed, 102 insertions(+), 536 deletions(-) delete mode 100644 packages/x-rxjs/LICENSE delete mode 100644 packages/x-rxjs/README.md delete mode 100644 packages/x-rxjs/package.json delete mode 100644 packages/x-rxjs/src/index.d.ts delete mode 100644 packages/x-rxjs/src/index.js delete mode 100644 packages/x-rxjs/src/index.mjs delete mode 100644 packages/x-rxjs/src/operators.d.ts delete mode 100644 packages/x-rxjs/src/operators.js delete mode 100644 packages/x-rxjs/src/operators.mjs diff --git a/jest.config.js b/jest.config.js index 6264a76524..c3711ef9d9 100644 --- a/jest.config.js +++ b/jest.config.js @@ -13,8 +13,7 @@ module.exports = Object.assign({}, config, { '@polkadot/typegen(.*)$': '/packages/typegen/src/$1', '@polkadot/types-known(.*)$': '/packages/types-known/src/$1', // eslint-disable-next-line sort-keys - '@polkadot/types(.*)$': '/packages/types/src/$1', - '@polkadot/x-rxjs(.*)$': '/packages/x-rxjs/src/$1' + '@polkadot/types(.*)$': '/packages/types/src/$1' }, modulePathIgnorePatterns: [ '/packages/api/build', @@ -25,8 +24,7 @@ module.exports = Object.assign({}, config, { '/packages/rpc-provider/build', '/packages/typegen/build', '/packages/types/build', - '/packages/types-known/build', - '/packages/x-rxjs/build' + '/packages/types-known/build' ], resolver: '@polkadot/dev/config/jest-resolver.cjs' }); diff --git a/packages/api-contract/package.json b/packages/api-contract/package.json index 04203ad960..26fc1ef5d7 100644 --- a/packages/api-contract/package.json +++ b/packages/api-contract/package.json @@ -16,7 +16,7 @@ "@babel/runtime": "^7.12.5", "@polkadot/api": "3.5.2-1", "@polkadot/types": "3.5.2-1", - "@polkadot/util": "^5.3.1", + "@polkadot/util": "^5.3.2-1", "@polkadot/x-rxjs": "3.5.2-1", "bn.js": "^4.11.9" } diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json index 42ecfd9c79..bfaccd7e0a 100644 --- a/packages/api-derive/package.json +++ b/packages/api-derive/package.json @@ -17,13 +17,13 @@ "@polkadot/api": "3.5.2-1", "@polkadot/rpc-core": "3.5.2-1", "@polkadot/types": "3.5.2-1", - "@polkadot/util": "^5.3.1", - "@polkadot/util-crypto": "^5.3.1", + "@polkadot/util": "^5.3.2-1", + "@polkadot/util-crypto": "^5.3.2-1", "@polkadot/x-rxjs": "3.5.2-1", "bn.js": "^4.11.9" }, "devDependencies": { - "@polkadot/keyring": "^5.3.1", + "@polkadot/keyring": "^5.3.2-1", "@polkadot/rpc-provider": "3.5.2-1" } } diff --git a/packages/api/package.json b/packages/api/package.json index e62c540202..60e7d7b668 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -18,14 +18,14 @@ "dependencies": { "@babel/runtime": "^7.12.5", "@polkadot/api-derive": "3.5.2-1", - "@polkadot/keyring": "^5.3.1", + "@polkadot/keyring": "^5.3.2-1", "@polkadot/metadata": "3.5.2-1", "@polkadot/rpc-core": "3.5.2-1", "@polkadot/rpc-provider": "3.5.2-1", "@polkadot/types": "3.5.2-1", "@polkadot/types-known": "3.5.2-1", - "@polkadot/util": "^5.3.1", - "@polkadot/util-crypto": "^5.3.1", + "@polkadot/util": "^5.3.2-1", + "@polkadot/util-crypto": "^5.3.2-1", "@polkadot/x-rxjs": "3.5.2-1", "bn.js": "^4.11.9", "eventemitter3": "^4.0.7" diff --git a/packages/metadata/package.json b/packages/metadata/package.json index d4e26f292d..b5a456e8dc 100644 --- a/packages/metadata/package.json +++ b/packages/metadata/package.json @@ -19,11 +19,11 @@ "@babel/runtime": "^7.12.5", "@polkadot/types": "3.5.2-1", "@polkadot/types-known": "3.5.2-1", - "@polkadot/util": "^5.3.1", - "@polkadot/util-crypto": "^5.3.1", + "@polkadot/util": "^5.3.2-1", + "@polkadot/util-crypto": "^5.3.2-1", "bn.js": "^4.11.9" }, "devDependencies": { - "@polkadot/keyring": "^5.3.1" + "@polkadot/keyring": "^5.3.2-1" } } diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json index 3a433718fa..ab8d69cdc3 100644 --- a/packages/rpc-core/package.json +++ b/packages/rpc-core/package.json @@ -17,10 +17,10 @@ "@polkadot/metadata": "3.5.2-1", "@polkadot/rpc-provider": "3.5.2-1", "@polkadot/types": "3.5.2-1", - "@polkadot/util": "^5.3.1", + "@polkadot/util": "^5.3.2-1", "@polkadot/x-rxjs": "3.5.2-1" }, "devDependencies": { - "@polkadot/keyring": "^5.3.1" + "@polkadot/keyring": "^5.3.2-1" } } diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json index 461b9872e8..4981aadc9b 100644 --- a/packages/rpc-provider/package.json +++ b/packages/rpc-provider/package.json @@ -15,15 +15,15 @@ "dependencies": { "@babel/runtime": "^7.12.5", "@polkadot/types": "3.5.2-1", - "@polkadot/util": "^5.3.1", - "@polkadot/util-crypto": "^5.3.1", - "@polkadot/x-fetch": "^5.3.1", - "@polkadot/x-ws": "^5.3.1", + "@polkadot/util": "^5.3.2-1", + "@polkadot/util-crypto": "^5.3.2-1", + "@polkadot/x-fetch": "^5.3.2-1", + "@polkadot/x-ws": "^5.3.2-1", "bn.js": "^4.11.9", "eventemitter3": "^4.0.7" }, "devDependencies": { - "@polkadot/keyring": "^5.3.1", + "@polkadot/keyring": "^5.3.2-1", "@polkadot/metadata": "3.5.2-1", "mock-socket": "^9.0.3", "nock": "^13.0.5" diff --git a/packages/typegen/package.json b/packages/typegen/package.json index f44c7ceacd..3c4a904663 100644 --- a/packages/typegen/package.json +++ b/packages/typegen/package.json @@ -27,7 +27,7 @@ "@polkadot/metadata": "3.5.2-1", "@polkadot/rpc-provider": "3.5.2-1", "@polkadot/types": "3.5.2-1", - "@polkadot/util": "^5.3.1", + "@polkadot/util": "^5.3.2-1", "handlebars": "^4.7.6", "websocket": "^1.0.33", "yargs": "^16.2.0" diff --git a/packages/types-known/package.json b/packages/types-known/package.json index e0bf6f7757..8086d8619b 100644 --- a/packages/types-known/package.json +++ b/packages/types-known/package.json @@ -15,7 +15,7 @@ "dependencies": { "@babel/runtime": "^7.12.5", "@polkadot/types": "3.5.2-1", - "@polkadot/util": "^5.3.1", + "@polkadot/util": "^5.3.2-1", "bn.js": "^4.11.9" }, "devDependencies": { diff --git a/packages/types/package.json b/packages/types/package.json index d0c97e749e..2a6cde4295 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -18,13 +18,13 @@ "dependencies": { "@babel/runtime": "^7.12.5", "@polkadot/metadata": "3.5.2-1", - "@polkadot/util": "^5.3.1", - "@polkadot/util-crypto": "^5.3.1", + "@polkadot/util": "^5.3.2-1", + "@polkadot/util-crypto": "^5.3.2-1", "@polkadot/x-rxjs": "3.5.2-1", "@types/bn.js": "^4.11.6", "bn.js": "^4.11.9" }, "devDependencies": { - "@polkadot/keyring": "^5.3.1" + "@polkadot/keyring": "^5.3.2-1" } } diff --git a/packages/x-rxjs/LICENSE b/packages/x-rxjs/LICENSE deleted file mode 100644 index 0d381b2e97..0000000000 --- a/packages/x-rxjs/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/packages/x-rxjs/README.md b/packages/x-rxjs/README.md deleted file mode 100644 index 05fef36bf0..0000000000 --- a/packages/x-rxjs/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# @polkadot/x-rxjs - -This is a small wrapper around rjx to make it friendly to both Node.js (from .mjs as well as .cjs) as well as bundlers using both esm and cjs modules. - -This need wil disappear, once rxjs supports export maps. diff --git a/packages/x-rxjs/package.json b/packages/x-rxjs/package.json deleted file mode 100644 index a2a24765a8..0000000000 --- a/packages/x-rxjs/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "@polkadot/x-rxjs", - "version": "3.5.2-1", - "description": "A pass-through interface for RxJs (allowing node + mjs usage)", - "main": "index.js", - "sideEffects": false, - "author": "Jaco Greeff ", - "maintainers": [], - "contributors": [], - "license": "Apache-2.0", - "repository": "github:polkadot-js/api", - "bugs": "https://github.com/polkadot-js/api/issues", - "homepage": "https://github.com/polkadot-js/api/tree/master/packages/x-rxjs#readme", - "dependencies": { - "@babel/runtime": "^7.12.5", - "rxjs": "^6.6.3" - } -} diff --git a/packages/x-rxjs/src/index.d.ts b/packages/x-rxjs/src/index.d.ts deleted file mode 100644 index 652cd6e296..0000000000 --- a/packages/x-rxjs/src/index.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2017-2021 @polkadot/x-rxjs authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -export * from 'rxjs'; diff --git a/packages/x-rxjs/src/index.js b/packages/x-rxjs/src/index.js deleted file mode 100644 index 6edbd35f2b..0000000000 --- a/packages/x-rxjs/src/index.js +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright 2017-2021 @polkadot/x-rxjs authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// This is not great, but while having esm files, rxjs doesn't quite play nicely with -// Node.js mjs files. (Hopefully this improves in 7.0, although no exports map as of yet) -// -// Generated via s/export \{ (.*) \} from .*/exports.$1 = rxjs.$1;/ on rxjs/_esm - -// This is or our builder -// @polkadot/dev: exports-node - -const rxjs = require('rxjs'); - -exports.Observable = rxjs.Observable; -exports.ConnectableObservable = rxjs.ConnectableObservable; -exports.GroupedObservable = rxjs.GroupedObservable; -exports.observable = rxjs.observable; -exports.Subject = rxjs.Subject; -exports.BehaviorSubject = rxjs.BehaviorSubject; -exports.ReplaySubject = rxjs.ReplaySubject; -exports.AsyncSubject = rxjs.AsyncSubject; -exports.asap = rxjs.asap; -exports.asapScheduler = rxjs.asapScheduler; -exports.async = rxjs.async; -exports.asyncScheduler = rxjs.asyncScheduler; -exports.queue = rxjs.queue; -exports.queueScheduler = rxjs.queueScheduler; -exports.animationFrame = rxjs.animationFrame; -exports.animationFrameScheduler = rxjs.animationFrameScheduler; -exports.VirtualTimeScheduler = rxjs.VirtualTimeScheduler; -exports.VirtualAction = rxjs.VirtualAction; -exports.Scheduler = rxjs.Scheduler; -exports.Subscription = rxjs.Subscription; -exports.Subscriber = rxjs.Subscriber; -exports.Notification = rxjs.Notification; -exports.NotificationKind = rxjs.NotificationKind; -exports.pipe = rxjs.pipe; -exports.noop = rxjs.noop; -exports.identity = rxjs.identity; -exports.isObservable = rxjs.isObservable; -exports.ArgumentOutOfRangeError = rxjs.ArgumentOutOfRangeError; -exports.EmptyError = rxjs.EmptyError; -exports.ObjectUnsubscribedError = rxjs.ObjectUnsubscribedError; -exports.UnsubscriptionError = rxjs.UnsubscriptionError; -exports.TimeoutError = rxjs.TimeoutError; -exports.bindCallback = rxjs.bindCallback; -exports.bindNodeCallback = rxjs.bindNodeCallback; -exports.combineLatest = rxjs.combineLatest; -exports.concat = rxjs.concat; -exports.defer = rxjs.defer; -exports.empty = rxjs.empty; -exports.forkJoin = rxjs.forkJoin; -exports.from = rxjs.from; -exports.fromEvent = rxjs.fromEvent; -exports.fromEventPattern = rxjs.fromEventPattern; -exports.generate = rxjs.generate; -exports.iif = rxjs.iif; -exports.interval = rxjs.interval; -exports.merge = rxjs.merge; -exports.never = rxjs.never; -exports.of = rxjs.of; -exports.onErrorResumeNext = rxjs.onErrorResumeNext; -exports.pairs = rxjs.pairs; -exports.partition = rxjs.partition; -exports.race = rxjs.race; -exports.range = rxjs.range; -exports.throwError = rxjs.throwError; -exports.timer = rxjs.timer; -exports.using = rxjs.using; -exports.zip = rxjs.zip; -exports.scheduled = rxjs.scheduled; -exports.EMPTY = rxjs.EMPTY; -exports.NEVER = rxjs.NEVER; -exports.config = rxjs.config; diff --git a/packages/x-rxjs/src/index.mjs b/packages/x-rxjs/src/index.mjs deleted file mode 100644 index 3351161e14..0000000000 --- a/packages/x-rxjs/src/index.mjs +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2017-2021 @polkadot/x-rxjs authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -export { animationFrame, animationFrameScheduler, ArgumentOutOfRangeError, asap, asapScheduler, async, asyncScheduler, AsyncSubject, BehaviorSubject, bindCallback, bindNodeCallback, combineLatest, concat, config, ConnectableObservable, defer, EMPTY, empty, EmptyError, forkJoin, from, fromEvent, fromEventPattern, generate, GroupedObservable, identity, iif, interval, isObservable, merge, NEVER, never, noop, Notification, NotificationKind, ObjectUnsubscribedError, Observable, observable, of, onErrorResumeNext, pairs, partition, pipe, queue, queueScheduler, race, range, ReplaySubject, scheduled, Scheduler, Subject, Subscriber, Subscription, throwError, TimeoutError, timer, UnsubscriptionError, using, VirtualAction, VirtualTimeScheduler, zip } from 'rxjs/_esm5/index.js'; diff --git a/packages/x-rxjs/src/operators.d.ts b/packages/x-rxjs/src/operators.d.ts deleted file mode 100644 index c137d5dc3c..0000000000 --- a/packages/x-rxjs/src/operators.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2017-2021 @polkadot/x-rxjs authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -export * from 'rxjs/operators'; diff --git a/packages/x-rxjs/src/operators.js b/packages/x-rxjs/src/operators.js deleted file mode 100644 index 8d996c9d63..0000000000 --- a/packages/x-rxjs/src/operators.js +++ /dev/null @@ -1,117 +0,0 @@ -// Copyright 2017-2021 @polkadot/x-rxjs authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// This is not great, but while having esm files, rxjs doesn't quite play nicely with -// Node.js mjs files. (Hopefully this improves in 7.0, although no exports map as of yet) -// -// Generated via s/export \{ (.*) \} from .*/exports.$1 = rxjs.$1;/ on rxjs/_esm - -// This is or our builder, to add the correct exports entry -// @polkadot/dev: exports-node - -const operators = require('rxjs/operators'); - -exports.audit = operators.audit; -exports.auditTime = operators.auditTime; -exports.buffer = operators.buffer; -exports.bufferCount = operators.bufferCount; -exports.bufferTime = operators.bufferTime; -exports.bufferToggle = operators.bufferToggle; -exports.bufferWhen = operators.bufferWhen; -exports.catchError = operators.catchError; -exports.combineAll = operators.combineAll; -exports.combineLatest = operators.combineLatest; -exports.concat = operators.concat; -exports.concatAll = operators.concatAll; -exports.concatMap = operators.concatMap; -exports.concatMapTo = operators.concatMapTo; -exports.count = operators.count; -exports.debounce = operators.debounce; -exports.debounceTime = operators.debounceTime; -exports.defaultIfEmpty = operators.defaultIfEmpty; -exports.delay = operators.delay; -exports.delayWhen = operators.delayWhen; -exports.dematerialize = operators.dematerialize; -exports.distinct = operators.distinct; -exports.distinctUntilChanged = operators.distinctUntilChanged; -exports.distinctUntilKeyChanged = operators.distinctUntilKeyChanged; -exports.elementAt = operators.elementAt; -exports.endWith = operators.endWith; -exports.every = operators.every; -exports.exhaust = operators.exhaust; -exports.exhaustMap = operators.exhaustMap; -exports.expand = operators.expand; -exports.filter = operators.filter; -exports.finalize = operators.finalize; -exports.find = operators.find; -exports.findIndex = operators.findIndex; -exports.first = operators.first; -exports.groupBy = operators.groupBy; -exports.ignoreElements = operators.ignoreElements; -exports.isEmpty = operators.isEmpty; -exports.last = operators.last; -exports.map = operators.map; -exports.mapTo = operators.mapTo; -exports.materialize = operators.materialize; -exports.max = operators.max; -exports.merge = operators.merge; -exports.mergeAll = operators.mergeAll; -exports.mergeMap = operators.mergeMap; -exports.flatMap = operators.flatMap; -exports.mergeMapTo = operators.mergeMapTo; -exports.mergeScan = operators.mergeScan; -exports.min = operators.min; -exports.multicast = operators.multicast; -exports.observeOn = operators.observeOn; -exports.onErrorResumeNext = operators.onErrorResumeNext; -exports.pairwise = operators.pairwise; -exports.partition = operators.partition; -exports.pluck = operators.pluck; -exports.publish = operators.publish; -exports.publishBehavior = operators.publishBehavior; -exports.publishLast = operators.publishLast; -exports.publishReplay = operators.publishReplay; -exports.race = operators.race; -exports.reduce = operators.reduce; -exports.repeat = operators.repeat; -exports.repeatWhen = operators.repeatWhen; -exports.retry = operators.retry; -exports.retryWhen = operators.retryWhen; -exports.refCount = operators.refCount; -exports.sample = operators.sample; -exports.sampleTime = operators.sampleTime; -exports.scan = operators.scan; -exports.sequenceEqual = operators.sequenceEqual; -exports.share = operators.share; -exports.shareReplay = operators.shareReplay; -exports.single = operators.single; -exports.skip = operators.skip; -exports.skipLast = operators.skipLast; -exports.skipUntil = operators.skipUntil; -exports.skipWhile = operators.skipWhile; -exports.startWith = operators.startWith; -exports.subscribeOn = operators.subscribeOn; -exports.switchAll = operators.switchAll; -exports.switchMap = operators.switchMap; -exports.switchMapTo = operators.switchMapTo; -exports.take = operators.take; -exports.takeLast = operators.takeLast; -exports.takeUntil = operators.takeUntil; -exports.takeWhile = operators.takeWhile; -exports.tap = operators.tap; -exports.throttle = operators.throttle; -exports.throttleTime = operators.throttleTime; -exports.throwIfEmpty = operators.throwIfEmpty; -exports.timeInterval = operators.timeInterval; -exports.timeout = operators.timeout; -exports.timeoutWith = operators.timeoutWith; -exports.timestamp = operators.timestamp; -exports.toArray = operators.toArray; -exports.window = operators.window; -exports.windowCount = operators.windowCount; -exports.windowTime = operators.windowTime; -exports.windowToggle = operators.windowToggle; -exports.windowWhen = operators.windowWhen; -exports.withLatestFrom = operators.withLatestFrom; -exports.zip = operators.zip; -exports.zipAll = operators.zipAll; diff --git a/packages/x-rxjs/src/operators.mjs b/packages/x-rxjs/src/operators.mjs deleted file mode 100644 index a829660fb6..0000000000 --- a/packages/x-rxjs/src/operators.mjs +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2017-2021 @polkadot/x-rxjs authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -export { audit, auditTime, buffer, bufferCount, bufferTime, bufferToggle, bufferWhen, catchError, combineAll, combineLatest, concat, concatAll, concatMap, concatMapTo, count, debounce, debounceTime, defaultIfEmpty, delay, delayWhen, dematerialize, distinct, distinctUntilChanged, distinctUntilKeyChanged, elementAt, endWith, every, exhaust, exhaustMap, expand, filter, finalize, find, findIndex, first, flatMap, groupBy, ignoreElements, isEmpty, last, map, mapTo, materialize, max, merge, mergeAll, mergeMap, mergeMapTo, mergeScan, min, multicast, observeOn, onErrorResumeNext, pairwise, partition, pluck, publish, publishBehavior, publishLast, publishReplay, race, reduce, refCount, repeat, repeatWhen, retry, retryWhen, sample, sampleTime, scan, sequenceEqual, share, shareReplay, single, skip, skipLast, skipUntil, skipWhile, startWith, subscribeOn, switchAll, switchMap, switchMapTo, take, takeLast, takeUntil, takeWhile, tap, throttle, throttleTime, throwIfEmpty, timeInterval, timeout, timeoutWith, timestamp, toArray, window, windowCount, windowTime, windowToggle, windowWhen, withLatestFrom, zip, zipAll } from 'rxjs/_esm5/operators/index.js'; diff --git a/tsconfig.json b/tsconfig.json index 7ee70f73b8..635923122e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -27,9 +27,7 @@ "@polkadot/types/package-info.json": ["packages/types/package.json"], "@polkadot/types/*": ["packages/types/src/*"], "@polkadot/types-known": ["packages/types-known/src"], - "@polkadot/types-known/*": ["packages/types-known/src/*"], - "@polkadot/x-rxjs": ["packages/x-rxjs/src"], - "@polkadot/x-rxjs/*": ["packages/x-rxjs/src/*"], + "@polkadot/types-known/*": ["packages/types-known/src/*"] }, "skipLibCheck": true, "typeRoots": [ diff --git a/yarn.lock b/yarn.lock index 90cf130eff..d50105efe7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1624,7 +1624,7 @@ __metadata: "@babel/runtime": ^7.12.5 "@polkadot/api": 3.5.2-1 "@polkadot/types": 3.5.2-1 - "@polkadot/util": ^5.3.1 + "@polkadot/util": ^5.3.2-1 "@polkadot/x-rxjs": 3.5.2-1 bn.js: ^4.11.9 languageName: unknown @@ -1636,12 +1636,12 @@ __metadata: dependencies: "@babel/runtime": ^7.12.5 "@polkadot/api": 3.5.2-1 - "@polkadot/keyring": ^5.3.1 + "@polkadot/keyring": ^5.3.2-1 "@polkadot/rpc-core": 3.5.2-1 "@polkadot/rpc-provider": 3.5.2-1 "@polkadot/types": 3.5.2-1 - "@polkadot/util": ^5.3.1 - "@polkadot/util-crypto": ^5.3.1 + "@polkadot/util": ^5.3.2-1 + "@polkadot/util-crypto": ^5.3.2-1 "@polkadot/x-rxjs": 3.5.2-1 bn.js: ^4.11.9 languageName: unknown @@ -1653,14 +1653,14 @@ __metadata: dependencies: "@babel/runtime": ^7.12.5 "@polkadot/api-derive": 3.5.2-1 - "@polkadot/keyring": ^5.3.1 + "@polkadot/keyring": ^5.3.2-1 "@polkadot/metadata": 3.5.2-1 "@polkadot/rpc-core": 3.5.2-1 "@polkadot/rpc-provider": 3.5.2-1 "@polkadot/types": 3.5.2-1 "@polkadot/types-known": 3.5.2-1 - "@polkadot/util": ^5.3.1 - "@polkadot/util-crypto": ^5.3.1 + "@polkadot/util": ^5.3.2-1 + "@polkadot/util-crypto": ^5.3.2-1 "@polkadot/x-rxjs": 3.5.2-1 bn.js: ^4.11.9 eventemitter3: ^4.0.7 @@ -1758,17 +1758,17 @@ __metadata: languageName: node linkType: hard -"@polkadot/keyring@npm:^5.3.1": - version: 5.3.1 - resolution: "@polkadot/keyring@npm:5.3.1" +"@polkadot/keyring@npm:^5.3.2-1": + version: 5.3.2-1 + resolution: "@polkadot/keyring@npm:5.3.2-1" dependencies: "@babel/runtime": ^7.12.5 - "@polkadot/util": 5.3.1 - "@polkadot/util-crypto": 5.3.1 + "@polkadot/util": 5.3.2-1 + "@polkadot/util-crypto": 5.3.2-1 peerDependencies: - "@polkadot/util": 5.3.1 - "@polkadot/util-crypto": 5.3.1 - checksum: 8cbef9e4a9359b0602cc45584aafbcdebbea83b640a78e719e3d6ebaf2c1d323dfdef9f9344d9cc6201a1660bbdbff58b1aacf2fafbb51520cbc161ea9fbaff6 + "@polkadot/util": 5.3.2-1 + "@polkadot/util-crypto": 5.3.2-1 + checksum: a64f423044c0cb363d6367fb05331a035edd1c8debb9b9cc00e4b6600411d7b872f13f6d2248fc1b125e3993c76f953a70c4daf6c3ab21a64d62e89b5e86822f languageName: node linkType: hard @@ -1777,21 +1777,21 @@ __metadata: resolution: "@polkadot/metadata@workspace:packages/metadata" dependencies: "@babel/runtime": ^7.12.5 - "@polkadot/keyring": ^5.3.1 + "@polkadot/keyring": ^5.3.2-1 "@polkadot/types": 3.5.2-1 "@polkadot/types-known": 3.5.2-1 - "@polkadot/util": ^5.3.1 - "@polkadot/util-crypto": ^5.3.1 + "@polkadot/util": ^5.3.2-1 + "@polkadot/util-crypto": ^5.3.2-1 bn.js: ^4.11.9 languageName: unknown linkType: soft -"@polkadot/networks@npm:5.3.1": - version: 5.3.1 - resolution: "@polkadot/networks@npm:5.3.1" +"@polkadot/networks@npm:5.3.2-1": + version: 5.3.2-1 + resolution: "@polkadot/networks@npm:5.3.2-1" dependencies: "@babel/runtime": ^7.12.5 - checksum: 8d18f7a1776d17b9494c79a131c14bc6c2a8272e43eeb0a71d68700637b151b58e4905bf920e09f0f49c9ebc0bbb59d122e323136f1a38f655b851a5a8ab8fbd + checksum: a2504d3e3df50b6ac42816d3e230068fb3b6027f487248bcc5781160d2ad66d6f35039f5e72f144687ebfdfd715975ddc8492f0f44f4935637d4cbf97dcccbb2 languageName: node linkType: hard @@ -1800,11 +1800,11 @@ __metadata: resolution: "@polkadot/rpc-core@workspace:packages/rpc-core" dependencies: "@babel/runtime": ^7.12.5 - "@polkadot/keyring": ^5.3.1 + "@polkadot/keyring": ^5.3.2-1 "@polkadot/metadata": 3.5.2-1 "@polkadot/rpc-provider": 3.5.2-1 "@polkadot/types": 3.5.2-1 - "@polkadot/util": ^5.3.1 + "@polkadot/util": ^5.3.2-1 "@polkadot/x-rxjs": 3.5.2-1 languageName: unknown linkType: soft @@ -1814,13 +1814,13 @@ __metadata: resolution: "@polkadot/rpc-provider@workspace:packages/rpc-provider" dependencies: "@babel/runtime": ^7.12.5 - "@polkadot/keyring": ^5.3.1 + "@polkadot/keyring": ^5.3.2-1 "@polkadot/metadata": 3.5.2-1 "@polkadot/types": 3.5.2-1 - "@polkadot/util": ^5.3.1 - "@polkadot/util-crypto": ^5.3.1 - "@polkadot/x-fetch": ^5.3.1 - "@polkadot/x-ws": ^5.3.1 + "@polkadot/util": ^5.3.2-1 + "@polkadot/util-crypto": ^5.3.2-1 + "@polkadot/x-fetch": ^5.3.2-1 + "@polkadot/x-ws": ^5.3.2-1 bn.js: ^4.11.9 eventemitter3: ^4.0.7 mock-socket: ^9.0.3 @@ -1848,7 +1848,7 @@ __metadata: "@polkadot/metadata": 3.5.2-1 "@polkadot/rpc-provider": 3.5.2-1 "@polkadot/types": 3.5.2-1 - "@polkadot/util": ^5.3.1 + "@polkadot/util": ^5.3.2-1 "@types/websocket": ^1.0.1 "@types/yargs": ^15.0.12 handlebars: ^4.7.6 @@ -1869,7 +1869,7 @@ __metadata: dependencies: "@babel/runtime": ^7.12.5 "@polkadot/types": 3.5.2-1 - "@polkadot/util": ^5.3.1 + "@polkadot/util": ^5.3.2-1 "@types/bn.js": ^4.11.6 bn.js: ^4.11.9 languageName: unknown @@ -1880,25 +1880,25 @@ __metadata: resolution: "@polkadot/types@workspace:packages/types" dependencies: "@babel/runtime": ^7.12.5 - "@polkadot/keyring": ^5.3.1 + "@polkadot/keyring": ^5.3.2-1 "@polkadot/metadata": 3.5.2-1 - "@polkadot/util": ^5.3.1 - "@polkadot/util-crypto": ^5.3.1 + "@polkadot/util": ^5.3.2-1 + "@polkadot/util-crypto": ^5.3.2-1 "@polkadot/x-rxjs": 3.5.2-1 "@types/bn.js": ^4.11.6 bn.js: ^4.11.9 languageName: unknown linkType: soft -"@polkadot/util-crypto@npm:5.3.1, @polkadot/util-crypto@npm:^5.3.1": - version: 5.3.1 - resolution: "@polkadot/util-crypto@npm:5.3.1" +"@polkadot/util-crypto@npm:5.3.2-1, @polkadot/util-crypto@npm:^5.3.2-1": + version: 5.3.2-1 + resolution: "@polkadot/util-crypto@npm:5.3.2-1" dependencies: "@babel/runtime": ^7.12.5 - "@polkadot/networks": 5.3.1 - "@polkadot/util": 5.3.1 + "@polkadot/networks": 5.3.2-1 + "@polkadot/util": 5.3.2-1 "@polkadot/wasm-crypto": ^3.1.1 - "@polkadot/x-randomvalues": 5.3.1 + "@polkadot/x-randomvalues": 5.3.2-1 base-x: ^3.0.8 blakejs: ^1.1.0 bn.js: ^4.11.9 @@ -1910,23 +1910,23 @@ __metadata: tweetnacl: ^1.0.3 xxhashjs: ^0.2.2 peerDependencies: - "@polkadot/util": 5.3.1 - checksum: db67cefaa5cadbad8eaf6b68e56ac29661d1b91a6f0911791a07c363a5d66c343cfdb89fd732ca8b2c24516b2911373ccdc5fb74e451c2f53d3458f575e8546a + "@polkadot/util": 5.3.2-1 + checksum: db59b5157825e53836c9a4a3321212337eb7b1a087162a3248d894bfcc671e06b8760f5e1ef98fb475acc474a463ae95c270a74834a15ebd8a977aeced05b31f languageName: node linkType: hard -"@polkadot/util@npm:5.3.1, @polkadot/util@npm:^5.3.1": - version: 5.3.1 - resolution: "@polkadot/util@npm:5.3.1" +"@polkadot/util@npm:5.3.2-1, @polkadot/util@npm:^5.3.2-1": + version: 5.3.2-1 + resolution: "@polkadot/util@npm:5.3.2-1" dependencies: "@babel/runtime": ^7.12.5 - "@polkadot/x-textdecoder": 5.3.1 - "@polkadot/x-textencoder": 5.3.1 + "@polkadot/x-textdecoder": 5.3.2-1 + "@polkadot/x-textencoder": 5.3.2-1 "@types/bn.js": ^4.11.6 bn.js: ^4.11.9 camelcase: ^5.3.1 ip-regex: ^4.2.0 - checksum: 4cb048507ac4d49227f7183faf764bb07b8445cf4ac79106664b15287499d4e0aa76530eed0dc234940a86b3355808a6c705d1fd07e0db1c6cc5f19dd4dd3119 + checksum: 4f6e1a4152911238fb81ed7710fc93544a9c6d4c209600be542e7cad6c5d07ef527d28dda0743a3d45c51e202b42aff1e1b5ea0a0ccd97d34b4f15dee556bf2b languageName: node linkType: hard @@ -1962,61 +1962,62 @@ __metadata: languageName: node linkType: hard -"@polkadot/x-fetch@npm:^5.3.1": - version: 5.3.1 - resolution: "@polkadot/x-fetch@npm:5.3.1" +"@polkadot/x-fetch@npm:^5.3.2-1": + version: 5.3.2-1 + resolution: "@polkadot/x-fetch@npm:5.3.2-1" dependencies: "@babel/runtime": ^7.12.5 "@types/node-fetch": ^2.5.8 node-fetch: ^2.6.1 - checksum: 7a0408e9ae106b1625fb193cad7c8e5e2a1a80d1f103eaa5d1fc3234563d22c2e98cbbe1a6bc17a50793fe8012c2c57a962de3207735bf956fd7594bbbdcd4b3 + checksum: b523afe9466bff38307d1f45b4356c69f9cceb808211f69d93163a194f99efebef71707f89c80b814aef5a029e209edb664960095336e0a6e9a5ce575d738d37 languageName: node linkType: hard -"@polkadot/x-randomvalues@npm:5.3.1": - version: 5.3.1 - resolution: "@polkadot/x-randomvalues@npm:5.3.1" +"@polkadot/x-randomvalues@npm:5.3.2-1": + version: 5.3.2-1 + resolution: "@polkadot/x-randomvalues@npm:5.3.2-1" dependencies: "@babel/runtime": ^7.12.5 - checksum: 2a4cf1b746bfd4f84ed473dac53780dd9e15b7dd5528cad300c6eb4ba35793fb7cd8862065e236110b14e90a0ada06f47d7998a935c57509c62edda87610b42e + checksum: 6b08e40aa4273b171a76c75f1c0db89bf525eed8878183097fdd6e484d50752b06d266885703bb4ffa9ff22f8c9b7d44ee9310c5c77e0238a316011782949c25 languageName: node linkType: hard -"@polkadot/x-rxjs@3.5.2-1, @polkadot/x-rxjs@workspace:packages/x-rxjs": - version: 0.0.0-use.local - resolution: "@polkadot/x-rxjs@workspace:packages/x-rxjs" +"@polkadot/x-rxjs@npm:3.5.2-1": + version: 3.5.2-1 + resolution: "@polkadot/x-rxjs@npm:3.5.2-1" dependencies: "@babel/runtime": ^7.12.5 rxjs: ^6.6.3 - languageName: unknown - linkType: soft - -"@polkadot/x-textdecoder@npm:5.3.1": - version: 5.3.1 - resolution: "@polkadot/x-textdecoder@npm:5.3.1" - dependencies: - "@babel/runtime": ^7.12.5 - checksum: e6388d73224007426461923c24506759aaf24d34f86d147707e146902febddbe9e477717a187694381cff8248a0c260075fed16ae0b901d4766b1929e28bdc6e + checksum: 4944e559b5a8fc70154da3d2c5fc157c795bc82cae7ba4b91e5e6408001519a57d1fbef53846962171d2e9d4dabc184d021612def75b6c27393ec4b3d5669853 languageName: node linkType: hard -"@polkadot/x-textencoder@npm:5.3.1": - version: 5.3.1 - resolution: "@polkadot/x-textencoder@npm:5.3.1" +"@polkadot/x-textdecoder@npm:5.3.2-1": + version: 5.3.2-1 + resolution: "@polkadot/x-textdecoder@npm:5.3.2-1" dependencies: "@babel/runtime": ^7.12.5 - checksum: 8131133c82016e7ce7abdd72667c656f3c067e909ece9b8f497d6ffba78a84d86efbabf8833d1fec3acf29dda33ce460d8d7b44b52cc4a85a8330a9609e3a772 + checksum: edc52a77a4feb7e0fafd300dd1b1c01f85847100bd7601efd45476f55508bbac936c4e9d89b4ed3e58bd128c2d5341a69c5d4b5d4309fd4566b3bcb27c51810a languageName: node linkType: hard -"@polkadot/x-ws@npm:^5.3.1": - version: 5.3.1 - resolution: "@polkadot/x-ws@npm:5.3.1" +"@polkadot/x-textencoder@npm:5.3.2-1": + version: 5.3.2-1 + resolution: "@polkadot/x-textencoder@npm:5.3.2-1" + dependencies: + "@babel/runtime": ^7.12.5 + checksum: 9c15afb1ea945a0a2c831e592944b34346690ac5f7d716ee5983b86714b6800777293226d720b2d6c826465816ba8bf388fdaaf230d02416388a264ba150e2c6 + languageName: node + linkType: hard + +"@polkadot/x-ws@npm:^5.3.2-1": + version: 5.3.2-1 + resolution: "@polkadot/x-ws@npm:5.3.2-1" dependencies: "@babel/runtime": ^7.12.5 "@types/websocket": ^1.0.1 websocket: ^1.0.33 - checksum: 8a2105dd7fa91eebd987960c96b052f5f008e6d62039120dbd75b7d375674679e551dc66505091c96e9472fd2c392a5fba8d34f440c4b706f4f355e049d3371a + checksum: a071d3cbadfcf735b42df8e67f9e6d8e34f3eb15a47b82d5a3793a6976e0316442e0f165887c8a28f6b0bd2a1f9c756bbe7a0138349a1e75c08f74267a1593cc languageName: node linkType: hard