diff --git a/package.json b/package.json index 5b71303b34..a2c0d5e4a4 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@babel/core": "^7.12.10", "@babel/register": "^7.12.10", "@babel/runtime": "^7.12.5", - "@polkadot/dev": "^0.61.5", + "@polkadot/dev": "^0.61.7", "@polkadot/ts": "^0.3.58", "@polkadot/typegen": "workspace:packages/typegen", "@types/jest": "^26.0.19", diff --git a/packages/typegen/package.json b/packages/typegen/package.json index ca26befe5a..89f91c144f 100644 --- a/packages/typegen/package.json +++ b/packages/typegen/package.json @@ -33,6 +33,6 @@ }, "devDependencies": { "@types/websocket": "^1.0.1", - "@types/yargs": "^15.0.11" + "@types/yargs": "^15.0.12" } } diff --git a/packages/x-rxjs/README.md b/packages/x-rxjs/README.md index 4c3eeff46e..05fef36bf0 100644 --- a/packages/x-rxjs/README.md +++ b/packages/x-rxjs/README.md @@ -1 +1,5 @@ # @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/src/index.js b/packages/x-rxjs/src/index.js index d5a90adcef..535d844fc2 100644 --- a/packages/x-rxjs/src/index.js +++ b/packages/x-rxjs/src/index.js @@ -6,6 +6,9 @@ // // 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; diff --git a/packages/x-rxjs/src/index.mjs b/packages/x-rxjs/src/index.mjs new file mode 100644 index 0000000000..192ca03458 --- /dev/null +++ b/packages/x-rxjs/src/index.mjs @@ -0,0 +1,4 @@ +// Copyright 2017-2020 @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.js b/packages/x-rxjs/src/operators.js index 615dca9d27..c614e53968 100644 --- a/packages/x-rxjs/src/operators.js +++ b/packages/x-rxjs/src/operators.js @@ -6,6 +6,9 @@ // // 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; diff --git a/packages/x-rxjs/src/operators.mjs b/packages/x-rxjs/src/operators.mjs new file mode 100644 index 0000000000..b49258694d --- /dev/null +++ b/packages/x-rxjs/src/operators.mjs @@ -0,0 +1,4 @@ +// Copyright 2017-2020 @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/yarn.lock b/yarn.lock index 95a574fa00..de76b14ec2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1736,9 +1736,9 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/dev@npm:^0.61.5": - version: 0.61.5 - resolution: "@polkadot/dev@npm:0.61.5" +"@polkadot/dev@npm:^0.61.7": + version: 0.61.7 + resolution: "@polkadot/dev@npm:0.61.7" dependencies: "@babel/cli": ^7.12.10 "@babel/core": ^7.12.10 @@ -1825,7 +1825,7 @@ __metadata: polkadot-exec-typedoc: scripts/polkadot-exec-typedoc.cjs polkadot-exec-vuepress: scripts/polkadot-exec-vuepress.cjs polkadot-exec-webpack: scripts/polkadot-exec-webpack.cjs - checksum: f58b0190986d600ddbd46ce854eca164ee7bc71ec4c09614b01ce96ca8256a63871b6344f3d0819d778a15de6b787c730ded12a863c3172f74decc65adaa1f4d + checksum: 7be9f1bf2049f1ad6994667294a40eafbd707afea07e4e63dc6eca9e18542d874a7de696580a6ca0dc716143376a63ee7a156e0074b2e500833c08b96ab7d770 languageName: node linkType: hard @@ -1921,7 +1921,7 @@ __metadata: "@polkadot/types": 3.0.2-4 "@polkadot/util": ^5.0.1 "@types/websocket": ^1.0.1 - "@types/yargs": ^15.0.11 + "@types/yargs": ^15.0.12 handlebars: ^4.7.6 websocket: ^1.0.33 yargs: ^16.2.0 @@ -2346,12 +2346,12 @@ __metadata: languageName: node linkType: hard -"@types/yargs@npm:^15.0.0, @types/yargs@npm:^15.0.11": - version: 15.0.11 - resolution: "@types/yargs@npm:15.0.11" +"@types/yargs@npm:^15.0.0, @types/yargs@npm:^15.0.12": + version: 15.0.12 + resolution: "@types/yargs@npm:15.0.12" dependencies: "@types/yargs-parser": "*" - checksum: e26daf9b3a85085d2f2571dd6e23968c8ad7fee87bf0c0c979594b7d5a52ff3353cdf5389d40c61c5f21f271dca93123a4e260c6887c3c48355457c9413942b8 + checksum: b67cf9e8f25865a6d6e72196fe7f47c6f328d2b7a54ed9fa0e60f9693abb332fec1a826f90310804f231bca28a2f71367956b3be2fdba2d4bf316f0394d84f4d languageName: node linkType: hard @@ -9196,7 +9196,7 @@ fsevents@~2.1.2: "@babel/core": ^7.12.10 "@babel/register": ^7.12.10 "@babel/runtime": ^7.12.5 - "@polkadot/dev": ^0.61.5 + "@polkadot/dev": ^0.61.7 "@polkadot/ts": ^0.3.58 "@polkadot/typegen": "workspace:packages/typegen" "@types/jest": ^26.0.19