From 80d05afead0aaea75b8a18b42b13c1c725697674 Mon Sep 17 00:00:00 2001 From: Ben Lesh Date: Tue, 13 Mar 2018 11:59:24 -0700 Subject: [PATCH 01/39] chore(publish): 6.0.0-alpha.4 --- CHANGELOG.md | 68 +++++++++++++++++++++++++++++++++++++++++++++++ package-lock.json | 29 +++++++++++--------- package.json | 2 +- 3 files changed, 86 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fa2e732546..2773710ae6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,71 @@ + +# [6.0.0-alpha.4](https://github.com/ReactiveX/RxJS/compare/6.0.0-alpha.3...v6.0.0-alpha.4) (2018-03-13) + + +### Bug Fixes + +* **ESM:** Add [operators|ajax|websocket|testing]/package.json for ESM support, fixes [#3227](https://github.com/ReactiveX/RxJS/issues/3227) ([#3356](https://github.com/ReactiveX/RxJS/issues/3356)) ([725dcb4](https://github.com/ReactiveX/RxJS/commit/725dcb4)) +* **fromEvent:** Defines toString to fix Closure compilations ([#3417](https://github.com/ReactiveX/RxJS/issues/3417)) ([1558b43](https://github.com/ReactiveX/RxJS/commit/1558b43)) +* **fromEvent:** pass options in unsubscribe ([f1872b0](https://github.com/ReactiveX/RxJS/commit/f1872b0)), closes [#3349](https://github.com/ReactiveX/RxJS/issues/3349) +* **rxjs:** add exports for symbols/interfaces that were missing ([#3380](https://github.com/ReactiveX/RxJS/issues/3380)) ([1622ee0](https://github.com/ReactiveX/RxJS/commit/1622ee0)) +* **rxjs:** make sure esm imports from index.js by default, not Rx.js ([#3316](https://github.com/ReactiveX/RxJS/issues/3316)) ([c2b00f4](https://github.com/ReactiveX/RxJS/commit/c2b00f4)), closes [#3315](https://github.com/ReactiveX/RxJS/issues/3315) +* **rxjs:** once again exports custom error types ([#3371](https://github.com/ReactiveX/RxJS/issues/3371)) ([4465a9f](https://github.com/ReactiveX/RxJS/commit/4465a9f)) +* **rxjs:** remove types.ts importing from itself. ([#3383](https://github.com/ReactiveX/RxJS/issues/3383)) ([8fd50ad](https://github.com/ReactiveX/RxJS/commit/8fd50ad)) +* correct internal module paths to be systemjs compatible ([#3412](https://github.com/ReactiveX/RxJS/issues/3412)) ([35abc9d](https://github.com/ReactiveX/RxJS/commit/35abc9d)) +* **Symbol.iterator:** correctly handle case where Symbol constructor itself is not defined ([#3394](https://github.com/ReactiveX/RxJS/issues/3394)) ([6725be1](https://github.com/ReactiveX/RxJS/commit/6725be1)) +* **typings:** fixed some cases where multicast and publish would not return a ConnectableObservable ([#3320](https://github.com/ReactiveX/RxJS/issues/3320)) ([ddffecc](https://github.com/ReactiveX/RxJS/commit/ddffecc)) +* reexport Symbol.observable typings patch ([4c4d7b0](https://github.com/ReactiveX/RxJS/commit/4c4d7b0)) +* remove the root operators.ts because it overshadows operators/package.json ([184b6d4](https://github.com/ReactiveX/RxJS/commit/184b6d4)) + + +### Code Refactoring + +* **Observable.if:** remove ts hacks from Observable ([f46f261](https://github.com/ReactiveX/RxJS/commit/f46f261)) +* **Rx.ts:** move Rx.ts to internal ([#3400](https://github.com/ReactiveX/RxJS/issues/3400)) ([7ad2119](https://github.com/ReactiveX/RxJS/commit/7ad2119)) + + +### Features + +* **bindCallback:** remove result selector ([2535641](https://github.com/ReactiveX/RxJS/commit/2535641)) +* **bindNodeCallback:** remove resultSelector ([26e6e5c](https://github.com/ReactiveX/RxJS/commit/26e6e5c)) +* **exhaustMap:** simplify interface ([42589d0](https://github.com/ReactiveX/RxJS/commit/42589d0)) +* **first:** simplify interface ([a011338](https://github.com/ReactiveX/RxJS/commit/a011338)) +* **forkJoin:** simplify interface ([4d2338b](https://github.com/ReactiveX/RxJS/commit/4d2338b)) +* **fromEvent:** remove resultSelector ([197f449](https://github.com/ReactiveX/RxJS/commit/197f449)) +* **fromEvent:** will now emit an array when event emits multiple arguments ([51b37fd](https://github.com/ReactiveX/RxJS/commit/51b37fd)) +* **fromEventPattern:** removed resultSelector ([6b34f9f](https://github.com/ReactiveX/RxJS/commit/6b34f9f)) +* **last:** simplify interface ([3240419](https://github.com/ReactiveX/RxJS/commit/3240419)) +* **mergeMap|concatMap|concatMapTo:** simplified the signatures ([d293245](https://github.com/ReactiveX/RxJS/commit/d293245)) +* **mergeMapTo:** simplify interface ([582c7be](https://github.com/ReactiveX/RxJS/commit/582c7be)) +* **never:** no longer export `never` function ([#3386](https://github.com/ReactiveX/RxJS/issues/3386)) ([53debc8](https://github.com/ReactiveX/RxJS/commit/53debc8)) +* **switchMap|switchMapTo:** simplify interface ([959fb6a](https://github.com/ReactiveX/RxJS/commit/959fb6a)) +* **Symbol.iterator:** no longer polyfilled ([#3389](https://github.com/ReactiveX/RxJS/issues/3389)) ([6319f3c](https://github.com/ReactiveX/RxJS/commit/6319f3c)) +* **Symbol.observable:** is no longer polyfilled ([#3387](https://github.com/ReactiveX/RxJS/issues/3387)) ([4a5aaaf](https://github.com/ReactiveX/RxJS/commit/4a5aaaf)) +* **throwIfEmpty:** adds throwIfEmpty operator ([#3368](https://github.com/ReactiveX/RxJS/issues/3368)) ([9b21458](https://github.com/ReactiveX/RxJS/commit/9b21458)) +* **typings:** updated typings for combineAll, mergeAll, concatAll, switch, exhaust, zipAll ([#3321](https://github.com/ReactiveX/RxJS/issues/3321)) ([f7e4c02](https://github.com/ReactiveX/RxJS/commit/f7e4c02)) +* **umd:** UMD now mirrors export schema for ESM and CJS ([#3426](https://github.com/ReactiveX/RxJS/issues/3426)) ([556c904](https://github.com/ReactiveX/RxJS/commit/556c904)) + + +### BREAKING CHANGES + +* **Symbol.observable:** RxJS will no longer be polyfilling Symbol.observable. That should be done by an actual polyfill library. This is to prevent duplication of code, and also to prevent having modules with side-effects in rxjs. +* **mergeMap|concatMap|concatMapTo:** mergeMap, concatMap and concatMapTo no longer support a result selector, if you need to use a result selector, use the following pattern: `source.mergeMap(x => of(x + x).pipe(map(y => y + x))` (the pattern would be the same for `concatMap`). +* **bindCallback:** removes result selector, use `map` instead: `bindCallback(fn1, fn2)()` becomes `bindCallback(fn1)().pipe(map(fn2))` +* **Rx.ts:** importing from `rxjs/Rx` is no longer available. Upcoming backwards compat solution will allow that +* **Symbol.iterator:** We are no longer polyfilling `Symbol.iterator`. That would be done by a proper polyfilling library +* **Observable.if:** TypeScript users using `Observable.if` will have to cast `Observable` as any to get to `if`. It is a better idae to just use `iif` directly via `import { iif } from 'rxjs';` +* **bindNodeCallback:** resultSelector removed, use `map` instead: `bindNodeCallback(fn1, fn2)()` becomes `bindNodeCallback(fn1)().pipe(map(fn2))` +* **never:** no longer exported. Use the `NEVER` constant instead. +* **fromEvent:** result selector removed, use `map` instead: `fromEvent(target, 'click', fn)` becomes `fromEvent(target, 'click').pipe(map(fn))` +* **last:** no longer accepts `resultSelector` argument. To get this same functionality, use `map`. +* **first:** no longer supports `resultSelector` argument. The same functionality can be achieved by simply mapping either before or after `first` depending on your use case. +* **exhaustMap:** `resultSelector` no longer supported, to get this functionality use: `source.pipe(exhaustMap(x => of(x + x).pipe(map(y => x + y))))` +* **switchMap|switchMapTo:** `switchMap` and `switchMapTo` no longer take `resultSelector` arguments, to get the same functionality use `switchMap` and `map` in combination: `source.pipe(switchMap(x => of(x + x).pipe(y => x + y)))`. +* **mergeMapTo:** `mergeMapTo` no longer accepts a resultSelector, to get this functionality, you'll want to use `mergeMap` and `map` together: `source.pipe(mergeMap(() => inner).pipe(map(y => x + y)))` +* **fromEventPattern:** no longer supports a result selector, use `map` instead: `fromEventPattern(fn1, fn2, fn3)` becomes `fromEventPattern(fn1, fn2).pipe(map(fn3))` + + + # [6.0.0-alpha.3](https://github.com/ReactiveX/RxJS/compare/6.0.0-alpha.2...v6.0.0-alpha.3) (2018-02-06) diff --git a/package-lock.json b/package-lock.json index 05e96b771f..7e68ad39f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "requires": { "loader-utils": "1.1.0", "source-map": "0.5.7", - "typescript": "2.7.1", + "typescript": "2.7.2", "webpack-sources": "1.1.0" } }, @@ -6948,7 +6948,7 @@ "log-symbols": "1.0.2", "log-update": "1.0.2", "ora": "0.2.3", - "rxjs": "5.5.6", + "rxjs": "5.5.7", "stream-to-observable": "0.1.0", "strip-ansi": "3.0.1" } @@ -11076,9 +11076,9 @@ } }, "rxjs": { - "version": "5.5.6", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.6.tgz", - "integrity": "sha512-v4Q5HDC0FHAQ7zcBX7T2IL6O5ltl1a2GX4ENjPXg6SjDY69Cmx9v4113C99a4wGF16ClPv5Z8mghuYorVkg/kg==", + "version": "5.5.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.7.tgz", + "integrity": "sha512-Hxo2ac8gRQjwjtKgukMIwBRbq5+KAeEV5hXM4obYBOAghev41bDQWgFH4svYiU9UnQ5kNww2LgfyBdevCd2HXA==", "dev": true, "requires": { "symbol-observable": "1.0.1" @@ -11757,6 +11757,12 @@ "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=", "dev": true }, + "systemjs": { + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-0.21.0.tgz", + "integrity": "sha512-Ly/H3MUDaxl5OzMJ/loGFLWPao0h6WHcN6LHlI2HdsTJfZY9sYyn5B2SDnifuBlOUFlTr65rLAP+vSAXDsxOtg==", + "dev": true + }, "table": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", @@ -12111,10 +12117,9 @@ } }, "tslib": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.5.0.tgz", - "integrity": "sha1-O7UPhx5f35pFVan/I3tzCGAEj+o=", - "dev": true + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", + "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==" }, "tslint": { "version": "5.9.1", @@ -12277,9 +12282,9 @@ "dev": true }, "typescript": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.1.tgz", - "integrity": "sha512-bqB1yS6o9TNA9ZC/MJxM0FZzPnZdtHj0xWK/IZ5khzVqdpGul/R/EIiHRgFXlwTD7PSIaYVnGKq1QgMCu2mnqw==", + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz", + "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==", "dev": true }, "uglify-js": { diff --git a/package.json b/package.json index 4cbe945ba0..15c74b03e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@reactivex/rxjs", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "description": "Reactive Extensions for modern JavaScript", "main": "index.js", "sideEffects": false, From 3ed75d5e40131cb5d9bbf146d543b2bbdbe067ba Mon Sep 17 00:00:00 2001 From: Igor Minar Date: Tue, 13 Mar 2018 18:14:40 -0700 Subject: [PATCH 02/39] build: delete umd.js from the final package (#3431) This file is not necessary and breaks closure compiler. --- .make-packages.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.make-packages.js b/.make-packages.js index 617fb8a81b..e9da9d51bd 100644 --- a/.make-packages.js +++ b/.make-packages.js @@ -118,6 +118,15 @@ if (fs.existsSync(UMD_ROOT)) { addLicenseTextToFile(license, UMD_PKG + 'rxjs.umd.min.js'); } +// remove umd.js/umd.d.ts files that are only needed for creation of the umd bundle +fs.removeSync(CJS_PKG + '/internal/umd.js'); +fs.removeSync(CJS_PKG + '/internal/umd.js.map'); +fs.removeSync(ESM5_PKG + '/internal/umd.js'); +fs.removeSync(ESM5_PKG + '/internal/umd.js.map'); +fs.removeSync(ESM2015_PKG + '/internal/umd.js'); +fs.removeSync(ESM2015_PKG + '/internal/umd.js.map'); +fs.removeSync(TYPE_PKG + '/internal/umd.d.ts'); + function copySources(rootDir, packageDir, ignoreMissing) { // If we are ignoring missing directories, early return when source doesn't exist if (!fs.existsSync(rootDir)) { From f66cd3f923bb206cddc33cbee0078d559397bd3a Mon Sep 17 00:00:00 2001 From: Ben Lesh Date: Thu, 15 Mar 2018 11:16:14 -0700 Subject: [PATCH 03/39] docs(README): update branch information closes #3397 --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5e2caf96d6..86f22a2321 100644 --- a/README.md +++ b/README.md @@ -21,10 +21,8 @@ Reactive Extensions Library for JavaScript. This is a rewrite of [Reactive-Exten ## Versions In This Repository -- [master](https://github.com/ReactiveX/rxjs/commits/master) - commits that will be included in the next _major_ release (breaking changes) -- [next](https://github.com/ReactiveX/rxjs/commits/stable) - commits that will be included in the next _minor_ or _patch_ release - -Most PRs should be made to **master**, unless you know it is a breaking change. +- [master](https://github.com/ReactiveX/rxjs/commits/master) - This all of the current, unreleased work, which is against v6 of RxJS right now +- [stable](https://github.com/ReactiveX/rxjs/commits/stable) - This is the branch for the latest version you'd get if you do `npm install rxjs`, (currently this is 5.5) ## Important From 9de7b6f87dab8294f81f9bdbc85bac34137621ce Mon Sep 17 00:00:00 2001 From: Ben Lesh Date: Thu, 15 Mar 2018 11:19:16 -0700 Subject: [PATCH 04/39] docs(README): update usage information --- README.md | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 86f22a2321..5b1460d32e 100644 --- a/README.md +++ b/README.md @@ -36,19 +36,10 @@ By contributing or commenting on issues in this repository, whether you've read npm install rxjs@alpha ``` -To import the entire core set of functionality: - -```js -import Rx from 'rxjs/Rx'; - -Rx.Observable.of(1,2,3) -``` - To import only what you need by patching (this is useful for size-sensitive bundling): ```js -import { Observable, Subject, ReplaySubject } from 'rxjs'; -import { from, of, range } from 'rxjs/create'; +import { Observable, Subject, ReplaySubject, from, of, range } from 'rxjs'; import { map, filter, switchMap } from 'rxjs/operators'; range(1, 200) @@ -67,8 +58,7 @@ npm install rxjs@alpha (Note: destructuring available in Node 8+) ```js -const { Observable, Subject, ReplaySubject } = require('rxjs'); -const { from, of, range } = require('rxjs/create'); +const { Observable, Subject, ReplaySubject, from, of, range } = require('rxjs'); const { map, filter, switchMap } = require('rxjs/operators'); range(1, 200) @@ -80,15 +70,17 @@ range(1, 200) For CDN, you can use [unpkg](https://unpkg.com/): -https://unpkg.com/rxjs/bundles/Rx.min.js +https://unpkg.com/rxjs/bundles/rxjs.umd.min.js -#### Node.js Usage: +The global namespace for rxjs is `rxjs`: ```js -var Rx = require('@reactivex/rxjs'); +const { Observable, Subject, ReplaySubject, from, of, range } = rxjs; +const { map, filter, switchMap } = rxjs.operators; -Rx.Observable.of('hello world') - .subscribe(function(x) { console.log(x); }); +range(1, 200) + .pipe(filter(x => x % 2 === 1), map(x => x + x)) + .subscribe(x => console.log(x)); ``` ## Goals From b61d8cea8ddc532015532c104fecba0f89212f22 Mon Sep 17 00:00:00 2001 From: Claudio Rodriguez Date: Thu, 15 Mar 2018 14:49:54 -0400 Subject: [PATCH 05/39] refactor(ignoreElements): ignoreElements now returns Observable (#3410) * refactor(ignoreElements): ignoreElements now returns Observable Per #2640 ignoreElements should resolve to Observable, #3340 asks for this explicitly, there was also another issue with tests2png that I fix here Closes #3340, #3410 * refactor(ignoreElements): Wrong return type on type of ignoreElements Previous change tried to add the correct return type but ended up adding Observable> which is not what was requested #3340 and #2640 --- spec/support/tests2png.opts | 2 +- src/internal/operators/ignoreElements.ts | 6 +++--- src/internal/patching/operator/ignoreElements.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spec/support/tests2png.opts b/spec/support/tests2png.opts index bb52156e4c..616dc33d0b 100644 --- a/spec/support/tests2png.opts +++ b/spec/support/tests2png.opts @@ -1,4 +1,4 @@ ---require spec-js/helpers/polyfills.ts +--require spec/helpers/polyfills.ts --require source-map-support/register --require spec/helpers/tests2png/diagram-test-runner.ts --require spec/helpers/testScheduler-ui.ts diff --git a/src/internal/operators/ignoreElements.ts b/src/internal/operators/ignoreElements.ts index 791a3407ad..47600b15ae 100644 --- a/src/internal/operators/ignoreElements.ts +++ b/src/internal/operators/ignoreElements.ts @@ -1,7 +1,7 @@ import { Observable } from '../Observable'; import { Operator } from '../Operator'; import { Subscriber } from '../Subscriber'; -import { MonoTypeOperatorFunction } from '../types'; +import { OperatorFunction } from '../types'; /** * Ignores all items emitted by the source Observable and only passes calls of `complete` or `error`. @@ -13,8 +13,8 @@ import { MonoTypeOperatorFunction } from '../types'; * @method ignoreElements * @owner Observable */ -export function ignoreElements(): MonoTypeOperatorFunction { - return function ignoreElementsOperatorFunction(source: Observable) { +export function ignoreElements(): OperatorFunction { + return function ignoreElementsOperatorFunction(source: Observable) { return source.lift(new IgnoreElementsOperator()); }; } diff --git a/src/internal/patching/operator/ignoreElements.ts b/src/internal/patching/operator/ignoreElements.ts index 3adc7d258c..621fbf75f7 100644 --- a/src/internal/patching/operator/ignoreElements.ts +++ b/src/internal/patching/operator/ignoreElements.ts @@ -11,6 +11,6 @@ import { ignoreElements as higherOrder } from '../../operators/ignoreElements'; * @method ignoreElements * @owner Observable */ -export function ignoreElements(this: Observable): Observable { - return higherOrder()(this) as Observable; +export function ignoreElements(this: Observable): Observable { + return higherOrder()(this); } From 1ec951edf915ce6b1c50f06cfceff0cc048a40c7 Mon Sep 17 00:00:00 2001 From: Ben Lesh Date: Thu, 15 Mar 2018 12:28:16 -0700 Subject: [PATCH 06/39] refactor(Observable): toPromise and forEach return Promise not PromiseLike (#3434) Unfortunately this requires a cast because we don't want to specify PromiseConstructor, because that comes with a bunch of statics that are optional, so we use PromiseConstructorLike, however that returns a PromiseLike, and we want to ensure that the returned promise also has a `catch` method and isn't just a thennable. --- src/internal/Observable.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/internal/Observable.ts b/src/internal/Observable.ts index c31d656160..38177fa4a1 100644 --- a/src/internal/Observable.ts +++ b/src/internal/Observable.ts @@ -213,7 +213,7 @@ export class Observable implements Subscribable { * @return {Promise} a promise that either resolves on observable completion or * rejects with the handled error */ - forEach(next: (value: T) => void, promiseCtor?: PromiseConstructorLike): PromiseLike { + forEach(next: (value: T) => void, promiseCtor?: PromiseConstructorLike): Promise { promiseCtor = getPromiseCtor(promiseCtor); return new promiseCtor((resolve, reject) => { @@ -230,7 +230,7 @@ export class Observable implements Subscribable { } } }, reject, resolve); - }); + }) as Promise; } /** @internal */ @@ -297,13 +297,13 @@ export class Observable implements Subscribable { toPromise(this: Observable, PromiseCtor: PromiseConstructorLike): Promise; /* tslint:enable:max-line-length */ - toPromise(promiseCtor?: PromiseConstructorLike): PromiseLike { + toPromise(promiseCtor?: PromiseConstructorLike): Promise { promiseCtor = getPromiseCtor(promiseCtor); return new promiseCtor((resolve, reject) => { let value: any; this.subscribe((x: T) => value = x, (err: any) => reject(err), () => resolve(value)); - }); + }) as Promise; } } From c611403ef1744403a6549b1c43fcbc62156076a4 Mon Sep 17 00:00:00 2001 From: Ashley Cutmore Date: Thu, 15 Mar 2018 19:34:23 +0000 Subject: [PATCH 07/39] docs(single): Describe case where `undefined` is emitted (#3303) Closes #3182 --- src/internal/operators/single.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/internal/operators/single.ts b/src/internal/operators/single.ts index cff597c8b1..236ea6591f 100644 --- a/src/internal/operators/single.ts +++ b/src/internal/operators/single.ts @@ -8,7 +8,8 @@ import { Observer, MonoTypeOperatorFunction, TeardownLogic } from '../types'; /** * Returns an Observable that emits the single item emitted by the source Observable that matches a specified * predicate, if that Observable emits one such item. If the source Observable emits more than one such item or no - * such items, notify of an IllegalArgumentException or NoSuchElementException respectively. + * items, notify of an IllegalArgumentException or NoSuchElementException respectively. If the source Observable + * emits items but none match the specified predicate then `undefined` is emiited. * * * @@ -16,8 +17,8 @@ import { Observer, MonoTypeOperatorFunction, TeardownLogic } from '../types'; * callback if the Observable completes before any `next` notification was sent. * @param {Function} predicate - A predicate function to evaluate items emitted by the source Observable. * @return {Observable} An Observable that emits the single item emitted by the source Observable that matches - * the predicate. - . + * the predicate or `undefined` when no items match. + * * @method single * @owner Observable */ From 17c7f8f05762c1cd4c5b1be53945fb8fdc4a4821 Mon Sep 17 00:00:00 2001 From: Ben Lesh Date: Thu, 15 Mar 2018 14:00:29 -0700 Subject: [PATCH 08/39] fix(forkJoin): fix forkJoin typings for forkJoin(Observable[]) (#3436) --- src/internal/observable/forkJoin.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/internal/observable/forkJoin.ts b/src/internal/observable/forkJoin.ts index ea6140713a..338cc1ca75 100644 --- a/src/internal/observable/forkJoin.ts +++ b/src/internal/observable/forkJoin.ts @@ -8,13 +8,22 @@ import { InnerSubscriber } from '../InnerSubscriber'; import { Subscriber } from '../Subscriber'; /* tslint:disable:max-line-length */ +// forkJoin([a$, b$, c$]); +export function forkJoin(sources: [ObservableInput]): Observable; +export function forkJoin(sources: [ObservableInput, ObservableInput]): Observable<[T, T2]>; +export function forkJoin(sources: [ObservableInput, ObservableInput, ObservableInput]): Observable<[T, T2, T3]>; +export function forkJoin(sources: [ObservableInput, ObservableInput, ObservableInput, ObservableInput]): Observable<[T, T2, T3, T4]>; +export function forkJoin(sources: [ObservableInput, ObservableInput, ObservableInput, ObservableInput, ObservableInput]): Observable<[T, T2, T3, T4, T5]>; +export function forkJoin(sources: [ObservableInput, ObservableInput, ObservableInput, ObservableInput, ObservableInput, ObservableInput]): Observable<[T, T2, T3, T4, T5, T6]>; +export function forkJoin(sources: Array>): Observable; + +// forkJoin(a$, b$, c$) +export function forkJoin(v1: ObservableInput): Observable; export function forkJoin(v1: ObservableInput, v2: ObservableInput): Observable<[T, T2]>; export function forkJoin(v1: ObservableInput, v2: ObservableInput, v3: ObservableInput): Observable<[T, T2, T3]>; export function forkJoin(v1: ObservableInput, v2: ObservableInput, v3: ObservableInput, v4: ObservableInput): Observable<[T, T2, T3, T4]>; export function forkJoin(v1: ObservableInput, v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, v5: ObservableInput): Observable<[T, T2, T3, T4, T5]>; export function forkJoin(v1: ObservableInput, v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, v5: ObservableInput, v6: ObservableInput): Observable<[T, T2, T3, T4, T5, T6]>; -export function forkJoin(v1: ObservableInput): Observable; -export function forkJoin(sources: Array>): Observable; export function forkJoin(...sources: Array>): Observable; /* tslint:enable:max-line-length */ From 4898f52e76bb2aba9c3fd13257a3288820718554 Mon Sep 17 00:00:00 2001 From: Anthony Ciccarello Date: Thu, 15 Mar 2018 15:02:22 -0600 Subject: [PATCH 09/39] docs: correct broken video link (#3123) parleys.com domain has expired --- doc/external-references.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/external-references.md b/doc/external-references.md index 6d7d1fa691..eed70240bd 100644 --- a/doc/external-references.md +++ b/doc/external-references.md @@ -34,7 +34,7 @@ Can't get enough RxJS? Check out these other great resources! - [Asynchronous JavaScript at Netflix - MountainWest JavaScript 2014 - Jafar Husain](https://www.youtube.com/watch?v=XE692Clb5LU) - [Asynchronous JavaScript at Netflix - HTML5DevConf - Jafar Husain](https://www.youtube.com/watch?v=5uxSu-F5Kj0) - [Adding Even More Fun to Functional Programming With RXJS - Ryan Anklam](https://www.youtube.com/watch?v=8EExNfm0gt4) -- [Reactive Angular - Devoxx France 2014 - Martin Gontovnikas](http://parleys.com/play/53677646e4b0593229b85841/chapter0/about) +- [Reactive Angular - Devoxx France 2014 - Martin Gontovnikas](https://www.youtube.com/watch?v=q_WdJguyRrg) - [Reactive Game Programming for the Discerning Hipster - JSConf 2014 - Bodil Stokke](https://www.youtube.com/watch?v=x8mmAu7ZR9Y) ## Presentations From dd7c9f1929c9a9314dc27128d847fc660f96435e Mon Sep 17 00:00:00 2001 From: Ben Lesh Date: Thu, 15 Mar 2018 15:07:39 -0700 Subject: [PATCH 10/39] fix(publishReplay): type inference improved (#3437) closes #3260 --- src/internal/operators/publishReplay.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/internal/operators/publishReplay.ts b/src/internal/operators/publishReplay.ts index 629261a9a1..68162b6aa3 100644 --- a/src/internal/operators/publishReplay.ts +++ b/src/internal/operators/publishReplay.ts @@ -5,7 +5,7 @@ import { ConnectableObservable } from '../observable/ConnectableObservable'; import { UnaryFunction, MonoTypeOperatorFunction, OperatorFunction, SchedulerLike } from '../types'; /* tslint:disable:max-line-length */ -export function publishReplay(bufferSize?: number, windowTime?: number, scheduler?: SchedulerLike): UnaryFunction, ConnectableObservable>; +export function publishReplay(bufferSize?: number, windowTime?: number, scheduler?: SchedulerLike): MonoTypeOperatorFunction; export function publishReplay(bufferSize?: number, windowTime?: number, selector?: OperatorFunction, scheduler?: SchedulerLike): OperatorFunction; export function publishReplay(bufferSize?: number, windowTime?: number, selector?: MonoTypeOperatorFunction, scheduler?: SchedulerLike): MonoTypeOperatorFunction; /* tslint:enable:max-line-length */ From 710e624fbf7a2ffdff776b7e1ab76083fd751b79 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Mon, 5 Mar 2018 15:12:40 -0800 Subject: [PATCH 11/39] refactor(rxjs): start compatability package moving 'src/add' dir to 'compat' at root --- {src => compat}/add/observable/bindCallback.ts | 0 {src => compat}/add/observable/bindNodeCallback.ts | 0 {src => compat}/add/observable/combineLatest.ts | 0 {src => compat}/add/observable/concat.ts | 0 {src => compat}/add/observable/defer.ts | 0 {src => compat}/add/observable/dom/ajax.ts | 0 {src => compat}/add/observable/dom/webSocket.ts | 0 {src => compat}/add/observable/empty.ts | 0 {src => compat}/add/observable/forkJoin.ts | 0 {src => compat}/add/observable/from.ts | 0 {src => compat}/add/observable/fromEvent.ts | 0 {src => compat}/add/observable/fromEventPattern.ts | 0 {src => compat}/add/observable/fromPromise.ts | 0 {src => compat}/add/observable/generate.ts | 0 {src => compat}/add/observable/if.ts | 0 {src => compat}/add/observable/interval.ts | 0 {src => compat}/add/observable/merge.ts | 0 {src => compat}/add/observable/never.ts | 0 {src => compat}/add/observable/of.ts | 0 {src => compat}/add/observable/onErrorResumeNext.ts | 0 {src => compat}/add/observable/pairs.ts | 0 {src => compat}/add/observable/race.ts | 0 {src => compat}/add/observable/range.ts | 0 {src => compat}/add/observable/throw.ts | 0 {src => compat}/add/observable/timer.ts | 0 {src => compat}/add/observable/using.ts | 0 {src => compat}/add/observable/zip.ts | 0 {src => compat}/add/operator/audit.ts | 0 {src => compat}/add/operator/auditTime.ts | 0 {src => compat}/add/operator/buffer.ts | 0 {src => compat}/add/operator/bufferCount.ts | 0 {src => compat}/add/operator/bufferTime.ts | 0 {src => compat}/add/operator/bufferToggle.ts | 0 {src => compat}/add/operator/bufferWhen.ts | 0 {src => compat}/add/operator/catch.ts | 0 {src => compat}/add/operator/combineAll.ts | 0 {src => compat}/add/operator/combineLatest.ts | 0 {src => compat}/add/operator/concat.ts | 0 {src => compat}/add/operator/concatAll.ts | 0 {src => compat}/add/operator/concatMap.ts | 0 {src => compat}/add/operator/concatMapTo.ts | 0 {src => compat}/add/operator/count.ts | 0 {src => compat}/add/operator/debounce.ts | 0 {src => compat}/add/operator/debounceTime.ts | 0 {src => compat}/add/operator/defaultIfEmpty.ts | 0 {src => compat}/add/operator/delay.ts | 0 {src => compat}/add/operator/delayWhen.ts | 0 {src => compat}/add/operator/dematerialize.ts | 0 {src => compat}/add/operator/distinct.ts | 0 {src => compat}/add/operator/distinctUntilChanged.ts | 0 {src => compat}/add/operator/distinctUntilKeyChanged.ts | 0 {src => compat}/add/operator/do.ts | 0 {src => compat}/add/operator/elementAt.ts | 0 {src => compat}/add/operator/every.ts | 0 {src => compat}/add/operator/exhaust.ts | 0 {src => compat}/add/operator/exhaustMap.ts | 0 {src => compat}/add/operator/expand.ts | 0 {src => compat}/add/operator/filter.ts | 0 {src => compat}/add/operator/finally.ts | 0 {src => compat}/add/operator/find.ts | 0 {src => compat}/add/operator/findIndex.ts | 0 {src => compat}/add/operator/first.ts | 0 {src => compat}/add/operator/groupBy.ts | 0 {src => compat}/add/operator/ignoreElements.ts | 0 {src => compat}/add/operator/isEmpty.ts | 0 {src => compat}/add/operator/last.ts | 0 {src => compat}/add/operator/let.ts | 0 {src => compat}/add/operator/map.ts | 0 {src => compat}/add/operator/mapTo.ts | 0 {src => compat}/add/operator/materialize.ts | 0 {src => compat}/add/operator/max.ts | 0 {src => compat}/add/operator/merge.ts | 0 {src => compat}/add/operator/mergeAll.ts | 0 {src => compat}/add/operator/mergeMap.ts | 0 {src => compat}/add/operator/mergeMapTo.ts | 0 {src => compat}/add/operator/mergeScan.ts | 0 {src => compat}/add/operator/min.ts | 0 {src => compat}/add/operator/multicast.ts | 0 {src => compat}/add/operator/observeOn.ts | 0 {src => compat}/add/operator/onErrorResumeNext.ts | 0 {src => compat}/add/operator/pairwise.ts | 0 {src => compat}/add/operator/partition.ts | 0 {src => compat}/add/operator/pluck.ts | 0 {src => compat}/add/operator/publish.ts | 0 {src => compat}/add/operator/publishBehavior.ts | 0 {src => compat}/add/operator/publishLast.ts | 0 {src => compat}/add/operator/publishReplay.ts | 0 {src => compat}/add/operator/race.ts | 0 {src => compat}/add/operator/reduce.ts | 0 {src => compat}/add/operator/repeat.ts | 0 {src => compat}/add/operator/repeatWhen.ts | 0 {src => compat}/add/operator/retry.ts | 0 {src => compat}/add/operator/retryWhen.ts | 0 {src => compat}/add/operator/sample.ts | 0 {src => compat}/add/operator/sampleTime.ts | 0 {src => compat}/add/operator/scan.ts | 0 {src => compat}/add/operator/sequenceEqual.ts | 0 {src => compat}/add/operator/share.ts | 0 {src => compat}/add/operator/shareReplay.ts | 0 {src => compat}/add/operator/single.ts | 0 {src => compat}/add/operator/skip.ts | 0 {src => compat}/add/operator/skipLast.ts | 0 {src => compat}/add/operator/skipUntil.ts | 0 {src => compat}/add/operator/skipWhile.ts | 0 {src => compat}/add/operator/startWith.ts | 0 {src => compat}/add/operator/subscribeOn.ts | 0 {src => compat}/add/operator/switch.ts | 0 {src => compat}/add/operator/switchMap.ts | 0 {src => compat}/add/operator/switchMapTo.ts | 0 {src => compat}/add/operator/take.ts | 0 {src => compat}/add/operator/takeLast.ts | 0 {src => compat}/add/operator/takeUntil.ts | 0 {src => compat}/add/operator/takeWhile.ts | 0 {src => compat}/add/operator/throttle.ts | 0 {src => compat}/add/operator/throttleTime.ts | 0 {src => compat}/add/operator/timeInterval.ts | 0 {src => compat}/add/operator/timeout.ts | 0 {src => compat}/add/operator/timeoutWith.ts | 0 {src => compat}/add/operator/timestamp.ts | 0 {src => compat}/add/operator/toArray.ts | 0 {src => compat}/add/operator/toPromise.ts | 0 {src => compat}/add/operator/window.ts | 0 {src => compat}/add/operator/windowCount.ts | 0 {src => compat}/add/operator/windowTime.ts | 0 {src => compat}/add/operator/windowToggle.ts | 0 {src => compat}/add/operator/windowWhen.ts | 0 {src => compat}/add/operator/withLatestFrom.ts | 0 {src => compat}/add/operator/zip.ts | 0 {src => compat}/add/operator/zipAll.ts | 0 129 files changed, 0 insertions(+), 0 deletions(-) rename {src => compat}/add/observable/bindCallback.ts (100%) rename {src => compat}/add/observable/bindNodeCallback.ts (100%) rename {src => compat}/add/observable/combineLatest.ts (100%) rename {src => compat}/add/observable/concat.ts (100%) rename {src => compat}/add/observable/defer.ts (100%) rename {src => compat}/add/observable/dom/ajax.ts (100%) rename {src => compat}/add/observable/dom/webSocket.ts (100%) rename {src => compat}/add/observable/empty.ts (100%) rename {src => compat}/add/observable/forkJoin.ts (100%) rename {src => compat}/add/observable/from.ts (100%) rename {src => compat}/add/observable/fromEvent.ts (100%) rename {src => compat}/add/observable/fromEventPattern.ts (100%) rename {src => compat}/add/observable/fromPromise.ts (100%) rename {src => compat}/add/observable/generate.ts (100%) rename {src => compat}/add/observable/if.ts (100%) rename {src => compat}/add/observable/interval.ts (100%) rename {src => compat}/add/observable/merge.ts (100%) rename {src => compat}/add/observable/never.ts (100%) rename {src => compat}/add/observable/of.ts (100%) rename {src => compat}/add/observable/onErrorResumeNext.ts (100%) rename {src => compat}/add/observable/pairs.ts (100%) rename {src => compat}/add/observable/race.ts (100%) rename {src => compat}/add/observable/range.ts (100%) rename {src => compat}/add/observable/throw.ts (100%) rename {src => compat}/add/observable/timer.ts (100%) rename {src => compat}/add/observable/using.ts (100%) rename {src => compat}/add/observable/zip.ts (100%) rename {src => compat}/add/operator/audit.ts (100%) rename {src => compat}/add/operator/auditTime.ts (100%) rename {src => compat}/add/operator/buffer.ts (100%) rename {src => compat}/add/operator/bufferCount.ts (100%) rename {src => compat}/add/operator/bufferTime.ts (100%) rename {src => compat}/add/operator/bufferToggle.ts (100%) rename {src => compat}/add/operator/bufferWhen.ts (100%) rename {src => compat}/add/operator/catch.ts (100%) rename {src => compat}/add/operator/combineAll.ts (100%) rename {src => compat}/add/operator/combineLatest.ts (100%) rename {src => compat}/add/operator/concat.ts (100%) rename {src => compat}/add/operator/concatAll.ts (100%) rename {src => compat}/add/operator/concatMap.ts (100%) rename {src => compat}/add/operator/concatMapTo.ts (100%) rename {src => compat}/add/operator/count.ts (100%) rename {src => compat}/add/operator/debounce.ts (100%) rename {src => compat}/add/operator/debounceTime.ts (100%) rename {src => compat}/add/operator/defaultIfEmpty.ts (100%) rename {src => compat}/add/operator/delay.ts (100%) rename {src => compat}/add/operator/delayWhen.ts (100%) rename {src => compat}/add/operator/dematerialize.ts (100%) rename {src => compat}/add/operator/distinct.ts (100%) rename {src => compat}/add/operator/distinctUntilChanged.ts (100%) rename {src => compat}/add/operator/distinctUntilKeyChanged.ts (100%) rename {src => compat}/add/operator/do.ts (100%) rename {src => compat}/add/operator/elementAt.ts (100%) rename {src => compat}/add/operator/every.ts (100%) rename {src => compat}/add/operator/exhaust.ts (100%) rename {src => compat}/add/operator/exhaustMap.ts (100%) rename {src => compat}/add/operator/expand.ts (100%) rename {src => compat}/add/operator/filter.ts (100%) rename {src => compat}/add/operator/finally.ts (100%) rename {src => compat}/add/operator/find.ts (100%) rename {src => compat}/add/operator/findIndex.ts (100%) rename {src => compat}/add/operator/first.ts (100%) rename {src => compat}/add/operator/groupBy.ts (100%) rename {src => compat}/add/operator/ignoreElements.ts (100%) rename {src => compat}/add/operator/isEmpty.ts (100%) rename {src => compat}/add/operator/last.ts (100%) rename {src => compat}/add/operator/let.ts (100%) rename {src => compat}/add/operator/map.ts (100%) rename {src => compat}/add/operator/mapTo.ts (100%) rename {src => compat}/add/operator/materialize.ts (100%) rename {src => compat}/add/operator/max.ts (100%) rename {src => compat}/add/operator/merge.ts (100%) rename {src => compat}/add/operator/mergeAll.ts (100%) rename {src => compat}/add/operator/mergeMap.ts (100%) rename {src => compat}/add/operator/mergeMapTo.ts (100%) rename {src => compat}/add/operator/mergeScan.ts (100%) rename {src => compat}/add/operator/min.ts (100%) rename {src => compat}/add/operator/multicast.ts (100%) rename {src => compat}/add/operator/observeOn.ts (100%) rename {src => compat}/add/operator/onErrorResumeNext.ts (100%) rename {src => compat}/add/operator/pairwise.ts (100%) rename {src => compat}/add/operator/partition.ts (100%) rename {src => compat}/add/operator/pluck.ts (100%) rename {src => compat}/add/operator/publish.ts (100%) rename {src => compat}/add/operator/publishBehavior.ts (100%) rename {src => compat}/add/operator/publishLast.ts (100%) rename {src => compat}/add/operator/publishReplay.ts (100%) rename {src => compat}/add/operator/race.ts (100%) rename {src => compat}/add/operator/reduce.ts (100%) rename {src => compat}/add/operator/repeat.ts (100%) rename {src => compat}/add/operator/repeatWhen.ts (100%) rename {src => compat}/add/operator/retry.ts (100%) rename {src => compat}/add/operator/retryWhen.ts (100%) rename {src => compat}/add/operator/sample.ts (100%) rename {src => compat}/add/operator/sampleTime.ts (100%) rename {src => compat}/add/operator/scan.ts (100%) rename {src => compat}/add/operator/sequenceEqual.ts (100%) rename {src => compat}/add/operator/share.ts (100%) rename {src => compat}/add/operator/shareReplay.ts (100%) rename {src => compat}/add/operator/single.ts (100%) rename {src => compat}/add/operator/skip.ts (100%) rename {src => compat}/add/operator/skipLast.ts (100%) rename {src => compat}/add/operator/skipUntil.ts (100%) rename {src => compat}/add/operator/skipWhile.ts (100%) rename {src => compat}/add/operator/startWith.ts (100%) rename {src => compat}/add/operator/subscribeOn.ts (100%) rename {src => compat}/add/operator/switch.ts (100%) rename {src => compat}/add/operator/switchMap.ts (100%) rename {src => compat}/add/operator/switchMapTo.ts (100%) rename {src => compat}/add/operator/take.ts (100%) rename {src => compat}/add/operator/takeLast.ts (100%) rename {src => compat}/add/operator/takeUntil.ts (100%) rename {src => compat}/add/operator/takeWhile.ts (100%) rename {src => compat}/add/operator/throttle.ts (100%) rename {src => compat}/add/operator/throttleTime.ts (100%) rename {src => compat}/add/operator/timeInterval.ts (100%) rename {src => compat}/add/operator/timeout.ts (100%) rename {src => compat}/add/operator/timeoutWith.ts (100%) rename {src => compat}/add/operator/timestamp.ts (100%) rename {src => compat}/add/operator/toArray.ts (100%) rename {src => compat}/add/operator/toPromise.ts (100%) rename {src => compat}/add/operator/window.ts (100%) rename {src => compat}/add/operator/windowCount.ts (100%) rename {src => compat}/add/operator/windowTime.ts (100%) rename {src => compat}/add/operator/windowToggle.ts (100%) rename {src => compat}/add/operator/windowWhen.ts (100%) rename {src => compat}/add/operator/withLatestFrom.ts (100%) rename {src => compat}/add/operator/zip.ts (100%) rename {src => compat}/add/operator/zipAll.ts (100%) diff --git a/src/add/observable/bindCallback.ts b/compat/add/observable/bindCallback.ts similarity index 100% rename from src/add/observable/bindCallback.ts rename to compat/add/observable/bindCallback.ts diff --git a/src/add/observable/bindNodeCallback.ts b/compat/add/observable/bindNodeCallback.ts similarity index 100% rename from src/add/observable/bindNodeCallback.ts rename to compat/add/observable/bindNodeCallback.ts diff --git a/src/add/observable/combineLatest.ts b/compat/add/observable/combineLatest.ts similarity index 100% rename from src/add/observable/combineLatest.ts rename to compat/add/observable/combineLatest.ts diff --git a/src/add/observable/concat.ts b/compat/add/observable/concat.ts similarity index 100% rename from src/add/observable/concat.ts rename to compat/add/observable/concat.ts diff --git a/src/add/observable/defer.ts b/compat/add/observable/defer.ts similarity index 100% rename from src/add/observable/defer.ts rename to compat/add/observable/defer.ts diff --git a/src/add/observable/dom/ajax.ts b/compat/add/observable/dom/ajax.ts similarity index 100% rename from src/add/observable/dom/ajax.ts rename to compat/add/observable/dom/ajax.ts diff --git a/src/add/observable/dom/webSocket.ts b/compat/add/observable/dom/webSocket.ts similarity index 100% rename from src/add/observable/dom/webSocket.ts rename to compat/add/observable/dom/webSocket.ts diff --git a/src/add/observable/empty.ts b/compat/add/observable/empty.ts similarity index 100% rename from src/add/observable/empty.ts rename to compat/add/observable/empty.ts diff --git a/src/add/observable/forkJoin.ts b/compat/add/observable/forkJoin.ts similarity index 100% rename from src/add/observable/forkJoin.ts rename to compat/add/observable/forkJoin.ts diff --git a/src/add/observable/from.ts b/compat/add/observable/from.ts similarity index 100% rename from src/add/observable/from.ts rename to compat/add/observable/from.ts diff --git a/src/add/observable/fromEvent.ts b/compat/add/observable/fromEvent.ts similarity index 100% rename from src/add/observable/fromEvent.ts rename to compat/add/observable/fromEvent.ts diff --git a/src/add/observable/fromEventPattern.ts b/compat/add/observable/fromEventPattern.ts similarity index 100% rename from src/add/observable/fromEventPattern.ts rename to compat/add/observable/fromEventPattern.ts diff --git a/src/add/observable/fromPromise.ts b/compat/add/observable/fromPromise.ts similarity index 100% rename from src/add/observable/fromPromise.ts rename to compat/add/observable/fromPromise.ts diff --git a/src/add/observable/generate.ts b/compat/add/observable/generate.ts similarity index 100% rename from src/add/observable/generate.ts rename to compat/add/observable/generate.ts diff --git a/src/add/observable/if.ts b/compat/add/observable/if.ts similarity index 100% rename from src/add/observable/if.ts rename to compat/add/observable/if.ts diff --git a/src/add/observable/interval.ts b/compat/add/observable/interval.ts similarity index 100% rename from src/add/observable/interval.ts rename to compat/add/observable/interval.ts diff --git a/src/add/observable/merge.ts b/compat/add/observable/merge.ts similarity index 100% rename from src/add/observable/merge.ts rename to compat/add/observable/merge.ts diff --git a/src/add/observable/never.ts b/compat/add/observable/never.ts similarity index 100% rename from src/add/observable/never.ts rename to compat/add/observable/never.ts diff --git a/src/add/observable/of.ts b/compat/add/observable/of.ts similarity index 100% rename from src/add/observable/of.ts rename to compat/add/observable/of.ts diff --git a/src/add/observable/onErrorResumeNext.ts b/compat/add/observable/onErrorResumeNext.ts similarity index 100% rename from src/add/observable/onErrorResumeNext.ts rename to compat/add/observable/onErrorResumeNext.ts diff --git a/src/add/observable/pairs.ts b/compat/add/observable/pairs.ts similarity index 100% rename from src/add/observable/pairs.ts rename to compat/add/observable/pairs.ts diff --git a/src/add/observable/race.ts b/compat/add/observable/race.ts similarity index 100% rename from src/add/observable/race.ts rename to compat/add/observable/race.ts diff --git a/src/add/observable/range.ts b/compat/add/observable/range.ts similarity index 100% rename from src/add/observable/range.ts rename to compat/add/observable/range.ts diff --git a/src/add/observable/throw.ts b/compat/add/observable/throw.ts similarity index 100% rename from src/add/observable/throw.ts rename to compat/add/observable/throw.ts diff --git a/src/add/observable/timer.ts b/compat/add/observable/timer.ts similarity index 100% rename from src/add/observable/timer.ts rename to compat/add/observable/timer.ts diff --git a/src/add/observable/using.ts b/compat/add/observable/using.ts similarity index 100% rename from src/add/observable/using.ts rename to compat/add/observable/using.ts diff --git a/src/add/observable/zip.ts b/compat/add/observable/zip.ts similarity index 100% rename from src/add/observable/zip.ts rename to compat/add/observable/zip.ts diff --git a/src/add/operator/audit.ts b/compat/add/operator/audit.ts similarity index 100% rename from src/add/operator/audit.ts rename to compat/add/operator/audit.ts diff --git a/src/add/operator/auditTime.ts b/compat/add/operator/auditTime.ts similarity index 100% rename from src/add/operator/auditTime.ts rename to compat/add/operator/auditTime.ts diff --git a/src/add/operator/buffer.ts b/compat/add/operator/buffer.ts similarity index 100% rename from src/add/operator/buffer.ts rename to compat/add/operator/buffer.ts diff --git a/src/add/operator/bufferCount.ts b/compat/add/operator/bufferCount.ts similarity index 100% rename from src/add/operator/bufferCount.ts rename to compat/add/operator/bufferCount.ts diff --git a/src/add/operator/bufferTime.ts b/compat/add/operator/bufferTime.ts similarity index 100% rename from src/add/operator/bufferTime.ts rename to compat/add/operator/bufferTime.ts diff --git a/src/add/operator/bufferToggle.ts b/compat/add/operator/bufferToggle.ts similarity index 100% rename from src/add/operator/bufferToggle.ts rename to compat/add/operator/bufferToggle.ts diff --git a/src/add/operator/bufferWhen.ts b/compat/add/operator/bufferWhen.ts similarity index 100% rename from src/add/operator/bufferWhen.ts rename to compat/add/operator/bufferWhen.ts diff --git a/src/add/operator/catch.ts b/compat/add/operator/catch.ts similarity index 100% rename from src/add/operator/catch.ts rename to compat/add/operator/catch.ts diff --git a/src/add/operator/combineAll.ts b/compat/add/operator/combineAll.ts similarity index 100% rename from src/add/operator/combineAll.ts rename to compat/add/operator/combineAll.ts diff --git a/src/add/operator/combineLatest.ts b/compat/add/operator/combineLatest.ts similarity index 100% rename from src/add/operator/combineLatest.ts rename to compat/add/operator/combineLatest.ts diff --git a/src/add/operator/concat.ts b/compat/add/operator/concat.ts similarity index 100% rename from src/add/operator/concat.ts rename to compat/add/operator/concat.ts diff --git a/src/add/operator/concatAll.ts b/compat/add/operator/concatAll.ts similarity index 100% rename from src/add/operator/concatAll.ts rename to compat/add/operator/concatAll.ts diff --git a/src/add/operator/concatMap.ts b/compat/add/operator/concatMap.ts similarity index 100% rename from src/add/operator/concatMap.ts rename to compat/add/operator/concatMap.ts diff --git a/src/add/operator/concatMapTo.ts b/compat/add/operator/concatMapTo.ts similarity index 100% rename from src/add/operator/concatMapTo.ts rename to compat/add/operator/concatMapTo.ts diff --git a/src/add/operator/count.ts b/compat/add/operator/count.ts similarity index 100% rename from src/add/operator/count.ts rename to compat/add/operator/count.ts diff --git a/src/add/operator/debounce.ts b/compat/add/operator/debounce.ts similarity index 100% rename from src/add/operator/debounce.ts rename to compat/add/operator/debounce.ts diff --git a/src/add/operator/debounceTime.ts b/compat/add/operator/debounceTime.ts similarity index 100% rename from src/add/operator/debounceTime.ts rename to compat/add/operator/debounceTime.ts diff --git a/src/add/operator/defaultIfEmpty.ts b/compat/add/operator/defaultIfEmpty.ts similarity index 100% rename from src/add/operator/defaultIfEmpty.ts rename to compat/add/operator/defaultIfEmpty.ts diff --git a/src/add/operator/delay.ts b/compat/add/operator/delay.ts similarity index 100% rename from src/add/operator/delay.ts rename to compat/add/operator/delay.ts diff --git a/src/add/operator/delayWhen.ts b/compat/add/operator/delayWhen.ts similarity index 100% rename from src/add/operator/delayWhen.ts rename to compat/add/operator/delayWhen.ts diff --git a/src/add/operator/dematerialize.ts b/compat/add/operator/dematerialize.ts similarity index 100% rename from src/add/operator/dematerialize.ts rename to compat/add/operator/dematerialize.ts diff --git a/src/add/operator/distinct.ts b/compat/add/operator/distinct.ts similarity index 100% rename from src/add/operator/distinct.ts rename to compat/add/operator/distinct.ts diff --git a/src/add/operator/distinctUntilChanged.ts b/compat/add/operator/distinctUntilChanged.ts similarity index 100% rename from src/add/operator/distinctUntilChanged.ts rename to compat/add/operator/distinctUntilChanged.ts diff --git a/src/add/operator/distinctUntilKeyChanged.ts b/compat/add/operator/distinctUntilKeyChanged.ts similarity index 100% rename from src/add/operator/distinctUntilKeyChanged.ts rename to compat/add/operator/distinctUntilKeyChanged.ts diff --git a/src/add/operator/do.ts b/compat/add/operator/do.ts similarity index 100% rename from src/add/operator/do.ts rename to compat/add/operator/do.ts diff --git a/src/add/operator/elementAt.ts b/compat/add/operator/elementAt.ts similarity index 100% rename from src/add/operator/elementAt.ts rename to compat/add/operator/elementAt.ts diff --git a/src/add/operator/every.ts b/compat/add/operator/every.ts similarity index 100% rename from src/add/operator/every.ts rename to compat/add/operator/every.ts diff --git a/src/add/operator/exhaust.ts b/compat/add/operator/exhaust.ts similarity index 100% rename from src/add/operator/exhaust.ts rename to compat/add/operator/exhaust.ts diff --git a/src/add/operator/exhaustMap.ts b/compat/add/operator/exhaustMap.ts similarity index 100% rename from src/add/operator/exhaustMap.ts rename to compat/add/operator/exhaustMap.ts diff --git a/src/add/operator/expand.ts b/compat/add/operator/expand.ts similarity index 100% rename from src/add/operator/expand.ts rename to compat/add/operator/expand.ts diff --git a/src/add/operator/filter.ts b/compat/add/operator/filter.ts similarity index 100% rename from src/add/operator/filter.ts rename to compat/add/operator/filter.ts diff --git a/src/add/operator/finally.ts b/compat/add/operator/finally.ts similarity index 100% rename from src/add/operator/finally.ts rename to compat/add/operator/finally.ts diff --git a/src/add/operator/find.ts b/compat/add/operator/find.ts similarity index 100% rename from src/add/operator/find.ts rename to compat/add/operator/find.ts diff --git a/src/add/operator/findIndex.ts b/compat/add/operator/findIndex.ts similarity index 100% rename from src/add/operator/findIndex.ts rename to compat/add/operator/findIndex.ts diff --git a/src/add/operator/first.ts b/compat/add/operator/first.ts similarity index 100% rename from src/add/operator/first.ts rename to compat/add/operator/first.ts diff --git a/src/add/operator/groupBy.ts b/compat/add/operator/groupBy.ts similarity index 100% rename from src/add/operator/groupBy.ts rename to compat/add/operator/groupBy.ts diff --git a/src/add/operator/ignoreElements.ts b/compat/add/operator/ignoreElements.ts similarity index 100% rename from src/add/operator/ignoreElements.ts rename to compat/add/operator/ignoreElements.ts diff --git a/src/add/operator/isEmpty.ts b/compat/add/operator/isEmpty.ts similarity index 100% rename from src/add/operator/isEmpty.ts rename to compat/add/operator/isEmpty.ts diff --git a/src/add/operator/last.ts b/compat/add/operator/last.ts similarity index 100% rename from src/add/operator/last.ts rename to compat/add/operator/last.ts diff --git a/src/add/operator/let.ts b/compat/add/operator/let.ts similarity index 100% rename from src/add/operator/let.ts rename to compat/add/operator/let.ts diff --git a/src/add/operator/map.ts b/compat/add/operator/map.ts similarity index 100% rename from src/add/operator/map.ts rename to compat/add/operator/map.ts diff --git a/src/add/operator/mapTo.ts b/compat/add/operator/mapTo.ts similarity index 100% rename from src/add/operator/mapTo.ts rename to compat/add/operator/mapTo.ts diff --git a/src/add/operator/materialize.ts b/compat/add/operator/materialize.ts similarity index 100% rename from src/add/operator/materialize.ts rename to compat/add/operator/materialize.ts diff --git a/src/add/operator/max.ts b/compat/add/operator/max.ts similarity index 100% rename from src/add/operator/max.ts rename to compat/add/operator/max.ts diff --git a/src/add/operator/merge.ts b/compat/add/operator/merge.ts similarity index 100% rename from src/add/operator/merge.ts rename to compat/add/operator/merge.ts diff --git a/src/add/operator/mergeAll.ts b/compat/add/operator/mergeAll.ts similarity index 100% rename from src/add/operator/mergeAll.ts rename to compat/add/operator/mergeAll.ts diff --git a/src/add/operator/mergeMap.ts b/compat/add/operator/mergeMap.ts similarity index 100% rename from src/add/operator/mergeMap.ts rename to compat/add/operator/mergeMap.ts diff --git a/src/add/operator/mergeMapTo.ts b/compat/add/operator/mergeMapTo.ts similarity index 100% rename from src/add/operator/mergeMapTo.ts rename to compat/add/operator/mergeMapTo.ts diff --git a/src/add/operator/mergeScan.ts b/compat/add/operator/mergeScan.ts similarity index 100% rename from src/add/operator/mergeScan.ts rename to compat/add/operator/mergeScan.ts diff --git a/src/add/operator/min.ts b/compat/add/operator/min.ts similarity index 100% rename from src/add/operator/min.ts rename to compat/add/operator/min.ts diff --git a/src/add/operator/multicast.ts b/compat/add/operator/multicast.ts similarity index 100% rename from src/add/operator/multicast.ts rename to compat/add/operator/multicast.ts diff --git a/src/add/operator/observeOn.ts b/compat/add/operator/observeOn.ts similarity index 100% rename from src/add/operator/observeOn.ts rename to compat/add/operator/observeOn.ts diff --git a/src/add/operator/onErrorResumeNext.ts b/compat/add/operator/onErrorResumeNext.ts similarity index 100% rename from src/add/operator/onErrorResumeNext.ts rename to compat/add/operator/onErrorResumeNext.ts diff --git a/src/add/operator/pairwise.ts b/compat/add/operator/pairwise.ts similarity index 100% rename from src/add/operator/pairwise.ts rename to compat/add/operator/pairwise.ts diff --git a/src/add/operator/partition.ts b/compat/add/operator/partition.ts similarity index 100% rename from src/add/operator/partition.ts rename to compat/add/operator/partition.ts diff --git a/src/add/operator/pluck.ts b/compat/add/operator/pluck.ts similarity index 100% rename from src/add/operator/pluck.ts rename to compat/add/operator/pluck.ts diff --git a/src/add/operator/publish.ts b/compat/add/operator/publish.ts similarity index 100% rename from src/add/operator/publish.ts rename to compat/add/operator/publish.ts diff --git a/src/add/operator/publishBehavior.ts b/compat/add/operator/publishBehavior.ts similarity index 100% rename from src/add/operator/publishBehavior.ts rename to compat/add/operator/publishBehavior.ts diff --git a/src/add/operator/publishLast.ts b/compat/add/operator/publishLast.ts similarity index 100% rename from src/add/operator/publishLast.ts rename to compat/add/operator/publishLast.ts diff --git a/src/add/operator/publishReplay.ts b/compat/add/operator/publishReplay.ts similarity index 100% rename from src/add/operator/publishReplay.ts rename to compat/add/operator/publishReplay.ts diff --git a/src/add/operator/race.ts b/compat/add/operator/race.ts similarity index 100% rename from src/add/operator/race.ts rename to compat/add/operator/race.ts diff --git a/src/add/operator/reduce.ts b/compat/add/operator/reduce.ts similarity index 100% rename from src/add/operator/reduce.ts rename to compat/add/operator/reduce.ts diff --git a/src/add/operator/repeat.ts b/compat/add/operator/repeat.ts similarity index 100% rename from src/add/operator/repeat.ts rename to compat/add/operator/repeat.ts diff --git a/src/add/operator/repeatWhen.ts b/compat/add/operator/repeatWhen.ts similarity index 100% rename from src/add/operator/repeatWhen.ts rename to compat/add/operator/repeatWhen.ts diff --git a/src/add/operator/retry.ts b/compat/add/operator/retry.ts similarity index 100% rename from src/add/operator/retry.ts rename to compat/add/operator/retry.ts diff --git a/src/add/operator/retryWhen.ts b/compat/add/operator/retryWhen.ts similarity index 100% rename from src/add/operator/retryWhen.ts rename to compat/add/operator/retryWhen.ts diff --git a/src/add/operator/sample.ts b/compat/add/operator/sample.ts similarity index 100% rename from src/add/operator/sample.ts rename to compat/add/operator/sample.ts diff --git a/src/add/operator/sampleTime.ts b/compat/add/operator/sampleTime.ts similarity index 100% rename from src/add/operator/sampleTime.ts rename to compat/add/operator/sampleTime.ts diff --git a/src/add/operator/scan.ts b/compat/add/operator/scan.ts similarity index 100% rename from src/add/operator/scan.ts rename to compat/add/operator/scan.ts diff --git a/src/add/operator/sequenceEqual.ts b/compat/add/operator/sequenceEqual.ts similarity index 100% rename from src/add/operator/sequenceEqual.ts rename to compat/add/operator/sequenceEqual.ts diff --git a/src/add/operator/share.ts b/compat/add/operator/share.ts similarity index 100% rename from src/add/operator/share.ts rename to compat/add/operator/share.ts diff --git a/src/add/operator/shareReplay.ts b/compat/add/operator/shareReplay.ts similarity index 100% rename from src/add/operator/shareReplay.ts rename to compat/add/operator/shareReplay.ts diff --git a/src/add/operator/single.ts b/compat/add/operator/single.ts similarity index 100% rename from src/add/operator/single.ts rename to compat/add/operator/single.ts diff --git a/src/add/operator/skip.ts b/compat/add/operator/skip.ts similarity index 100% rename from src/add/operator/skip.ts rename to compat/add/operator/skip.ts diff --git a/src/add/operator/skipLast.ts b/compat/add/operator/skipLast.ts similarity index 100% rename from src/add/operator/skipLast.ts rename to compat/add/operator/skipLast.ts diff --git a/src/add/operator/skipUntil.ts b/compat/add/operator/skipUntil.ts similarity index 100% rename from src/add/operator/skipUntil.ts rename to compat/add/operator/skipUntil.ts diff --git a/src/add/operator/skipWhile.ts b/compat/add/operator/skipWhile.ts similarity index 100% rename from src/add/operator/skipWhile.ts rename to compat/add/operator/skipWhile.ts diff --git a/src/add/operator/startWith.ts b/compat/add/operator/startWith.ts similarity index 100% rename from src/add/operator/startWith.ts rename to compat/add/operator/startWith.ts diff --git a/src/add/operator/subscribeOn.ts b/compat/add/operator/subscribeOn.ts similarity index 100% rename from src/add/operator/subscribeOn.ts rename to compat/add/operator/subscribeOn.ts diff --git a/src/add/operator/switch.ts b/compat/add/operator/switch.ts similarity index 100% rename from src/add/operator/switch.ts rename to compat/add/operator/switch.ts diff --git a/src/add/operator/switchMap.ts b/compat/add/operator/switchMap.ts similarity index 100% rename from src/add/operator/switchMap.ts rename to compat/add/operator/switchMap.ts diff --git a/src/add/operator/switchMapTo.ts b/compat/add/operator/switchMapTo.ts similarity index 100% rename from src/add/operator/switchMapTo.ts rename to compat/add/operator/switchMapTo.ts diff --git a/src/add/operator/take.ts b/compat/add/operator/take.ts similarity index 100% rename from src/add/operator/take.ts rename to compat/add/operator/take.ts diff --git a/src/add/operator/takeLast.ts b/compat/add/operator/takeLast.ts similarity index 100% rename from src/add/operator/takeLast.ts rename to compat/add/operator/takeLast.ts diff --git a/src/add/operator/takeUntil.ts b/compat/add/operator/takeUntil.ts similarity index 100% rename from src/add/operator/takeUntil.ts rename to compat/add/operator/takeUntil.ts diff --git a/src/add/operator/takeWhile.ts b/compat/add/operator/takeWhile.ts similarity index 100% rename from src/add/operator/takeWhile.ts rename to compat/add/operator/takeWhile.ts diff --git a/src/add/operator/throttle.ts b/compat/add/operator/throttle.ts similarity index 100% rename from src/add/operator/throttle.ts rename to compat/add/operator/throttle.ts diff --git a/src/add/operator/throttleTime.ts b/compat/add/operator/throttleTime.ts similarity index 100% rename from src/add/operator/throttleTime.ts rename to compat/add/operator/throttleTime.ts diff --git a/src/add/operator/timeInterval.ts b/compat/add/operator/timeInterval.ts similarity index 100% rename from src/add/operator/timeInterval.ts rename to compat/add/operator/timeInterval.ts diff --git a/src/add/operator/timeout.ts b/compat/add/operator/timeout.ts similarity index 100% rename from src/add/operator/timeout.ts rename to compat/add/operator/timeout.ts diff --git a/src/add/operator/timeoutWith.ts b/compat/add/operator/timeoutWith.ts similarity index 100% rename from src/add/operator/timeoutWith.ts rename to compat/add/operator/timeoutWith.ts diff --git a/src/add/operator/timestamp.ts b/compat/add/operator/timestamp.ts similarity index 100% rename from src/add/operator/timestamp.ts rename to compat/add/operator/timestamp.ts diff --git a/src/add/operator/toArray.ts b/compat/add/operator/toArray.ts similarity index 100% rename from src/add/operator/toArray.ts rename to compat/add/operator/toArray.ts diff --git a/src/add/operator/toPromise.ts b/compat/add/operator/toPromise.ts similarity index 100% rename from src/add/operator/toPromise.ts rename to compat/add/operator/toPromise.ts diff --git a/src/add/operator/window.ts b/compat/add/operator/window.ts similarity index 100% rename from src/add/operator/window.ts rename to compat/add/operator/window.ts diff --git a/src/add/operator/windowCount.ts b/compat/add/operator/windowCount.ts similarity index 100% rename from src/add/operator/windowCount.ts rename to compat/add/operator/windowCount.ts diff --git a/src/add/operator/windowTime.ts b/compat/add/operator/windowTime.ts similarity index 100% rename from src/add/operator/windowTime.ts rename to compat/add/operator/windowTime.ts diff --git a/src/add/operator/windowToggle.ts b/compat/add/operator/windowToggle.ts similarity index 100% rename from src/add/operator/windowToggle.ts rename to compat/add/operator/windowToggle.ts diff --git a/src/add/operator/windowWhen.ts b/compat/add/operator/windowWhen.ts similarity index 100% rename from src/add/operator/windowWhen.ts rename to compat/add/operator/windowWhen.ts diff --git a/src/add/operator/withLatestFrom.ts b/compat/add/operator/withLatestFrom.ts similarity index 100% rename from src/add/operator/withLatestFrom.ts rename to compat/add/operator/withLatestFrom.ts diff --git a/src/add/operator/zip.ts b/compat/add/operator/zip.ts similarity index 100% rename from src/add/operator/zip.ts rename to compat/add/operator/zip.ts diff --git a/src/add/operator/zipAll.ts b/compat/add/operator/zipAll.ts similarity index 100% rename from src/add/operator/zipAll.ts rename to compat/add/operator/zipAll.ts From 40aca82934aea7fd82c04fa62783f572784c8667 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Mon, 5 Mar 2018 16:03:43 -0800 Subject: [PATCH 12/39] feat(compat): add compatability package definition --- compat/package.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 compat/package.json diff --git a/compat/package.json b/compat/package.json new file mode 100644 index 0000000000..26f81792be --- /dev/null +++ b/compat/package.json @@ -0,0 +1,7 @@ +{ + "name": "rxjs-compat", + "version": "6.0.0-alpha.3", + "dependencies": { + "rxjs": "^6.0.0-alpha.3" + } +} From df25de14bef804b1061aa91b9588ee777ce8775f Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Mon, 5 Mar 2018 16:04:32 -0800 Subject: [PATCH 13/39] feat(compat): add Rx.ts to rxjs-compat --- compat/Rx.ts | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 227 insertions(+) create mode 100644 compat/Rx.ts diff --git a/compat/Rx.ts b/compat/Rx.ts new file mode 100644 index 0000000000..1384555389 --- /dev/null +++ b/compat/Rx.ts @@ -0,0 +1,227 @@ +/* tslint:disable:no-unused-variable */ +// Subject imported before Observable to bypass circular dependency issue since +// Subject extends Observable and Observable references Subject in it's +// definition +export {Subject, AnonymousSubject} from './internal/Subject'; +/* tslint:enable:no-unused-variable */ +export {Observable} from './internal/Observable'; + +// statics +/* tslint:disable:no-use-before-declare */ +import './add/observable/bindCallback'; +import './add/observable/bindNodeCallback'; +import './add/observable/combineLatest'; +import './add/observable/concat'; +import './add/observable/defer'; +import './add/observable/empty'; +import './add/observable/forkJoin'; +import './add/observable/from'; +import './add/observable/fromEvent'; +import './add/observable/fromEventPattern'; +import './add/observable/fromPromise'; +import './add/observable/generate'; +import './add/observable/if'; +import './add/observable/interval'; +import './add/observable/merge'; +import './add/observable/race'; +import './add/observable/never'; +import './add/observable/of'; +import './add/observable/onErrorResumeNext'; +import './add/observable/pairs'; +import './add/observable/range'; +import './add/observable/using'; +import './add/observable/throw'; +import './add/observable/timer'; +import './add/observable/zip'; + +//dom +import './add/observable/dom/ajax'; +import './add/observable/dom/webSocket'; + +//internal/operators +import './add/operator/buffer'; +import './add/operator/bufferCount'; +import './add/operator/bufferTime'; +import './add/operator/bufferToggle'; +import './add/operator/bufferWhen'; +import './add/operator/catch'; +import './add/operator/combineAll'; +import './add/operator/combineLatest'; +import './add/operator/concat'; +import './add/operator/concatAll'; +import './add/operator/concatMap'; +import './add/operator/concatMapTo'; +import './add/operator/count'; +import './add/operator/dematerialize'; +import './add/operator/debounce'; +import './add/operator/debounceTime'; +import './add/operator/defaultIfEmpty'; +import './add/operator/delay'; +import './add/operator/delayWhen'; +import './add/operator/distinct'; +import './add/operator/distinctUntilChanged'; +import './add/operator/distinctUntilKeyChanged'; +import './add/operator/do'; +import './add/operator/exhaust'; +import './add/operator/exhaustMap'; +import './add/operator/expand'; +import './add/operator/elementAt'; +import './add/operator/filter'; +import './add/operator/finally'; +import './add/operator/find'; +import './add/operator/findIndex'; +import './add/operator/first'; +import './add/operator/groupBy'; +import './add/operator/ignoreElements'; +import './add/operator/isEmpty'; +import './add/operator/audit'; +import './add/operator/auditTime'; +import './add/operator/last'; +import './add/operator/let'; +import './add/operator/every'; +import './add/operator/map'; +import './add/operator/mapTo'; +import './add/operator/materialize'; +import './add/operator/max'; +import './add/operator/merge'; +import './add/operator/mergeAll'; +import './add/operator/mergeMap'; +import './add/operator/mergeMapTo'; +import './add/operator/mergeScan'; +import './add/operator/min'; +import './add/operator/multicast'; +import './add/operator/observeOn'; +import './add/operator/onErrorResumeNext'; +import './add/operator/pairwise'; +import './add/operator/partition'; +import './add/operator/pluck'; +import './add/operator/publish'; +import './add/operator/publishBehavior'; +import './add/operator/publishReplay'; +import './add/operator/publishLast'; +import './add/operator/race'; +import './add/operator/reduce'; +import './add/operator/repeat'; +import './add/operator/repeatWhen'; +import './add/operator/retry'; +import './add/operator/retryWhen'; +import './add/operator/sample'; +import './add/operator/sampleTime'; +import './add/operator/scan'; +import './add/operator/sequenceEqual'; +import './add/operator/share'; +import './add/operator/shareReplay'; +import './add/operator/single'; +import './add/operator/skip'; +import './add/operator/skipLast'; +import './add/operator/skipUntil'; +import './add/operator/skipWhile'; +import './add/operator/startWith'; +import './add/operator/subscribeOn'; +import './add/operator/switch'; +import './add/operator/switchMap'; +import './add/operator/switchMapTo'; +import './add/operator/take'; +import './add/operator/takeLast'; +import './add/operator/takeUntil'; +import './add/operator/takeWhile'; +import './add/operator/throttle'; +import './add/operator/throttleTime'; +import './add/operator/timeInterval'; +import './add/operator/timeout'; +import './add/operator/timeoutWith'; +import './add/operator/timestamp'; +import './add/operator/toArray'; +import './add/operator/toPromise'; +import './add/operator/window'; +import './add/operator/windowCount'; +import './add/operator/windowTime'; +import './add/operator/windowToggle'; +import './add/operator/windowWhen'; +import './add/operator/withLatestFrom'; +import './add/operator/zip'; +import './add/operator/zipAll'; + +/* tslint:disable:no-unused-variable */ +export {Operator} from './internal/Operator'; +export {Observer} from './internal/types'; +export {Subscription} from './internal/Subscription'; +export {Subscriber} from './internal/Subscriber'; +export {AsyncSubject} from './internal/AsyncSubject'; +export {ReplaySubject} from './internal/ReplaySubject'; +export {BehaviorSubject} from './internal/BehaviorSubject'; +export {ConnectableObservable} from './internal/observable/ConnectableObservable'; +export {Notification} from './internal/Notification'; +export {EmptyError} from './internal/util/EmptyError'; +export {ArgumentOutOfRangeError} from './internal/util/ArgumentOutOfRangeError'; +export {ObjectUnsubscribedError} from './internal/util/ObjectUnsubscribedError'; +export {TimeoutError} from './internal/util/TimeoutError'; +export {UnsubscriptionError} from './internal/util/UnsubscriptionError'; +export {TimeInterval} from './internal/patching/operator/timeInterval'; +export {Timestamp} from './internal/operators/timestamp'; +export {TestScheduler} from './internal/testing/TestScheduler'; +export {VirtualTimeScheduler} from './internal/scheduler/VirtualTimeScheduler'; +export {AjaxRequest, AjaxResponse, AjaxError, AjaxTimeoutError} from './internal/observable/dom/AjaxObservable'; +export { pipe } from './internal/util/pipe'; + +import { asap } from './internal/scheduler/asap'; +import { async } from './internal/scheduler/async'; +import { queue } from './internal/scheduler/queue'; +import { animationFrame } from './internal/scheduler/animationFrame'; +import { AsapScheduler } from './internal/scheduler/AsapScheduler'; +import { AsyncScheduler } from './internal/scheduler/AsyncScheduler'; +import { QueueScheduler } from './internal/scheduler/QueueScheduler'; +import { AnimationFrameScheduler } from './internal/scheduler/AnimationFrameScheduler'; +import { rxSubscriber } from './internal/symbol/rxSubscriber'; +import { iterator } from './internal/symbol/iterator'; +import { observable } from './internal/symbol/observable'; + +import * as _operators from './internal/operators'; + +export const operators = _operators; + +/* tslint:enable:no-unused-variable */ + +/** + * @typedef {Object} Rx.Scheduler + * @property {Scheduler} queue Schedules on a queue in the current event frame + * (trampoline scheduler). Use this for iteration operations. + * @property {Scheduler} asap Schedules on the micro task queue, which uses the + * fastest transport mechanism available, either Node.js' `process.nextTick()` + * or Web Worker MessageChannel or setTimeout or others. Use this for + * asynchronous conversions. + * @property {Scheduler} async Schedules work with `setInterval`. Use this for + * time-based operations. + * @property {Scheduler} animationFrame Schedules work with `requestAnimationFrame`. + * Use this for synchronizing with the platform's painting + */ +let Scheduler = { + asap, + queue, + animationFrame, + async +}; + +/** + * @typedef {Object} Rx.Symbol + * @property {Symbol|string} rxSubscriber A symbol to use as a property name to + * retrieve an "Rx safe" Observer from an object. "Rx safety" can be defined as + * an object that has all of the traits of an Rx Subscriber, including the + * ability to add and remove subscriptions to the subscription chain and + * guarantees involving event triggering (can't "next" after unsubscription, + * etc). + * @property {Symbol|string} observable A symbol to use as a property name to + * retrieve an Observable as defined by the [ECMAScript "Observable" spec](https://github.com/zenparsing/es-observable). + * @property {Symbol|string} iterator The ES6 symbol to use as a property name + * to retrieve an iterator from an object. + */ +let Symbol = { + rxSubscriber, + observable, + iterator +}; + +export { + Scheduler, + Symbol +}; From d43a4c299ef830d4281828075dc0fb14f6779b6a Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Mon, 5 Mar 2018 16:36:03 -0800 Subject: [PATCH 14/39] feat(compat): make Rx.ts for compatability layer work as the default for rxjs-compat --- compat/{Rx.ts => index.ts} | 71 ++++++++++++++++++++------------------ compat/package.json | 1 + tsconfig.json | 10 +++++- 3 files changed, 47 insertions(+), 35 deletions(-) rename compat/{Rx.ts => index.ts} (76%) diff --git a/compat/Rx.ts b/compat/index.ts similarity index 76% rename from compat/Rx.ts rename to compat/index.ts index 1384555389..1ee75393b6 100644 --- a/compat/Rx.ts +++ b/compat/index.ts @@ -2,9 +2,8 @@ // Subject imported before Observable to bypass circular dependency issue since // Subject extends Observable and Observable references Subject in it's // definition -export {Subject, AnonymousSubject} from './internal/Subject'; +export {Observable, Subject} from 'rxjs'; /* tslint:enable:no-unused-variable */ -export {Observable} from './internal/Observable'; // statics /* tslint:disable:no-use-before-declare */ @@ -143,40 +142,44 @@ import './add/operator/zip'; import './add/operator/zipAll'; /* tslint:disable:no-unused-variable */ -export {Operator} from './internal/Operator'; -export {Observer} from './internal/types'; -export {Subscription} from './internal/Subscription'; -export {Subscriber} from './internal/Subscriber'; -export {AsyncSubject} from './internal/AsyncSubject'; -export {ReplaySubject} from './internal/ReplaySubject'; -export {BehaviorSubject} from './internal/BehaviorSubject'; -export {ConnectableObservable} from './internal/observable/ConnectableObservable'; -export {Notification} from './internal/Notification'; -export {EmptyError} from './internal/util/EmptyError'; -export {ArgumentOutOfRangeError} from './internal/util/ArgumentOutOfRangeError'; -export {ObjectUnsubscribedError} from './internal/util/ObjectUnsubscribedError'; -export {TimeoutError} from './internal/util/TimeoutError'; -export {UnsubscriptionError} from './internal/util/UnsubscriptionError'; -export {TimeInterval} from './internal/patching/operator/timeInterval'; -export {Timestamp} from './internal/operators/timestamp'; -export {TestScheduler} from './internal/testing/TestScheduler'; -export {VirtualTimeScheduler} from './internal/scheduler/VirtualTimeScheduler'; -export {AjaxRequest, AjaxResponse, AjaxError, AjaxTimeoutError} from './internal/observable/dom/AjaxObservable'; -export { pipe } from './internal/util/pipe'; +export { + Observer, + Subscription, + ReplaySubject, + BehaviorSubject, + Notification, + EmptyError, + ArgumentOutOfRangeError, + ObjectUnsubscribedError, + UnsubscriptionError, + pipe +} from 'rxjs'; + +export {TestScheduler} from 'rxjs/testing'; + +export {Operator} from 'rxjs/internal/Operator'; +export {Subscriber} from 'rxjs/internal/Subscriber'; +export {AsyncSubject} from 'rxjs/internal/AsyncSubject'; +export {ConnectableObservable} from 'rxjs/internal/observable/ConnectableObservable'; +export {TimeoutError} from 'rxjs/internal/util/TimeoutError'; +export {TimeInterval} from 'rxjs/internal/patching/operator/timeInterval'; +export {Timestamp} from 'rxjs/internal/operators/timestamp'; +export {VirtualTimeScheduler} from 'rxjs/internal/scheduler/VirtualTimeScheduler'; +export {AjaxRequest, AjaxResponse, AjaxError, AjaxTimeoutError} from 'rxjs/internal/observable/dom/AjaxObservable'; + +import { + asapScheduler as asap, + asyncScheduler as async, + queueScheduler as queue, + animationFrameScheduler as animationFrame, + +} from 'rxjs'; -import { asap } from './internal/scheduler/asap'; -import { async } from './internal/scheduler/async'; -import { queue } from './internal/scheduler/queue'; -import { animationFrame } from './internal/scheduler/animationFrame'; -import { AsapScheduler } from './internal/scheduler/AsapScheduler'; -import { AsyncScheduler } from './internal/scheduler/AsyncScheduler'; -import { QueueScheduler } from './internal/scheduler/QueueScheduler'; -import { AnimationFrameScheduler } from './internal/scheduler/AnimationFrameScheduler'; -import { rxSubscriber } from './internal/symbol/rxSubscriber'; -import { iterator } from './internal/symbol/iterator'; -import { observable } from './internal/symbol/observable'; +import { rxSubscriber } from 'rxjs/internal/symbol/rxSubscriber'; +import { iterator } from 'rxjs/internal/symbol/iterator'; +import { observable } from 'rxjs/internal/symbol/observable'; -import * as _operators from './internal/operators'; +import * as _operators from 'rxjs/operators'; export const operators = _operators; diff --git a/compat/package.json b/compat/package.json index 26f81792be..77565dab5e 100644 --- a/compat/package.json +++ b/compat/package.json @@ -1,6 +1,7 @@ { "name": "rxjs-compat", "version": "6.0.0-alpha.3", + "main": "index.js", "dependencies": { "rxjs": "^6.0.0-alpha.3" } diff --git a/tsconfig.json b/tsconfig.json index 992c41c3eb..2a919c001d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -20,7 +20,15 @@ "es2015.symbol", "es2015.symbol.wellknown", "dom" - ] + ], + "rootDir": ".", + "baseUrl": ".", + "paths": { + "rxjs": ["./src"], + "rxjs/*": ["./src/*"], + "rxjs-compat": ["./compat"], + "rxjs-compat/*": ["./compat/*"] + } }, "formatCodeOptions": { "indentSize": 2, From 70e562befade9dbcf53c040711ef1e26363b6888 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Mon, 5 Mar 2018 20:01:20 -0800 Subject: [PATCH 15/39] feat(compat): add legacy reexport compat layer for 'rxjs/Observable' and other top-level symbols --- compat/AsyncSubject.ts | 1 + compat/BehaviorSubject.ts | 1 + compat/InnerSubscriber.ts | 1 + compat/Notification.ts | 1 + compat/Observable.ts | 1 + compat/Observer.ts | 1 + compat/Operator.ts | 1 + compat/OuterSubscriber.ts | 1 + compat/ReplaySubject.ts | 1 + compat/Scheduler.ts | 1 + compat/Subject.ts | 1 + compat/SubjectSubscription.ts | 1 + compat/Subscriber.ts | 1 + compat/Subscription.ts | 1 + legacy-reexport/AsyncSubject.ts | 1 + legacy-reexport/BehaviorSubject.ts | 1 + legacy-reexport/InnerSubscriber.ts | 1 + legacy-reexport/Notification.ts | 1 + legacy-reexport/Observable.ts | 1 + legacy-reexport/Observer.ts | 1 + legacy-reexport/Operator.ts | 1 + legacy-reexport/OuterSubscriber.ts | 1 + legacy-reexport/ReplaySubject.ts | 1 + legacy-reexport/Scheduler.ts | 1 + legacy-reexport/Subject.ts | 1 + legacy-reexport/SubjectSubscription.ts | 1 + legacy-reexport/Subscriber.ts | 1 + legacy-reexport/Subscription.ts | 1 + 28 files changed, 28 insertions(+) create mode 100644 compat/AsyncSubject.ts create mode 100644 compat/BehaviorSubject.ts create mode 100644 compat/InnerSubscriber.ts create mode 100644 compat/Notification.ts create mode 100644 compat/Observable.ts create mode 100644 compat/Observer.ts create mode 100644 compat/Operator.ts create mode 100644 compat/OuterSubscriber.ts create mode 100644 compat/ReplaySubject.ts create mode 100644 compat/Scheduler.ts create mode 100644 compat/Subject.ts create mode 100644 compat/SubjectSubscription.ts create mode 100644 compat/Subscriber.ts create mode 100644 compat/Subscription.ts create mode 100644 legacy-reexport/AsyncSubject.ts create mode 100644 legacy-reexport/BehaviorSubject.ts create mode 100644 legacy-reexport/InnerSubscriber.ts create mode 100644 legacy-reexport/Notification.ts create mode 100644 legacy-reexport/Observable.ts create mode 100644 legacy-reexport/Observer.ts create mode 100644 legacy-reexport/Operator.ts create mode 100644 legacy-reexport/OuterSubscriber.ts create mode 100644 legacy-reexport/ReplaySubject.ts create mode 100644 legacy-reexport/Scheduler.ts create mode 100644 legacy-reexport/Subject.ts create mode 100644 legacy-reexport/SubjectSubscription.ts create mode 100644 legacy-reexport/Subscriber.ts create mode 100644 legacy-reexport/Subscription.ts diff --git a/compat/AsyncSubject.ts b/compat/AsyncSubject.ts new file mode 100644 index 0000000000..16413b0048 --- /dev/null +++ b/compat/AsyncSubject.ts @@ -0,0 +1 @@ +export {AsyncSubject} from 'rxjs/internal/AsyncSubject'; diff --git a/compat/BehaviorSubject.ts b/compat/BehaviorSubject.ts new file mode 100644 index 0000000000..0809d1fa5a --- /dev/null +++ b/compat/BehaviorSubject.ts @@ -0,0 +1 @@ +export {BehaviorSubject} from 'rxjs'; diff --git a/compat/InnerSubscriber.ts b/compat/InnerSubscriber.ts new file mode 100644 index 0000000000..167d60f2ed --- /dev/null +++ b/compat/InnerSubscriber.ts @@ -0,0 +1 @@ +export {InnerSubscriber} from 'rxjs/internal/InnerSubscriber'; diff --git a/compat/Notification.ts b/compat/Notification.ts new file mode 100644 index 0000000000..812cebd1e5 --- /dev/null +++ b/compat/Notification.ts @@ -0,0 +1 @@ +export {Notification} from 'rxjs'; diff --git a/compat/Observable.ts b/compat/Observable.ts new file mode 100644 index 0000000000..7fcdaa5244 --- /dev/null +++ b/compat/Observable.ts @@ -0,0 +1 @@ +export {Observable} from 'rxjs'; diff --git a/compat/Observer.ts b/compat/Observer.ts new file mode 100644 index 0000000000..91bf8e1db9 --- /dev/null +++ b/compat/Observer.ts @@ -0,0 +1 @@ +export {Observer} from 'rxjs'; diff --git a/compat/Operator.ts b/compat/Operator.ts new file mode 100644 index 0000000000..462381152b --- /dev/null +++ b/compat/Operator.ts @@ -0,0 +1 @@ +export {Operator} from 'rxjs/internal/Operator'; diff --git a/compat/OuterSubscriber.ts b/compat/OuterSubscriber.ts new file mode 100644 index 0000000000..a2be341392 --- /dev/null +++ b/compat/OuterSubscriber.ts @@ -0,0 +1 @@ +export {OuterSubscriber} from 'rxjs/internal/OuterSubscriber'; diff --git a/compat/ReplaySubject.ts b/compat/ReplaySubject.ts new file mode 100644 index 0000000000..af2dc8e479 --- /dev/null +++ b/compat/ReplaySubject.ts @@ -0,0 +1 @@ +export {ReplaySubject} from 'rxjs'; diff --git a/compat/Scheduler.ts b/compat/Scheduler.ts new file mode 100644 index 0000000000..3fa8068b2c --- /dev/null +++ b/compat/Scheduler.ts @@ -0,0 +1 @@ +export {Scheduler} from 'rxjs/internal/Scheduler'; diff --git a/compat/Subject.ts b/compat/Subject.ts new file mode 100644 index 0000000000..50d7b4bdb1 --- /dev/null +++ b/compat/Subject.ts @@ -0,0 +1 @@ +export {Subject} from 'rxjs'; diff --git a/compat/SubjectSubscription.ts b/compat/SubjectSubscription.ts new file mode 100644 index 0000000000..1897a0945c --- /dev/null +++ b/compat/SubjectSubscription.ts @@ -0,0 +1 @@ +export {SubjectSubscription} from 'rxjs/internal/SubjectSubscription'; diff --git a/compat/Subscriber.ts b/compat/Subscriber.ts new file mode 100644 index 0000000000..48e2fae6fe --- /dev/null +++ b/compat/Subscriber.ts @@ -0,0 +1 @@ +export {Subscriber} from 'rxjs/internal/Subscriber'; diff --git a/compat/Subscription.ts b/compat/Subscription.ts new file mode 100644 index 0000000000..3eed430206 --- /dev/null +++ b/compat/Subscription.ts @@ -0,0 +1 @@ +export {Subscription} from 'rxjs'; diff --git a/legacy-reexport/AsyncSubject.ts b/legacy-reexport/AsyncSubject.ts new file mode 100644 index 0000000000..f1748812fb --- /dev/null +++ b/legacy-reexport/AsyncSubject.ts @@ -0,0 +1 @@ +export {AsyncSubject} from 'rxjs-compat/AsyncSubject'; diff --git a/legacy-reexport/BehaviorSubject.ts b/legacy-reexport/BehaviorSubject.ts new file mode 100644 index 0000000000..7e9d0d357d --- /dev/null +++ b/legacy-reexport/BehaviorSubject.ts @@ -0,0 +1 @@ +export {BehaviorSubject} from 'rxjs-compat/BehaviorSubject'; diff --git a/legacy-reexport/InnerSubscriber.ts b/legacy-reexport/InnerSubscriber.ts new file mode 100644 index 0000000000..d516de22bf --- /dev/null +++ b/legacy-reexport/InnerSubscriber.ts @@ -0,0 +1 @@ +export {InnerSubscriber} from 'rxjs-compat/InnerSubscriber'; diff --git a/legacy-reexport/Notification.ts b/legacy-reexport/Notification.ts new file mode 100644 index 0000000000..2900b750c2 --- /dev/null +++ b/legacy-reexport/Notification.ts @@ -0,0 +1 @@ +export {Notification} from 'rxjs-compat/Notification'; diff --git a/legacy-reexport/Observable.ts b/legacy-reexport/Observable.ts new file mode 100644 index 0000000000..72d7166120 --- /dev/null +++ b/legacy-reexport/Observable.ts @@ -0,0 +1 @@ +export {Observable} from 'rxjs-compat/Observable'; diff --git a/legacy-reexport/Observer.ts b/legacy-reexport/Observer.ts new file mode 100644 index 0000000000..7dbfb7eab1 --- /dev/null +++ b/legacy-reexport/Observer.ts @@ -0,0 +1 @@ +export {Observer} from 'rxjs-compat/Observer'; diff --git a/legacy-reexport/Operator.ts b/legacy-reexport/Operator.ts new file mode 100644 index 0000000000..8e6a02f830 --- /dev/null +++ b/legacy-reexport/Operator.ts @@ -0,0 +1 @@ +export {Operator} from 'rxjs-compat/Operator'; diff --git a/legacy-reexport/OuterSubscriber.ts b/legacy-reexport/OuterSubscriber.ts new file mode 100644 index 0000000000..96916ca1d8 --- /dev/null +++ b/legacy-reexport/OuterSubscriber.ts @@ -0,0 +1 @@ +export {OuterSubscriber} from 'rxjs-compat/OuterSubscriber'; diff --git a/legacy-reexport/ReplaySubject.ts b/legacy-reexport/ReplaySubject.ts new file mode 100644 index 0000000000..ffe5f15340 --- /dev/null +++ b/legacy-reexport/ReplaySubject.ts @@ -0,0 +1 @@ +export {ReplaySubject} from 'rxjs-compat/ReplaySubject'; diff --git a/legacy-reexport/Scheduler.ts b/legacy-reexport/Scheduler.ts new file mode 100644 index 0000000000..be544d5ccd --- /dev/null +++ b/legacy-reexport/Scheduler.ts @@ -0,0 +1 @@ +export {Scheduler} from 'rxjs-compat/Scheduler'; diff --git a/legacy-reexport/Subject.ts b/legacy-reexport/Subject.ts new file mode 100644 index 0000000000..f1e31794b7 --- /dev/null +++ b/legacy-reexport/Subject.ts @@ -0,0 +1 @@ +export {Subject} from 'rxjs-compat/Subject'; diff --git a/legacy-reexport/SubjectSubscription.ts b/legacy-reexport/SubjectSubscription.ts new file mode 100644 index 0000000000..035681311e --- /dev/null +++ b/legacy-reexport/SubjectSubscription.ts @@ -0,0 +1 @@ +export {SubjectSubscription} from 'rxjs-compat/SubjectSubscription'; diff --git a/legacy-reexport/Subscriber.ts b/legacy-reexport/Subscriber.ts new file mode 100644 index 0000000000..124bc41f82 --- /dev/null +++ b/legacy-reexport/Subscriber.ts @@ -0,0 +1 @@ +export {Subscriber} from 'rxjs-compat/Subscriber'; diff --git a/legacy-reexport/Subscription.ts b/legacy-reexport/Subscription.ts new file mode 100644 index 0000000000..a24d9b7eac --- /dev/null +++ b/legacy-reexport/Subscription.ts @@ -0,0 +1 @@ +export {Subscription} from 'rxjs-compat/Subscription'; From 1a0dc97113efa29bb67eca17f7a5d73fd00fcc50 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Tue, 6 Mar 2018 11:49:41 -0800 Subject: [PATCH 16/39] feat(compat): set up correct imports & get build working for rxjs-comapt --- .gitignore | 1 + .make-compat-package.js | 53 +++++++++++++++++++ compat/README.md | 15 ++++++ compat/{index.ts => Rx.ts} | 38 +++++++------ compat/add/observable/bindCallback.ts | 5 +- compat/add/observable/bindNodeCallback.ts | 5 +- compat/add/observable/combineLatest.ts | 5 +- compat/add/observable/concat.ts | 5 +- compat/add/observable/defer.ts | 6 +-- compat/add/observable/dom/ajax.ts | 8 +-- compat/add/observable/dom/webSocket.ts | 6 +-- compat/add/observable/empty.ts | 5 +- compat/add/observable/forkJoin.ts | 5 +- compat/add/observable/from.ts | 5 +- compat/add/observable/fromEvent.ts | 5 +- compat/add/observable/fromEventPattern.ts | 5 +- compat/add/observable/fromPromise.ts | 8 +-- compat/add/observable/generate.ts | 5 +- compat/add/observable/if.ts | 3 +- compat/add/observable/interval.ts | 5 +- compat/add/observable/merge.ts | 5 +- compat/add/observable/never.ts | 6 +-- compat/add/observable/of.ts | 5 +- compat/add/observable/onErrorResumeNext.ts | 5 +- compat/add/observable/pairs.ts | 5 +- compat/add/observable/race.ts | 5 +- compat/add/observable/range.ts | 5 +- compat/add/observable/throw.ts | 5 +- compat/add/observable/timer.ts | 5 +- compat/add/observable/using.ts | 5 +- compat/add/observable/zip.ts | 5 +- compat/add/operator/audit.ts | 8 +-- compat/add/operator/auditTime.ts | 8 +-- compat/add/operator/buffer.ts | 8 +-- compat/add/operator/bufferCount.ts | 8 +-- compat/add/operator/bufferTime.ts | 8 +-- compat/add/operator/bufferToggle.ts | 8 +-- compat/add/operator/bufferWhen.ts | 8 +-- compat/add/operator/catch.ts | 10 ++-- compat/add/operator/combineAll.ts | 8 +-- compat/add/operator/combineLatest.ts | 8 +-- compat/add/operator/concat.ts | 8 +-- compat/add/operator/concatAll.ts | 8 +-- compat/add/operator/concatMap.ts | 8 +-- compat/add/operator/concatMapTo.ts | 8 +-- compat/add/operator/count.ts | 8 +-- compat/add/operator/debounce.ts | 8 +-- compat/add/operator/debounceTime.ts | 8 +-- compat/add/operator/defaultIfEmpty.ts | 8 +-- compat/add/operator/delay.ts | 8 +-- compat/add/operator/delayWhen.ts | 8 +-- compat/add/operator/dematerialize.ts | 8 +-- compat/add/operator/distinct.ts | 8 +-- compat/add/operator/distinctUntilChanged.ts | 8 +-- .../add/operator/distinctUntilKeyChanged.ts | 8 +-- compat/add/operator/do.ts | 10 ++-- compat/add/operator/elementAt.ts | 8 +-- compat/add/operator/every.ts | 8 +-- compat/add/operator/exhaust.ts | 8 +-- compat/add/operator/exhaustMap.ts | 8 +-- compat/add/operator/expand.ts | 8 +-- compat/add/operator/filter.ts | 8 +-- compat/add/operator/finally.ts | 10 ++-- compat/add/operator/find.ts | 8 +-- compat/add/operator/findIndex.ts | 8 +-- compat/add/operator/first.ts | 8 +-- compat/add/operator/groupBy.ts | 8 +-- compat/add/operator/ignoreElements.ts | 8 +-- compat/add/operator/isEmpty.ts | 8 +-- compat/add/operator/last.ts | 8 +-- compat/add/operator/let.ts | 10 ++-- compat/add/operator/map.ts | 8 +-- compat/add/operator/mapTo.ts | 8 +-- compat/add/operator/materialize.ts | 8 +-- compat/add/operator/max.ts | 8 +-- compat/add/operator/merge.ts | 8 +-- compat/add/operator/mergeAll.ts | 8 +-- compat/add/operator/mergeMap.ts | 10 ++-- compat/add/operator/mergeMapTo.ts | 10 ++-- compat/add/operator/mergeScan.ts | 8 +-- compat/add/operator/min.ts | 8 +-- compat/add/operator/multicast.ts | 8 +-- compat/add/operator/observeOn.ts | 8 +-- compat/add/operator/onErrorResumeNext.ts | 8 +-- compat/add/operator/pairwise.ts | 8 +-- compat/add/operator/partition.ts | 8 +-- compat/add/operator/pluck.ts | 8 +-- compat/add/operator/publish.ts | 8 +-- compat/add/operator/publishBehavior.ts | 8 +-- compat/add/operator/publishLast.ts | 8 +-- compat/add/operator/publishReplay.ts | 8 +-- compat/add/operator/race.ts | 8 +-- compat/add/operator/reduce.ts | 8 +-- compat/add/operator/repeat.ts | 8 +-- compat/add/operator/repeatWhen.ts | 8 +-- compat/add/operator/retry.ts | 8 +-- compat/add/operator/retryWhen.ts | 8 +-- compat/add/operator/sample.ts | 8 +-- compat/add/operator/sampleTime.ts | 8 +-- compat/add/operator/scan.ts | 8 +-- compat/add/operator/sequenceEqual.ts | 8 +-- compat/add/operator/share.ts | 8 +-- compat/add/operator/shareReplay.ts | 8 +-- compat/add/operator/single.ts | 8 +-- compat/add/operator/skip.ts | 8 +-- compat/add/operator/skipLast.ts | 8 +-- compat/add/operator/skipUntil.ts | 8 +-- compat/add/operator/skipWhile.ts | 8 +-- compat/add/operator/startWith.ts | 8 +-- compat/add/operator/subscribeOn.ts | 8 +-- compat/add/operator/switch.ts | 10 ++-- compat/add/operator/switchMap.ts | 8 +-- compat/add/operator/switchMapTo.ts | 8 +-- compat/add/operator/take.ts | 8 +-- compat/add/operator/takeLast.ts | 8 +-- compat/add/operator/takeUntil.ts | 8 +-- compat/add/operator/takeWhile.ts | 8 +-- compat/add/operator/throttle.ts | 8 +-- compat/add/operator/throttleTime.ts | 8 +-- compat/add/operator/timeInterval.ts | 8 +-- compat/add/operator/timeout.ts | 8 +-- compat/add/operator/timeoutWith.ts | 8 +-- compat/add/operator/timestamp.ts | 8 +-- compat/add/operator/toArray.ts | 8 +-- compat/add/operator/window.ts | 8 +-- compat/add/operator/windowCount.ts | 8 +-- compat/add/operator/windowTime.ts | 8 +-- compat/add/operator/windowToggle.ts | 8 +-- compat/add/operator/windowWhen.ts | 8 +-- compat/add/operator/withLatestFrom.ts | 8 +-- compat/add/operator/zip.ts | 8 +-- compat/add/operator/zipAll.ts | 8 +-- compat/package.json | 3 +- package.json | 19 ++++++- tsconfig/compat/tsconfig.base.json | 9 ++++ tsconfig/compat/tsconfig.cjs.json | 10 ++++ tsconfig/compat/tsconfig.esm2015.json | 8 +++ tsconfig/compat/tsconfig.esm5.json | 8 +++ tsconfig/tsconfig.base.json | 6 ++- 139 files changed, 618 insertions(+), 516 deletions(-) create mode 100644 .make-compat-package.js create mode 100644 compat/README.md rename compat/{index.ts => Rx.ts} (85%) create mode 100644 tsconfig/compat/tsconfig.base.json create mode 100644 tsconfig/compat/tsconfig.cjs.json create mode 100644 tsconfig/compat/tsconfig.esm2015.json create mode 100644 tsconfig/compat/tsconfig.esm5.json diff --git a/.gitignore b/.gitignore index c615f32539..fab7bff263 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ typings/ # Generated dist/ +dist-compat/ tmp/ coverage/ img/ diff --git a/.make-compat-package.js b/.make-compat-package.js new file mode 100644 index 0000000000..ae7b6e2816 --- /dev/null +++ b/.make-compat-package.js @@ -0,0 +1,53 @@ +"use strict"; + +let pkg = require('./compat/package.json'); +let fs = require('fs-extra'); +let mkdirp = require('mkdirp'); +let path = require('path'); +let klawSync = require('klaw-sync'); +let licenseTool = require('./tools/add-license-to-file'); +let addLicenseToFile = licenseTool.addLicenseToFile; +let addLicenseTextToFile = licenseTool.addLicenseTextToFile; + +const ROOT = 'dist-compat/'; +const CJS_ROOT = ROOT + 'cjs/compat/'; +const ESM5_ROOT = ROOT + 'esm5/compat/'; +const ESM2015_ROOT = ROOT + 'esm2015/compat/'; +const TYPE_ROOT = ROOT + 'typings/compat/'; +const PKG_ROOT = ROOT + 'package/'; +const CJS_PKG = PKG_ROOT + ''; +const ESM5_PKG = PKG_ROOT + '_esm5/'; +const ESM2015_PKG = PKG_ROOT + '_esm2015/'; +const UMD_PKG = PKG_ROOT + 'bundles/'; +const TYPE_PKG = PKG_ROOT; + +// License info for minified files +let licenseUrl = 'https://github.com/ReactiveX/RxJS/blob/master/LICENSE.txt'; +let license = 'Apache License 2.0 ' + licenseUrl; + +// Recreate the distribution folder +fs.removeSync(PKG_ROOT); +mkdirp.sync(PKG_ROOT); + +// Copy over the sources +fs.copySync(TYPE_ROOT, TYPE_PKG); +copySources(CJS_ROOT, CJS_PKG); +copySources(ESM5_ROOT, ESM5_PKG, true); +copySources(ESM2015_ROOT, ESM2015_PKG, true); + +fs.copySync('compat/package.json', PKG_ROOT + '/package.json'); + +function copySources(rootDir, packageDir, ignoreMissing) { + // If we are ignoring missing directories, early return when source doesn't exist + if (!fs.existsSync(rootDir)) { + if (ignoreMissing) { + return; + } else { + throw "Source root dir does not exist!"; + } + } + // Copy over the CommonJS files + fs.copySync(rootDir, packageDir); + fs.copySync('./LICENSE.txt', packageDir + 'LICENSE.txt'); + fs.copySync('./compat/README.md', packageDir + 'README.md'); +} diff --git a/compat/README.md b/compat/README.md new file mode 100644 index 0000000000..e5bb718791 --- /dev/null +++ b/compat/README.md @@ -0,0 +1,15 @@ +# RxJS Compatibility Package + +This package is required to get backwards compatibility with RxJS pervious to version 6. It contains the imports to add operators to `Observable.prototype` and creation methods to `Observable`. This is what allows, for instance, dot-chaining: + +``` +Observable.interval(1) + .map(i => i * i) +``` + +vs + +``` +Observable.interval(1) + .pipe(map(i => i * i)) +``` diff --git a/compat/index.ts b/compat/Rx.ts similarity index 85% rename from compat/index.ts rename to compat/Rx.ts index 1ee75393b6..14289a9c4d 100644 --- a/compat/index.ts +++ b/compat/Rx.ts @@ -157,23 +157,21 @@ export { export {TestScheduler} from 'rxjs/testing'; -export {Operator} from 'rxjs/internal/Operator'; -export {Subscriber} from 'rxjs/internal/Subscriber'; -export {AsyncSubject} from 'rxjs/internal/AsyncSubject'; -export {ConnectableObservable} from 'rxjs/internal/observable/ConnectableObservable'; -export {TimeoutError} from 'rxjs/internal/util/TimeoutError'; -export {TimeInterval} from 'rxjs/internal/patching/operator/timeInterval'; -export {Timestamp} from 'rxjs/internal/operators/timestamp'; -export {VirtualTimeScheduler} from 'rxjs/internal/scheduler/VirtualTimeScheduler'; -export {AjaxRequest, AjaxResponse, AjaxError, AjaxTimeoutError} from 'rxjs/internal/observable/dom/AjaxObservable'; +export { Operator } from 'rxjs/internal/Operator'; +export { Subscriber } from 'rxjs/internal/Subscriber'; +export { AsyncSubject } from 'rxjs/internal/AsyncSubject'; +export { ConnectableObservable } from 'rxjs/internal/observable/ConnectableObservable'; +export { TimeoutError } from 'rxjs/internal/util/TimeoutError'; +export { TimeInterval } from 'rxjs/internal/patching/operator/timeInterval'; +export { Timestamp } from 'rxjs/internal/operators/timestamp'; +export { VirtualTimeScheduler } from 'rxjs/internal/scheduler/VirtualTimeScheduler'; +export { AjaxRequest, AjaxResponse, AjaxError, AjaxTimeoutError } from 'rxjs/internal/observable/dom/AjaxObservable'; +import { AsapScheduler } from 'rxjs/internal/scheduler/AsapScheduler'; +import { AsyncScheduler } from 'rxjs/internal/scheduler/AsyncScheduler'; +import { QueueScheduler } from 'rxjs/internal/scheduler/QueueScheduler'; +import { AnimationFrameScheduler } from 'rxjs/internal/scheduler/AnimationFrameScheduler'; -import { - asapScheduler as asap, - asyncScheduler as async, - queueScheduler as queue, - animationFrameScheduler as animationFrame, - -} from 'rxjs'; +import { asapScheduler, asyncScheduler, queueScheduler, animationFrameScheduler } from 'rxjs'; import { rxSubscriber } from 'rxjs/internal/symbol/rxSubscriber'; import { iterator } from 'rxjs/internal/symbol/iterator'; @@ -199,10 +197,10 @@ export const operators = _operators; * Use this for synchronizing with the platform's painting */ let Scheduler = { - asap, - queue, - animationFrame, - async + asap: asapScheduler, + queue: queueScheduler, + animationFrame: animationFrameScheduler, + async: asyncScheduler }; /** diff --git a/compat/add/observable/bindCallback.ts b/compat/add/observable/bindCallback.ts index 773606a355..add5eb5975 100644 --- a/compat/add/observable/bindCallback.ts +++ b/compat/add/observable/bindCallback.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { bindCallback as staticBindCallback } from '../../internal/observable/bindCallback'; +import { Observable, bindCallback as staticBindCallback } from 'rxjs'; Observable.bindCallback = staticBindCallback; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let bindCallback: typeof staticBindCallback; } diff --git a/compat/add/observable/bindNodeCallback.ts b/compat/add/observable/bindNodeCallback.ts index afc5a8cd85..65a380a0ba 100644 --- a/compat/add/observable/bindNodeCallback.ts +++ b/compat/add/observable/bindNodeCallback.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { bindNodeCallback as staticBindNodeCallback } from '../../internal/observable/bindNodeCallback'; +import { Observable, bindNodeCallback as staticBindNodeCallback } from 'rxjs'; Observable.bindNodeCallback = staticBindNodeCallback; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let bindNodeCallback: typeof staticBindNodeCallback; } diff --git a/compat/add/observable/combineLatest.ts b/compat/add/observable/combineLatest.ts index 89ebc707ae..0d77a00f6f 100644 --- a/compat/add/observable/combineLatest.ts +++ b/compat/add/observable/combineLatest.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { combineLatest as combineLatestStatic } from '../../internal/observable/combineLatest'; +import { Observable, combineLatest as combineLatestStatic } from 'rxjs'; Observable.combineLatest = combineLatestStatic; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let combineLatest: typeof combineLatestStatic; } diff --git a/compat/add/observable/concat.ts b/compat/add/observable/concat.ts index d5605fb9ed..f32c1a52d5 100644 --- a/compat/add/observable/concat.ts +++ b/compat/add/observable/concat.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { concat as concatStatic } from '../../internal/observable/concat'; +import { Observable, concat as concatStatic } from 'rxjs'; Observable.concat = concatStatic; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let concat: typeof concatStatic; } diff --git a/compat/add/observable/defer.ts b/compat/add/observable/defer.ts index 6cb3e10351..9733c19c56 100644 --- a/compat/add/observable/defer.ts +++ b/compat/add/observable/defer.ts @@ -1,9 +1,9 @@ -import { Observable } from '../../internal/Observable'; -import { defer as staticDefer } from '../../internal/observable/defer'; +import { Observable } from 'rxjs'; +import { defer as staticDefer } from 'rxjs/observable/defer'; Observable.defer = staticDefer; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let defer: typeof staticDefer; } diff --git a/compat/add/observable/dom/ajax.ts b/compat/add/observable/dom/ajax.ts index 7b8bdb3fac..15f4114fc9 100644 --- a/compat/add/observable/dom/ajax.ts +++ b/compat/add/observable/dom/ajax.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../../internal/Observable'; -import { ajax as staticAjax } from '../../../internal/observable/dom/ajax'; -import { AjaxCreationMethod } from '../../../internal/observable/dom/AjaxObservable'; +import { Observable } from 'rxjs'; +import { ajax as staticAjax } from 'rxjs/ajax'; +import { AjaxCreationMethod } from 'rxjs/internal/observable/dom/AjaxObservable'; Observable.ajax = staticAjax; -declare module '../../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let ajax: AjaxCreationMethod; } diff --git a/compat/add/observable/dom/webSocket.ts b/compat/add/observable/dom/webSocket.ts index b0e31c4b4a..9d5c338491 100644 --- a/compat/add/observable/dom/webSocket.ts +++ b/compat/add/observable/dom/webSocket.ts @@ -1,9 +1,9 @@ -import { Observable } from '../../../internal/Observable'; -import { webSocket as staticWebSocket } from '../../../internal/observable/dom/webSocket'; +import { Observable } from 'rxjs'; +import { websocket as staticWebSocket } from 'rxjs/websocket'; Observable.webSocket = staticWebSocket; -declare module '../../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let webSocket: typeof staticWebSocket; } diff --git a/compat/add/observable/empty.ts b/compat/add/observable/empty.ts index f9f4faa24a..bd922dd4dd 100644 --- a/compat/add/observable/empty.ts +++ b/compat/add/observable/empty.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { empty as staticEmpty } from '../../internal/observable/empty'; +import { Observable, empty as staticEmpty } from 'rxjs'; Observable.empty = staticEmpty; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let empty: typeof staticEmpty; } diff --git a/compat/add/observable/forkJoin.ts b/compat/add/observable/forkJoin.ts index 0f1aa5988a..9cf144c306 100644 --- a/compat/add/observable/forkJoin.ts +++ b/compat/add/observable/forkJoin.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { forkJoin as staticForkJoin } from '../../internal/observable/forkJoin'; +import { Observable, forkJoin as staticForkJoin } from 'rxjs'; Observable.forkJoin = staticForkJoin; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let forkJoin: typeof staticForkJoin; } diff --git a/compat/add/observable/from.ts b/compat/add/observable/from.ts index b50847a6c6..7b3565eda3 100644 --- a/compat/add/observable/from.ts +++ b/compat/add/observable/from.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { from as staticFrom } from '../../internal/observable/from'; +import { Observable, from as staticFrom } from 'rxjs'; Observable.from = staticFrom; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let from: typeof staticFrom; } diff --git a/compat/add/observable/fromEvent.ts b/compat/add/observable/fromEvent.ts index 0f03dcf8d0..3f95111cfd 100644 --- a/compat/add/observable/fromEvent.ts +++ b/compat/add/observable/fromEvent.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { fromEvent as staticFromEvent } from '../../internal/observable/fromEvent'; +import { Observable, fromEvent as staticFromEvent } from 'rxjs'; Observable.fromEvent = staticFromEvent; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let fromEvent: typeof staticFromEvent; } diff --git a/compat/add/observable/fromEventPattern.ts b/compat/add/observable/fromEventPattern.ts index 7bd25a00d5..752d28bcf4 100644 --- a/compat/add/observable/fromEventPattern.ts +++ b/compat/add/observable/fromEventPattern.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { fromEventPattern as staticFromEventPattern } from '../../internal/observable/fromEventPattern'; +import { Observable, fromEventPattern as staticFromEventPattern } from 'rxjs'; Observable.fromEventPattern = staticFromEventPattern; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let fromEventPattern: typeof staticFromEventPattern; } diff --git a/compat/add/observable/fromPromise.ts b/compat/add/observable/fromPromise.ts index 2bdd586ab8..2b705dd379 100644 --- a/compat/add/observable/fromPromise.ts +++ b/compat/add/observable/fromPromise.ts @@ -1,9 +1,9 @@ -import { Observable } from '../../internal/Observable'; -import { fromPromise as staticFromPromise } from '../../internal/observable/fromPromise'; +import { Observable } from 'rxjs'; +import { fromPromise as staticFromPromise } from 'rxjs/internal/observable/fromPromise'; -Observable.fromPromise = staticFromPromise; +(Observable as any).fromPromise = staticFromPromise; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let fromPromise: typeof staticFromPromise; } diff --git a/compat/add/observable/generate.ts b/compat/add/observable/generate.ts index 4855f12f1b..dc9e0118c3 100644 --- a/compat/add/observable/generate.ts +++ b/compat/add/observable/generate.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { generate as staticGenerate } from '../../internal/observable/generate'; +import { Observable, generate as staticGenerate } from 'rxjs'; Observable.generate = staticGenerate; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let generate: typeof staticGenerate; } diff --git a/compat/add/observable/if.ts b/compat/add/observable/if.ts index 271595ed14..9314971233 100644 --- a/compat/add/observable/if.ts +++ b/compat/add/observable/if.ts @@ -1,5 +1,4 @@ -import { Observable } from '../../internal/Observable'; -import { iif } from '../../internal/observable/iif'; +import { Observable, iif } from 'rxjs'; //tslint:disable-next-line:no-any TypeScript doesn't like `if` (Observable as any).if = iif; diff --git a/compat/add/observable/interval.ts b/compat/add/observable/interval.ts index 517c60210e..1a0164525b 100644 --- a/compat/add/observable/interval.ts +++ b/compat/add/observable/interval.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { interval as staticInterval } from '../../internal/observable/interval'; +import { Observable, interval as staticInterval } from 'rxjs'; Observable.interval = staticInterval; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let interval: typeof staticInterval; } diff --git a/compat/add/observable/merge.ts b/compat/add/observable/merge.ts index 6fd8446c24..34fc685ef6 100644 --- a/compat/add/observable/merge.ts +++ b/compat/add/observable/merge.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { merge as mergeStatic } from '../../internal/observable/merge'; +import { Observable, merge as mergeStatic } from 'rxjs'; Observable.merge = mergeStatic; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let merge: typeof mergeStatic; } diff --git a/compat/add/observable/never.ts b/compat/add/observable/never.ts index bc1950fa11..3b32889941 100644 --- a/compat/add/observable/never.ts +++ b/compat/add/observable/never.ts @@ -1,5 +1,5 @@ -import { Observable } from '../../internal/Observable'; -import { NEVER } from '../../internal/observable/never'; +import { Observable, interval } from 'rxjs'; +import { NEVER } from 'rxjs/internal/observable/never'; export function staticNever() { return NEVER; @@ -7,7 +7,7 @@ export function staticNever() { Observable.never = staticNever; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let never: typeof staticNever; } diff --git a/compat/add/observable/of.ts b/compat/add/observable/of.ts index 24742ca0c5..7acc3ede35 100644 --- a/compat/add/observable/of.ts +++ b/compat/add/observable/of.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { of as staticOf } from '../../internal/observable/of'; +import { Observable, of as staticOf } from 'rxjs'; Observable.of = staticOf; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let of: typeof staticOf; //formOf an iceberg! } diff --git a/compat/add/observable/onErrorResumeNext.ts b/compat/add/observable/onErrorResumeNext.ts index 2ebce0f2e7..e0be75708a 100644 --- a/compat/add/observable/onErrorResumeNext.ts +++ b/compat/add/observable/onErrorResumeNext.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { onErrorResumeNext as staticOnErrorResumeNext } from '../../internal/observable/onErrorResumeNext'; +import { Observable, onErrorResumeNext as staticOnErrorResumeNext } from 'rxjs'; Observable.onErrorResumeNext = staticOnErrorResumeNext; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let onErrorResumeNext: typeof staticOnErrorResumeNext; } diff --git a/compat/add/observable/pairs.ts b/compat/add/observable/pairs.ts index 4377030b78..13f67fc149 100644 --- a/compat/add/observable/pairs.ts +++ b/compat/add/observable/pairs.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { pairs as staticPairs } from '../../internal/observable/pairs'; +import { Observable, pairs as staticPairs } from 'rxjs'; Observable.pairs = staticPairs; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let pairs: typeof staticPairs; } diff --git a/compat/add/observable/race.ts b/compat/add/observable/race.ts index c5cdcff1ee..b4dd7b63b9 100644 --- a/compat/add/observable/race.ts +++ b/compat/add/observable/race.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { race as staticRace } from '../../internal/observable/race'; +import { Observable, race as staticRace } from 'rxjs'; Observable.race = staticRace; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let race: typeof staticRace; } diff --git a/compat/add/observable/range.ts b/compat/add/observable/range.ts index ac889a7713..45a03770e4 100644 --- a/compat/add/observable/range.ts +++ b/compat/add/observable/range.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { range as staticRange } from '../../internal/observable/range'; +import { Observable, range as staticRange } from 'rxjs'; Observable.range = staticRange; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let range: typeof staticRange; } diff --git a/compat/add/observable/throw.ts b/compat/add/observable/throw.ts index ab097bda73..44fa0a0d35 100644 --- a/compat/add/observable/throw.ts +++ b/compat/add/observable/throw.ts @@ -1,10 +1,9 @@ -import { Observable } from '../../internal/Observable'; -import { throwError as staticThrowError } from '../../internal/observable/throwError'; +import { Observable, throwError as staticThrowError } from 'rxjs'; (Observable as any).throw = staticThrowError; (Observable as any).throwError = staticThrowError; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let throwError: typeof staticThrowError; } diff --git a/compat/add/observable/timer.ts b/compat/add/observable/timer.ts index 34b061ce26..641f45e746 100644 --- a/compat/add/observable/timer.ts +++ b/compat/add/observable/timer.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { timer as staticTimer } from '../../internal/observable/timer'; +import { Observable, timer as staticTimer } from 'rxjs'; Observable.timer = staticTimer; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let timer: typeof staticTimer; } diff --git a/compat/add/observable/using.ts b/compat/add/observable/using.ts index 8bc4ed502c..e56025298c 100644 --- a/compat/add/observable/using.ts +++ b/compat/add/observable/using.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { using as staticUsing } from '../../internal/observable/using'; +import { Observable, using as staticUsing } from 'rxjs'; Observable.using = staticUsing; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let using: typeof staticUsing; } diff --git a/compat/add/observable/zip.ts b/compat/add/observable/zip.ts index 787764d0d2..5693e96f69 100644 --- a/compat/add/observable/zip.ts +++ b/compat/add/observable/zip.ts @@ -1,9 +1,8 @@ -import { Observable } from '../../internal/Observable'; -import { zip as zipStatic } from '../../internal/observable/zip'; +import { Observable, zip as zipStatic } from 'rxjs'; Observable.zip = zipStatic; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { namespace Observable { export let zip: typeof zipStatic; } diff --git a/compat/add/operator/audit.ts b/compat/add/operator/audit.ts index a139d66b01..8a0af6e3c2 100644 --- a/compat/add/operator/audit.ts +++ b/compat/add/operator/audit.ts @@ -1,9 +1,9 @@ -import { Observable } from '../../internal/Observable'; -import { audit } from '../../internal/patching/operator/audit'; +import { Observable } from 'rxjs'; +import { audit } from 'rxjs/internal/patching/operator/audit'; -Observable.prototype.audit = audit; +(Observable as any).prototype.audit = audit; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { audit: typeof audit; } diff --git a/compat/add/operator/auditTime.ts b/compat/add/operator/auditTime.ts index 5e2f601101..4db1bb6567 100644 --- a/compat/add/operator/auditTime.ts +++ b/compat/add/operator/auditTime.ts @@ -1,9 +1,9 @@ -import { Observable } from '../../internal/Observable'; -import { auditTime } from '../../internal/patching/operator/auditTime'; +import { Observable } from 'rxjs'; +import { auditTime } from 'rxjs/internal/patching/operator/auditTime'; -Observable.prototype.auditTime = auditTime; +(Observable as any).prototype.auditTime = auditTime; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { auditTime: typeof auditTime; } diff --git a/compat/add/operator/buffer.ts b/compat/add/operator/buffer.ts index 853ad3d189..9586f7b4b4 100644 --- a/compat/add/operator/buffer.ts +++ b/compat/add/operator/buffer.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { buffer } from '../../internal/patching/operator/buffer'; +import { Observable } from 'rxjs'; +import { buffer } from 'rxjs/internal/patching/operator/buffer'; -Observable.prototype.buffer = buffer; +(Observable as any).prototype.buffer = buffer; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { buffer: typeof buffer; } diff --git a/compat/add/operator/bufferCount.ts b/compat/add/operator/bufferCount.ts index 6ccedb97d6..b53e7d16c0 100644 --- a/compat/add/operator/bufferCount.ts +++ b/compat/add/operator/bufferCount.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { bufferCount } from '../../internal/patching/operator/bufferCount'; +import { Observable } from 'rxjs'; +import { bufferCount } from 'rxjs/internal/patching/operator/bufferCount'; -Observable.prototype.bufferCount = bufferCount; +(Observable as any).prototype.bufferCount = bufferCount; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { bufferCount: typeof bufferCount; } diff --git a/compat/add/operator/bufferTime.ts b/compat/add/operator/bufferTime.ts index a490c19fa7..f464096566 100644 --- a/compat/add/operator/bufferTime.ts +++ b/compat/add/operator/bufferTime.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { bufferTime } from '../../internal/patching/operator/bufferTime'; +import { Observable } from 'rxjs'; +import { bufferTime } from 'rxjs/internal/patching/operator/bufferTime'; -Observable.prototype.bufferTime = bufferTime; +(Observable as any).prototype.bufferTime = bufferTime; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { bufferTime: typeof bufferTime; } diff --git a/compat/add/operator/bufferToggle.ts b/compat/add/operator/bufferToggle.ts index 45afe94df8..373f9a077f 100644 --- a/compat/add/operator/bufferToggle.ts +++ b/compat/add/operator/bufferToggle.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { bufferToggle } from '../../internal/patching/operator/bufferToggle'; +import { Observable } from 'rxjs'; +import { bufferToggle } from 'rxjs/internal/patching/operator/bufferToggle'; -Observable.prototype.bufferToggle = bufferToggle; +(Observable as any).prototype.bufferToggle = bufferToggle; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { bufferToggle: typeof bufferToggle; } diff --git a/compat/add/operator/bufferWhen.ts b/compat/add/operator/bufferWhen.ts index 8471555118..f36a9dff1f 100644 --- a/compat/add/operator/bufferWhen.ts +++ b/compat/add/operator/bufferWhen.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { bufferWhen } from '../../internal/patching/operator/bufferWhen'; +import { Observable } from 'rxjs'; +import { bufferWhen } from 'rxjs/internal/patching/operator/bufferWhen'; -Observable.prototype.bufferWhen = bufferWhen; +(Observable as any).prototype.bufferWhen = bufferWhen; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { bufferWhen: typeof bufferWhen; } diff --git a/compat/add/operator/catch.ts b/compat/add/operator/catch.ts index d4e2c7ab5e..880daaf467 100644 --- a/compat/add/operator/catch.ts +++ b/compat/add/operator/catch.ts @@ -1,11 +1,11 @@ -import { Observable } from '../../internal/Observable'; -import { _catch } from '../../internal/patching/operator/catch'; +import { Observable } from 'rxjs'; +import { _catch } from 'rxjs/internal/patching/operator/catch'; -Observable.prototype.catch = _catch; -Observable.prototype._catch = _catch; +(Observable as any).prototype.catch = _catch; +(Observable as any).prototype._catch = _catch; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { catch: typeof _catch; _catch: typeof _catch; diff --git a/compat/add/operator/combineAll.ts b/compat/add/operator/combineAll.ts index 16433e777f..773dea083e 100644 --- a/compat/add/operator/combineAll.ts +++ b/compat/add/operator/combineAll.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { combineAll } from '../../internal/patching/operator/combineAll'; +import { Observable } from 'rxjs'; +import { combineAll } from 'rxjs/internal/patching/operator/combineAll'; -Observable.prototype.combineAll = combineAll; +(Observable as any).prototype.combineAll = combineAll; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { combineAll: typeof combineAll; } diff --git a/compat/add/operator/combineLatest.ts b/compat/add/operator/combineLatest.ts index a53076ca4c..3ca8de56d1 100644 --- a/compat/add/operator/combineLatest.ts +++ b/compat/add/operator/combineLatest.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { combineLatest } from '../../internal/patching/operator/combineLatest'; +import { Observable } from 'rxjs'; +import { combineLatest } from 'rxjs/internal/patching/operator/combineLatest'; -Observable.prototype.combineLatest = combineLatest; +(Observable as any).prototype.combineLatest = combineLatest; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { combineLatest: typeof combineLatest; } diff --git a/compat/add/operator/concat.ts b/compat/add/operator/concat.ts index 32eab2bc17..a1aa396d5d 100644 --- a/compat/add/operator/concat.ts +++ b/compat/add/operator/concat.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { concat } from '../../internal/patching/operator/concat'; +import { Observable } from 'rxjs'; +import { concat } from 'rxjs/internal/patching/operator/concat'; -Observable.prototype.concat = concat; +(Observable as any).prototype.concat = concat; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { concat: typeof concat; } diff --git a/compat/add/operator/concatAll.ts b/compat/add/operator/concatAll.ts index 2ac63ee03e..92b49659be 100644 --- a/compat/add/operator/concatAll.ts +++ b/compat/add/operator/concatAll.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { concatAll } from '../../internal/patching/operator/concatAll'; +import { Observable } from 'rxjs'; +import { concatAll } from 'rxjs/internal/patching/operator/concatAll'; -Observable.prototype.concatAll = concatAll; +(Observable as any).prototype.concatAll = concatAll; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { concatAll: typeof concatAll; } diff --git a/compat/add/operator/concatMap.ts b/compat/add/operator/concatMap.ts index 26fe660cfc..d284111e94 100644 --- a/compat/add/operator/concatMap.ts +++ b/compat/add/operator/concatMap.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { concatMap } from '../../internal/patching/operator/concatMap'; +import { Observable } from 'rxjs'; +import { concatMap } from 'rxjs/internal/patching/operator/concatMap'; -Observable.prototype.concatMap = concatMap; +(Observable as any).prototype.concatMap = concatMap; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { concatMap: typeof concatMap; } diff --git a/compat/add/operator/concatMapTo.ts b/compat/add/operator/concatMapTo.ts index 78ff76da80..79aff35468 100644 --- a/compat/add/operator/concatMapTo.ts +++ b/compat/add/operator/concatMapTo.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { concatMapTo } from '../../internal/patching/operator/concatMapTo'; +import { Observable } from 'rxjs'; +import { concatMapTo } from 'rxjs/internal/patching/operator/concatMapTo'; -Observable.prototype.concatMapTo = concatMapTo; +(Observable as any).prototype.concatMapTo = concatMapTo; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { concatMapTo: typeof concatMapTo; } diff --git a/compat/add/operator/count.ts b/compat/add/operator/count.ts index 228457a326..f231d52162 100644 --- a/compat/add/operator/count.ts +++ b/compat/add/operator/count.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { count } from '../../internal/patching/operator/count'; +import { Observable } from 'rxjs'; +import { count } from 'rxjs/internal/patching/operator/count'; -Observable.prototype.count = count; +(Observable as any).prototype.count = count; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { count: typeof count; } diff --git a/compat/add/operator/debounce.ts b/compat/add/operator/debounce.ts index d3e9a46524..b9e22b8f08 100644 --- a/compat/add/operator/debounce.ts +++ b/compat/add/operator/debounce.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { debounce } from '../../internal/patching/operator/debounce'; +import { Observable } from 'rxjs'; +import { debounce } from 'rxjs/internal/patching/operator/debounce'; -Observable.prototype.debounce = debounce; +(Observable as any).prototype.debounce = debounce; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { debounce: typeof debounce; } diff --git a/compat/add/operator/debounceTime.ts b/compat/add/operator/debounceTime.ts index 08b9caba82..720f00403a 100644 --- a/compat/add/operator/debounceTime.ts +++ b/compat/add/operator/debounceTime.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { debounceTime } from '../../internal/patching/operator/debounceTime'; +import { Observable } from 'rxjs'; +import { debounceTime } from 'rxjs/internal/patching/operator/debounceTime'; -Observable.prototype.debounceTime = debounceTime; +(Observable as any).prototype.debounceTime = debounceTime; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { debounceTime: typeof debounceTime; } diff --git a/compat/add/operator/defaultIfEmpty.ts b/compat/add/operator/defaultIfEmpty.ts index 745f10b1d8..e35980c045 100644 --- a/compat/add/operator/defaultIfEmpty.ts +++ b/compat/add/operator/defaultIfEmpty.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { defaultIfEmpty } from '../../internal/patching/operator/defaultIfEmpty'; +import { Observable } from 'rxjs'; +import { defaultIfEmpty } from 'rxjs/internal/patching/operator/defaultIfEmpty'; -Observable.prototype.defaultIfEmpty = defaultIfEmpty; +(Observable as any).prototype.defaultIfEmpty = defaultIfEmpty; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { defaultIfEmpty: typeof defaultIfEmpty; } diff --git a/compat/add/operator/delay.ts b/compat/add/operator/delay.ts index 33ce9104c3..7527ebd603 100644 --- a/compat/add/operator/delay.ts +++ b/compat/add/operator/delay.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { delay } from '../../internal/patching/operator/delay'; +import { Observable } from 'rxjs'; +import { delay } from 'rxjs/internal/patching/operator/delay'; -Observable.prototype.delay = delay; +(Observable as any).prototype.delay = delay; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { delay: typeof delay; } diff --git a/compat/add/operator/delayWhen.ts b/compat/add/operator/delayWhen.ts index 6bc092a387..61482ce842 100644 --- a/compat/add/operator/delayWhen.ts +++ b/compat/add/operator/delayWhen.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { delayWhen } from '../../internal/patching/operator/delayWhen'; +import { Observable } from 'rxjs'; +import { delayWhen } from 'rxjs/internal/patching/operator/delayWhen'; -Observable.prototype.delayWhen = delayWhen; +(Observable as any).prototype.delayWhen = delayWhen; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { delayWhen: typeof delayWhen; } diff --git a/compat/add/operator/dematerialize.ts b/compat/add/operator/dematerialize.ts index d5f4e1bbe4..e8875654ad 100644 --- a/compat/add/operator/dematerialize.ts +++ b/compat/add/operator/dematerialize.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { dematerialize } from '../../internal/patching/operator/dematerialize'; +import { Observable } from 'rxjs'; +import { dematerialize } from 'rxjs/internal/patching/operator/dematerialize'; -Observable.prototype.dematerialize = dematerialize; +(Observable as any).prototype.dematerialize = dematerialize; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { dematerialize: typeof dematerialize; } diff --git a/compat/add/operator/distinct.ts b/compat/add/operator/distinct.ts index d7b61b03c9..5c2a418048 100644 --- a/compat/add/operator/distinct.ts +++ b/compat/add/operator/distinct.ts @@ -1,9 +1,9 @@ -import { Observable } from '../../internal/Observable'; -import { distinct } from '../../internal/patching/operator/distinct'; +import { Observable } from 'rxjs'; +import { distinct } from 'rxjs/internal/patching/operator/distinct'; -Observable.prototype.distinct = distinct; +(Observable as any).prototype.distinct = distinct; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { distinct: typeof distinct; } diff --git a/compat/add/operator/distinctUntilChanged.ts b/compat/add/operator/distinctUntilChanged.ts index bee4d48c40..67cae53132 100644 --- a/compat/add/operator/distinctUntilChanged.ts +++ b/compat/add/operator/distinctUntilChanged.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { distinctUntilChanged } from '../../internal/patching/operator/distinctUntilChanged'; +import { Observable } from 'rxjs'; +import { distinctUntilChanged } from 'rxjs/internal/patching/operator/distinctUntilChanged'; -Observable.prototype.distinctUntilChanged = distinctUntilChanged; +(Observable as any).prototype.distinctUntilChanged = distinctUntilChanged; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { distinctUntilChanged: typeof distinctUntilChanged; } diff --git a/compat/add/operator/distinctUntilKeyChanged.ts b/compat/add/operator/distinctUntilKeyChanged.ts index 1ee66146cd..eb70cc2527 100644 --- a/compat/add/operator/distinctUntilKeyChanged.ts +++ b/compat/add/operator/distinctUntilKeyChanged.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { distinctUntilKeyChanged } from '../../internal/patching/operator/distinctUntilKeyChanged'; +import { Observable } from 'rxjs'; +import { distinctUntilKeyChanged } from 'rxjs/internal/patching/operator/distinctUntilKeyChanged'; -Observable.prototype.distinctUntilKeyChanged = distinctUntilKeyChanged; +(Observable as any).prototype.distinctUntilKeyChanged = distinctUntilKeyChanged; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { distinctUntilKeyChanged: typeof distinctUntilKeyChanged; } diff --git a/compat/add/operator/do.ts b/compat/add/operator/do.ts index 0e43320ff9..5927b97813 100644 --- a/compat/add/operator/do.ts +++ b/compat/add/operator/do.ts @@ -1,11 +1,11 @@ -import { Observable } from '../../internal/Observable'; -import { _do } from '../../internal/patching/operator/do'; +import { Observable } from 'rxjs'; +import { _do } from 'rxjs/internal/patching/operator/do'; -Observable.prototype.do = _do; -Observable.prototype._do = _do; +(Observable as any).prototype.do = _do; +(Observable as any).prototype._do = _do; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { do: typeof _do; _do: typeof _do; diff --git a/compat/add/operator/elementAt.ts b/compat/add/operator/elementAt.ts index f333faf047..587adb259a 100644 --- a/compat/add/operator/elementAt.ts +++ b/compat/add/operator/elementAt.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { elementAt } from '../../internal/patching/operator/elementAt'; +import { Observable } from 'rxjs'; +import { elementAt } from 'rxjs/internal/patching/operator/elementAt'; -Observable.prototype.elementAt = elementAt; +(Observable as any).prototype.elementAt = elementAt; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { elementAt: typeof elementAt; } diff --git a/compat/add/operator/every.ts b/compat/add/operator/every.ts index 42eca774a8..c604fd57ca 100644 --- a/compat/add/operator/every.ts +++ b/compat/add/operator/every.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { every } from '../../internal/patching/operator/every'; +import { Observable } from 'rxjs'; +import { every } from 'rxjs/internal/patching/operator/every'; -Observable.prototype.every = every; +(Observable as any).prototype.every = every; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { every: typeof every; } diff --git a/compat/add/operator/exhaust.ts b/compat/add/operator/exhaust.ts index b5919838a1..dbe3d6335d 100644 --- a/compat/add/operator/exhaust.ts +++ b/compat/add/operator/exhaust.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { exhaust } from '../../internal/patching/operator/exhaust'; +import { Observable } from 'rxjs'; +import { exhaust } from 'rxjs/internal/patching/operator/exhaust'; -Observable.prototype.exhaust = exhaust; +(Observable as any).prototype.exhaust = exhaust; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { exhaust: typeof exhaust; } diff --git a/compat/add/operator/exhaustMap.ts b/compat/add/operator/exhaustMap.ts index 0d5bdf94a9..c0be85452b 100644 --- a/compat/add/operator/exhaustMap.ts +++ b/compat/add/operator/exhaustMap.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { exhaustMap } from '../../internal/patching/operator/exhaustMap'; +import { Observable } from 'rxjs'; +import { exhaustMap } from 'rxjs/internal/patching/operator/exhaustMap'; -Observable.prototype.exhaustMap = exhaustMap; +(Observable as any).prototype.exhaustMap = exhaustMap; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { exhaustMap: typeof exhaustMap; } diff --git a/compat/add/operator/expand.ts b/compat/add/operator/expand.ts index e6e726023e..ff8509577c 100644 --- a/compat/add/operator/expand.ts +++ b/compat/add/operator/expand.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { expand } from '../../internal/patching/operator/expand'; +import { Observable } from 'rxjs'; +import { expand } from 'rxjs/internal/patching/operator/expand'; -Observable.prototype.expand = expand; +(Observable as any).prototype.expand = expand; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { expand: typeof expand; } diff --git a/compat/add/operator/filter.ts b/compat/add/operator/filter.ts index 7cd60841c1..88d2c10271 100644 --- a/compat/add/operator/filter.ts +++ b/compat/add/operator/filter.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { filter } from '../../internal/patching/operator/filter'; +import { Observable } from 'rxjs'; +import { filter } from 'rxjs/internal/patching/operator/filter'; -Observable.prototype.filter = filter; +(Observable as any).prototype.filter = filter; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { filter: typeof filter; } diff --git a/compat/add/operator/finally.ts b/compat/add/operator/finally.ts index 6db2fa2d52..8858b8a2c0 100644 --- a/compat/add/operator/finally.ts +++ b/compat/add/operator/finally.ts @@ -1,11 +1,11 @@ -import { Observable } from '../../internal/Observable'; -import { _finally } from '../../internal/patching/operator/finally'; +import { Observable } from 'rxjs'; +import { _finally } from 'rxjs/internal/patching/operator/finally'; -Observable.prototype.finally = _finally; -Observable.prototype._finally = _finally; +(Observable as any).prototype.finally = _finally; +(Observable as any).prototype._finally = _finally; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { finally: typeof _finally; _finally: typeof _finally; diff --git a/compat/add/operator/find.ts b/compat/add/operator/find.ts index cdefd1303b..3723b4041f 100644 --- a/compat/add/operator/find.ts +++ b/compat/add/operator/find.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { find } from '../../internal/patching/operator/find'; +import { Observable } from 'rxjs'; +import { find } from 'rxjs/internal/patching/operator/find'; -Observable.prototype.find = find; +(Observable as any).prototype.find = find; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { find: typeof find; } diff --git a/compat/add/operator/findIndex.ts b/compat/add/operator/findIndex.ts index 6c4a83bfe5..3c8fa1c8bf 100644 --- a/compat/add/operator/findIndex.ts +++ b/compat/add/operator/findIndex.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { findIndex } from '../../internal/patching/operator/findIndex'; +import { Observable } from 'rxjs'; +import { findIndex } from 'rxjs/internal/patching/operator/findIndex'; -Observable.prototype.findIndex = findIndex; +(Observable as any).prototype.findIndex = findIndex; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { findIndex: typeof findIndex; } diff --git a/compat/add/operator/first.ts b/compat/add/operator/first.ts index 8e890b0d66..c6ec4c8709 100644 --- a/compat/add/operator/first.ts +++ b/compat/add/operator/first.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { first } from '../../internal/patching/operator/first'; +import { Observable } from 'rxjs'; +import { first } from 'rxjs/internal/patching/operator/first'; -Observable.prototype.first = first; +(Observable as any).prototype.first = first; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { first: typeof first; } diff --git a/compat/add/operator/groupBy.ts b/compat/add/operator/groupBy.ts index 966b703635..ca93d4be8a 100644 --- a/compat/add/operator/groupBy.ts +++ b/compat/add/operator/groupBy.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { groupBy } from '../../internal/patching/operator/groupBy'; +import { Observable } from 'rxjs'; +import { groupBy } from 'rxjs/internal/patching/operator/groupBy'; -Observable.prototype.groupBy = groupBy; +(Observable as any).prototype.groupBy = groupBy; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { groupBy: typeof groupBy; } diff --git a/compat/add/operator/ignoreElements.ts b/compat/add/operator/ignoreElements.ts index b78054e033..0641f032eb 100644 --- a/compat/add/operator/ignoreElements.ts +++ b/compat/add/operator/ignoreElements.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { ignoreElements } from '../../internal/patching/operator/ignoreElements'; +import { Observable } from 'rxjs'; +import { ignoreElements } from 'rxjs/internal/patching/operator/ignoreElements'; -Observable.prototype.ignoreElements = ignoreElements; +(Observable as any).prototype.ignoreElements = ignoreElements; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { ignoreElements: typeof ignoreElements; } diff --git a/compat/add/operator/isEmpty.ts b/compat/add/operator/isEmpty.ts index cd634048cc..7d6511d86b 100644 --- a/compat/add/operator/isEmpty.ts +++ b/compat/add/operator/isEmpty.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { isEmpty } from '../../internal/patching/operator/isEmpty'; +import { Observable } from 'rxjs'; +import { isEmpty } from 'rxjs/internal/patching/operator/isEmpty'; -Observable.prototype.isEmpty = isEmpty; +(Observable as any).prototype.isEmpty = isEmpty; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { isEmpty: typeof isEmpty; } diff --git a/compat/add/operator/last.ts b/compat/add/operator/last.ts index 2056cc8fd1..b80cf0b877 100644 --- a/compat/add/operator/last.ts +++ b/compat/add/operator/last.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { last } from '../../internal/patching/operator/last'; +import { Observable } from 'rxjs'; +import { last } from 'rxjs/internal/patching/operator/last'; -Observable.prototype.last = last; +(Observable as any).prototype.last = last; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { last: typeof last; } diff --git a/compat/add/operator/let.ts b/compat/add/operator/let.ts index 06e36da073..efb9380f73 100644 --- a/compat/add/operator/let.ts +++ b/compat/add/operator/let.ts @@ -1,11 +1,11 @@ -import { Observable } from '../../internal/Observable'; -import { letProto } from '../../internal/patching/operator/let'; +import { Observable } from 'rxjs'; +import { letProto } from 'rxjs/internal/patching/operator/let'; -Observable.prototype.let = letProto; -Observable.prototype.letBind = letProto; +(Observable as any).prototype.let = letProto; +(Observable as any).prototype.letBind = letProto; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { let: typeof letProto; letBind: typeof letProto; diff --git a/compat/add/operator/map.ts b/compat/add/operator/map.ts index 900a56d5a9..725b3c6864 100644 --- a/compat/add/operator/map.ts +++ b/compat/add/operator/map.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { map } from '../../internal/patching/operator/map'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/internal/patching/operator/map'; -Observable.prototype.map = map; +(Observable as any).prototype.map = map; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { map: typeof map; } diff --git a/compat/add/operator/mapTo.ts b/compat/add/operator/mapTo.ts index 6722f40ed4..9eb81a9136 100644 --- a/compat/add/operator/mapTo.ts +++ b/compat/add/operator/mapTo.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { mapTo } from '../../internal/patching/operator/mapTo'; +import { Observable } from 'rxjs'; +import { mapTo } from 'rxjs/internal/patching/operator/mapTo'; -Observable.prototype.mapTo = mapTo; +(Observable as any).prototype.mapTo = mapTo; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { mapTo: typeof mapTo; } diff --git a/compat/add/operator/materialize.ts b/compat/add/operator/materialize.ts index e72d4a8bd4..fba8f4c220 100644 --- a/compat/add/operator/materialize.ts +++ b/compat/add/operator/materialize.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { materialize } from '../../internal/patching/operator/materialize'; +import { Observable } from 'rxjs'; +import { materialize } from 'rxjs/internal/patching/operator/materialize'; -Observable.prototype.materialize = materialize; +(Observable as any).prototype.materialize = materialize; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { materialize: typeof materialize; } diff --git a/compat/add/operator/max.ts b/compat/add/operator/max.ts index 256de5b8bb..81d906f0a0 100644 --- a/compat/add/operator/max.ts +++ b/compat/add/operator/max.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { max } from '../../internal/patching/operator/max'; +import { Observable } from 'rxjs'; +import { max } from 'rxjs/internal/patching/operator/max'; -Observable.prototype.max = max; +(Observable as any).prototype.max = max; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { max: typeof max; } diff --git a/compat/add/operator/merge.ts b/compat/add/operator/merge.ts index 2d39e1713a..3a155eb2d9 100644 --- a/compat/add/operator/merge.ts +++ b/compat/add/operator/merge.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { merge } from '../../internal/patching/operator/merge'; +import { Observable } from 'rxjs'; +import { merge } from 'rxjs/internal/patching/operator/merge'; -Observable.prototype.merge = merge; +(Observable as any).prototype.merge = merge; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { merge: typeof merge; } diff --git a/compat/add/operator/mergeAll.ts b/compat/add/operator/mergeAll.ts index e61bde2458..f92ad1f169 100644 --- a/compat/add/operator/mergeAll.ts +++ b/compat/add/operator/mergeAll.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { mergeAll } from '../../internal/patching/operator/mergeAll'; +import { Observable } from 'rxjs'; +import { mergeAll } from 'rxjs/internal/patching/operator/mergeAll'; -Observable.prototype.mergeAll = mergeAll; +(Observable as any).prototype.mergeAll = mergeAll; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { mergeAll: typeof mergeAll; } diff --git a/compat/add/operator/mergeMap.ts b/compat/add/operator/mergeMap.ts index 7b4e27f8ca..1d8dc1753c 100644 --- a/compat/add/operator/mergeMap.ts +++ b/compat/add/operator/mergeMap.ts @@ -1,11 +1,11 @@ -import { Observable } from '../../internal/Observable'; -import { mergeMap } from '../../internal/patching/operator/mergeMap'; +import { Observable } from 'rxjs'; +import { mergeMap } from 'rxjs/internal/patching/operator/mergeMap'; -Observable.prototype.mergeMap = mergeMap; -Observable.prototype.flatMap = mergeMap; +(Observable as any).prototype.mergeMap = mergeMap; +(Observable as any).prototype.flatMap = mergeMap; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { flatMap: typeof mergeMap; mergeMap: typeof mergeMap; diff --git a/compat/add/operator/mergeMapTo.ts b/compat/add/operator/mergeMapTo.ts index 2d6a90e083..8d3cef56de 100644 --- a/compat/add/operator/mergeMapTo.ts +++ b/compat/add/operator/mergeMapTo.ts @@ -1,11 +1,11 @@ -import { Observable } from '../../internal/Observable'; -import { mergeMapTo } from '../../internal/patching/operator/mergeMapTo'; +import { Observable } from 'rxjs'; +import { mergeMapTo } from 'rxjs/internal/patching/operator/mergeMapTo'; -Observable.prototype.flatMapTo = mergeMapTo; -Observable.prototype.mergeMapTo = mergeMapTo; +(Observable as any).prototype.flatMapTo = mergeMapTo; +(Observable as any).prototype.mergeMapTo = mergeMapTo; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { flatMapTo: typeof mergeMapTo; mergeMapTo: typeof mergeMapTo; diff --git a/compat/add/operator/mergeScan.ts b/compat/add/operator/mergeScan.ts index 6d80680af8..e6d418e013 100644 --- a/compat/add/operator/mergeScan.ts +++ b/compat/add/operator/mergeScan.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { mergeScan } from '../../internal/patching/operator/mergeScan'; +import { Observable } from 'rxjs'; +import { mergeScan } from 'rxjs/internal/patching/operator/mergeScan'; -Observable.prototype.mergeScan = mergeScan; +(Observable as any).prototype.mergeScan = mergeScan; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { mergeScan: typeof mergeScan; } diff --git a/compat/add/operator/min.ts b/compat/add/operator/min.ts index 6849139d26..c36d0b1a82 100644 --- a/compat/add/operator/min.ts +++ b/compat/add/operator/min.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { min } from '../../internal/patching/operator/min'; +import { Observable } from 'rxjs'; +import { min } from 'rxjs/internal/patching/operator/min'; -Observable.prototype.min = min; +(Observable as any).prototype.min = min; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { min: typeof min; } diff --git a/compat/add/operator/multicast.ts b/compat/add/operator/multicast.ts index f724a61fdc..3919794946 100644 --- a/compat/add/operator/multicast.ts +++ b/compat/add/operator/multicast.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { multicast } from '../../internal/patching/operator/multicast'; +import { Observable } from 'rxjs'; +import { multicast } from 'rxjs/internal/patching/operator/multicast'; -Observable.prototype.multicast = multicast; +(Observable as any).prototype.multicast = multicast; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { multicast: typeof multicast; } diff --git a/compat/add/operator/observeOn.ts b/compat/add/operator/observeOn.ts index df71a52bdc..b4c4eda6ad 100644 --- a/compat/add/operator/observeOn.ts +++ b/compat/add/operator/observeOn.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { observeOn } from '../../internal/patching/operator/observeOn'; +import { Observable } from 'rxjs'; +import { observeOn } from 'rxjs/internal/patching/operator/observeOn'; -Observable.prototype.observeOn = observeOn; +(Observable as any).prototype.observeOn = observeOn; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { observeOn: typeof observeOn; } diff --git a/compat/add/operator/onErrorResumeNext.ts b/compat/add/operator/onErrorResumeNext.ts index b45fd78b0a..9d19325c81 100644 --- a/compat/add/operator/onErrorResumeNext.ts +++ b/compat/add/operator/onErrorResumeNext.ts @@ -1,9 +1,9 @@ -import { Observable } from '../../internal/Observable'; -import { onErrorResumeNext } from '../../internal/patching/operator/onErrorResumeNext'; +import { Observable } from 'rxjs'; +import { onErrorResumeNext } from 'rxjs/internal/patching/operator/onErrorResumeNext'; -Observable.prototype.onErrorResumeNext = onErrorResumeNext; +(Observable as any).prototype.onErrorResumeNext = onErrorResumeNext; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { onErrorResumeNext: typeof onErrorResumeNext; } diff --git a/compat/add/operator/pairwise.ts b/compat/add/operator/pairwise.ts index f7f9f8861f..934d2ee9e2 100644 --- a/compat/add/operator/pairwise.ts +++ b/compat/add/operator/pairwise.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { pairwise } from '../../internal/patching/operator/pairwise'; +import { Observable } from 'rxjs'; +import { pairwise } from 'rxjs/internal/patching/operator/pairwise'; -Observable.prototype.pairwise = pairwise; +(Observable as any).prototype.pairwise = pairwise; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { pairwise: typeof pairwise; } diff --git a/compat/add/operator/partition.ts b/compat/add/operator/partition.ts index f4e87e1d80..344de678f9 100644 --- a/compat/add/operator/partition.ts +++ b/compat/add/operator/partition.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { partition } from '../../internal/patching/operator/partition'; +import { Observable } from 'rxjs'; +import { partition } from 'rxjs/internal/patching/operator/partition'; -Observable.prototype.partition = partition; +(Observable as any).prototype.partition = partition; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { partition: typeof partition; } diff --git a/compat/add/operator/pluck.ts b/compat/add/operator/pluck.ts index f988e087d9..003cb99ff5 100644 --- a/compat/add/operator/pluck.ts +++ b/compat/add/operator/pluck.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { pluck } from '../../internal/patching/operator/pluck'; +import { Observable } from 'rxjs'; +import { pluck } from 'rxjs/internal/patching/operator/pluck'; -Observable.prototype.pluck = pluck; +(Observable as any).prototype.pluck = pluck; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { pluck: typeof pluck; } diff --git a/compat/add/operator/publish.ts b/compat/add/operator/publish.ts index 99b5f6663e..84c0586267 100644 --- a/compat/add/operator/publish.ts +++ b/compat/add/operator/publish.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { publish } from '../../internal/patching/operator/publish'; +import { Observable } from 'rxjs'; +import { publish } from 'rxjs/internal/patching/operator/publish'; -Observable.prototype.publish = publish; +(Observable as any).prototype.publish = publish; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { publish: typeof publish; } diff --git a/compat/add/operator/publishBehavior.ts b/compat/add/operator/publishBehavior.ts index 3889527bf5..5ad467da6f 100644 --- a/compat/add/operator/publishBehavior.ts +++ b/compat/add/operator/publishBehavior.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { publishBehavior } from '../../internal/patching/operator/publishBehavior'; +import { Observable } from 'rxjs'; +import { publishBehavior } from 'rxjs/internal/patching/operator/publishBehavior'; -Observable.prototype.publishBehavior = publishBehavior; +(Observable as any).prototype.publishBehavior = publishBehavior; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { publishBehavior: typeof publishBehavior; } diff --git a/compat/add/operator/publishLast.ts b/compat/add/operator/publishLast.ts index 6297c1e715..6baa52fcf8 100644 --- a/compat/add/operator/publishLast.ts +++ b/compat/add/operator/publishLast.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { publishLast } from '../../internal/patching/operator/publishLast'; +import { Observable } from 'rxjs'; +import { publishLast } from 'rxjs/internal/patching/operator/publishLast'; -Observable.prototype.publishLast = publishLast; +(Observable as any).prototype.publishLast = publishLast; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { publishLast: typeof publishLast; } diff --git a/compat/add/operator/publishReplay.ts b/compat/add/operator/publishReplay.ts index c35edc04b3..b507fb4db5 100644 --- a/compat/add/operator/publishReplay.ts +++ b/compat/add/operator/publishReplay.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { publishReplay } from '../../internal/patching/operator/publishReplay'; +import { Observable } from 'rxjs'; +import { publishReplay } from 'rxjs/internal/patching/operator/publishReplay'; -Observable.prototype.publishReplay = publishReplay; +(Observable as any).prototype.publishReplay = publishReplay; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { publishReplay: typeof publishReplay; } diff --git a/compat/add/operator/race.ts b/compat/add/operator/race.ts index 3857be2a99..74d5c3dcf9 100644 --- a/compat/add/operator/race.ts +++ b/compat/add/operator/race.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { race } from '../../internal/patching/operator/race'; +import { Observable } from 'rxjs'; +import { race } from 'rxjs/internal/patching/operator/race'; -Observable.prototype.race = race; +(Observable as any).prototype.race = race; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { race: typeof race; } diff --git a/compat/add/operator/reduce.ts b/compat/add/operator/reduce.ts index 90d8767ff3..33872bd2ff 100644 --- a/compat/add/operator/reduce.ts +++ b/compat/add/operator/reduce.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { reduce } from '../../internal/patching/operator/reduce'; +import { Observable } from 'rxjs'; +import { reduce } from 'rxjs/internal/patching/operator/reduce'; -Observable.prototype.reduce = reduce; +(Observable as any).prototype.reduce = reduce; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { reduce: typeof reduce; } diff --git a/compat/add/operator/repeat.ts b/compat/add/operator/repeat.ts index 354ee3aa37..53e168801f 100644 --- a/compat/add/operator/repeat.ts +++ b/compat/add/operator/repeat.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { repeat } from '../../internal/patching/operator/repeat'; +import { Observable } from 'rxjs'; +import { repeat } from 'rxjs/internal/patching/operator/repeat'; -Observable.prototype.repeat = repeat; +(Observable as any).prototype.repeat = repeat; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { repeat: typeof repeat; } diff --git a/compat/add/operator/repeatWhen.ts b/compat/add/operator/repeatWhen.ts index 8c333ec5fa..ea18f4c139 100644 --- a/compat/add/operator/repeatWhen.ts +++ b/compat/add/operator/repeatWhen.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { repeatWhen } from '../../internal/patching/operator/repeatWhen'; +import { Observable } from 'rxjs'; +import { repeatWhen } from 'rxjs/internal/patching/operator/repeatWhen'; -Observable.prototype.repeatWhen = repeatWhen; +(Observable as any).prototype.repeatWhen = repeatWhen; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { repeatWhen: typeof repeatWhen; } diff --git a/compat/add/operator/retry.ts b/compat/add/operator/retry.ts index dffa2678fa..8a28705384 100644 --- a/compat/add/operator/retry.ts +++ b/compat/add/operator/retry.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { retry } from '../../internal/patching/operator/retry'; +import { Observable } from 'rxjs'; +import { retry } from 'rxjs/internal/patching/operator/retry'; -Observable.prototype.retry = retry; +(Observable as any).prototype.retry = retry; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { retry: typeof retry; } diff --git a/compat/add/operator/retryWhen.ts b/compat/add/operator/retryWhen.ts index 0d74265daf..d1d1ffb50c 100644 --- a/compat/add/operator/retryWhen.ts +++ b/compat/add/operator/retryWhen.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { retryWhen } from '../../internal/patching/operator/retryWhen'; +import { Observable } from 'rxjs'; +import { retryWhen } from 'rxjs/internal/patching/operator/retryWhen'; -Observable.prototype.retryWhen = retryWhen; +(Observable as any).prototype.retryWhen = retryWhen; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { retryWhen: typeof retryWhen; } diff --git a/compat/add/operator/sample.ts b/compat/add/operator/sample.ts index 9f020c4a3f..c569d93961 100644 --- a/compat/add/operator/sample.ts +++ b/compat/add/operator/sample.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { sample } from '../../internal/patching/operator/sample'; +import { Observable } from 'rxjs'; +import { sample } from 'rxjs/internal/patching/operator/sample'; -Observable.prototype.sample = sample; +(Observable as any).prototype.sample = sample; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { sample: typeof sample; } diff --git a/compat/add/operator/sampleTime.ts b/compat/add/operator/sampleTime.ts index 4bea1b7cef..2c860bec5f 100644 --- a/compat/add/operator/sampleTime.ts +++ b/compat/add/operator/sampleTime.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { sampleTime } from '../../internal/patching/operator/sampleTime'; +import { Observable } from 'rxjs'; +import { sampleTime } from 'rxjs/internal/patching/operator/sampleTime'; -Observable.prototype.sampleTime = sampleTime; +(Observable as any).prototype.sampleTime = sampleTime; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { sampleTime: typeof sampleTime; } diff --git a/compat/add/operator/scan.ts b/compat/add/operator/scan.ts index a797032ba1..e8201e3cfc 100644 --- a/compat/add/operator/scan.ts +++ b/compat/add/operator/scan.ts @@ -1,11 +1,11 @@ -import { Observable } from '../../internal/Observable'; +import { Observable } from 'rxjs'; -import { scan } from '../../internal/patching/operator/scan'; +import { scan } from 'rxjs/internal/patching/operator/scan'; -Observable.prototype.scan = scan; +(Observable as any).prototype.scan = scan; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { scan: typeof scan; } diff --git a/compat/add/operator/sequenceEqual.ts b/compat/add/operator/sequenceEqual.ts index 0767cd1bf1..52fa0862de 100644 --- a/compat/add/operator/sequenceEqual.ts +++ b/compat/add/operator/sequenceEqual.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { sequenceEqual } from '../../internal/patching/operator/sequenceEqual'; +import { Observable } from 'rxjs'; +import { sequenceEqual } from 'rxjs/internal/patching/operator/sequenceEqual'; -Observable.prototype.sequenceEqual = sequenceEqual; +(Observable as any).prototype.sequenceEqual = sequenceEqual; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { sequenceEqual: typeof sequenceEqual; } diff --git a/compat/add/operator/share.ts b/compat/add/operator/share.ts index 4473e876c4..3f5a9eb9f0 100644 --- a/compat/add/operator/share.ts +++ b/compat/add/operator/share.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { share } from '../../internal/patching/operator/share'; +import { Observable } from 'rxjs'; +import { share } from 'rxjs/internal/patching/operator/share'; -Observable.prototype.share = share; +(Observable as any).prototype.share = share; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { share: typeof share; } diff --git a/compat/add/operator/shareReplay.ts b/compat/add/operator/shareReplay.ts index 9587373626..54d3c5ecd3 100644 --- a/compat/add/operator/shareReplay.ts +++ b/compat/add/operator/shareReplay.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { shareReplay } from '../../internal/patching/operator/shareReplay'; +import { Observable } from 'rxjs'; +import { shareReplay } from 'rxjs/internal/patching/operator/shareReplay'; -Observable.prototype.shareReplay = shareReplay; +(Observable as any).prototype.shareReplay = shareReplay; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { shareReplay: typeof shareReplay; } diff --git a/compat/add/operator/single.ts b/compat/add/operator/single.ts index 8122dc29d7..725cf56166 100644 --- a/compat/add/operator/single.ts +++ b/compat/add/operator/single.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { single } from '../../internal/patching/operator/single'; +import { Observable } from 'rxjs'; +import { single } from 'rxjs/internal/patching/operator/single'; -Observable.prototype.single = single; +(Observable as any).prototype.single = single; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { single: typeof single; } diff --git a/compat/add/operator/skip.ts b/compat/add/operator/skip.ts index 54902a49a3..433074b477 100644 --- a/compat/add/operator/skip.ts +++ b/compat/add/operator/skip.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { skip } from '../../internal/patching/operator/skip'; +import { Observable } from 'rxjs'; +import { skip } from 'rxjs/internal/patching/operator/skip'; -Observable.prototype.skip = skip; +(Observable as any).prototype.skip = skip; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { skip: typeof skip; } diff --git a/compat/add/operator/skipLast.ts b/compat/add/operator/skipLast.ts index a71a55af99..f1e51d2fe4 100644 --- a/compat/add/operator/skipLast.ts +++ b/compat/add/operator/skipLast.ts @@ -1,9 +1,9 @@ -import { Observable } from '../../internal/Observable'; -import { skipLast } from '../../internal/patching/operator/skipLast'; +import { Observable } from 'rxjs'; +import { skipLast } from 'rxjs/internal/patching/operator/skipLast'; -Observable.prototype.skipLast = skipLast; +(Observable as any).prototype.skipLast = skipLast; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { skipLast: typeof skipLast; } diff --git a/compat/add/operator/skipUntil.ts b/compat/add/operator/skipUntil.ts index 730151edaa..bad31225d3 100644 --- a/compat/add/operator/skipUntil.ts +++ b/compat/add/operator/skipUntil.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { skipUntil } from '../../internal/patching/operator/skipUntil'; +import { Observable } from 'rxjs'; +import { skipUntil } from 'rxjs/internal/patching/operator/skipUntil'; -Observable.prototype.skipUntil = skipUntil; +(Observable as any).prototype.skipUntil = skipUntil; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { skipUntil: typeof skipUntil; } diff --git a/compat/add/operator/skipWhile.ts b/compat/add/operator/skipWhile.ts index 2f85cd2bc7..6bcee97e21 100644 --- a/compat/add/operator/skipWhile.ts +++ b/compat/add/operator/skipWhile.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { skipWhile } from '../../internal/patching/operator/skipWhile'; +import { Observable } from 'rxjs'; +import { skipWhile } from 'rxjs/internal/patching/operator/skipWhile'; -Observable.prototype.skipWhile = skipWhile; +(Observable as any).prototype.skipWhile = skipWhile; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { skipWhile: typeof skipWhile; } diff --git a/compat/add/operator/startWith.ts b/compat/add/operator/startWith.ts index f7a0d06186..e822c99494 100644 --- a/compat/add/operator/startWith.ts +++ b/compat/add/operator/startWith.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { startWith } from '../../internal/patching/operator/startWith'; +import { Observable } from 'rxjs'; +import { startWith } from 'rxjs/internal/patching/operator/startWith'; -Observable.prototype.startWith = startWith; +(Observable as any).prototype.startWith = startWith; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { startWith: typeof startWith; } diff --git a/compat/add/operator/subscribeOn.ts b/compat/add/operator/subscribeOn.ts index 838858b2f2..57388cf7c0 100644 --- a/compat/add/operator/subscribeOn.ts +++ b/compat/add/operator/subscribeOn.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { subscribeOn } from '../../internal/patching/operator/subscribeOn'; +import { Observable } from 'rxjs'; +import { subscribeOn } from 'rxjs/internal/patching/operator/subscribeOn'; -Observable.prototype.subscribeOn = subscribeOn; +(Observable as any).prototype.subscribeOn = subscribeOn; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { subscribeOn: typeof subscribeOn; } diff --git a/compat/add/operator/switch.ts b/compat/add/operator/switch.ts index f08be66fe0..8a8d9cea3b 100644 --- a/compat/add/operator/switch.ts +++ b/compat/add/operator/switch.ts @@ -1,11 +1,11 @@ -import { Observable } from '../../internal/Observable'; -import { _switch } from '../../internal/patching/operator/switch'; +import { Observable } from 'rxjs'; +import { _switch } from 'rxjs/internal/patching/operator/switch'; -Observable.prototype.switch = _switch; -Observable.prototype._switch = _switch; +(Observable as any).prototype.switch = _switch; +(Observable as any).prototype._switch = _switch; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { switch: typeof _switch; _switch: typeof _switch; diff --git a/compat/add/operator/switchMap.ts b/compat/add/operator/switchMap.ts index b3914fe028..198da1c852 100644 --- a/compat/add/operator/switchMap.ts +++ b/compat/add/operator/switchMap.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { switchMap } from '../../internal/patching/operator/switchMap'; +import { Observable } from 'rxjs'; +import { switchMap } from 'rxjs/internal/patching/operator/switchMap'; -Observable.prototype.switchMap = switchMap; +(Observable as any).prototype.switchMap = switchMap; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { switchMap: typeof switchMap; } diff --git a/compat/add/operator/switchMapTo.ts b/compat/add/operator/switchMapTo.ts index e3a1bdedf7..6a96dcdcbe 100644 --- a/compat/add/operator/switchMapTo.ts +++ b/compat/add/operator/switchMapTo.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { switchMapTo } from '../../internal/patching/operator/switchMapTo'; +import { Observable } from 'rxjs'; +import { switchMapTo } from 'rxjs/internal/patching/operator/switchMapTo'; -Observable.prototype.switchMapTo = switchMapTo; +(Observable as any).prototype.switchMapTo = switchMapTo; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { switchMapTo: typeof switchMapTo; } diff --git a/compat/add/operator/take.ts b/compat/add/operator/take.ts index a923f891ca..da4f6a9b82 100644 --- a/compat/add/operator/take.ts +++ b/compat/add/operator/take.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { take } from '../../internal/patching/operator/take'; +import { Observable } from 'rxjs'; +import { take } from 'rxjs/internal/patching/operator/take'; -Observable.prototype.take = take; +(Observable as any).prototype.take = take; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { take: typeof take; } diff --git a/compat/add/operator/takeLast.ts b/compat/add/operator/takeLast.ts index 0db99e7a34..daeb7f5420 100644 --- a/compat/add/operator/takeLast.ts +++ b/compat/add/operator/takeLast.ts @@ -1,9 +1,9 @@ -import { Observable } from '../../internal/Observable'; -import { takeLast } from '../../internal/patching/operator/takeLast'; +import { Observable } from 'rxjs'; +import { takeLast } from 'rxjs/internal/patching/operator/takeLast'; -Observable.prototype.takeLast = takeLast; +(Observable as any).prototype.takeLast = takeLast; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { takeLast: typeof takeLast; } diff --git a/compat/add/operator/takeUntil.ts b/compat/add/operator/takeUntil.ts index b5bf91f3f7..2cab3a79b5 100644 --- a/compat/add/operator/takeUntil.ts +++ b/compat/add/operator/takeUntil.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { takeUntil } from '../../internal/patching/operator/takeUntil'; +import { Observable } from 'rxjs'; +import { takeUntil } from 'rxjs/internal/patching/operator/takeUntil'; -Observable.prototype.takeUntil = takeUntil; +(Observable as any).prototype.takeUntil = takeUntil; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { takeUntil: typeof takeUntil; } diff --git a/compat/add/operator/takeWhile.ts b/compat/add/operator/takeWhile.ts index 2743e8cf6e..4895e95b95 100644 --- a/compat/add/operator/takeWhile.ts +++ b/compat/add/operator/takeWhile.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { takeWhile } from '../../internal/patching/operator/takeWhile'; +import { Observable } from 'rxjs'; +import { takeWhile } from 'rxjs/internal/patching/operator/takeWhile'; -Observable.prototype.takeWhile = takeWhile; +(Observable as any).prototype.takeWhile = takeWhile; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { takeWhile: typeof takeWhile; } diff --git a/compat/add/operator/throttle.ts b/compat/add/operator/throttle.ts index 8d5bd8655c..c577695c7c 100644 --- a/compat/add/operator/throttle.ts +++ b/compat/add/operator/throttle.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { throttle } from '../../internal/patching/operator/throttle'; +import { Observable } from 'rxjs'; +import { throttle } from 'rxjs/internal/patching/operator/throttle'; -Observable.prototype.throttle = throttle; +(Observable as any).prototype.throttle = throttle; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { throttle: typeof throttle; } diff --git a/compat/add/operator/throttleTime.ts b/compat/add/operator/throttleTime.ts index 81b580b8d7..7082b7335b 100644 --- a/compat/add/operator/throttleTime.ts +++ b/compat/add/operator/throttleTime.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { throttleTime } from '../../internal/patching/operator/throttleTime'; +import { Observable } from 'rxjs'; +import { throttleTime } from 'rxjs/internal/patching/operator/throttleTime'; -Observable.prototype.throttleTime = throttleTime; +(Observable as any).prototype.throttleTime = throttleTime; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { throttleTime: typeof throttleTime; } diff --git a/compat/add/operator/timeInterval.ts b/compat/add/operator/timeInterval.ts index c630519c37..ec618b3655 100644 --- a/compat/add/operator/timeInterval.ts +++ b/compat/add/operator/timeInterval.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { timeInterval } from '../../internal/patching/operator/timeInterval'; +import { Observable } from 'rxjs'; +import { timeInterval } from 'rxjs/internal/patching/operator/timeInterval'; -Observable.prototype.timeInterval = timeInterval; +(Observable as any).prototype.timeInterval = timeInterval; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { timeInterval: typeof timeInterval; } diff --git a/compat/add/operator/timeout.ts b/compat/add/operator/timeout.ts index 18ee862bb2..dd16b518b5 100644 --- a/compat/add/operator/timeout.ts +++ b/compat/add/operator/timeout.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { timeout } from '../../internal/patching/operator/timeout'; +import { Observable } from 'rxjs'; +import { timeout } from 'rxjs/internal/patching/operator/timeout'; -Observable.prototype.timeout = timeout; +(Observable as any).prototype.timeout = timeout; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { timeout: typeof timeout; } diff --git a/compat/add/operator/timeoutWith.ts b/compat/add/operator/timeoutWith.ts index ed45771679..ecf8d9459d 100644 --- a/compat/add/operator/timeoutWith.ts +++ b/compat/add/operator/timeoutWith.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { timeoutWith } from '../../internal/patching/operator/timeoutWith'; +import { Observable } from 'rxjs'; +import { timeoutWith } from 'rxjs/internal/patching/operator/timeoutWith'; -Observable.prototype.timeoutWith = timeoutWith; +(Observable as any).prototype.timeoutWith = timeoutWith; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { timeoutWith: typeof timeoutWith; } diff --git a/compat/add/operator/timestamp.ts b/compat/add/operator/timestamp.ts index 5e17672b64..198df47637 100644 --- a/compat/add/operator/timestamp.ts +++ b/compat/add/operator/timestamp.ts @@ -1,9 +1,9 @@ -import { Observable } from '../../internal/Observable'; -import { timestamp } from '../../internal/patching/operator/timestamp'; +import { Observable } from 'rxjs'; +import { timestamp } from 'rxjs/internal/patching/operator/timestamp'; -Observable.prototype.timestamp = timestamp; +(Observable as any).prototype.timestamp = timestamp; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { timestamp: typeof timestamp; } diff --git a/compat/add/operator/toArray.ts b/compat/add/operator/toArray.ts index c95d60df9a..8ee9b82bcf 100644 --- a/compat/add/operator/toArray.ts +++ b/compat/add/operator/toArray.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { toArray } from '../../internal/patching/operator/toArray'; +import { Observable } from 'rxjs'; +import { toArray } from 'rxjs/internal/patching/operator/toArray'; -Observable.prototype.toArray = toArray; +(Observable as any).prototype.toArray = toArray; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { toArray: typeof toArray; } diff --git a/compat/add/operator/window.ts b/compat/add/operator/window.ts index cb8857fe6b..00312db273 100644 --- a/compat/add/operator/window.ts +++ b/compat/add/operator/window.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { window } from '../../internal/patching/operator/window'; +import { Observable } from 'rxjs'; +import { window } from 'rxjs/internal/patching/operator/window'; -Observable.prototype.window = window; +(Observable as any).prototype.window = window; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { window: typeof window; } diff --git a/compat/add/operator/windowCount.ts b/compat/add/operator/windowCount.ts index fb34027b43..f3b99502c1 100644 --- a/compat/add/operator/windowCount.ts +++ b/compat/add/operator/windowCount.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { windowCount } from '../../internal/patching/operator/windowCount'; +import { Observable } from 'rxjs'; +import { windowCount } from 'rxjs/internal/patching/operator/windowCount'; -Observable.prototype.windowCount = windowCount; +(Observable as any).prototype.windowCount = windowCount; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { windowCount: typeof windowCount; } diff --git a/compat/add/operator/windowTime.ts b/compat/add/operator/windowTime.ts index deabc6d3ec..7cc2b837e9 100644 --- a/compat/add/operator/windowTime.ts +++ b/compat/add/operator/windowTime.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { windowTime } from '../../internal/patching/operator/windowTime'; +import { Observable } from 'rxjs'; +import { windowTime } from 'rxjs/internal/patching/operator/windowTime'; -Observable.prototype.windowTime = windowTime; +(Observable as any).prototype.windowTime = windowTime; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { windowTime: typeof windowTime; } diff --git a/compat/add/operator/windowToggle.ts b/compat/add/operator/windowToggle.ts index a476291216..b79adf1bb9 100644 --- a/compat/add/operator/windowToggle.ts +++ b/compat/add/operator/windowToggle.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { windowToggle } from '../../internal/patching/operator/windowToggle'; +import { Observable } from 'rxjs'; +import { windowToggle } from 'rxjs/internal/patching/operator/windowToggle'; -Observable.prototype.windowToggle = windowToggle; +(Observable as any).prototype.windowToggle = windowToggle; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { windowToggle: typeof windowToggle; } diff --git a/compat/add/operator/windowWhen.ts b/compat/add/operator/windowWhen.ts index 48ab024fd2..1d1d3ca147 100644 --- a/compat/add/operator/windowWhen.ts +++ b/compat/add/operator/windowWhen.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { windowWhen } from '../../internal/patching/operator/windowWhen'; +import { Observable } from 'rxjs'; +import { windowWhen } from 'rxjs/internal/patching/operator/windowWhen'; -Observable.prototype.windowWhen = windowWhen; +(Observable as any).prototype.windowWhen = windowWhen; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { windowWhen: typeof windowWhen; } diff --git a/compat/add/operator/withLatestFrom.ts b/compat/add/operator/withLatestFrom.ts index 208bcc181e..d2eeb1da2c 100644 --- a/compat/add/operator/withLatestFrom.ts +++ b/compat/add/operator/withLatestFrom.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { withLatestFrom } from '../../internal/patching/operator/withLatestFrom'; +import { Observable } from 'rxjs'; +import { withLatestFrom } from 'rxjs/internal/patching/operator/withLatestFrom'; -Observable.prototype.withLatestFrom = withLatestFrom; +(Observable as any).prototype.withLatestFrom = withLatestFrom; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { withLatestFrom: typeof withLatestFrom; } diff --git a/compat/add/operator/zip.ts b/compat/add/operator/zip.ts index 587e70ebd3..cd893b7247 100644 --- a/compat/add/operator/zip.ts +++ b/compat/add/operator/zip.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { zipProto } from '../../internal/patching/operator/zip'; +import { Observable } from 'rxjs'; +import { zipProto } from 'rxjs/internal/patching/operator/zip'; -Observable.prototype.zip = zipProto; +(Observable as any).prototype.zip = zipProto; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { zip: typeof zipProto; } diff --git a/compat/add/operator/zipAll.ts b/compat/add/operator/zipAll.ts index 6808162712..604dcec353 100644 --- a/compat/add/operator/zipAll.ts +++ b/compat/add/operator/zipAll.ts @@ -1,10 +1,10 @@ -import { Observable } from '../../internal/Observable'; -import { zipAll } from '../../internal/patching/operator/zipAll'; +import { Observable } from 'rxjs'; +import { zipAll } from 'rxjs/internal/patching/operator/zipAll'; -Observable.prototype.zipAll = zipAll; +(Observable as any).prototype.zipAll = zipAll; -declare module '../../internal/Observable' { +declare module 'rxjs/internal/Observable' { interface Observable { zipAll: typeof zipAll; } diff --git a/compat/package.json b/compat/package.json index 77565dab5e..cdc832bdf1 100644 --- a/compat/package.json +++ b/compat/package.json @@ -1,7 +1,8 @@ { "name": "rxjs-compat", "version": "6.0.0-alpha.3", - "main": "index.js", + "main": "./Rx.js", + "typings": "./Rx.d.ts", "dependencies": { "rxjs": "^6.0.0-alpha.3" } diff --git a/package.json b/package.json index 15c74b03e7..f2bb2f3c20 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,24 @@ "test:circular": "dependency-cruise --validate .dependency-cruiser.json -x \"^node_modules\" src", "test:systemjs": "node integration/systemjs/systemjs-compatibility-spec.js", "tests2png": "mkdirp tmp/docs/img && cross-env TS_NODE_FAST=true mocha --compilers ts:ts-node/register --opts spec/support/tests2png.opts \"spec/**/*-spec.ts\"", - "watch": "watch \"echo triggering build && npm run test && echo build completed\" src -d -u -w=15" + "watch": "watch \"echo triggering build && npm run test && echo build completed\" src -d -u -w=15", + + "compat_build_all": "npm-run-all compat_clean_dist compat_build_cjs compat_build_esm5 compat_build_esm2015 compat_generate_packages", + "compat_build_cjs": "npm-run-all compat_clean_dist_cjs compat_compile_dist_cjs", + "compat_build_esm5": "npm-run-all compat_clean_dist_esm5 compat_compile_dist_esm5", + "compat_build_esm2015": "npm-run-all compat_clean_dist_esm2015 compat_compile_dist_esm2015", + + "compat_clean_dist": "shx rm -rf ./dist-compat", + "compat_clean_dist_cjs": "shx rm -rf ./dist-compat/cjs", + "compat_clean_dist_esm5": "shx rm -rf ./dist-compat/esm5", + "compat_clean_dist_esm2015": "shx rm -rf ./dist-compat/esm2015", + + "compat_compile_dist_cjs": "tsc -p ./tsconfig/compat/tsconfig.cjs.json", + "compat_compile_dist_esm5": "tsc -p ./tsconfig/compat/tsconfig.esm5.json", + "compat_compile_dist_esm2015": "tsc -p ./tsconfig/compat/tsconfig.esm2015.json", + + "compat_copy_sources": "mkdirp dist-compat && shx cp -r ./compat/ ./dist-compat/", + "compat_generate_packages": "node .make-compat-package.js" }, "repository": { "type": "git", diff --git a/tsconfig/compat/tsconfig.base.json b/tsconfig/compat/tsconfig.base.json new file mode 100644 index 0000000000..deaf02d6dd --- /dev/null +++ b/tsconfig/compat/tsconfig.base.json @@ -0,0 +1,9 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "noEmit": false + }, + "include": [ + "../../compat/**/*.ts" + ] +} \ No newline at end of file diff --git a/tsconfig/compat/tsconfig.cjs.json b/tsconfig/compat/tsconfig.cjs.json new file mode 100644 index 0000000000..e6b197ff8d --- /dev/null +++ b/tsconfig/compat/tsconfig.cjs.json @@ -0,0 +1,10 @@ +{ + "extends": "./tsconfig.base.json", + "compilerOptions": { + "module": "commonjs", + "target": "es5", + "declaration": true, + "declarationDir": "../../dist-compat/typings", + "outDir": "../../dist-compat/cjs" + } +} \ No newline at end of file diff --git a/tsconfig/compat/tsconfig.esm2015.json b/tsconfig/compat/tsconfig.esm2015.json new file mode 100644 index 0000000000..27c524f4c9 --- /dev/null +++ b/tsconfig/compat/tsconfig.esm2015.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.base.json", + "compilerOptions": { + "module": "es2015", + "target": "es2015", + "outDir": "../../dist-compat/esm2015" + } +} \ No newline at end of file diff --git a/tsconfig/compat/tsconfig.esm5.json b/tsconfig/compat/tsconfig.esm5.json new file mode 100644 index 0000000000..41187707a4 --- /dev/null +++ b/tsconfig/compat/tsconfig.esm5.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.base.json", + "compilerOptions": { + "module": "es2015", + "target": "es5", + "outDir": "../../dist-compat/esm5" + } +} \ No newline at end of file diff --git a/tsconfig/tsconfig.base.json b/tsconfig/tsconfig.base.json index 74674baaa7..2c6ab234f8 100644 --- a/tsconfig/tsconfig.base.json +++ b/tsconfig/tsconfig.base.json @@ -13,9 +13,13 @@ // legacy entry-points "../dist/src/internal/Rx.ts", - "../dist/src/add/observable/of.ts", // umd entry-point "../dist/src/internal/umd.ts", + "../dist/src/index.ts", + "../dist/src/operators.ts", + "../dist/src/ajax.ts", + "../dist/src/websocket.ts", + "../dist/src/testing.ts" ] } From a44db720dca7551f2288a65c80479c08fffd9132 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Wed, 7 Mar 2018 10:01:03 -0800 Subject: [PATCH 17/39] chore(build): build the legacy-reexports for inclusion in final distribution --- package.json | 4 +++- tsconfig/tsconfig.legacy-reexport.json | 29 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 tsconfig/tsconfig.legacy-reexport.json diff --git a/package.json b/package.json index f2bb2f3c20..fe7b734d57 100644 --- a/package.json +++ b/package.json @@ -75,12 +75,13 @@ "precommit": "lint-staged", "commitmsg": "validate-commit-msg", "info": "npm-scripts-info", - "build_all": "npm-run-all clean_dist copy_sources build_cjs build_esm5 build_esm2015 build_esm5_for_rollup build_umd generate_packages", + "build_all": "npm-run-all clean_dist copy_sources build_cjs build_esm5 build_esm2015 build_esm5_for_rollup build_umd build_legacy_reexport generate_packages", "build_cjs": "npm-run-all clean_dist_cjs compile_dist_cjs", "build_esm5": "npm-run-all clean_dist_esm5 compile_dist_esm5", "build_esm5_for_rollup": "npm-run-all clean_dist_esm5_for_rollup compile_dist_esm5_for_rollup", "build_esm2015": "npm-run-all clean_dist_esm2015 compile_dist_esm2015", "build_esm2015_for_docs": "npm-run-all clean_dist_esm2015 compile_dist_esm2015_for_docs", + "build_legacy_reexport": "npm-run-all compile_legacy_reexport", "build_closure_core": "node ./tools/make-closure-core.js", "build_global": "npm-run-all clean_dist_global build_esm5_for_rollup && mkdirp ./dist/global && node ./tools/make-umd-bundle.js && npm-run-all build_closure_core clean_dist_esm5_for_rollup", "build_umd": "npm-run-all clean_dist_global && mkdirp ./dist/global && node ./tools/make-umd-bundle.js && npm-run-all build_closure_core", @@ -99,6 +100,7 @@ "compile_dist_esm2015": "tsc -p ./tsconfig/tsconfig.esm2015.json", "compile_dist_esm2015_for_docs": "tsc ./dist/src/internal/Rx.ts ./dist/src/add/observable/of.ts ./dist/src/MiscJSDoc.ts -m es2015 --sourceMap --outDir ./dist/es6 --target es2015 -d --diagnostics --pretty --noImplicitAny --noImplicitReturns --noImplicitThis --suppressImplicitAnyIndexErrors --moduleResolution node", "compile_dist_esm5_for_rollup": "tsc -p ./tsconfig/tsconfig.esm5.rollup.json", + "compile_legacy_reexport": "tsc -p ./tsconfig/tsconfig.legacy-reexport.json", "copy_sources": "mkdirp dist && shx cp -r ./src/ ./dist/src", "decision_tree_widget": "cd doc/decision-tree-widget && npm run build && cd ../..", "doctoc": "doctoc CONTRIBUTING.md", diff --git a/tsconfig/tsconfig.legacy-reexport.json b/tsconfig/tsconfig.legacy-reexport.json new file mode 100644 index 0000000000..644324fc06 --- /dev/null +++ b/tsconfig/tsconfig.legacy-reexport.json @@ -0,0 +1,29 @@ +{ + "extends": "./tsconfig.base.json", + "compilerOptions": { + "module": "commonjs", + "target": "es5", + "declaration": true, + "outDir": "../dist/legacy-reexport" + }, + "files": [ + "../legacy-reexport/AsyncSubject.ts", + "../legacy-reexport/BehaviorSubject.ts", + "../legacy-reexport/InnerSubscriber.ts", + "../legacy-reexport/Notification.ts", + "../legacy-reexport/Observable.ts", + "../legacy-reexport/Observer.ts", + "../legacy-reexport/Operator.ts", + "../legacy-reexport/OuterSubscriber.ts", + "../legacy-reexport/ReplaySubject.ts", + "../legacy-reexport/Scheduler.ts", + "../legacy-reexport/Subject.ts", + "../legacy-reexport/SubjectSubscription.ts", + "../legacy-reexport/Subscriber.ts", + "../legacy-reexport/Subscription.ts" + ], + "exclude": [ + "../src", + "../compat" + ] +} From c24de91768a523353316645b73142fb30f97ab12 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Wed, 7 Mar 2018 10:29:36 -0800 Subject: [PATCH 18/39] chore(build): add the add operator/observable to legacy-reexports --- compat/index.ts | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 compat/index.ts diff --git a/compat/index.ts b/compat/index.ts new file mode 100644 index 0000000000..20522faff7 --- /dev/null +++ b/compat/index.ts @@ -0,0 +1,2 @@ + +export * from './Rx'; diff --git a/package.json b/package.json index fe7b734d57..10ebdc28ae 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "precommit": "lint-staged", "commitmsg": "validate-commit-msg", "info": "npm-scripts-info", - "build_all": "npm-run-all clean_dist copy_sources build_cjs build_esm5 build_esm2015 build_esm5_for_rollup build_umd build_legacy_reexport generate_packages", + "build_all": "npm-run-all clean_dist copy_sources build_cjs build_esm5 build_esm2015 build_esm5_for_rollup build_legacy_reexport generate_packages", "build_cjs": "npm-run-all clean_dist_cjs compile_dist_cjs", "build_esm5": "npm-run-all clean_dist_esm5 compile_dist_esm5", "build_esm5_for_rollup": "npm-run-all clean_dist_esm5_for_rollup compile_dist_esm5_for_rollup", From f823b965e5aafa7c58615b32468c28af2c089791 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Wed, 7 Mar 2018 11:06:31 -0800 Subject: [PATCH 19/39] chore(build): create legacy-reexports for all add operators/observable --- legacy-reexport/add/observable/bindCallback.ts | 1 + legacy-reexport/add/observable/bindNodeCallback.ts | 1 + legacy-reexport/add/observable/combineLatest.ts | 1 + legacy-reexport/add/observable/concat.ts | 1 + legacy-reexport/add/observable/defer.ts | 1 + legacy-reexport/add/observable/dom/ajax.ts | 1 + legacy-reexport/add/observable/dom/webSocket.ts | 1 + legacy-reexport/add/observable/empty.ts | 1 + legacy-reexport/add/observable/forkJoin.ts | 1 + legacy-reexport/add/observable/from.ts | 1 + legacy-reexport/add/observable/fromEvent.ts | 1 + legacy-reexport/add/observable/fromEventPattern.ts | 1 + legacy-reexport/add/observable/fromPromise.ts | 1 + legacy-reexport/add/observable/generate.ts | 1 + legacy-reexport/add/observable/if.ts | 1 + legacy-reexport/add/observable/interval.ts | 1 + legacy-reexport/add/observable/merge.ts | 1 + legacy-reexport/add/observable/never.ts | 1 + legacy-reexport/add/observable/of.ts | 1 + legacy-reexport/add/observable/onErrorResumeNext.ts | 1 + legacy-reexport/add/observable/pairs.ts | 1 + legacy-reexport/add/observable/race.ts | 1 + legacy-reexport/add/observable/range.ts | 1 + legacy-reexport/add/observable/throw.ts | 1 + legacy-reexport/add/observable/timer.ts | 1 + legacy-reexport/add/observable/using.ts | 1 + legacy-reexport/add/observable/zip.ts | 1 + legacy-reexport/add/oecho | 0 legacy-reexport/add/operator/audit.ts | 1 + legacy-reexport/add/operator/auditTime.ts | 1 + legacy-reexport/add/operator/buffer.ts | 1 + legacy-reexport/add/operator/bufferCount.ts | 1 + legacy-reexport/add/operator/bufferTime.ts | 1 + legacy-reexport/add/operator/bufferTimecho | 0 legacy-reexport/add/operator/bufferToggle.ts | 1 + legacy-reexport/add/operator/bufferWhen.ts | 1 + legacy-reexport/add/operator/catch.ts | 1 + legacy-reexport/add/operator/combineAll.ts | 1 + legacy-reexport/add/operator/combineLatest.ts | 1 + legacy-reexport/add/operator/concat.ts | 1 + legacy-reexport/add/operator/concatAll.ts | 1 + legacy-reexport/add/operator/concatMap.ts | 1 + legacy-reexport/add/operator/concatMapTo.ts | 1 + legacy-reexport/add/operator/count.ts | 1 + legacy-reexport/add/operator/debounce.ts | 1 + legacy-reexport/add/operator/debounceTime.ts | 1 + legacy-reexport/add/operator/defaultIfEmpty.ts | 1 + legacy-reexport/add/operator/delay.ts | 1 + legacy-reexport/add/operator/delayWhen.ts | 1 + legacy-reexport/add/operator/dematerialize.ts | 1 + legacy-reexport/add/operator/distinct.ts | 1 + legacy-reexport/add/operator/distinctUntilChanged.ts | 1 + legacy-reexport/add/operator/distinctUntilKeyChanged.ts | 1 + legacy-reexport/add/operator/do.ts | 1 + legacy-reexport/add/operator/elementAt.ts | 1 + legacy-reexport/add/operator/every.ts | 1 + legacy-reexport/add/operator/exhaust.ts | 1 + legacy-reexport/add/operator/exhaustMap.ts | 1 + legacy-reexport/add/operator/expand.ts | 1 + legacy-reexport/add/operator/filter.ts | 1 + legacy-reexport/add/operator/finally.ts | 1 + legacy-reexport/add/operator/find.ts | 1 + legacy-reexport/add/operator/findIndex.ts | 1 + legacy-reexport/add/operator/first.ts | 1 + legacy-reexport/add/operator/groupBy.ts | 1 + legacy-reexport/add/operator/ignoreElements.ts | 1 + legacy-reexport/add/operator/isEmpty.ts | 1 + legacy-reexport/add/operator/last.ts | 1 + legacy-reexport/add/operator/let.ts | 1 + legacy-reexport/add/operator/map.ts | 1 + legacy-reexport/add/operator/mapTo.ts | 1 + legacy-reexport/add/operator/materialize.ts | 1 + legacy-reexport/add/operator/max.ts | 1 + legacy-reexport/add/operator/merge.ts | 1 + legacy-reexport/add/operator/mergeAll.ts | 1 + legacy-reexport/add/operator/mergeMap.ts | 1 + legacy-reexport/add/operator/mergeMapTo.ts | 1 + legacy-reexport/add/operator/mergeScan.ts | 1 + legacy-reexport/add/operator/min.ts | 1 + legacy-reexport/add/operator/multicast.ts | 1 + legacy-reexport/add/operator/observeOn.ts | 1 + legacy-reexport/add/operator/onErrorResumeNext.ts | 1 + legacy-reexport/add/operator/pairwise.ts | 1 + legacy-reexport/add/operator/partition.ts | 1 + legacy-reexport/add/operator/pluck.ts | 1 + legacy-reexport/add/operator/publish.ts | 1 + legacy-reexport/add/operator/publishBehavior.ts | 1 + legacy-reexport/add/operator/publishLast.ts | 1 + legacy-reexport/add/operator/publishReplay.ts | 1 + legacy-reexport/add/operator/race.ts | 1 + legacy-reexport/add/operator/reduce.ts | 1 + legacy-reexport/add/operator/repeat.ts | 1 + legacy-reexport/add/operator/repeatWhen.ts | 1 + legacy-reexport/add/operator/retry.ts | 1 + legacy-reexport/add/operator/retryWhen.ts | 1 + legacy-reexport/add/operator/sample.ts | 1 + legacy-reexport/add/operator/sampleTime.ts | 1 + legacy-reexport/add/operator/scan.ts | 1 + legacy-reexport/add/operator/sequenceEqual.ts | 1 + legacy-reexport/add/operator/share.ts | 1 + legacy-reexport/add/operator/shareReplay.ts | 1 + legacy-reexport/add/operator/single.ts | 1 + legacy-reexport/add/operator/skip.ts | 1 + legacy-reexport/add/operator/skipLast.ts | 1 + legacy-reexport/add/operator/skipUntil.ts | 1 + legacy-reexport/add/operator/skipWhile.ts | 1 + legacy-reexport/add/operator/startWith.ts | 1 + legacy-reexport/add/operator/subscribeOn.ts | 1 + legacy-reexport/add/operator/switch.ts | 1 + legacy-reexport/add/operator/switchMap.ts | 1 + legacy-reexport/add/operator/switchMapTo.ts | 1 + legacy-reexport/add/operator/take.ts | 1 + legacy-reexport/add/operator/takeLast.ts | 1 + legacy-reexport/add/operator/takeUntil.ts | 1 + legacy-reexport/add/operator/takeWhile.ts | 1 + legacy-reexport/add/operator/throttle.ts | 1 + legacy-reexport/add/operator/throttleTime.ts | 1 + legacy-reexport/add/operator/timeInterval.ts | 1 + legacy-reexport/add/operator/timeout.ts | 1 + legacy-reexport/add/operator/timeoutWith.ts | 1 + legacy-reexport/add/operator/timestamp.ts | 1 + legacy-reexport/add/operator/toArray.ts | 1 + legacy-reexport/add/operator/toPromise.ts | 1 + legacy-reexport/add/operator/window.ts | 1 + legacy-reexport/add/operator/windowCount.ts | 1 + legacy-reexport/add/operator/windowTime.ts | 1 + legacy-reexport/add/operator/windowToggle.ts | 1 + legacy-reexport/add/operator/windowWhen.ts | 1 + legacy-reexport/add/operator/withLatestFrom.ts | 1 + legacy-reexport/add/operator/zip.ts | 1 + legacy-reexport/add/operator/zipAll.ts | 1 + 131 files changed, 129 insertions(+) create mode 100644 legacy-reexport/add/observable/bindCallback.ts create mode 100644 legacy-reexport/add/observable/bindNodeCallback.ts create mode 100644 legacy-reexport/add/observable/combineLatest.ts create mode 100644 legacy-reexport/add/observable/concat.ts create mode 100644 legacy-reexport/add/observable/defer.ts create mode 100644 legacy-reexport/add/observable/dom/ajax.ts create mode 100644 legacy-reexport/add/observable/dom/webSocket.ts create mode 100644 legacy-reexport/add/observable/empty.ts create mode 100644 legacy-reexport/add/observable/forkJoin.ts create mode 100644 legacy-reexport/add/observable/from.ts create mode 100644 legacy-reexport/add/observable/fromEvent.ts create mode 100644 legacy-reexport/add/observable/fromEventPattern.ts create mode 100644 legacy-reexport/add/observable/fromPromise.ts create mode 100644 legacy-reexport/add/observable/generate.ts create mode 100644 legacy-reexport/add/observable/if.ts create mode 100644 legacy-reexport/add/observable/interval.ts create mode 100644 legacy-reexport/add/observable/merge.ts create mode 100644 legacy-reexport/add/observable/never.ts create mode 100644 legacy-reexport/add/observable/of.ts create mode 100644 legacy-reexport/add/observable/onErrorResumeNext.ts create mode 100644 legacy-reexport/add/observable/pairs.ts create mode 100644 legacy-reexport/add/observable/race.ts create mode 100644 legacy-reexport/add/observable/range.ts create mode 100644 legacy-reexport/add/observable/throw.ts create mode 100644 legacy-reexport/add/observable/timer.ts create mode 100644 legacy-reexport/add/observable/using.ts create mode 100644 legacy-reexport/add/observable/zip.ts create mode 100644 legacy-reexport/add/oecho create mode 100644 legacy-reexport/add/operator/audit.ts create mode 100644 legacy-reexport/add/operator/auditTime.ts create mode 100644 legacy-reexport/add/operator/buffer.ts create mode 100644 legacy-reexport/add/operator/bufferCount.ts create mode 100644 legacy-reexport/add/operator/bufferTime.ts create mode 100644 legacy-reexport/add/operator/bufferTimecho create mode 100644 legacy-reexport/add/operator/bufferToggle.ts create mode 100644 legacy-reexport/add/operator/bufferWhen.ts create mode 100644 legacy-reexport/add/operator/catch.ts create mode 100644 legacy-reexport/add/operator/combineAll.ts create mode 100644 legacy-reexport/add/operator/combineLatest.ts create mode 100644 legacy-reexport/add/operator/concat.ts create mode 100644 legacy-reexport/add/operator/concatAll.ts create mode 100644 legacy-reexport/add/operator/concatMap.ts create mode 100644 legacy-reexport/add/operator/concatMapTo.ts create mode 100644 legacy-reexport/add/operator/count.ts create mode 100644 legacy-reexport/add/operator/debounce.ts create mode 100644 legacy-reexport/add/operator/debounceTime.ts create mode 100644 legacy-reexport/add/operator/defaultIfEmpty.ts create mode 100644 legacy-reexport/add/operator/delay.ts create mode 100644 legacy-reexport/add/operator/delayWhen.ts create mode 100644 legacy-reexport/add/operator/dematerialize.ts create mode 100644 legacy-reexport/add/operator/distinct.ts create mode 100644 legacy-reexport/add/operator/distinctUntilChanged.ts create mode 100644 legacy-reexport/add/operator/distinctUntilKeyChanged.ts create mode 100644 legacy-reexport/add/operator/do.ts create mode 100644 legacy-reexport/add/operator/elementAt.ts create mode 100644 legacy-reexport/add/operator/every.ts create mode 100644 legacy-reexport/add/operator/exhaust.ts create mode 100644 legacy-reexport/add/operator/exhaustMap.ts create mode 100644 legacy-reexport/add/operator/expand.ts create mode 100644 legacy-reexport/add/operator/filter.ts create mode 100644 legacy-reexport/add/operator/finally.ts create mode 100644 legacy-reexport/add/operator/find.ts create mode 100644 legacy-reexport/add/operator/findIndex.ts create mode 100644 legacy-reexport/add/operator/first.ts create mode 100644 legacy-reexport/add/operator/groupBy.ts create mode 100644 legacy-reexport/add/operator/ignoreElements.ts create mode 100644 legacy-reexport/add/operator/isEmpty.ts create mode 100644 legacy-reexport/add/operator/last.ts create mode 100644 legacy-reexport/add/operator/let.ts create mode 100644 legacy-reexport/add/operator/map.ts create mode 100644 legacy-reexport/add/operator/mapTo.ts create mode 100644 legacy-reexport/add/operator/materialize.ts create mode 100644 legacy-reexport/add/operator/max.ts create mode 100644 legacy-reexport/add/operator/merge.ts create mode 100644 legacy-reexport/add/operator/mergeAll.ts create mode 100644 legacy-reexport/add/operator/mergeMap.ts create mode 100644 legacy-reexport/add/operator/mergeMapTo.ts create mode 100644 legacy-reexport/add/operator/mergeScan.ts create mode 100644 legacy-reexport/add/operator/min.ts create mode 100644 legacy-reexport/add/operator/multicast.ts create mode 100644 legacy-reexport/add/operator/observeOn.ts create mode 100644 legacy-reexport/add/operator/onErrorResumeNext.ts create mode 100644 legacy-reexport/add/operator/pairwise.ts create mode 100644 legacy-reexport/add/operator/partition.ts create mode 100644 legacy-reexport/add/operator/pluck.ts create mode 100644 legacy-reexport/add/operator/publish.ts create mode 100644 legacy-reexport/add/operator/publishBehavior.ts create mode 100644 legacy-reexport/add/operator/publishLast.ts create mode 100644 legacy-reexport/add/operator/publishReplay.ts create mode 100644 legacy-reexport/add/operator/race.ts create mode 100644 legacy-reexport/add/operator/reduce.ts create mode 100644 legacy-reexport/add/operator/repeat.ts create mode 100644 legacy-reexport/add/operator/repeatWhen.ts create mode 100644 legacy-reexport/add/operator/retry.ts create mode 100644 legacy-reexport/add/operator/retryWhen.ts create mode 100644 legacy-reexport/add/operator/sample.ts create mode 100644 legacy-reexport/add/operator/sampleTime.ts create mode 100644 legacy-reexport/add/operator/scan.ts create mode 100644 legacy-reexport/add/operator/sequenceEqual.ts create mode 100644 legacy-reexport/add/operator/share.ts create mode 100644 legacy-reexport/add/operator/shareReplay.ts create mode 100644 legacy-reexport/add/operator/single.ts create mode 100644 legacy-reexport/add/operator/skip.ts create mode 100644 legacy-reexport/add/operator/skipLast.ts create mode 100644 legacy-reexport/add/operator/skipUntil.ts create mode 100644 legacy-reexport/add/operator/skipWhile.ts create mode 100644 legacy-reexport/add/operator/startWith.ts create mode 100644 legacy-reexport/add/operator/subscribeOn.ts create mode 100644 legacy-reexport/add/operator/switch.ts create mode 100644 legacy-reexport/add/operator/switchMap.ts create mode 100644 legacy-reexport/add/operator/switchMapTo.ts create mode 100644 legacy-reexport/add/operator/take.ts create mode 100644 legacy-reexport/add/operator/takeLast.ts create mode 100644 legacy-reexport/add/operator/takeUntil.ts create mode 100644 legacy-reexport/add/operator/takeWhile.ts create mode 100644 legacy-reexport/add/operator/throttle.ts create mode 100644 legacy-reexport/add/operator/throttleTime.ts create mode 100644 legacy-reexport/add/operator/timeInterval.ts create mode 100644 legacy-reexport/add/operator/timeout.ts create mode 100644 legacy-reexport/add/operator/timeoutWith.ts create mode 100644 legacy-reexport/add/operator/timestamp.ts create mode 100644 legacy-reexport/add/operator/toArray.ts create mode 100644 legacy-reexport/add/operator/toPromise.ts create mode 100644 legacy-reexport/add/operator/window.ts create mode 100644 legacy-reexport/add/operator/windowCount.ts create mode 100644 legacy-reexport/add/operator/windowTime.ts create mode 100644 legacy-reexport/add/operator/windowToggle.ts create mode 100644 legacy-reexport/add/operator/windowWhen.ts create mode 100644 legacy-reexport/add/operator/withLatestFrom.ts create mode 100644 legacy-reexport/add/operator/zip.ts create mode 100644 legacy-reexport/add/operator/zipAll.ts diff --git a/legacy-reexport/add/observable/bindCallback.ts b/legacy-reexport/add/observable/bindCallback.ts new file mode 100644 index 0000000000..7926a093aa --- /dev/null +++ b/legacy-reexport/add/observable/bindCallback.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/bindCallback'; diff --git a/legacy-reexport/add/observable/bindNodeCallback.ts b/legacy-reexport/add/observable/bindNodeCallback.ts new file mode 100644 index 0000000000..049f9a7c22 --- /dev/null +++ b/legacy-reexport/add/observable/bindNodeCallback.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/bindNodeCallback'; diff --git a/legacy-reexport/add/observable/combineLatest.ts b/legacy-reexport/add/observable/combineLatest.ts new file mode 100644 index 0000000000..7163d7a9bf --- /dev/null +++ b/legacy-reexport/add/observable/combineLatest.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/combineLatest'; diff --git a/legacy-reexport/add/observable/concat.ts b/legacy-reexport/add/observable/concat.ts new file mode 100644 index 0000000000..b392cb2e47 --- /dev/null +++ b/legacy-reexport/add/observable/concat.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/concat'; diff --git a/legacy-reexport/add/observable/defer.ts b/legacy-reexport/add/observable/defer.ts new file mode 100644 index 0000000000..b4e296628f --- /dev/null +++ b/legacy-reexport/add/observable/defer.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/defer'; diff --git a/legacy-reexport/add/observable/dom/ajax.ts b/legacy-reexport/add/observable/dom/ajax.ts new file mode 100644 index 0000000000..2b32efef18 --- /dev/null +++ b/legacy-reexport/add/observable/dom/ajax.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/dom/ajax'; diff --git a/legacy-reexport/add/observable/dom/webSocket.ts b/legacy-reexport/add/observable/dom/webSocket.ts new file mode 100644 index 0000000000..bc5d3f32ad --- /dev/null +++ b/legacy-reexport/add/observable/dom/webSocket.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/dom/webSocket'; diff --git a/legacy-reexport/add/observable/empty.ts b/legacy-reexport/add/observable/empty.ts new file mode 100644 index 0000000000..d261ad7fcf --- /dev/null +++ b/legacy-reexport/add/observable/empty.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/empty'; diff --git a/legacy-reexport/add/observable/forkJoin.ts b/legacy-reexport/add/observable/forkJoin.ts new file mode 100644 index 0000000000..2a581e2999 --- /dev/null +++ b/legacy-reexport/add/observable/forkJoin.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/forkJoin'; diff --git a/legacy-reexport/add/observable/from.ts b/legacy-reexport/add/observable/from.ts new file mode 100644 index 0000000000..06572d8707 --- /dev/null +++ b/legacy-reexport/add/observable/from.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/from'; diff --git a/legacy-reexport/add/observable/fromEvent.ts b/legacy-reexport/add/observable/fromEvent.ts new file mode 100644 index 0000000000..0d6e05b376 --- /dev/null +++ b/legacy-reexport/add/observable/fromEvent.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/fromEvent'; diff --git a/legacy-reexport/add/observable/fromEventPattern.ts b/legacy-reexport/add/observable/fromEventPattern.ts new file mode 100644 index 0000000000..c7241f8677 --- /dev/null +++ b/legacy-reexport/add/observable/fromEventPattern.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/fromEventPattern'; diff --git a/legacy-reexport/add/observable/fromPromise.ts b/legacy-reexport/add/observable/fromPromise.ts new file mode 100644 index 0000000000..c2622426d3 --- /dev/null +++ b/legacy-reexport/add/observable/fromPromise.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/fromPromise'; diff --git a/legacy-reexport/add/observable/generate.ts b/legacy-reexport/add/observable/generate.ts new file mode 100644 index 0000000000..3203a9b699 --- /dev/null +++ b/legacy-reexport/add/observable/generate.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/generate'; diff --git a/legacy-reexport/add/observable/if.ts b/legacy-reexport/add/observable/if.ts new file mode 100644 index 0000000000..5767d74c70 --- /dev/null +++ b/legacy-reexport/add/observable/if.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/if'; diff --git a/legacy-reexport/add/observable/interval.ts b/legacy-reexport/add/observable/interval.ts new file mode 100644 index 0000000000..6cd2b31dca --- /dev/null +++ b/legacy-reexport/add/observable/interval.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/interval'; diff --git a/legacy-reexport/add/observable/merge.ts b/legacy-reexport/add/observable/merge.ts new file mode 100644 index 0000000000..7a111a5ddb --- /dev/null +++ b/legacy-reexport/add/observable/merge.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/merge'; diff --git a/legacy-reexport/add/observable/never.ts b/legacy-reexport/add/observable/never.ts new file mode 100644 index 0000000000..4c464d09fe --- /dev/null +++ b/legacy-reexport/add/observable/never.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/never'; diff --git a/legacy-reexport/add/observable/of.ts b/legacy-reexport/add/observable/of.ts new file mode 100644 index 0000000000..c0720f6aaa --- /dev/null +++ b/legacy-reexport/add/observable/of.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/of'; diff --git a/legacy-reexport/add/observable/onErrorResumeNext.ts b/legacy-reexport/add/observable/onErrorResumeNext.ts new file mode 100644 index 0000000000..80a4d91a9b --- /dev/null +++ b/legacy-reexport/add/observable/onErrorResumeNext.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/onErrorResumeNext'; diff --git a/legacy-reexport/add/observable/pairs.ts b/legacy-reexport/add/observable/pairs.ts new file mode 100644 index 0000000000..3af25b6bb7 --- /dev/null +++ b/legacy-reexport/add/observable/pairs.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/pairs'; diff --git a/legacy-reexport/add/observable/race.ts b/legacy-reexport/add/observable/race.ts new file mode 100644 index 0000000000..9b45c4e3f6 --- /dev/null +++ b/legacy-reexport/add/observable/race.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/race'; diff --git a/legacy-reexport/add/observable/range.ts b/legacy-reexport/add/observable/range.ts new file mode 100644 index 0000000000..2ae274ed55 --- /dev/null +++ b/legacy-reexport/add/observable/range.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/range'; diff --git a/legacy-reexport/add/observable/throw.ts b/legacy-reexport/add/observable/throw.ts new file mode 100644 index 0000000000..7405653da6 --- /dev/null +++ b/legacy-reexport/add/observable/throw.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/throw'; diff --git a/legacy-reexport/add/observable/timer.ts b/legacy-reexport/add/observable/timer.ts new file mode 100644 index 0000000000..60e2f9b4d7 --- /dev/null +++ b/legacy-reexport/add/observable/timer.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/timer'; diff --git a/legacy-reexport/add/observable/using.ts b/legacy-reexport/add/observable/using.ts new file mode 100644 index 0000000000..c7ac49a406 --- /dev/null +++ b/legacy-reexport/add/observable/using.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/using'; diff --git a/legacy-reexport/add/observable/zip.ts b/legacy-reexport/add/observable/zip.ts new file mode 100644 index 0000000000..5c720416e9 --- /dev/null +++ b/legacy-reexport/add/observable/zip.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/observable/zip'; diff --git a/legacy-reexport/add/oecho b/legacy-reexport/add/oecho new file mode 100644 index 0000000000..e69de29bb2 diff --git a/legacy-reexport/add/operator/audit.ts b/legacy-reexport/add/operator/audit.ts new file mode 100644 index 0000000000..a3eb5a4beb --- /dev/null +++ b/legacy-reexport/add/operator/audit.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/audit'; diff --git a/legacy-reexport/add/operator/auditTime.ts b/legacy-reexport/add/operator/auditTime.ts new file mode 100644 index 0000000000..41f68da287 --- /dev/null +++ b/legacy-reexport/add/operator/auditTime.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/auditTime'; diff --git a/legacy-reexport/add/operator/buffer.ts b/legacy-reexport/add/operator/buffer.ts new file mode 100644 index 0000000000..b501cae14a --- /dev/null +++ b/legacy-reexport/add/operator/buffer.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/buffer'; diff --git a/legacy-reexport/add/operator/bufferCount.ts b/legacy-reexport/add/operator/bufferCount.ts new file mode 100644 index 0000000000..96237e565e --- /dev/null +++ b/legacy-reexport/add/operator/bufferCount.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/bufferCount'; diff --git a/legacy-reexport/add/operator/bufferTime.ts b/legacy-reexport/add/operator/bufferTime.ts new file mode 100644 index 0000000000..abd78ab83b --- /dev/null +++ b/legacy-reexport/add/operator/bufferTime.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/bufferTime'; diff --git a/legacy-reexport/add/operator/bufferTimecho b/legacy-reexport/add/operator/bufferTimecho new file mode 100644 index 0000000000..e69de29bb2 diff --git a/legacy-reexport/add/operator/bufferToggle.ts b/legacy-reexport/add/operator/bufferToggle.ts new file mode 100644 index 0000000000..2dbdf86ebe --- /dev/null +++ b/legacy-reexport/add/operator/bufferToggle.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/bufferToggle'; diff --git a/legacy-reexport/add/operator/bufferWhen.ts b/legacy-reexport/add/operator/bufferWhen.ts new file mode 100644 index 0000000000..4ad636f834 --- /dev/null +++ b/legacy-reexport/add/operator/bufferWhen.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/bufferWhen'; diff --git a/legacy-reexport/add/operator/catch.ts b/legacy-reexport/add/operator/catch.ts new file mode 100644 index 0000000000..316a29eea5 --- /dev/null +++ b/legacy-reexport/add/operator/catch.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/catch'; diff --git a/legacy-reexport/add/operator/combineAll.ts b/legacy-reexport/add/operator/combineAll.ts new file mode 100644 index 0000000000..0cf4be8153 --- /dev/null +++ b/legacy-reexport/add/operator/combineAll.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/combineAll'; diff --git a/legacy-reexport/add/operator/combineLatest.ts b/legacy-reexport/add/operator/combineLatest.ts new file mode 100644 index 0000000000..88333e7216 --- /dev/null +++ b/legacy-reexport/add/operator/combineLatest.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/combineLatest'; diff --git a/legacy-reexport/add/operator/concat.ts b/legacy-reexport/add/operator/concat.ts new file mode 100644 index 0000000000..c743a6b40f --- /dev/null +++ b/legacy-reexport/add/operator/concat.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/concat'; diff --git a/legacy-reexport/add/operator/concatAll.ts b/legacy-reexport/add/operator/concatAll.ts new file mode 100644 index 0000000000..cf9157fdac --- /dev/null +++ b/legacy-reexport/add/operator/concatAll.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/concatAll'; diff --git a/legacy-reexport/add/operator/concatMap.ts b/legacy-reexport/add/operator/concatMap.ts new file mode 100644 index 0000000000..dadc722014 --- /dev/null +++ b/legacy-reexport/add/operator/concatMap.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/concatMap'; diff --git a/legacy-reexport/add/operator/concatMapTo.ts b/legacy-reexport/add/operator/concatMapTo.ts new file mode 100644 index 0000000000..9a843a60e7 --- /dev/null +++ b/legacy-reexport/add/operator/concatMapTo.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/concatMapTo'; diff --git a/legacy-reexport/add/operator/count.ts b/legacy-reexport/add/operator/count.ts new file mode 100644 index 0000000000..85c6832335 --- /dev/null +++ b/legacy-reexport/add/operator/count.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/count'; diff --git a/legacy-reexport/add/operator/debounce.ts b/legacy-reexport/add/operator/debounce.ts new file mode 100644 index 0000000000..e5ff5dbd6d --- /dev/null +++ b/legacy-reexport/add/operator/debounce.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/debounce'; diff --git a/legacy-reexport/add/operator/debounceTime.ts b/legacy-reexport/add/operator/debounceTime.ts new file mode 100644 index 0000000000..8ffedf912c --- /dev/null +++ b/legacy-reexport/add/operator/debounceTime.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/debounceTime'; diff --git a/legacy-reexport/add/operator/defaultIfEmpty.ts b/legacy-reexport/add/operator/defaultIfEmpty.ts new file mode 100644 index 0000000000..d8e00700f5 --- /dev/null +++ b/legacy-reexport/add/operator/defaultIfEmpty.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/defaultIfEmpty'; diff --git a/legacy-reexport/add/operator/delay.ts b/legacy-reexport/add/operator/delay.ts new file mode 100644 index 0000000000..96d20172c1 --- /dev/null +++ b/legacy-reexport/add/operator/delay.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/delay'; diff --git a/legacy-reexport/add/operator/delayWhen.ts b/legacy-reexport/add/operator/delayWhen.ts new file mode 100644 index 0000000000..a50cebb07b --- /dev/null +++ b/legacy-reexport/add/operator/delayWhen.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/delayWhen'; diff --git a/legacy-reexport/add/operator/dematerialize.ts b/legacy-reexport/add/operator/dematerialize.ts new file mode 100644 index 0000000000..18f368b967 --- /dev/null +++ b/legacy-reexport/add/operator/dematerialize.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/dematerialize'; diff --git a/legacy-reexport/add/operator/distinct.ts b/legacy-reexport/add/operator/distinct.ts new file mode 100644 index 0000000000..330f8f9af3 --- /dev/null +++ b/legacy-reexport/add/operator/distinct.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/distinct'; diff --git a/legacy-reexport/add/operator/distinctUntilChanged.ts b/legacy-reexport/add/operator/distinctUntilChanged.ts new file mode 100644 index 0000000000..8273e9e8b7 --- /dev/null +++ b/legacy-reexport/add/operator/distinctUntilChanged.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/distinctUntilChanged'; diff --git a/legacy-reexport/add/operator/distinctUntilKeyChanged.ts b/legacy-reexport/add/operator/distinctUntilKeyChanged.ts new file mode 100644 index 0000000000..f556b82964 --- /dev/null +++ b/legacy-reexport/add/operator/distinctUntilKeyChanged.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/distinctUntilKeyChanged'; diff --git a/legacy-reexport/add/operator/do.ts b/legacy-reexport/add/operator/do.ts new file mode 100644 index 0000000000..9eee7cd518 --- /dev/null +++ b/legacy-reexport/add/operator/do.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/do'; diff --git a/legacy-reexport/add/operator/elementAt.ts b/legacy-reexport/add/operator/elementAt.ts new file mode 100644 index 0000000000..8fe8f29a2e --- /dev/null +++ b/legacy-reexport/add/operator/elementAt.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/elementAt'; diff --git a/legacy-reexport/add/operator/every.ts b/legacy-reexport/add/operator/every.ts new file mode 100644 index 0000000000..789d3c1409 --- /dev/null +++ b/legacy-reexport/add/operator/every.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/every'; diff --git a/legacy-reexport/add/operator/exhaust.ts b/legacy-reexport/add/operator/exhaust.ts new file mode 100644 index 0000000000..d0cae89693 --- /dev/null +++ b/legacy-reexport/add/operator/exhaust.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/exhaust'; diff --git a/legacy-reexport/add/operator/exhaustMap.ts b/legacy-reexport/add/operator/exhaustMap.ts new file mode 100644 index 0000000000..6e231be49a --- /dev/null +++ b/legacy-reexport/add/operator/exhaustMap.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/exhaustMap'; diff --git a/legacy-reexport/add/operator/expand.ts b/legacy-reexport/add/operator/expand.ts new file mode 100644 index 0000000000..035ea4963e --- /dev/null +++ b/legacy-reexport/add/operator/expand.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/expand'; diff --git a/legacy-reexport/add/operator/filter.ts b/legacy-reexport/add/operator/filter.ts new file mode 100644 index 0000000000..1cfe74a7a1 --- /dev/null +++ b/legacy-reexport/add/operator/filter.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/filter'; diff --git a/legacy-reexport/add/operator/finally.ts b/legacy-reexport/add/operator/finally.ts new file mode 100644 index 0000000000..7db9d996cb --- /dev/null +++ b/legacy-reexport/add/operator/finally.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/finally'; diff --git a/legacy-reexport/add/operator/find.ts b/legacy-reexport/add/operator/find.ts new file mode 100644 index 0000000000..2255ba45e1 --- /dev/null +++ b/legacy-reexport/add/operator/find.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/find'; diff --git a/legacy-reexport/add/operator/findIndex.ts b/legacy-reexport/add/operator/findIndex.ts new file mode 100644 index 0000000000..8d984696d2 --- /dev/null +++ b/legacy-reexport/add/operator/findIndex.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/findIndex'; diff --git a/legacy-reexport/add/operator/first.ts b/legacy-reexport/add/operator/first.ts new file mode 100644 index 0000000000..b12264fc58 --- /dev/null +++ b/legacy-reexport/add/operator/first.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/first'; diff --git a/legacy-reexport/add/operator/groupBy.ts b/legacy-reexport/add/operator/groupBy.ts new file mode 100644 index 0000000000..932d1f4607 --- /dev/null +++ b/legacy-reexport/add/operator/groupBy.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/groupBy'; diff --git a/legacy-reexport/add/operator/ignoreElements.ts b/legacy-reexport/add/operator/ignoreElements.ts new file mode 100644 index 0000000000..28b04ba00b --- /dev/null +++ b/legacy-reexport/add/operator/ignoreElements.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/ignoreElements'; diff --git a/legacy-reexport/add/operator/isEmpty.ts b/legacy-reexport/add/operator/isEmpty.ts new file mode 100644 index 0000000000..b84aaa9f59 --- /dev/null +++ b/legacy-reexport/add/operator/isEmpty.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/isEmpty'; diff --git a/legacy-reexport/add/operator/last.ts b/legacy-reexport/add/operator/last.ts new file mode 100644 index 0000000000..0b222df5b4 --- /dev/null +++ b/legacy-reexport/add/operator/last.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/last'; diff --git a/legacy-reexport/add/operator/let.ts b/legacy-reexport/add/operator/let.ts new file mode 100644 index 0000000000..5b92015106 --- /dev/null +++ b/legacy-reexport/add/operator/let.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/let'; diff --git a/legacy-reexport/add/operator/map.ts b/legacy-reexport/add/operator/map.ts new file mode 100644 index 0000000000..e9f2a7f481 --- /dev/null +++ b/legacy-reexport/add/operator/map.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/map'; diff --git a/legacy-reexport/add/operator/mapTo.ts b/legacy-reexport/add/operator/mapTo.ts new file mode 100644 index 0000000000..a49f787cee --- /dev/null +++ b/legacy-reexport/add/operator/mapTo.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/mapTo'; diff --git a/legacy-reexport/add/operator/materialize.ts b/legacy-reexport/add/operator/materialize.ts new file mode 100644 index 0000000000..e7731991fa --- /dev/null +++ b/legacy-reexport/add/operator/materialize.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/materialize'; diff --git a/legacy-reexport/add/operator/max.ts b/legacy-reexport/add/operator/max.ts new file mode 100644 index 0000000000..c66f7aeaf2 --- /dev/null +++ b/legacy-reexport/add/operator/max.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/max'; diff --git a/legacy-reexport/add/operator/merge.ts b/legacy-reexport/add/operator/merge.ts new file mode 100644 index 0000000000..dfa5c46331 --- /dev/null +++ b/legacy-reexport/add/operator/merge.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/merge'; diff --git a/legacy-reexport/add/operator/mergeAll.ts b/legacy-reexport/add/operator/mergeAll.ts new file mode 100644 index 0000000000..06cdc4fad6 --- /dev/null +++ b/legacy-reexport/add/operator/mergeAll.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/mergeAll'; diff --git a/legacy-reexport/add/operator/mergeMap.ts b/legacy-reexport/add/operator/mergeMap.ts new file mode 100644 index 0000000000..d8ec3cc4e2 --- /dev/null +++ b/legacy-reexport/add/operator/mergeMap.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/mergeMap'; diff --git a/legacy-reexport/add/operator/mergeMapTo.ts b/legacy-reexport/add/operator/mergeMapTo.ts new file mode 100644 index 0000000000..0d8e15fb2e --- /dev/null +++ b/legacy-reexport/add/operator/mergeMapTo.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/mergeMapTo'; diff --git a/legacy-reexport/add/operator/mergeScan.ts b/legacy-reexport/add/operator/mergeScan.ts new file mode 100644 index 0000000000..17c5fcc122 --- /dev/null +++ b/legacy-reexport/add/operator/mergeScan.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/mergeScan'; diff --git a/legacy-reexport/add/operator/min.ts b/legacy-reexport/add/operator/min.ts new file mode 100644 index 0000000000..5fa91d5207 --- /dev/null +++ b/legacy-reexport/add/operator/min.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/min'; diff --git a/legacy-reexport/add/operator/multicast.ts b/legacy-reexport/add/operator/multicast.ts new file mode 100644 index 0000000000..03b0670b06 --- /dev/null +++ b/legacy-reexport/add/operator/multicast.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/multicast'; diff --git a/legacy-reexport/add/operator/observeOn.ts b/legacy-reexport/add/operator/observeOn.ts new file mode 100644 index 0000000000..4ade08594d --- /dev/null +++ b/legacy-reexport/add/operator/observeOn.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/observeOn'; diff --git a/legacy-reexport/add/operator/onErrorResumeNext.ts b/legacy-reexport/add/operator/onErrorResumeNext.ts new file mode 100644 index 0000000000..0d2aa976cb --- /dev/null +++ b/legacy-reexport/add/operator/onErrorResumeNext.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/onErrorResumeNext'; diff --git a/legacy-reexport/add/operator/pairwise.ts b/legacy-reexport/add/operator/pairwise.ts new file mode 100644 index 0000000000..2930fd30b9 --- /dev/null +++ b/legacy-reexport/add/operator/pairwise.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/pairwise'; diff --git a/legacy-reexport/add/operator/partition.ts b/legacy-reexport/add/operator/partition.ts new file mode 100644 index 0000000000..7b8c869fb0 --- /dev/null +++ b/legacy-reexport/add/operator/partition.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/partition'; diff --git a/legacy-reexport/add/operator/pluck.ts b/legacy-reexport/add/operator/pluck.ts new file mode 100644 index 0000000000..0af0f3b66b --- /dev/null +++ b/legacy-reexport/add/operator/pluck.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/pluck'; diff --git a/legacy-reexport/add/operator/publish.ts b/legacy-reexport/add/operator/publish.ts new file mode 100644 index 0000000000..b7198cc9a0 --- /dev/null +++ b/legacy-reexport/add/operator/publish.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/publish'; diff --git a/legacy-reexport/add/operator/publishBehavior.ts b/legacy-reexport/add/operator/publishBehavior.ts new file mode 100644 index 0000000000..3bc5e01ae1 --- /dev/null +++ b/legacy-reexport/add/operator/publishBehavior.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/publishBehavior'; diff --git a/legacy-reexport/add/operator/publishLast.ts b/legacy-reexport/add/operator/publishLast.ts new file mode 100644 index 0000000000..243d07cf16 --- /dev/null +++ b/legacy-reexport/add/operator/publishLast.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/publishLast'; diff --git a/legacy-reexport/add/operator/publishReplay.ts b/legacy-reexport/add/operator/publishReplay.ts new file mode 100644 index 0000000000..06bc92239c --- /dev/null +++ b/legacy-reexport/add/operator/publishReplay.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/publishReplay'; diff --git a/legacy-reexport/add/operator/race.ts b/legacy-reexport/add/operator/race.ts new file mode 100644 index 0000000000..b11346693d --- /dev/null +++ b/legacy-reexport/add/operator/race.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/race'; diff --git a/legacy-reexport/add/operator/reduce.ts b/legacy-reexport/add/operator/reduce.ts new file mode 100644 index 0000000000..c8db530ec2 --- /dev/null +++ b/legacy-reexport/add/operator/reduce.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/reduce'; diff --git a/legacy-reexport/add/operator/repeat.ts b/legacy-reexport/add/operator/repeat.ts new file mode 100644 index 0000000000..4290613b94 --- /dev/null +++ b/legacy-reexport/add/operator/repeat.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/repeat'; diff --git a/legacy-reexport/add/operator/repeatWhen.ts b/legacy-reexport/add/operator/repeatWhen.ts new file mode 100644 index 0000000000..ca5471a38b --- /dev/null +++ b/legacy-reexport/add/operator/repeatWhen.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/repeatWhen'; diff --git a/legacy-reexport/add/operator/retry.ts b/legacy-reexport/add/operator/retry.ts new file mode 100644 index 0000000000..fb9316b376 --- /dev/null +++ b/legacy-reexport/add/operator/retry.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/retry'; diff --git a/legacy-reexport/add/operator/retryWhen.ts b/legacy-reexport/add/operator/retryWhen.ts new file mode 100644 index 0000000000..c4553374e9 --- /dev/null +++ b/legacy-reexport/add/operator/retryWhen.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/retryWhen'; diff --git a/legacy-reexport/add/operator/sample.ts b/legacy-reexport/add/operator/sample.ts new file mode 100644 index 0000000000..441255f375 --- /dev/null +++ b/legacy-reexport/add/operator/sample.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/sample'; diff --git a/legacy-reexport/add/operator/sampleTime.ts b/legacy-reexport/add/operator/sampleTime.ts new file mode 100644 index 0000000000..153d8b01a1 --- /dev/null +++ b/legacy-reexport/add/operator/sampleTime.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/sampleTime'; diff --git a/legacy-reexport/add/operator/scan.ts b/legacy-reexport/add/operator/scan.ts new file mode 100644 index 0000000000..baf81625b9 --- /dev/null +++ b/legacy-reexport/add/operator/scan.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/scan'; diff --git a/legacy-reexport/add/operator/sequenceEqual.ts b/legacy-reexport/add/operator/sequenceEqual.ts new file mode 100644 index 0000000000..f47a31dc24 --- /dev/null +++ b/legacy-reexport/add/operator/sequenceEqual.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/sequenceEqual'; diff --git a/legacy-reexport/add/operator/share.ts b/legacy-reexport/add/operator/share.ts new file mode 100644 index 0000000000..6db65af4a3 --- /dev/null +++ b/legacy-reexport/add/operator/share.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/share'; diff --git a/legacy-reexport/add/operator/shareReplay.ts b/legacy-reexport/add/operator/shareReplay.ts new file mode 100644 index 0000000000..7f31ff4b1d --- /dev/null +++ b/legacy-reexport/add/operator/shareReplay.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/shareReplay'; diff --git a/legacy-reexport/add/operator/single.ts b/legacy-reexport/add/operator/single.ts new file mode 100644 index 0000000000..d35b3cd68b --- /dev/null +++ b/legacy-reexport/add/operator/single.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/single'; diff --git a/legacy-reexport/add/operator/skip.ts b/legacy-reexport/add/operator/skip.ts new file mode 100644 index 0000000000..1456f1e5a1 --- /dev/null +++ b/legacy-reexport/add/operator/skip.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/skip'; diff --git a/legacy-reexport/add/operator/skipLast.ts b/legacy-reexport/add/operator/skipLast.ts new file mode 100644 index 0000000000..0c432c9c13 --- /dev/null +++ b/legacy-reexport/add/operator/skipLast.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/skipLast'; diff --git a/legacy-reexport/add/operator/skipUntil.ts b/legacy-reexport/add/operator/skipUntil.ts new file mode 100644 index 0000000000..21ea6b2b96 --- /dev/null +++ b/legacy-reexport/add/operator/skipUntil.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/skipUntil'; diff --git a/legacy-reexport/add/operator/skipWhile.ts b/legacy-reexport/add/operator/skipWhile.ts new file mode 100644 index 0000000000..496218b021 --- /dev/null +++ b/legacy-reexport/add/operator/skipWhile.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/skipWhile'; diff --git a/legacy-reexport/add/operator/startWith.ts b/legacy-reexport/add/operator/startWith.ts new file mode 100644 index 0000000000..9c9e670e1c --- /dev/null +++ b/legacy-reexport/add/operator/startWith.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/startWith'; diff --git a/legacy-reexport/add/operator/subscribeOn.ts b/legacy-reexport/add/operator/subscribeOn.ts new file mode 100644 index 0000000000..a1b5d6d417 --- /dev/null +++ b/legacy-reexport/add/operator/subscribeOn.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/subscribeOn'; diff --git a/legacy-reexport/add/operator/switch.ts b/legacy-reexport/add/operator/switch.ts new file mode 100644 index 0000000000..d2d3f48ef9 --- /dev/null +++ b/legacy-reexport/add/operator/switch.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/switch'; diff --git a/legacy-reexport/add/operator/switchMap.ts b/legacy-reexport/add/operator/switchMap.ts new file mode 100644 index 0000000000..b1dfdfa155 --- /dev/null +++ b/legacy-reexport/add/operator/switchMap.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/switchMap'; diff --git a/legacy-reexport/add/operator/switchMapTo.ts b/legacy-reexport/add/operator/switchMapTo.ts new file mode 100644 index 0000000000..320b8443d6 --- /dev/null +++ b/legacy-reexport/add/operator/switchMapTo.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/switchMapTo'; diff --git a/legacy-reexport/add/operator/take.ts b/legacy-reexport/add/operator/take.ts new file mode 100644 index 0000000000..08c3bcb203 --- /dev/null +++ b/legacy-reexport/add/operator/take.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/take'; diff --git a/legacy-reexport/add/operator/takeLast.ts b/legacy-reexport/add/operator/takeLast.ts new file mode 100644 index 0000000000..13d0816ca9 --- /dev/null +++ b/legacy-reexport/add/operator/takeLast.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/takeLast'; diff --git a/legacy-reexport/add/operator/takeUntil.ts b/legacy-reexport/add/operator/takeUntil.ts new file mode 100644 index 0000000000..78c8e553fd --- /dev/null +++ b/legacy-reexport/add/operator/takeUntil.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/takeUntil'; diff --git a/legacy-reexport/add/operator/takeWhile.ts b/legacy-reexport/add/operator/takeWhile.ts new file mode 100644 index 0000000000..06ff17408b --- /dev/null +++ b/legacy-reexport/add/operator/takeWhile.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/takeWhile'; diff --git a/legacy-reexport/add/operator/throttle.ts b/legacy-reexport/add/operator/throttle.ts new file mode 100644 index 0000000000..825457b966 --- /dev/null +++ b/legacy-reexport/add/operator/throttle.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/throttle'; diff --git a/legacy-reexport/add/operator/throttleTime.ts b/legacy-reexport/add/operator/throttleTime.ts new file mode 100644 index 0000000000..c683297a14 --- /dev/null +++ b/legacy-reexport/add/operator/throttleTime.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/throttleTime'; diff --git a/legacy-reexport/add/operator/timeInterval.ts b/legacy-reexport/add/operator/timeInterval.ts new file mode 100644 index 0000000000..198a616a73 --- /dev/null +++ b/legacy-reexport/add/operator/timeInterval.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/timeInterval'; diff --git a/legacy-reexport/add/operator/timeout.ts b/legacy-reexport/add/operator/timeout.ts new file mode 100644 index 0000000000..2a69ffdcfd --- /dev/null +++ b/legacy-reexport/add/operator/timeout.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/timeout'; diff --git a/legacy-reexport/add/operator/timeoutWith.ts b/legacy-reexport/add/operator/timeoutWith.ts new file mode 100644 index 0000000000..cd4ec44d8f --- /dev/null +++ b/legacy-reexport/add/operator/timeoutWith.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/timeoutWith'; diff --git a/legacy-reexport/add/operator/timestamp.ts b/legacy-reexport/add/operator/timestamp.ts new file mode 100644 index 0000000000..16402c814b --- /dev/null +++ b/legacy-reexport/add/operator/timestamp.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/timestamp'; diff --git a/legacy-reexport/add/operator/toArray.ts b/legacy-reexport/add/operator/toArray.ts new file mode 100644 index 0000000000..a0f1a4fc5c --- /dev/null +++ b/legacy-reexport/add/operator/toArray.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/toArray'; diff --git a/legacy-reexport/add/operator/toPromise.ts b/legacy-reexport/add/operator/toPromise.ts new file mode 100644 index 0000000000..cc7b16e2b5 --- /dev/null +++ b/legacy-reexport/add/operator/toPromise.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/toPromise'; diff --git a/legacy-reexport/add/operator/window.ts b/legacy-reexport/add/operator/window.ts new file mode 100644 index 0000000000..450c41f2ac --- /dev/null +++ b/legacy-reexport/add/operator/window.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/window'; diff --git a/legacy-reexport/add/operator/windowCount.ts b/legacy-reexport/add/operator/windowCount.ts new file mode 100644 index 0000000000..da7eccfea4 --- /dev/null +++ b/legacy-reexport/add/operator/windowCount.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/windowCount'; diff --git a/legacy-reexport/add/operator/windowTime.ts b/legacy-reexport/add/operator/windowTime.ts new file mode 100644 index 0000000000..1d82ec67cb --- /dev/null +++ b/legacy-reexport/add/operator/windowTime.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/windowTime'; diff --git a/legacy-reexport/add/operator/windowToggle.ts b/legacy-reexport/add/operator/windowToggle.ts new file mode 100644 index 0000000000..9ed25dfb40 --- /dev/null +++ b/legacy-reexport/add/operator/windowToggle.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/windowToggle'; diff --git a/legacy-reexport/add/operator/windowWhen.ts b/legacy-reexport/add/operator/windowWhen.ts new file mode 100644 index 0000000000..f5d85640b7 --- /dev/null +++ b/legacy-reexport/add/operator/windowWhen.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/windowWhen'; diff --git a/legacy-reexport/add/operator/withLatestFrom.ts b/legacy-reexport/add/operator/withLatestFrom.ts new file mode 100644 index 0000000000..9f715749a3 --- /dev/null +++ b/legacy-reexport/add/operator/withLatestFrom.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/withLatestFrom'; diff --git a/legacy-reexport/add/operator/zip.ts b/legacy-reexport/add/operator/zip.ts new file mode 100644 index 0000000000..414202af81 --- /dev/null +++ b/legacy-reexport/add/operator/zip.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/zip'; diff --git a/legacy-reexport/add/operator/zipAll.ts b/legacy-reexport/add/operator/zipAll.ts new file mode 100644 index 0000000000..cf8877f004 --- /dev/null +++ b/legacy-reexport/add/operator/zipAll.ts @@ -0,0 +1 @@ +import 'rxjs-compat/add/operator/zipAll'; From c2b705fd41380cb47a054a5e42a9eca7d4fa2568 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Wed, 7 Mar 2018 11:29:45 -0800 Subject: [PATCH 20/39] chore(build): get legacy reexports into the final rxjs build --- .make-packages.js | 5 ++++- legacy-reexport/Rx.ts | 2 ++ tsconfig/tsconfig.legacy-reexport.json | 17 ++--------------- 3 files changed, 8 insertions(+), 16 deletions(-) create mode 100644 legacy-reexport/Rx.ts diff --git a/.make-packages.js b/.make-packages.js index e9da9d51bd..ab410c1dda 100644 --- a/.make-packages.js +++ b/.make-packages.js @@ -22,6 +22,7 @@ const CJS_ROOT = ROOT + 'cjs/'; const ESM5_ROOT = ROOT + 'esm5/'; const ESM2015_ROOT = ROOT + 'esm2015/'; const UMD_ROOT = ROOT + 'global/'; +const LEGACY_REEXPORT_ROOT = ROOT + "legacy-reexport/legacy-reexport/" const TYPE_ROOT = ROOT + 'typings/'; const PKG_ROOT = ROOT + 'package/'; const CJS_PKG = PKG_ROOT + ''; @@ -96,6 +97,7 @@ mkdirp.sync(PKG_ROOT); copySources('src/', PKG_ROOT + 'src/'); copySources(CJS_ROOT, CJS_PKG); fs.copySync(TYPE_ROOT, TYPE_PKG); +fs.copySync(LEGACY_REEXPORT_ROOT, CJS_PKG, {overwrite: false, errorOnExist: true}); copySources(ESM5_ROOT, ESM5_PKG, true); copySources(ESM2015_ROOT, ESM2015_PKG, true); @@ -103,12 +105,13 @@ copySources(ESM2015_ROOT, ESM2015_PKG, true); // Copy over tsconfig.json for bazel build support fs.copySync('./tsconfig.json', PKG_ROOT + 'src/tsconfig.json'); -fs.writeJsonSync(PKG_ROOT + 'package.json', rootPackageJson); +fs.writeJsonSync(PKG_ROOT + 'package.json', rootPackageJson, {spaces: 2}); fs.copySync('src/operators/package.json', PKG_ROOT + '/operators/package.json'); fs.copySync('src/ajax/package.json', PKG_ROOT + '/ajax/package.json'); fs.copySync('src/websocket/package.json', PKG_ROOT + '/websocket/package.json'); fs.copySync('src/testing/package.json', PKG_ROOT + '/testing/package.json'); + if (fs.existsSync(UMD_ROOT)) { fs.copySync(UMD_ROOT, UMD_PKG); // Add licenses to tops of bundles diff --git a/legacy-reexport/Rx.ts b/legacy-reexport/Rx.ts new file mode 100644 index 0000000000..e04c752cf9 --- /dev/null +++ b/legacy-reexport/Rx.ts @@ -0,0 +1,2 @@ + +export * from 'rxjs-compat'; diff --git a/tsconfig/tsconfig.legacy-reexport.json b/tsconfig/tsconfig.legacy-reexport.json index 644324fc06..2913fda21d 100644 --- a/tsconfig/tsconfig.legacy-reexport.json +++ b/tsconfig/tsconfig.legacy-reexport.json @@ -6,21 +6,8 @@ "declaration": true, "outDir": "../dist/legacy-reexport" }, - "files": [ - "../legacy-reexport/AsyncSubject.ts", - "../legacy-reexport/BehaviorSubject.ts", - "../legacy-reexport/InnerSubscriber.ts", - "../legacy-reexport/Notification.ts", - "../legacy-reexport/Observable.ts", - "../legacy-reexport/Observer.ts", - "../legacy-reexport/Operator.ts", - "../legacy-reexport/OuterSubscriber.ts", - "../legacy-reexport/ReplaySubject.ts", - "../legacy-reexport/Scheduler.ts", - "../legacy-reexport/Subject.ts", - "../legacy-reexport/SubjectSubscription.ts", - "../legacy-reexport/Subscriber.ts", - "../legacy-reexport/Subscription.ts" + "include": [ + "../legacy-reexport" ], "exclude": [ "../src", From 0152a38feddb5b78dbd125a9ff08d7422ed018b8 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Wed, 7 Mar 2018 14:13:46 -0800 Subject: [PATCH 21/39] chore(compat): export ISubscription) --- compat/Observable.ts | 2 +- compat/Observer.ts | 2 +- compat/Subscription.ts | 2 +- legacy-reexport/AsyncSubject.ts | 2 +- legacy-reexport/BehaviorSubject.ts | 2 +- legacy-reexport/InnerSubscriber.ts | 2 +- legacy-reexport/Notification.ts | 2 +- legacy-reexport/Observable.ts | 2 +- legacy-reexport/Observer.ts | 2 +- legacy-reexport/Operator.ts | 2 +- legacy-reexport/OuterSubscriber.ts | 2 +- legacy-reexport/ReplaySubject.ts | 2 +- legacy-reexport/Scheduler.ts | 2 +- legacy-reexport/Subject.ts | 2 +- legacy-reexport/SubjectSubscription.ts | 2 +- legacy-reexport/Subscriber.ts | 2 +- legacy-reexport/Subscription.ts | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/compat/Observable.ts b/compat/Observable.ts index 7fcdaa5244..f3f522f4d6 100644 --- a/compat/Observable.ts +++ b/compat/Observable.ts @@ -1 +1 @@ -export {Observable} from 'rxjs'; +export {Observable, Subscribable, SubscribableOrPromise, ObservableInput} from 'rxjs'; diff --git a/compat/Observer.ts b/compat/Observer.ts index 91bf8e1db9..89a324b598 100644 --- a/compat/Observer.ts +++ b/compat/Observer.ts @@ -1 +1 @@ -export {Observer} from 'rxjs'; +export {Observer, NextObserver, ErrorObserver, CompletionObserver, PartialObserver} from 'rxjs'; diff --git a/compat/Subscription.ts b/compat/Subscription.ts index 3eed430206..5dc036ab40 100644 --- a/compat/Subscription.ts +++ b/compat/Subscription.ts @@ -1 +1 @@ -export {Subscription} from 'rxjs'; +export {Subscription, Unsubscribable as AnonymousSubscription, SubscriptionLike as ISubscription} from 'rxjs'; diff --git a/legacy-reexport/AsyncSubject.ts b/legacy-reexport/AsyncSubject.ts index f1748812fb..2c4d977f9a 100644 --- a/legacy-reexport/AsyncSubject.ts +++ b/legacy-reexport/AsyncSubject.ts @@ -1 +1 @@ -export {AsyncSubject} from 'rxjs-compat/AsyncSubject'; +export * from 'rxjs-compat/AsyncSubject'; diff --git a/legacy-reexport/BehaviorSubject.ts b/legacy-reexport/BehaviorSubject.ts index 7e9d0d357d..f8b4f44dff 100644 --- a/legacy-reexport/BehaviorSubject.ts +++ b/legacy-reexport/BehaviorSubject.ts @@ -1 +1 @@ -export {BehaviorSubject} from 'rxjs-compat/BehaviorSubject'; +export * from 'rxjs-compat/BehaviorSubject'; diff --git a/legacy-reexport/InnerSubscriber.ts b/legacy-reexport/InnerSubscriber.ts index d516de22bf..79e3b4a2d7 100644 --- a/legacy-reexport/InnerSubscriber.ts +++ b/legacy-reexport/InnerSubscriber.ts @@ -1 +1 @@ -export {InnerSubscriber} from 'rxjs-compat/InnerSubscriber'; +export * from 'rxjs-compat/InnerSubscriber'; diff --git a/legacy-reexport/Notification.ts b/legacy-reexport/Notification.ts index 2900b750c2..5d9956d109 100644 --- a/legacy-reexport/Notification.ts +++ b/legacy-reexport/Notification.ts @@ -1 +1 @@ -export {Notification} from 'rxjs-compat/Notification'; +export * from 'rxjs-compat/Notification'; diff --git a/legacy-reexport/Observable.ts b/legacy-reexport/Observable.ts index 72d7166120..cc1e68dffe 100644 --- a/legacy-reexport/Observable.ts +++ b/legacy-reexport/Observable.ts @@ -1 +1 @@ -export {Observable} from 'rxjs-compat/Observable'; +export * from 'rxjs-compat/Observable'; diff --git a/legacy-reexport/Observer.ts b/legacy-reexport/Observer.ts index 7dbfb7eab1..867ce2f93d 100644 --- a/legacy-reexport/Observer.ts +++ b/legacy-reexport/Observer.ts @@ -1 +1 @@ -export {Observer} from 'rxjs-compat/Observer'; +export * from 'rxjs-compat/Observer'; diff --git a/legacy-reexport/Operator.ts b/legacy-reexport/Operator.ts index 8e6a02f830..fb9a9f9979 100644 --- a/legacy-reexport/Operator.ts +++ b/legacy-reexport/Operator.ts @@ -1 +1 @@ -export {Operator} from 'rxjs-compat/Operator'; +export * from 'rxjs-compat/Operator'; diff --git a/legacy-reexport/OuterSubscriber.ts b/legacy-reexport/OuterSubscriber.ts index 96916ca1d8..9060ae771a 100644 --- a/legacy-reexport/OuterSubscriber.ts +++ b/legacy-reexport/OuterSubscriber.ts @@ -1 +1 @@ -export {OuterSubscriber} from 'rxjs-compat/OuterSubscriber'; +export * from 'rxjs-compat/OuterSubscriber'; diff --git a/legacy-reexport/ReplaySubject.ts b/legacy-reexport/ReplaySubject.ts index ffe5f15340..b66aea96e6 100644 --- a/legacy-reexport/ReplaySubject.ts +++ b/legacy-reexport/ReplaySubject.ts @@ -1 +1 @@ -export {ReplaySubject} from 'rxjs-compat/ReplaySubject'; +export * from 'rxjs-compat/ReplaySubject'; diff --git a/legacy-reexport/Scheduler.ts b/legacy-reexport/Scheduler.ts index be544d5ccd..c21eb1fe59 100644 --- a/legacy-reexport/Scheduler.ts +++ b/legacy-reexport/Scheduler.ts @@ -1 +1 @@ -export {Scheduler} from 'rxjs-compat/Scheduler'; +export * from 'rxjs-compat/Scheduler'; diff --git a/legacy-reexport/Subject.ts b/legacy-reexport/Subject.ts index f1e31794b7..7448233ec9 100644 --- a/legacy-reexport/Subject.ts +++ b/legacy-reexport/Subject.ts @@ -1 +1 @@ -export {Subject} from 'rxjs-compat/Subject'; +export * from 'rxjs-compat/Subject'; diff --git a/legacy-reexport/SubjectSubscription.ts b/legacy-reexport/SubjectSubscription.ts index 035681311e..4f481ced40 100644 --- a/legacy-reexport/SubjectSubscription.ts +++ b/legacy-reexport/SubjectSubscription.ts @@ -1 +1 @@ -export {SubjectSubscription} from 'rxjs-compat/SubjectSubscription'; +export * from 'rxjs-compat/SubjectSubscription'; diff --git a/legacy-reexport/Subscriber.ts b/legacy-reexport/Subscriber.ts index 124bc41f82..15356d5287 100644 --- a/legacy-reexport/Subscriber.ts +++ b/legacy-reexport/Subscriber.ts @@ -1 +1 @@ -export {Subscriber} from 'rxjs-compat/Subscriber'; +export * from 'rxjs-compat/Subscriber'; diff --git a/legacy-reexport/Subscription.ts b/legacy-reexport/Subscription.ts index a24d9b7eac..028cf4c7e9 100644 --- a/legacy-reexport/Subscription.ts +++ b/legacy-reexport/Subscription.ts @@ -1 +1 @@ -export {Subscription} from 'rxjs-compat/Subscription'; +export * from 'rxjs-compat/Subscription'; From fd86df57db1d738953a8f7669a3cb9f1df463600 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Wed, 7 Mar 2018 14:41:26 -0800 Subject: [PATCH 22/39] feat(compat): combatability mode for combineLatest --- compat/operators/combineLatest.ts | 41 ++++++++++++++++++++++ legacy-reexport/operators/combineLatest.ts | 1 + 2 files changed, 42 insertions(+) create mode 100644 compat/operators/combineLatest.ts create mode 100644 legacy-reexport/operators/combineLatest.ts diff --git a/compat/operators/combineLatest.ts b/compat/operators/combineLatest.ts new file mode 100644 index 0000000000..c8839cc956 --- /dev/null +++ b/compat/operators/combineLatest.ts @@ -0,0 +1,41 @@ + +import { isArray } from 'rxjs/util/isArray'; +import { subscribeToResult } from 'rxjs/util/subscribeToResult'; +import { Observable, ObservableInput, Operator, OperatorFunction, from } from 'rxjs'; +import { CombineLatestOperator } from 'rxjs/internal/observable/combineLatest'; + +const none = {}; + +/* tslint:disable:max-line-length */ +export function combineLatest(project: (v1: T) => R): OperatorFunction; +export function combineLatest(v2: ObservableInput, project: (v1: T, v2: T2) => R): OperatorFunction; +export function combineLatest(v2: ObservableInput, v3: ObservableInput, project: (v1: T, v2: T2, v3: T3) => R): OperatorFunction; +export function combineLatest(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, project: (v1: T, v2: T2, v3: T3, v4: T4) => R): OperatorFunction; +export function combineLatest(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, v5: ObservableInput, project: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5) => R): OperatorFunction; +export function combineLatest(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, v5: ObservableInput, v6: ObservableInput, project: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6) => R): OperatorFunction ; +export function combineLatest(v2: ObservableInput): OperatorFunction; +export function combineLatest(v2: ObservableInput, v3: ObservableInput): OperatorFunction; +export function combineLatest(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput): OperatorFunction; +export function combineLatest(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, v5: ObservableInput): OperatorFunction; +export function combineLatest(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, v5: ObservableInput, v6: ObservableInput): OperatorFunction ; +export function combineLatest(...observables: Array | ((...values: Array) => R)>): OperatorFunction; +export function combineLatest(array: ObservableInput[]): OperatorFunction>; +export function combineLatest(array: ObservableInput[], project: (v1: T, ...values: Array) => R): OperatorFunction; +/* tslint:enable:max-line-length */ + +export function combineLatest(...observables: Array | + Array> | + ((...values: Array) => R)>): OperatorFunction { + let project: (...values: Array) => R = null; + if (typeof observables[observables.length - 1] === 'function') { + project = <(...values: Array) => R>observables.pop(); + } + + // if the first and only other argument besides the resultSelector is an array + // assume it's been called with `combineLatest([obs1, obs2, obs3], project)` + if (observables.length === 1 && isArray(observables[0])) { + observables = (observables[0]).slice(); + } + + return (source: Observable) => source.lift.call(from([source, ...observables]), new CombineLatestOperator(project)); +} diff --git a/legacy-reexport/operators/combineLatest.ts b/legacy-reexport/operators/combineLatest.ts new file mode 100644 index 0000000000..cefd4d0756 --- /dev/null +++ b/legacy-reexport/operators/combineLatest.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/combineLatest'; From ce83f6228dfeb8e4cadd32dce4b872843d768bce Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Wed, 7 Mar 2018 16:39:13 -0800 Subject: [PATCH 23/39] chore(compat): add symbol to the compatibility package --- compat/symbol/iterator.ts | 1 + compat/symbol/observable.ts | 1 + compat/symbol/rxSubscriber.ts | 1 + legacy-reexport/symbol/iterator.ts | 1 + legacy-reexport/symbol/observable | 1 + legacy-reexport/symbol/rxSubscriber.ts | 1 + 6 files changed, 6 insertions(+) create mode 100644 compat/symbol/iterator.ts create mode 100644 compat/symbol/observable.ts create mode 100644 compat/symbol/rxSubscriber.ts create mode 100644 legacy-reexport/symbol/iterator.ts create mode 100644 legacy-reexport/symbol/observable create mode 100644 legacy-reexport/symbol/rxSubscriber.ts diff --git a/compat/symbol/iterator.ts b/compat/symbol/iterator.ts new file mode 100644 index 0000000000..092db344a6 --- /dev/null +++ b/compat/symbol/iterator.ts @@ -0,0 +1 @@ +export * from 'rxjs/symbol/iterator'; diff --git a/compat/symbol/observable.ts b/compat/symbol/observable.ts new file mode 100644 index 0000000000..073a7ce679 --- /dev/null +++ b/compat/symbol/observable.ts @@ -0,0 +1 @@ +export * from 'rxjs/symbol/observable'; diff --git a/compat/symbol/rxSubscriber.ts b/compat/symbol/rxSubscriber.ts new file mode 100644 index 0000000000..bae8fa9095 --- /dev/null +++ b/compat/symbol/rxSubscriber.ts @@ -0,0 +1 @@ +export * from 'rxjs/symbol/rxSubscriber'; diff --git a/legacy-reexport/symbol/iterator.ts b/legacy-reexport/symbol/iterator.ts new file mode 100644 index 0000000000..709036080a --- /dev/null +++ b/legacy-reexport/symbol/iterator.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/symbol/iterator'; diff --git a/legacy-reexport/symbol/observable b/legacy-reexport/symbol/observable new file mode 100644 index 0000000000..c5fc191347 --- /dev/null +++ b/legacy-reexport/symbol/observable @@ -0,0 +1 @@ +export * from 'rxjs-compat/symbol/observable'; diff --git a/legacy-reexport/symbol/rxSubscriber.ts b/legacy-reexport/symbol/rxSubscriber.ts new file mode 100644 index 0000000000..cf3866afc1 --- /dev/null +++ b/legacy-reexport/symbol/rxSubscriber.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/symbol/rxSubscriber'; From 9f131d0ddde6cfd74dc96c29c3b96a3840593e00 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Wed, 7 Mar 2018 16:42:38 -0800 Subject: [PATCH 24/39] feat(compat): compatibility mode for zip operator --- compat/operators/zip.ts | 30 ++++++++++++++++++++++++++++++ legacy-reexport/operators/zip.ts | 1 + 2 files changed, 31 insertions(+) create mode 100644 compat/operators/zip.ts create mode 100644 legacy-reexport/operators/zip.ts diff --git a/compat/operators/zip.ts b/compat/operators/zip.ts new file mode 100644 index 0000000000..afe4728b86 --- /dev/null +++ b/compat/operators/zip.ts @@ -0,0 +1,30 @@ +import { Observable, ObservableInput, OperatorFunction, zip as zipStatic } from 'rxjs'; + +/* tslint:disable:max-line-length */ +export function zip(project: (v1: T) => R): OperatorFunction; +export function zip(v2: ObservableInput, project: (v1: T, v2: T2) => R): OperatorFunction; +export function zip(v2: ObservableInput, v3: ObservableInput, project: (v1: T, v2: T2, v3: T3) => R): OperatorFunction; +export function zip(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, project: (v1: T, v2: T2, v3: T3, v4: T4) => R): OperatorFunction; +export function zip(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, v5: ObservableInput, project: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5) => R): OperatorFunction; +export function zip(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, v5: ObservableInput, v6: ObservableInput, project: (v1: T, v2: T2, v3: T3, v4: T4, v5: T5, v6: T6) => R): OperatorFunction ; +export function zip(v2: ObservableInput): OperatorFunction; +export function zip(v2: ObservableInput, v3: ObservableInput): OperatorFunction; +export function zip(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput): OperatorFunction; +export function zip(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, v5: ObservableInput): OperatorFunction; +export function zip(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, v5: ObservableInput, v6: ObservableInput): OperatorFunction ; +export function zip(...observables: Array | ((...values: Array) => R)>): OperatorFunction; +export function zip(array: Array>): OperatorFunction; +export function zip(array: Array>, project: (v1: T, ...values: Array) => R): OperatorFunction; +/* tslint:enable:max-line-length */ + +/** + * @param observables + * @return {Observable} + * @method zip + * @owner Observable + */ +export function zip(...observables: Array | ((...values: Array) => R)>): OperatorFunction { + return function zipOperatorFunction(source: Observable) { + return source.lift.call(zipStatic(source, ...observables)); + }; +} \ No newline at end of file diff --git a/legacy-reexport/operators/zip.ts b/legacy-reexport/operators/zip.ts new file mode 100644 index 0000000000..c75d56f1fe --- /dev/null +++ b/legacy-reexport/operators/zip.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/zip'; From ffce98036606ef59d66949666a069bcd57f9ee06 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Wed, 7 Mar 2018 17:38:25 -0800 Subject: [PATCH 25/39] feat(compat): compatibility mode for merge operator --- compat/operators/merge.ts | 22 ++++++++++++++++++++++ legacy-reexport/operators/merge.ts | 1 + 2 files changed, 23 insertions(+) create mode 100644 compat/operators/merge.ts create mode 100644 legacy-reexport/operators/merge.ts diff --git a/compat/operators/merge.ts b/compat/operators/merge.ts new file mode 100644 index 0000000000..320971d29d --- /dev/null +++ b/compat/operators/merge.ts @@ -0,0 +1,22 @@ +import { merge as mergeStatic, Observable, ObservableInput, OperatorFunction, MonoTypeOperatorFunction, SchedulerLike } from 'rxjs'; + +/* tslint:disable:max-line-length */ +export function merge(scheduler?: SchedulerLike): MonoTypeOperatorFunction; +export function merge(concurrent?: number, scheduler?: SchedulerLike): MonoTypeOperatorFunction; +export function merge(v2: ObservableInput, scheduler?: SchedulerLike): OperatorFunction; +export function merge(v2: ObservableInput, concurrent?: number, scheduler?: SchedulerLike): OperatorFunction; +export function merge(v2: ObservableInput, v3: ObservableInput, scheduler?: SchedulerLike): OperatorFunction; +export function merge(v2: ObservableInput, v3: ObservableInput, concurrent?: number, scheduler?: SchedulerLike): OperatorFunction; +export function merge(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, scheduler?: SchedulerLike): OperatorFunction; +export function merge(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, concurrent?: number, scheduler?: SchedulerLike): OperatorFunction; +export function merge(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, v5: ObservableInput, scheduler?: SchedulerLike): OperatorFunction; +export function merge(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, v5: ObservableInput, concurrent?: number, scheduler?: SchedulerLike): OperatorFunction; +export function merge(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, v5: ObservableInput, v6: ObservableInput, scheduler?: SchedulerLike): OperatorFunction; +export function merge(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, v5: ObservableInput, v6: ObservableInput, concurrent?: number, scheduler?: SchedulerLike): OperatorFunction; +export function merge(...observables: Array | SchedulerLike | number>): MonoTypeOperatorFunction; +export function merge(...observables: Array | SchedulerLike | number>): OperatorFunction; +/* tslint:enable:max-line-length */ + +export function merge(...observables: Array | SchedulerLike | number>): OperatorFunction { + return (source: Observable) => source.lift.call(mergeStatic(source, ...observables)); +} diff --git a/legacy-reexport/operators/merge.ts b/legacy-reexport/operators/merge.ts new file mode 100644 index 0000000000..7d9f674d48 --- /dev/null +++ b/legacy-reexport/operators/merge.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/merge'; \ No newline at end of file From 00e8ba0b6232aa13f50ac6880287084f4de394d5 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Thu, 8 Mar 2018 23:31:20 -0800 Subject: [PATCH 26/39] chore(InnerSubscriber): remove @internal on InnerSubscriber --- .make-packages.js | 10 +++++----- src/internal/InnerSubscriber.ts | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.make-packages.js b/.make-packages.js index ab410c1dda..3692719cb3 100644 --- a/.make-packages.js +++ b/.make-packages.js @@ -18,12 +18,12 @@ try { const ROOT = 'dist/'; -const CJS_ROOT = ROOT + 'cjs/'; -const ESM5_ROOT = ROOT + 'esm5/'; -const ESM2015_ROOT = ROOT + 'esm2015/'; -const UMD_ROOT = ROOT + 'global/'; +const CJS_ROOT = ROOT + 'cjs/dist/src/'; +const ESM5_ROOT = ROOT + 'esm5/dist/src/'; +const ESM2015_ROOT = ROOT + 'esm2015/dist/src/'; +const UMD_ROOT = ROOT + 'global/dist/src/'; const LEGACY_REEXPORT_ROOT = ROOT + "legacy-reexport/legacy-reexport/" -const TYPE_ROOT = ROOT + 'typings/'; +const TYPE_ROOT = ROOT + 'typings/dist/src/'; const PKG_ROOT = ROOT + 'package/'; const CJS_PKG = PKG_ROOT + ''; const ESM5_PKG = PKG_ROOT + '_esm5/'; diff --git a/src/internal/InnerSubscriber.ts b/src/internal/InnerSubscriber.ts index cb16178057..048e9a3761 100644 --- a/src/internal/InnerSubscriber.ts +++ b/src/internal/InnerSubscriber.ts @@ -3,7 +3,6 @@ import { OuterSubscriber } from './OuterSubscriber'; /** * We need this JSDoc comment for affecting ESDoc. - * @internal * @ignore * @extends {Ignored} */ From dea6964fabbd7e12b593ae741bf9a2e4be81b59c Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Thu, 8 Mar 2018 23:32:23 -0800 Subject: [PATCH 27/39] fix(compat): adjustments to get rxjs-compat to build correctly --- .make-packages.js | 8 +- compat/add/observable/defer.ts | 3 +- compat/operators/combineLatest.ts | 4 +- compat/package.json | 5 +- compat/symbol/iterator.ts | 2 +- compat/symbol/observable.ts | 2 +- compat/symbol/rxSubscriber.ts | 2 +- package.json | 2 +- src/internal/Rx.ts | 258 +++++++++++++++--------------- tsconfig.json | 5 +- 10 files changed, 143 insertions(+), 148 deletions(-) diff --git a/.make-packages.js b/.make-packages.js index 3692719cb3..577f895a75 100644 --- a/.make-packages.js +++ b/.make-packages.js @@ -53,14 +53,14 @@ let rootPackageJson = Object.assign({}, pkg, { // functionality requires that the most broad mapping (rxjs/operators) be at // the end of the alias mapping object. Created Webpack issue: // https://github.com/webpack/webpack/issues/5870 -const fileNames = klawSync(CJS_ROOT, { +const fileNames = klawSync(LEGACY_REEXPORT_ROOT, { nodir: true, filter: function(item) { return item.path.endsWith('.js'); } }) .map(item => item.path) -.map(path => path.slice((`${__dirname}/${CJS_ROOT}`).length)) +.map(path => path.slice((`${__dirname}/${LEGACY_REEXPORT_ROOT}`).length)) .sort().reverse(); // Execute build optimizer transforms on ESM5 files @@ -149,7 +149,7 @@ function copySources(rootDir, packageDir, ignoreMissing) { function createImportTargets(importTargets, targetName, targetDirectory) { const importMap = {}; for (const x in importTargets) { - importMap['rxjs/' + x] = 'rxjs/' + targetName + importTargets[x]; + importMap['rxjs/' + x] = ('rxjs-compat/' + targetName + importTargets[x]).replace(/\.js$/, ''); } const outputData = @@ -160,7 +160,7 @@ var path = require('path'); var dir = path.resolve(__dirname); module.exports = function() { - return ${JSON.stringify(importMap, null, 4).replace(/(: )"rxjs\/_esm(5|2015)\/(.+")(,?)/g, "$1path.join(dir, \"$3)$4")}; + return ${JSON.stringify(importMap, null, 4)}; } ` diff --git a/compat/add/observable/defer.ts b/compat/add/observable/defer.ts index 9733c19c56..eb5378ae6f 100644 --- a/compat/add/observable/defer.ts +++ b/compat/add/observable/defer.ts @@ -1,5 +1,4 @@ -import { Observable } from 'rxjs'; -import { defer as staticDefer } from 'rxjs/observable/defer'; +import { Observable, defer as staticDefer } from 'rxjs'; Observable.defer = staticDefer; diff --git a/compat/operators/combineLatest.ts b/compat/operators/combineLatest.ts index c8839cc956..198fcf09f2 100644 --- a/compat/operators/combineLatest.ts +++ b/compat/operators/combineLatest.ts @@ -1,6 +1,6 @@ -import { isArray } from 'rxjs/util/isArray'; -import { subscribeToResult } from 'rxjs/util/subscribeToResult'; +import { isArray } from 'rxjs/internal/util/isArray'; +import { subscribeToResult } from 'rxjs/internal/util/subscribeToResult'; import { Observable, ObservableInput, Operator, OperatorFunction, from } from 'rxjs'; import { CombineLatestOperator } from 'rxjs/internal/observable/combineLatest'; diff --git a/compat/package.json b/compat/package.json index cdc832bdf1..b88e3968a1 100644 --- a/compat/package.json +++ b/compat/package.json @@ -2,8 +2,5 @@ "name": "rxjs-compat", "version": "6.0.0-alpha.3", "main": "./Rx.js", - "typings": "./Rx.d.ts", - "dependencies": { - "rxjs": "^6.0.0-alpha.3" - } + "typings": "./Rx.d.ts" } diff --git a/compat/symbol/iterator.ts b/compat/symbol/iterator.ts index 092db344a6..d13717b3ea 100644 --- a/compat/symbol/iterator.ts +++ b/compat/symbol/iterator.ts @@ -1 +1 @@ -export * from 'rxjs/symbol/iterator'; +export * from 'rxjs/internal/symbol/iterator'; diff --git a/compat/symbol/observable.ts b/compat/symbol/observable.ts index 073a7ce679..1797979dc1 100644 --- a/compat/symbol/observable.ts +++ b/compat/symbol/observable.ts @@ -1 +1 @@ -export * from 'rxjs/symbol/observable'; +export * from 'rxjs/internal/symbol/observable'; diff --git a/compat/symbol/rxSubscriber.ts b/compat/symbol/rxSubscriber.ts index bae8fa9095..98a66a01dd 100644 --- a/compat/symbol/rxSubscriber.ts +++ b/compat/symbol/rxSubscriber.ts @@ -1 +1 @@ -export * from 'rxjs/symbol/rxSubscriber'; +export * from 'rxjs/internal/symbol/rxSubscriber'; diff --git a/package.json b/package.json index 10ebdc28ae..fe7b734d57 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "precommit": "lint-staged", "commitmsg": "validate-commit-msg", "info": "npm-scripts-info", - "build_all": "npm-run-all clean_dist copy_sources build_cjs build_esm5 build_esm2015 build_esm5_for_rollup build_legacy_reexport generate_packages", + "build_all": "npm-run-all clean_dist copy_sources build_cjs build_esm5 build_esm2015 build_esm5_for_rollup build_umd build_legacy_reexport generate_packages", "build_cjs": "npm-run-all clean_dist_cjs compile_dist_cjs", "build_esm5": "npm-run-all clean_dist_esm5 compile_dist_esm5", "build_esm5_for_rollup": "npm-run-all clean_dist_esm5_for_rollup compile_dist_esm5_for_rollup", diff --git a/src/internal/Rx.ts b/src/internal/Rx.ts index c634234d34..beae5d66d0 100644 --- a/src/internal/Rx.ts +++ b/src/internal/Rx.ts @@ -10,139 +10,139 @@ export { config } from './config'; // statics /* tslint:disable:no-use-before-declare */ -import '../add/observable/bindCallback'; -import '../add/observable/bindNodeCallback'; -import '../add/observable/combineLatest'; -import '../add/observable/concat'; -import '../add/observable/defer'; -import '../add/observable/empty'; -import '../add/observable/forkJoin'; -import '../add/observable/from'; -import '../add/observable/fromEvent'; -import '../add/observable/fromEventPattern'; -import '../add/observable/fromPromise'; -import '../add/observable/generate'; -import '../add/observable/if'; -import '../add/observable/interval'; -import '../add/observable/merge'; -import '../add/observable/race'; -import '../add/observable/never'; -import '../add/observable/of'; -import '../add/observable/onErrorResumeNext'; -import '../add/observable/pairs'; -import '../add/observable/range'; -import '../add/observable/using'; -import '../add/observable/throw'; -import '../add/observable/timer'; -import '../add/observable/zip'; +import 'rxjs-compat/add/observable/bindCallback'; +import 'rxjs-compat/add/observable/bindNodeCallback'; +import 'rxjs-compat/add/observable/combineLatest'; +import 'rxjs-compat/add/observable/concat'; +import 'rxjs-compat/add/observable/defer'; +import 'rxjs-compat/add/observable/empty'; +import 'rxjs-compat/add/observable/forkJoin'; +import 'rxjs-compat/add/observable/from'; +import 'rxjs-compat/add/observable/fromEvent'; +import 'rxjs-compat/add/observable/fromEventPattern'; +import 'rxjs-compat/add/observable/fromPromise'; +import 'rxjs-compat/add/observable/generate'; +import 'rxjs-compat/add/observable/if'; +import 'rxjs-compat/add/observable/interval'; +import 'rxjs-compat/add/observable/merge'; +import 'rxjs-compat/add/observable/race'; +import 'rxjs-compat/add/observable/never'; +import 'rxjs-compat/add/observable/of'; +import 'rxjs-compat/add/observable/onErrorResumeNext'; +import 'rxjs-compat/add/observable/pairs'; +import 'rxjs-compat/add/observable/range'; +import 'rxjs-compat/add/observable/using'; +import 'rxjs-compat/add/observable/throw'; +import 'rxjs-compat/add/observable/timer'; +import 'rxjs-compat/add/observable/zip'; //dom -import '../add/observable/dom/ajax'; -import '../add/observable/dom/webSocket'; +import 'rxjs-compat/add/observable/dom/ajax'; +import 'rxjs-compat/add/observable/dom/webSocket'; //internal/operators -import '../add/operator/buffer'; -import '../add/operator/bufferCount'; -import '../add/operator/bufferTime'; -import '../add/operator/bufferToggle'; -import '../add/operator/bufferWhen'; -import '../add/operator/catch'; -import '../add/operator/combineAll'; -import '../add/operator/combineLatest'; -import '../add/operator/concat'; -import '../add/operator/concatAll'; -import '../add/operator/concatMap'; -import '../add/operator/concatMapTo'; -import '../add/operator/count'; -import '../add/operator/dematerialize'; -import '../add/operator/debounce'; -import '../add/operator/debounceTime'; -import '../add/operator/defaultIfEmpty'; -import '../add/operator/delay'; -import '../add/operator/delayWhen'; -import '../add/operator/distinct'; -import '../add/operator/distinctUntilChanged'; -import '../add/operator/distinctUntilKeyChanged'; -import '../add/operator/do'; -import '../add/operator/exhaust'; -import '../add/operator/exhaustMap'; -import '../add/operator/expand'; -import '../add/operator/elementAt'; -import '../add/operator/filter'; -import '../add/operator/finally'; -import '../add/operator/find'; -import '../add/operator/findIndex'; -import '../add/operator/first'; -import '../add/operator/groupBy'; -import '../add/operator/ignoreElements'; -import '../add/operator/isEmpty'; -import '../add/operator/audit'; -import '../add/operator/auditTime'; -import '../add/operator/last'; -import '../add/operator/let'; -import '../add/operator/every'; -import '../add/operator/map'; -import '../add/operator/mapTo'; -import '../add/operator/materialize'; -import '../add/operator/max'; -import '../add/operator/merge'; -import '../add/operator/mergeAll'; -import '../add/operator/mergeMap'; -import '../add/operator/mergeMapTo'; -import '../add/operator/mergeScan'; -import '../add/operator/min'; -import '../add/operator/multicast'; -import '../add/operator/observeOn'; -import '../add/operator/onErrorResumeNext'; -import '../add/operator/pairwise'; -import '../add/operator/partition'; -import '../add/operator/pluck'; -import '../add/operator/publish'; -import '../add/operator/publishBehavior'; -import '../add/operator/publishReplay'; -import '../add/operator/publishLast'; -import '../add/operator/race'; -import '../add/operator/reduce'; -import '../add/operator/repeat'; -import '../add/operator/repeatWhen'; -import '../add/operator/retry'; -import '../add/operator/retryWhen'; -import '../add/operator/sample'; -import '../add/operator/sampleTime'; -import '../add/operator/scan'; -import '../add/operator/sequenceEqual'; -import '../add/operator/share'; -import '../add/operator/shareReplay'; -import '../add/operator/single'; -import '../add/operator/skip'; -import '../add/operator/skipLast'; -import '../add/operator/skipUntil'; -import '../add/operator/skipWhile'; -import '../add/operator/startWith'; -import '../add/operator/subscribeOn'; -import '../add/operator/switch'; -import '../add/operator/switchMap'; -import '../add/operator/switchMapTo'; -import '../add/operator/take'; -import '../add/operator/takeLast'; -import '../add/operator/takeUntil'; -import '../add/operator/takeWhile'; -import '../add/operator/throttle'; -import '../add/operator/throttleTime'; -import '../add/operator/timeInterval'; -import '../add/operator/timeout'; -import '../add/operator/timeoutWith'; -import '../add/operator/timestamp'; -import '../add/operator/toArray'; -import '../add/operator/toPromise'; -import '../add/operator/window'; -import '../add/operator/windowCount'; -import '../add/operator/windowTime'; -import '../add/operator/windowToggle'; -import '../add/operator/windowWhen'; -import '../add/operator/withLatestFrom'; -import '../add/operator/zip'; -import '../add/operator/zipAll'; +import 'rxjs-compat/add/operator/buffer'; +import 'rxjs-compat/add/operator/bufferCount'; +import 'rxjs-compat/add/operator/bufferTime'; +import 'rxjs-compat/add/operator/bufferToggle'; +import 'rxjs-compat/add/operator/bufferWhen'; +import 'rxjs-compat/add/operator/catch'; +import 'rxjs-compat/add/operator/combineAll'; +import 'rxjs-compat/add/operator/combineLatest'; +import 'rxjs-compat/add/operator/concat'; +import 'rxjs-compat/add/operator/concatAll'; +import 'rxjs-compat/add/operator/concatMap'; +import 'rxjs-compat/add/operator/concatMapTo'; +import 'rxjs-compat/add/operator/count'; +import 'rxjs-compat/add/operator/dematerialize'; +import 'rxjs-compat/add/operator/debounce'; +import 'rxjs-compat/add/operator/debounceTime'; +import 'rxjs-compat/add/operator/defaultIfEmpty'; +import 'rxjs-compat/add/operator/delay'; +import 'rxjs-compat/add/operator/delayWhen'; +import 'rxjs-compat/add/operator/distinct'; +import 'rxjs-compat/add/operator/distinctUntilChanged'; +import 'rxjs-compat/add/operator/distinctUntilKeyChanged'; +import 'rxjs-compat/add/operator/do'; +import 'rxjs-compat/add/operator/exhaust'; +import 'rxjs-compat/add/operator/exhaustMap'; +import 'rxjs-compat/add/operator/expand'; +import 'rxjs-compat/add/operator/elementAt'; +import 'rxjs-compat/add/operator/filter'; +import 'rxjs-compat/add/operator/finally'; +import 'rxjs-compat/add/operator/find'; +import 'rxjs-compat/add/operator/findIndex'; +import 'rxjs-compat/add/operator/first'; +import 'rxjs-compat/add/operator/groupBy'; +import 'rxjs-compat/add/operator/ignoreElements'; +import 'rxjs-compat/add/operator/isEmpty'; +import 'rxjs-compat/add/operator/audit'; +import 'rxjs-compat/add/operator/auditTime'; +import 'rxjs-compat/add/operator/last'; +import 'rxjs-compat/add/operator/let'; +import 'rxjs-compat/add/operator/every'; +import 'rxjs-compat/add/operator/map'; +import 'rxjs-compat/add/operator/mapTo'; +import 'rxjs-compat/add/operator/materialize'; +import 'rxjs-compat/add/operator/max'; +import 'rxjs-compat/add/operator/merge'; +import 'rxjs-compat/add/operator/mergeAll'; +import 'rxjs-compat/add/operator/mergeMap'; +import 'rxjs-compat/add/operator/mergeMapTo'; +import 'rxjs-compat/add/operator/mergeScan'; +import 'rxjs-compat/add/operator/min'; +import 'rxjs-compat/add/operator/multicast'; +import 'rxjs-compat/add/operator/observeOn'; +import 'rxjs-compat/add/operator/onErrorResumeNext'; +import 'rxjs-compat/add/operator/pairwise'; +import 'rxjs-compat/add/operator/partition'; +import 'rxjs-compat/add/operator/pluck'; +import 'rxjs-compat/add/operator/publish'; +import 'rxjs-compat/add/operator/publishBehavior'; +import 'rxjs-compat/add/operator/publishReplay'; +import 'rxjs-compat/add/operator/publishLast'; +import 'rxjs-compat/add/operator/race'; +import 'rxjs-compat/add/operator/reduce'; +import 'rxjs-compat/add/operator/repeat'; +import 'rxjs-compat/add/operator/repeatWhen'; +import 'rxjs-compat/add/operator/retry'; +import 'rxjs-compat/add/operator/retryWhen'; +import 'rxjs-compat/add/operator/sample'; +import 'rxjs-compat/add/operator/sampleTime'; +import 'rxjs-compat/add/operator/scan'; +import 'rxjs-compat/add/operator/sequenceEqual'; +import 'rxjs-compat/add/operator/share'; +import 'rxjs-compat/add/operator/shareReplay'; +import 'rxjs-compat/add/operator/single'; +import 'rxjs-compat/add/operator/skip'; +import 'rxjs-compat/add/operator/skipLast'; +import 'rxjs-compat/add/operator/skipUntil'; +import 'rxjs-compat/add/operator/skipWhile'; +import 'rxjs-compat/add/operator/startWith'; +import 'rxjs-compat/add/operator/subscribeOn'; +import 'rxjs-compat/add/operator/switch'; +import 'rxjs-compat/add/operator/switchMap'; +import 'rxjs-compat/add/operator/switchMapTo'; +import 'rxjs-compat/add/operator/take'; +import 'rxjs-compat/add/operator/takeLast'; +import 'rxjs-compat/add/operator/takeUntil'; +import 'rxjs-compat/add/operator/takeWhile'; +import 'rxjs-compat/add/operator/throttle'; +import 'rxjs-compat/add/operator/throttleTime'; +import 'rxjs-compat/add/operator/timeInterval'; +import 'rxjs-compat/add/operator/timeout'; +import 'rxjs-compat/add/operator/timeoutWith'; +import 'rxjs-compat/add/operator/timestamp'; +import 'rxjs-compat/add/operator/toArray'; +import 'rxjs-compat/add/operator/toPromise'; +import 'rxjs-compat/add/operator/window'; +import 'rxjs-compat/add/operator/windowCount'; +import 'rxjs-compat/add/operator/windowTime'; +import 'rxjs-compat/add/operator/windowToggle'; +import 'rxjs-compat/add/operator/windowWhen'; +import 'rxjs-compat/add/operator/withLatestFrom'; +import 'rxjs-compat/add/operator/zip'; +import 'rxjs-compat/add/operator/zipAll'; /* tslint:disable:no-unused-variable */ export {Operator} from './Operator'; diff --git a/tsconfig.json b/tsconfig.json index 2a919c001d..955087bddc 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -21,12 +21,11 @@ "es2015.symbol.wellknown", "dom" ], - "rootDir": ".", "baseUrl": ".", "paths": { - "rxjs": ["./src"], + "rxjs": ["./src/index"], "rxjs/*": ["./src/*"], - "rxjs-compat": ["./compat"], + "rxjs-compat": ["./compat/index"], "rxjs-compat/*": ["./compat/*"] } }, From 7255440db5166c61746da47dfa742f1693a2ffbe Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Tue, 13 Mar 2018 15:07:10 -0700 Subject: [PATCH 28/39] refactor(compat): adjust tsconfig files and build output for compatability --- .make-packages.js | 12 +++++----- compat/Rx.ts | 25 ++++++-------------- package.json | 10 +++----- spec/support/coverage.opts | 1 + tsconfig.base.json | 32 ++++++++++++++++++++++++++ tsconfig.json | 29 +---------------------- tsconfig/compat/tsconfig.base.json | 9 ++++++-- tsconfig/tsconfig.base.json | 5 ++-- tsconfig/tsconfig.legacy-reexport.json | 17 +++++++++----- 9 files changed, 71 insertions(+), 69 deletions(-) create mode 100644 tsconfig.base.json diff --git a/.make-packages.js b/.make-packages.js index 577f895a75..6ac13004c1 100644 --- a/.make-packages.js +++ b/.make-packages.js @@ -18,12 +18,12 @@ try { const ROOT = 'dist/'; -const CJS_ROOT = ROOT + 'cjs/dist/src/'; -const ESM5_ROOT = ROOT + 'esm5/dist/src/'; -const ESM2015_ROOT = ROOT + 'esm2015/dist/src/'; -const UMD_ROOT = ROOT + 'global/dist/src/'; +const CJS_ROOT = ROOT + 'cjs/'; +const ESM5_ROOT = ROOT + 'esm5/'; +const ESM2015_ROOT = ROOT + 'esm2015/'; +const UMD_ROOT = ROOT + 'global/'; const LEGACY_REEXPORT_ROOT = ROOT + "legacy-reexport/legacy-reexport/" -const TYPE_ROOT = ROOT + 'typings/dist/src/'; +const TYPE_ROOT = ROOT + 'typings/'; const PKG_ROOT = ROOT + 'package/'; const CJS_PKG = PKG_ROOT + ''; const ESM5_PKG = PKG_ROOT + '_esm5/'; @@ -103,7 +103,7 @@ copySources(ESM5_ROOT, ESM5_PKG, true); copySources(ESM2015_ROOT, ESM2015_PKG, true); // Copy over tsconfig.json for bazel build support -fs.copySync('./tsconfig.json', PKG_ROOT + 'src/tsconfig.json'); +fs.copySync('./tsconfig.base.json', PKG_ROOT + 'src/tsconfig.json'); fs.writeJsonSync(PKG_ROOT + 'package.json', rootPackageJson, {spaces: 2}); fs.copySync('src/operators/package.json', PKG_ROOT + '/operators/package.json'); diff --git a/compat/Rx.ts b/compat/Rx.ts index 14289a9c4d..6ab3b0a807 100644 --- a/compat/Rx.ts +++ b/compat/Rx.ts @@ -157,21 +157,10 @@ export { export {TestScheduler} from 'rxjs/testing'; -export { Operator } from 'rxjs/internal/Operator'; -export { Subscriber } from 'rxjs/internal/Subscriber'; -export { AsyncSubject } from 'rxjs/internal/AsyncSubject'; -export { ConnectableObservable } from 'rxjs/internal/observable/ConnectableObservable'; -export { TimeoutError } from 'rxjs/internal/util/TimeoutError'; -export { TimeInterval } from 'rxjs/internal/patching/operator/timeInterval'; -export { Timestamp } from 'rxjs/internal/operators/timestamp'; -export { VirtualTimeScheduler } from 'rxjs/internal/scheduler/VirtualTimeScheduler'; -export { AjaxRequest, AjaxResponse, AjaxError, AjaxTimeoutError } from 'rxjs/internal/observable/dom/AjaxObservable'; -import { AsapScheduler } from 'rxjs/internal/scheduler/AsapScheduler'; -import { AsyncScheduler } from 'rxjs/internal/scheduler/AsyncScheduler'; -import { QueueScheduler } from 'rxjs/internal/scheduler/QueueScheduler'; -import { AnimationFrameScheduler } from 'rxjs/internal/scheduler/AnimationFrameScheduler'; +export { Operator, Subscriber, AsyncSubject, ConnectableObservable, TimeoutError, TimeInterval, Timestamp, VirtualTimeScheduler } from 'rxjs'; +export { AjaxRequest, AjaxResponse, AjaxError, AjaxTimeoutError } from 'rxjs/ajax'; -import { asapScheduler, asyncScheduler, queueScheduler, animationFrameScheduler } from 'rxjs'; +import { asapScheduler, asyncScheduler, queueScheduler, animationFrameScheduler, SchedulerLike } from 'rxjs'; import { rxSubscriber } from 'rxjs/internal/symbol/rxSubscriber'; import { iterator } from 'rxjs/internal/symbol/iterator'; @@ -197,10 +186,10 @@ export const operators = _operators; * Use this for synchronizing with the platform's painting */ let Scheduler = { - asap: asapScheduler, - queue: queueScheduler, - animationFrame: animationFrameScheduler, - async: asyncScheduler + asap: asapScheduler as SchedulerLike, + queue: queueScheduler as SchedulerLike, + animationFrame: animationFrameScheduler as SchedulerLike, + async: asyncScheduler as SchedulerLike }; /** diff --git a/package.json b/package.json index fe7b734d57..c969ffa053 100644 --- a/package.json +++ b/package.json @@ -75,10 +75,10 @@ "precommit": "lint-staged", "commitmsg": "validate-commit-msg", "info": "npm-scripts-info", - "build_all": "npm-run-all clean_dist copy_sources build_cjs build_esm5 build_esm2015 build_esm5_for_rollup build_umd build_legacy_reexport generate_packages", + "build_all": "npm-run-all compat_build_all clean_dist copy_sources build_cjs build_esm5 build_esm2015 build_esm5_for_rollup build_umd build_legacy_reexport generate_packages", "build_cjs": "npm-run-all clean_dist_cjs compile_dist_cjs", "build_esm5": "npm-run-all clean_dist_esm5 compile_dist_esm5", - "build_esm5_for_rollup": "npm-run-all clean_dist_esm5_for_rollup compile_dist_esm5_for_rollup", + "build_esm5_for_rollup": "npm-run-all clean_dist_esm5_for_rollup compile_dist_esm5_for_rollup && mkdirp dist/esm5_for_rollup/node_modules && shx cp -r ./dist-compat/package ./dist/esm5_for_rollup/node_modules/rxjs-compat", "build_esm2015": "npm-run-all clean_dist_esm2015 compile_dist_esm2015", "build_esm2015_for_docs": "npm-run-all clean_dist_esm2015 compile_dist_esm2015_for_docs", "build_legacy_reexport": "npm-run-all compile_legacy_reexport", @@ -114,27 +114,23 @@ "prepublish": "shx rm -rf ./typings && npm run build_all", "publish_docs": "./publish_docs.sh", "test_browser": "npm-run-all build_spec_browser && opn spec/support/mocha-browser-runner.html", - "test": "cross-env TS_NODE_FAST=true mocha --compilers ts:ts-node/register --opts spec/support/coverage.opts \"spec/**/*-spec.ts\"", + "test": "cross-env TS_NODE_FAST=true cross-env NODE_PATH=./dist-compat/package mocha --require ts-node/register --opts spec/support/coverage.opts \"spec/**/*-spec.ts\"", "test:cover": "cross-env TS_NODE_FAST=true nyc npm test", "test:circular": "dependency-cruise --validate .dependency-cruiser.json -x \"^node_modules\" src", "test:systemjs": "node integration/systemjs/systemjs-compatibility-spec.js", "tests2png": "mkdirp tmp/docs/img && cross-env TS_NODE_FAST=true mocha --compilers ts:ts-node/register --opts spec/support/tests2png.opts \"spec/**/*-spec.ts\"", "watch": "watch \"echo triggering build && npm run test && echo build completed\" src -d -u -w=15", - "compat_build_all": "npm-run-all compat_clean_dist compat_build_cjs compat_build_esm5 compat_build_esm2015 compat_generate_packages", "compat_build_cjs": "npm-run-all compat_clean_dist_cjs compat_compile_dist_cjs", "compat_build_esm5": "npm-run-all compat_clean_dist_esm5 compat_compile_dist_esm5", "compat_build_esm2015": "npm-run-all compat_clean_dist_esm2015 compat_compile_dist_esm2015", - "compat_clean_dist": "shx rm -rf ./dist-compat", "compat_clean_dist_cjs": "shx rm -rf ./dist-compat/cjs", "compat_clean_dist_esm5": "shx rm -rf ./dist-compat/esm5", "compat_clean_dist_esm2015": "shx rm -rf ./dist-compat/esm2015", - "compat_compile_dist_cjs": "tsc -p ./tsconfig/compat/tsconfig.cjs.json", "compat_compile_dist_esm5": "tsc -p ./tsconfig/compat/tsconfig.esm5.json", "compat_compile_dist_esm2015": "tsc -p ./tsconfig/compat/tsconfig.esm2015.json", - "compat_copy_sources": "mkdirp dist-compat && shx cp -r ./compat/ ./dist-compat/", "compat_generate_packages": "node .make-compat-package.js" }, diff --git a/spec/support/coverage.opts b/spec/support/coverage.opts index 2c874036c1..e29f500896 100644 --- a/spec/support/coverage.opts +++ b/spec/support/coverage.opts @@ -1,3 +1,4 @@ +--require ts-node/register --require spec/helpers/polyfills.ts --require spec/helpers/testScheduler-ui.ts --ui spec/helpers/testScheduler-ui.ts diff --git a/tsconfig.base.json b/tsconfig.base.json new file mode 100644 index 0000000000..992c41c3eb --- /dev/null +++ b/tsconfig.base.json @@ -0,0 +1,32 @@ +{ + "compilerOptions": { + "removeComments": false, + "preserveConstEnums": true, + "sourceMap": true, + "strictFunctionTypes": true, + "noImplicitAny": true, + "noImplicitReturns": true, + "noImplicitThis": true, + "suppressImplicitAnyIndexErrors": true, + "moduleResolution": "classic", // we intentionally use "classic" module resolution to be SystemJS-compatible after transpilation + "stripInternal": false, + "target": "es5", + "outDir": "./.out", + "lib": [ + "es5", + "es2015.iterable", + "es2015.collection", + "es2015.promise", + "es2015.symbol", + "es2015.symbol.wellknown", + "dom" + ] + }, + "formatCodeOptions": { + "indentSize": 2, + "tabSize": 2 + }, + "bazelOptions": { + "suppressTsconfigOverrideWarnings": true + } +} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 955087bddc..6baca8dd7f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,26 +1,6 @@ { + "extends": "./tsconfig.base.json", "compilerOptions": { - "removeComments": false, - "preserveConstEnums": true, - "sourceMap": true, - "strictFunctionTypes": true, - "noImplicitAny": true, - "noImplicitReturns": true, - "noImplicitThis": true, - "suppressImplicitAnyIndexErrors": true, - "moduleResolution": "classic", // we intentionally use "classic" module resolution to be SystemJS-compatible after transpilation - "stripInternal": false, - "target": "es5", - "outDir": "./.out", - "lib": [ - "es5", - "es2015.iterable", - "es2015.collection", - "es2015.promise", - "es2015.symbol", - "es2015.symbol.wellknown", - "dom" - ], "baseUrl": ".", "paths": { "rxjs": ["./src/index"], @@ -28,12 +8,5 @@ "rxjs-compat": ["./compat/index"], "rxjs-compat/*": ["./compat/*"] } - }, - "formatCodeOptions": { - "indentSize": 2, - "tabSize": 2 - }, - "bazelOptions": { - "suppressTsconfigOverrideWarnings": true } } \ No newline at end of file diff --git a/tsconfig/compat/tsconfig.base.json b/tsconfig/compat/tsconfig.base.json index deaf02d6dd..a56c6ba779 100644 --- a/tsconfig/compat/tsconfig.base.json +++ b/tsconfig/compat/tsconfig.base.json @@ -1,7 +1,12 @@ { - "extends": "../../tsconfig.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "noEmit": false + "noEmit": false, + "baseUrl": "../../compat", + "paths": { + "rxjs": ["../src/index"], + "rxjs/*": ["../src/*"] + } }, "include": [ "../../compat/**/*.ts" diff --git a/tsconfig/tsconfig.base.json b/tsconfig/tsconfig.base.json index 2c6ab234f8..f010fda441 100644 --- a/tsconfig/tsconfig.base.json +++ b/tsconfig/tsconfig.base.json @@ -1,7 +1,8 @@ { - "extends": "../tsconfig.json", + "extends": "../tsconfig.base.json", "compilerOptions": { - "noEmit": false + "noEmit": false, + "baseUrl": "../src" }, "files": [ // entry-points diff --git a/tsconfig/tsconfig.legacy-reexport.json b/tsconfig/tsconfig.legacy-reexport.json index 2913fda21d..d73350980a 100644 --- a/tsconfig/tsconfig.legacy-reexport.json +++ b/tsconfig/tsconfig.legacy-reexport.json @@ -1,16 +1,21 @@ { - "extends": "./tsconfig.base.json", + "extends": "../tsconfig.base.json", "compilerOptions": { "module": "commonjs", "target": "es5", "declaration": true, - "outDir": "../dist/legacy-reexport" + "noEmit": false, + "outDir": "../dist/legacy-reexport", + "rootDir": "../legacy-reexport", + "baseUrl": "../legacy-reexport", + "paths": { + "rxjs": ["../dist/typings/index"], + "rxjs/*": ["../dist/typings/*"], + "rxjs-compat": ["../dist-compat/typings/compat/Rx"], + "rxjs-compat/*": ["../dist-compat/typings/compat/*"] + } }, "include": [ "../legacy-reexport" - ], - "exclude": [ - "../src", - "../compat" ] } From 7c16f3ae7055a6098f33a61ecbad882633326b9a Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Tue, 13 Mar 2018 18:14:22 -0700 Subject: [PATCH 29/39] build(compat): scope build artifacts correctly & generate full npm dist including globals --- .make-packages.js | 2 +- compat/add/operator/audit.ts | 2 +- compat/add/operator/auditTime.ts | 2 +- compat/add/operator/buffer.ts | 2 +- compat/add/operator/bufferCount.ts | 2 +- compat/add/operator/bufferTime.ts | 2 +- compat/add/operator/bufferToggle.ts | 2 +- compat/add/operator/bufferWhen.ts | 2 +- compat/add/operator/catch.ts | 2 +- compat/add/operator/combineAll.ts | 2 +- compat/add/operator/combineLatest.ts | 2 +- compat/add/operator/concat.ts | 2 +- compat/add/operator/concatAll.ts | 2 +- compat/add/operator/concatMap.ts | 2 +- compat/add/operator/concatMapTo.ts | 2 +- compat/add/operator/count.ts | 2 +- compat/add/operator/debounce.ts | 2 +- compat/add/operator/debounceTime.ts | 2 +- compat/add/operator/defaultIfEmpty.ts | 2 +- compat/add/operator/delay.ts | 2 +- compat/add/operator/delayWhen.ts | 2 +- compat/add/operator/dematerialize.ts | 2 +- compat/add/operator/distinct.ts | 2 +- compat/add/operator/distinctUntilChanged.ts | 2 +- .../add/operator/distinctUntilKeyChanged.ts | 2 +- compat/add/operator/do.ts | 2 +- compat/add/operator/elementAt.ts | 2 +- compat/add/operator/every.ts | 2 +- compat/add/operator/exhaust.ts | 2 +- compat/add/operator/exhaustMap.ts | 2 +- compat/add/operator/expand.ts | 2 +- compat/add/operator/filter.ts | 2 +- compat/add/operator/finally.ts | 2 +- compat/add/operator/find.ts | 2 +- compat/add/operator/findIndex.ts | 2 +- compat/add/operator/first.ts | 2 +- compat/add/operator/groupBy.ts | 2 +- compat/add/operator/ignoreElements.ts | 2 +- compat/add/operator/isEmpty.ts | 2 +- compat/add/operator/last.ts | 2 +- compat/add/operator/let.ts | 2 +- compat/add/operator/map.ts | 2 +- compat/add/operator/mapTo.ts | 2 +- compat/add/operator/materialize.ts | 2 +- compat/add/operator/max.ts | 2 +- compat/add/operator/merge.ts | 2 +- compat/add/operator/mergeAll.ts | 2 +- compat/add/operator/mergeMap.ts | 2 +- compat/add/operator/mergeMapTo.ts | 2 +- compat/add/operator/mergeScan.ts | 2 +- compat/add/operator/min.ts | 2 +- compat/add/operator/multicast.ts | 2 +- compat/add/operator/observeOn.ts | 2 +- compat/add/operator/onErrorResumeNext.ts | 2 +- compat/add/operator/pairwise.ts | 2 +- compat/add/operator/partition.ts | 2 +- compat/add/operator/pluck.ts | 2 +- compat/add/operator/publish.ts | 2 +- compat/add/operator/publishBehavior.ts | 2 +- compat/add/operator/publishLast.ts | 2 +- compat/add/operator/publishReplay.ts | 2 +- compat/add/operator/race.ts | 2 +- compat/add/operator/reduce.ts | 2 +- compat/add/operator/repeat.ts | 2 +- compat/add/operator/repeatWhen.ts | 2 +- compat/add/operator/retry.ts | 2 +- compat/add/operator/retryWhen.ts | 2 +- compat/add/operator/sample.ts | 2 +- compat/add/operator/sampleTime.ts | 2 +- compat/add/operator/scan.ts | 2 +- compat/add/operator/sequenceEqual.ts | 2 +- compat/add/operator/share.ts | 2 +- compat/add/operator/shareReplay.ts | 2 +- compat/add/operator/single.ts | 2 +- compat/add/operator/skip.ts | 2 +- compat/add/operator/skipLast.ts | 2 +- compat/add/operator/skipUntil.ts | 2 +- compat/add/operator/skipWhile.ts | 2 +- compat/add/operator/startWith.ts | 2 +- compat/add/operator/subscribeOn.ts | 2 +- compat/add/operator/switch.ts | 2 +- compat/add/operator/switchMap.ts | 2 +- compat/add/operator/switchMapTo.ts | 2 +- compat/add/operator/take.ts | 2 +- compat/add/operator/takeLast.ts | 2 +- compat/add/operator/takeUntil.ts | 2 +- compat/add/operator/takeWhile.ts | 2 +- compat/add/operator/throttle.ts | 2 +- compat/add/operator/throttleTime.ts | 2 +- compat/add/operator/timeInterval.ts | 2 +- compat/add/operator/timeout.ts | 2 +- compat/add/operator/timeoutWith.ts | 2 +- compat/add/operator/timestamp.ts | 2 +- compat/add/operator/toArray.ts | 2 +- compat/add/operator/window.ts | 2 +- compat/add/operator/windowCount.ts | 2 +- compat/add/operator/windowTime.ts | 2 +- compat/add/operator/windowToggle.ts | 2 +- compat/add/operator/windowWhen.ts | 2 +- compat/add/operator/withLatestFrom.ts | 2 +- compat/add/operator/zip.ts | 2 +- compat/add/operator/zipAll.ts | 2 +- src/internal-compatibility/index.ts | 105 ++++++++++++++++++ src/internal-compatibility/package.json | 8 ++ tsconfig.json | 1 + tsconfig/compat/tsconfig.base.json | 7 +- tsconfig/tsconfig.base.json | 8 +- tsconfig/tsconfig.legacy-reexport.json | 5 + 108 files changed, 229 insertions(+), 109 deletions(-) create mode 100644 src/internal-compatibility/index.ts create mode 100644 src/internal-compatibility/package.json diff --git a/.make-packages.js b/.make-packages.js index 6ac13004c1..826ab62dc2 100644 --- a/.make-packages.js +++ b/.make-packages.js @@ -22,7 +22,7 @@ const CJS_ROOT = ROOT + 'cjs/'; const ESM5_ROOT = ROOT + 'esm5/'; const ESM2015_ROOT = ROOT + 'esm2015/'; const UMD_ROOT = ROOT + 'global/'; -const LEGACY_REEXPORT_ROOT = ROOT + "legacy-reexport/legacy-reexport/" +const LEGACY_REEXPORT_ROOT = ROOT + "legacy-reexport/" const TYPE_ROOT = ROOT + 'typings/'; const PKG_ROOT = ROOT + 'package/'; const CJS_PKG = PKG_ROOT + ''; diff --git a/compat/add/operator/audit.ts b/compat/add/operator/audit.ts index 8a0af6e3c2..b34893bff8 100644 --- a/compat/add/operator/audit.ts +++ b/compat/add/operator/audit.ts @@ -1,5 +1,5 @@ import { Observable } from 'rxjs'; -import { audit } from 'rxjs/internal/patching/operator/audit'; +import { audit } from 'rxjs/internal-compatibility'; (Observable as any).prototype.audit = audit; diff --git a/compat/add/operator/auditTime.ts b/compat/add/operator/auditTime.ts index 4db1bb6567..e1f476ced4 100644 --- a/compat/add/operator/auditTime.ts +++ b/compat/add/operator/auditTime.ts @@ -1,5 +1,5 @@ import { Observable } from 'rxjs'; -import { auditTime } from 'rxjs/internal/patching/operator/auditTime'; +import { auditTime } from 'rxjs/internal-compatibility'; (Observable as any).prototype.auditTime = auditTime; diff --git a/compat/add/operator/buffer.ts b/compat/add/operator/buffer.ts index 9586f7b4b4..e9ab2428a7 100644 --- a/compat/add/operator/buffer.ts +++ b/compat/add/operator/buffer.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { buffer } from 'rxjs/internal/patching/operator/buffer'; +import { buffer } from 'rxjs/internal-compatibility'; (Observable as any).prototype.buffer = buffer; diff --git a/compat/add/operator/bufferCount.ts b/compat/add/operator/bufferCount.ts index b53e7d16c0..b3e8177da2 100644 --- a/compat/add/operator/bufferCount.ts +++ b/compat/add/operator/bufferCount.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { bufferCount } from 'rxjs/internal/patching/operator/bufferCount'; +import { bufferCount } from 'rxjs/internal-compatibility'; (Observable as any).prototype.bufferCount = bufferCount; diff --git a/compat/add/operator/bufferTime.ts b/compat/add/operator/bufferTime.ts index f464096566..f6915ba438 100644 --- a/compat/add/operator/bufferTime.ts +++ b/compat/add/operator/bufferTime.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { bufferTime } from 'rxjs/internal/patching/operator/bufferTime'; +import { bufferTime } from 'rxjs/internal-compatibility'; (Observable as any).prototype.bufferTime = bufferTime; diff --git a/compat/add/operator/bufferToggle.ts b/compat/add/operator/bufferToggle.ts index 373f9a077f..87b740e69b 100644 --- a/compat/add/operator/bufferToggle.ts +++ b/compat/add/operator/bufferToggle.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { bufferToggle } from 'rxjs/internal/patching/operator/bufferToggle'; +import { bufferToggle } from 'rxjs/internal-compatibility'; (Observable as any).prototype.bufferToggle = bufferToggle; diff --git a/compat/add/operator/bufferWhen.ts b/compat/add/operator/bufferWhen.ts index f36a9dff1f..e2e700df83 100644 --- a/compat/add/operator/bufferWhen.ts +++ b/compat/add/operator/bufferWhen.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { bufferWhen } from 'rxjs/internal/patching/operator/bufferWhen'; +import { bufferWhen } from 'rxjs/internal-compatibility'; (Observable as any).prototype.bufferWhen = bufferWhen; diff --git a/compat/add/operator/catch.ts b/compat/add/operator/catch.ts index 880daaf467..d57f08a7c1 100644 --- a/compat/add/operator/catch.ts +++ b/compat/add/operator/catch.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { _catch } from 'rxjs/internal/patching/operator/catch'; +import { _catch } from 'rxjs/internal-compatibility'; (Observable as any).prototype.catch = _catch; (Observable as any).prototype._catch = _catch; diff --git a/compat/add/operator/combineAll.ts b/compat/add/operator/combineAll.ts index 773dea083e..273b8df2f0 100644 --- a/compat/add/operator/combineAll.ts +++ b/compat/add/operator/combineAll.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { combineAll } from 'rxjs/internal/patching/operator/combineAll'; +import { combineAll } from 'rxjs/internal-compatibility'; (Observable as any).prototype.combineAll = combineAll; diff --git a/compat/add/operator/combineLatest.ts b/compat/add/operator/combineLatest.ts index 3ca8de56d1..25e08c45a4 100644 --- a/compat/add/operator/combineLatest.ts +++ b/compat/add/operator/combineLatest.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { combineLatest } from 'rxjs/internal/patching/operator/combineLatest'; +import { combineLatest } from 'rxjs/internal-compatibility'; (Observable as any).prototype.combineLatest = combineLatest; diff --git a/compat/add/operator/concat.ts b/compat/add/operator/concat.ts index a1aa396d5d..4dab93edc0 100644 --- a/compat/add/operator/concat.ts +++ b/compat/add/operator/concat.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { concat } from 'rxjs/internal/patching/operator/concat'; +import { concat } from 'rxjs/internal-compatibility'; (Observable as any).prototype.concat = concat; diff --git a/compat/add/operator/concatAll.ts b/compat/add/operator/concatAll.ts index 92b49659be..930c210b6d 100644 --- a/compat/add/operator/concatAll.ts +++ b/compat/add/operator/concatAll.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { concatAll } from 'rxjs/internal/patching/operator/concatAll'; +import { concatAll } from 'rxjs/internal-compatibility'; (Observable as any).prototype.concatAll = concatAll; diff --git a/compat/add/operator/concatMap.ts b/compat/add/operator/concatMap.ts index d284111e94..0f8caaaa7e 100644 --- a/compat/add/operator/concatMap.ts +++ b/compat/add/operator/concatMap.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { concatMap } from 'rxjs/internal/patching/operator/concatMap'; +import { concatMap } from 'rxjs/internal-compatibility'; (Observable as any).prototype.concatMap = concatMap; diff --git a/compat/add/operator/concatMapTo.ts b/compat/add/operator/concatMapTo.ts index 79aff35468..180cb73d65 100644 --- a/compat/add/operator/concatMapTo.ts +++ b/compat/add/operator/concatMapTo.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { concatMapTo } from 'rxjs/internal/patching/operator/concatMapTo'; +import { concatMapTo } from 'rxjs/internal-compatibility'; (Observable as any).prototype.concatMapTo = concatMapTo; diff --git a/compat/add/operator/count.ts b/compat/add/operator/count.ts index f231d52162..43c3eba8f0 100644 --- a/compat/add/operator/count.ts +++ b/compat/add/operator/count.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { count } from 'rxjs/internal/patching/operator/count'; +import { count } from 'rxjs/internal-compatibility'; (Observable as any).prototype.count = count; diff --git a/compat/add/operator/debounce.ts b/compat/add/operator/debounce.ts index b9e22b8f08..dfb1aebabe 100644 --- a/compat/add/operator/debounce.ts +++ b/compat/add/operator/debounce.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { debounce } from 'rxjs/internal/patching/operator/debounce'; +import { debounce } from 'rxjs/internal-compatibility'; (Observable as any).prototype.debounce = debounce; diff --git a/compat/add/operator/debounceTime.ts b/compat/add/operator/debounceTime.ts index 720f00403a..bafc7d7b8c 100644 --- a/compat/add/operator/debounceTime.ts +++ b/compat/add/operator/debounceTime.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { debounceTime } from 'rxjs/internal/patching/operator/debounceTime'; +import { debounceTime } from 'rxjs/internal-compatibility'; (Observable as any).prototype.debounceTime = debounceTime; diff --git a/compat/add/operator/defaultIfEmpty.ts b/compat/add/operator/defaultIfEmpty.ts index e35980c045..5276fa0252 100644 --- a/compat/add/operator/defaultIfEmpty.ts +++ b/compat/add/operator/defaultIfEmpty.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { defaultIfEmpty } from 'rxjs/internal/patching/operator/defaultIfEmpty'; +import { defaultIfEmpty } from 'rxjs/internal-compatibility'; (Observable as any).prototype.defaultIfEmpty = defaultIfEmpty; diff --git a/compat/add/operator/delay.ts b/compat/add/operator/delay.ts index 7527ebd603..13aac9c0f7 100644 --- a/compat/add/operator/delay.ts +++ b/compat/add/operator/delay.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { delay } from 'rxjs/internal/patching/operator/delay'; +import { delay } from 'rxjs/internal-compatibility'; (Observable as any).prototype.delay = delay; diff --git a/compat/add/operator/delayWhen.ts b/compat/add/operator/delayWhen.ts index 61482ce842..1f205f4f46 100644 --- a/compat/add/operator/delayWhen.ts +++ b/compat/add/operator/delayWhen.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { delayWhen } from 'rxjs/internal/patching/operator/delayWhen'; +import { delayWhen } from 'rxjs/internal-compatibility'; (Observable as any).prototype.delayWhen = delayWhen; diff --git a/compat/add/operator/dematerialize.ts b/compat/add/operator/dematerialize.ts index e8875654ad..24bf362896 100644 --- a/compat/add/operator/dematerialize.ts +++ b/compat/add/operator/dematerialize.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { dematerialize } from 'rxjs/internal/patching/operator/dematerialize'; +import { dematerialize } from 'rxjs/internal-compatibility'; (Observable as any).prototype.dematerialize = dematerialize; diff --git a/compat/add/operator/distinct.ts b/compat/add/operator/distinct.ts index 5c2a418048..8830d2789a 100644 --- a/compat/add/operator/distinct.ts +++ b/compat/add/operator/distinct.ts @@ -1,5 +1,5 @@ import { Observable } from 'rxjs'; -import { distinct } from 'rxjs/internal/patching/operator/distinct'; +import { distinct } from 'rxjs/internal-compatibility'; (Observable as any).prototype.distinct = distinct; diff --git a/compat/add/operator/distinctUntilChanged.ts b/compat/add/operator/distinctUntilChanged.ts index 67cae53132..91e6a182d0 100644 --- a/compat/add/operator/distinctUntilChanged.ts +++ b/compat/add/operator/distinctUntilChanged.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { distinctUntilChanged } from 'rxjs/internal/patching/operator/distinctUntilChanged'; +import { distinctUntilChanged } from 'rxjs/internal-compatibility'; (Observable as any).prototype.distinctUntilChanged = distinctUntilChanged; diff --git a/compat/add/operator/distinctUntilKeyChanged.ts b/compat/add/operator/distinctUntilKeyChanged.ts index eb70cc2527..ec696271dd 100644 --- a/compat/add/operator/distinctUntilKeyChanged.ts +++ b/compat/add/operator/distinctUntilKeyChanged.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { distinctUntilKeyChanged } from 'rxjs/internal/patching/operator/distinctUntilKeyChanged'; +import { distinctUntilKeyChanged } from 'rxjs/internal-compatibility'; (Observable as any).prototype.distinctUntilKeyChanged = distinctUntilKeyChanged; diff --git a/compat/add/operator/do.ts b/compat/add/operator/do.ts index 5927b97813..7e40f14bac 100644 --- a/compat/add/operator/do.ts +++ b/compat/add/operator/do.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { _do } from 'rxjs/internal/patching/operator/do'; +import { _do } from 'rxjs/internal-compatibility'; (Observable as any).prototype.do = _do; (Observable as any).prototype._do = _do; diff --git a/compat/add/operator/elementAt.ts b/compat/add/operator/elementAt.ts index 587adb259a..8a331c3ef2 100644 --- a/compat/add/operator/elementAt.ts +++ b/compat/add/operator/elementAt.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { elementAt } from 'rxjs/internal/patching/operator/elementAt'; +import { elementAt } from 'rxjs/internal-compatibility'; (Observable as any).prototype.elementAt = elementAt; diff --git a/compat/add/operator/every.ts b/compat/add/operator/every.ts index c604fd57ca..d2e9b16aad 100644 --- a/compat/add/operator/every.ts +++ b/compat/add/operator/every.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { every } from 'rxjs/internal/patching/operator/every'; +import { every } from 'rxjs/internal-compatibility'; (Observable as any).prototype.every = every; diff --git a/compat/add/operator/exhaust.ts b/compat/add/operator/exhaust.ts index dbe3d6335d..aa64918eb4 100644 --- a/compat/add/operator/exhaust.ts +++ b/compat/add/operator/exhaust.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { exhaust } from 'rxjs/internal/patching/operator/exhaust'; +import { exhaust } from 'rxjs/internal-compatibility'; (Observable as any).prototype.exhaust = exhaust; diff --git a/compat/add/operator/exhaustMap.ts b/compat/add/operator/exhaustMap.ts index c0be85452b..6ce2951e20 100644 --- a/compat/add/operator/exhaustMap.ts +++ b/compat/add/operator/exhaustMap.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { exhaustMap } from 'rxjs/internal/patching/operator/exhaustMap'; +import { exhaustMap } from 'rxjs/internal-compatibility'; (Observable as any).prototype.exhaustMap = exhaustMap; diff --git a/compat/add/operator/expand.ts b/compat/add/operator/expand.ts index ff8509577c..52fd5abaab 100644 --- a/compat/add/operator/expand.ts +++ b/compat/add/operator/expand.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { expand } from 'rxjs/internal/patching/operator/expand'; +import { expand } from 'rxjs/internal-compatibility'; (Observable as any).prototype.expand = expand; diff --git a/compat/add/operator/filter.ts b/compat/add/operator/filter.ts index 88d2c10271..85d6626be5 100644 --- a/compat/add/operator/filter.ts +++ b/compat/add/operator/filter.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { filter } from 'rxjs/internal/patching/operator/filter'; +import { filter } from 'rxjs/internal-compatibility'; (Observable as any).prototype.filter = filter; diff --git a/compat/add/operator/finally.ts b/compat/add/operator/finally.ts index 8858b8a2c0..9bdd55464d 100644 --- a/compat/add/operator/finally.ts +++ b/compat/add/operator/finally.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { _finally } from 'rxjs/internal/patching/operator/finally'; +import { _finally } from 'rxjs/internal-compatibility'; (Observable as any).prototype.finally = _finally; (Observable as any).prototype._finally = _finally; diff --git a/compat/add/operator/find.ts b/compat/add/operator/find.ts index 3723b4041f..78222d37ed 100644 --- a/compat/add/operator/find.ts +++ b/compat/add/operator/find.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { find } from 'rxjs/internal/patching/operator/find'; +import { find } from 'rxjs/internal-compatibility'; (Observable as any).prototype.find = find; diff --git a/compat/add/operator/findIndex.ts b/compat/add/operator/findIndex.ts index 3c8fa1c8bf..4669625007 100644 --- a/compat/add/operator/findIndex.ts +++ b/compat/add/operator/findIndex.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { findIndex } from 'rxjs/internal/patching/operator/findIndex'; +import { findIndex } from 'rxjs/internal-compatibility'; (Observable as any).prototype.findIndex = findIndex; diff --git a/compat/add/operator/first.ts b/compat/add/operator/first.ts index c6ec4c8709..29550bc826 100644 --- a/compat/add/operator/first.ts +++ b/compat/add/operator/first.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { first } from 'rxjs/internal/patching/operator/first'; +import { first } from 'rxjs/internal-compatibility'; (Observable as any).prototype.first = first; diff --git a/compat/add/operator/groupBy.ts b/compat/add/operator/groupBy.ts index ca93d4be8a..088154f19e 100644 --- a/compat/add/operator/groupBy.ts +++ b/compat/add/operator/groupBy.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { groupBy } from 'rxjs/internal/patching/operator/groupBy'; +import { groupBy } from 'rxjs/internal-compatibility'; (Observable as any).prototype.groupBy = groupBy; diff --git a/compat/add/operator/ignoreElements.ts b/compat/add/operator/ignoreElements.ts index 0641f032eb..be37c850f2 100644 --- a/compat/add/operator/ignoreElements.ts +++ b/compat/add/operator/ignoreElements.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { ignoreElements } from 'rxjs/internal/patching/operator/ignoreElements'; +import { ignoreElements } from 'rxjs/internal-compatibility'; (Observable as any).prototype.ignoreElements = ignoreElements; diff --git a/compat/add/operator/isEmpty.ts b/compat/add/operator/isEmpty.ts index 7d6511d86b..e4330374f6 100644 --- a/compat/add/operator/isEmpty.ts +++ b/compat/add/operator/isEmpty.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { isEmpty } from 'rxjs/internal/patching/operator/isEmpty'; +import { isEmpty } from 'rxjs/internal-compatibility'; (Observable as any).prototype.isEmpty = isEmpty; diff --git a/compat/add/operator/last.ts b/compat/add/operator/last.ts index b80cf0b877..9ad12992ad 100644 --- a/compat/add/operator/last.ts +++ b/compat/add/operator/last.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { last } from 'rxjs/internal/patching/operator/last'; +import { last } from 'rxjs/internal-compatibility'; (Observable as any).prototype.last = last; diff --git a/compat/add/operator/let.ts b/compat/add/operator/let.ts index efb9380f73..92436a2ad0 100644 --- a/compat/add/operator/let.ts +++ b/compat/add/operator/let.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { letProto } from 'rxjs/internal/patching/operator/let'; +import { letProto } from 'rxjs/internal-compatibility'; (Observable as any).prototype.let = letProto; (Observable as any).prototype.letBind = letProto; diff --git a/compat/add/operator/map.ts b/compat/add/operator/map.ts index 725b3c6864..c628aee513 100644 --- a/compat/add/operator/map.ts +++ b/compat/add/operator/map.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { map } from 'rxjs/internal/patching/operator/map'; +import { map } from 'rxjs/internal-compatibility'; (Observable as any).prototype.map = map; diff --git a/compat/add/operator/mapTo.ts b/compat/add/operator/mapTo.ts index 9eb81a9136..fb86c9057c 100644 --- a/compat/add/operator/mapTo.ts +++ b/compat/add/operator/mapTo.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { mapTo } from 'rxjs/internal/patching/operator/mapTo'; +import { mapTo } from 'rxjs/internal-compatibility'; (Observable as any).prototype.mapTo = mapTo; diff --git a/compat/add/operator/materialize.ts b/compat/add/operator/materialize.ts index fba8f4c220..7d7410900f 100644 --- a/compat/add/operator/materialize.ts +++ b/compat/add/operator/materialize.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { materialize } from 'rxjs/internal/patching/operator/materialize'; +import { materialize } from 'rxjs/internal-compatibility'; (Observable as any).prototype.materialize = materialize; diff --git a/compat/add/operator/max.ts b/compat/add/operator/max.ts index 81d906f0a0..c992e5932a 100644 --- a/compat/add/operator/max.ts +++ b/compat/add/operator/max.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { max } from 'rxjs/internal/patching/operator/max'; +import { max } from 'rxjs/internal-compatibility'; (Observable as any).prototype.max = max; diff --git a/compat/add/operator/merge.ts b/compat/add/operator/merge.ts index 3a155eb2d9..101f333a1f 100644 --- a/compat/add/operator/merge.ts +++ b/compat/add/operator/merge.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { merge } from 'rxjs/internal/patching/operator/merge'; +import { merge } from 'rxjs/internal-compatibility'; (Observable as any).prototype.merge = merge; diff --git a/compat/add/operator/mergeAll.ts b/compat/add/operator/mergeAll.ts index f92ad1f169..70b0307900 100644 --- a/compat/add/operator/mergeAll.ts +++ b/compat/add/operator/mergeAll.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { mergeAll } from 'rxjs/internal/patching/operator/mergeAll'; +import { mergeAll } from 'rxjs/internal-compatibility'; (Observable as any).prototype.mergeAll = mergeAll; diff --git a/compat/add/operator/mergeMap.ts b/compat/add/operator/mergeMap.ts index 1d8dc1753c..344987bc54 100644 --- a/compat/add/operator/mergeMap.ts +++ b/compat/add/operator/mergeMap.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { mergeMap } from 'rxjs/internal/patching/operator/mergeMap'; +import { mergeMap } from 'rxjs/internal-compatibility'; (Observable as any).prototype.mergeMap = mergeMap; (Observable as any).prototype.flatMap = mergeMap; diff --git a/compat/add/operator/mergeMapTo.ts b/compat/add/operator/mergeMapTo.ts index 8d3cef56de..d2ac343985 100644 --- a/compat/add/operator/mergeMapTo.ts +++ b/compat/add/operator/mergeMapTo.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { mergeMapTo } from 'rxjs/internal/patching/operator/mergeMapTo'; +import { mergeMapTo } from 'rxjs/internal-compatibility'; (Observable as any).prototype.flatMapTo = mergeMapTo; (Observable as any).prototype.mergeMapTo = mergeMapTo; diff --git a/compat/add/operator/mergeScan.ts b/compat/add/operator/mergeScan.ts index e6d418e013..f7696e0a0f 100644 --- a/compat/add/operator/mergeScan.ts +++ b/compat/add/operator/mergeScan.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { mergeScan } from 'rxjs/internal/patching/operator/mergeScan'; +import { mergeScan } from 'rxjs/internal-compatibility'; (Observable as any).prototype.mergeScan = mergeScan; diff --git a/compat/add/operator/min.ts b/compat/add/operator/min.ts index c36d0b1a82..a53d2508b6 100644 --- a/compat/add/operator/min.ts +++ b/compat/add/operator/min.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { min } from 'rxjs/internal/patching/operator/min'; +import { min } from 'rxjs/internal-compatibility'; (Observable as any).prototype.min = min; diff --git a/compat/add/operator/multicast.ts b/compat/add/operator/multicast.ts index 3919794946..96edfd1d6d 100644 --- a/compat/add/operator/multicast.ts +++ b/compat/add/operator/multicast.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { multicast } from 'rxjs/internal/patching/operator/multicast'; +import { multicast } from 'rxjs/internal-compatibility'; (Observable as any).prototype.multicast = multicast; diff --git a/compat/add/operator/observeOn.ts b/compat/add/operator/observeOn.ts index b4c4eda6ad..dd26d1d65d 100644 --- a/compat/add/operator/observeOn.ts +++ b/compat/add/operator/observeOn.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { observeOn } from 'rxjs/internal/patching/operator/observeOn'; +import { observeOn } from 'rxjs/internal-compatibility'; (Observable as any).prototype.observeOn = observeOn; diff --git a/compat/add/operator/onErrorResumeNext.ts b/compat/add/operator/onErrorResumeNext.ts index 9d19325c81..219fcfa358 100644 --- a/compat/add/operator/onErrorResumeNext.ts +++ b/compat/add/operator/onErrorResumeNext.ts @@ -1,5 +1,5 @@ import { Observable } from 'rxjs'; -import { onErrorResumeNext } from 'rxjs/internal/patching/operator/onErrorResumeNext'; +import { onErrorResumeNext } from 'rxjs/internal-compatibility'; (Observable as any).prototype.onErrorResumeNext = onErrorResumeNext; diff --git a/compat/add/operator/pairwise.ts b/compat/add/operator/pairwise.ts index 934d2ee9e2..934ec2a1c5 100644 --- a/compat/add/operator/pairwise.ts +++ b/compat/add/operator/pairwise.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { pairwise } from 'rxjs/internal/patching/operator/pairwise'; +import { pairwise } from 'rxjs/internal-compatibility'; (Observable as any).prototype.pairwise = pairwise; diff --git a/compat/add/operator/partition.ts b/compat/add/operator/partition.ts index 344de678f9..9b0145caaa 100644 --- a/compat/add/operator/partition.ts +++ b/compat/add/operator/partition.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { partition } from 'rxjs/internal/patching/operator/partition'; +import { partition } from 'rxjs/internal-compatibility'; (Observable as any).prototype.partition = partition; diff --git a/compat/add/operator/pluck.ts b/compat/add/operator/pluck.ts index 003cb99ff5..d711f5de72 100644 --- a/compat/add/operator/pluck.ts +++ b/compat/add/operator/pluck.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { pluck } from 'rxjs/internal/patching/operator/pluck'; +import { pluck } from 'rxjs/internal-compatibility'; (Observable as any).prototype.pluck = pluck; diff --git a/compat/add/operator/publish.ts b/compat/add/operator/publish.ts index 84c0586267..6bb9775155 100644 --- a/compat/add/operator/publish.ts +++ b/compat/add/operator/publish.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { publish } from 'rxjs/internal/patching/operator/publish'; +import { publish } from 'rxjs/internal-compatibility'; (Observable as any).prototype.publish = publish; diff --git a/compat/add/operator/publishBehavior.ts b/compat/add/operator/publishBehavior.ts index 5ad467da6f..9b19f6e6f5 100644 --- a/compat/add/operator/publishBehavior.ts +++ b/compat/add/operator/publishBehavior.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { publishBehavior } from 'rxjs/internal/patching/operator/publishBehavior'; +import { publishBehavior } from 'rxjs/internal-compatibility'; (Observable as any).prototype.publishBehavior = publishBehavior; diff --git a/compat/add/operator/publishLast.ts b/compat/add/operator/publishLast.ts index 6baa52fcf8..50c1de821d 100644 --- a/compat/add/operator/publishLast.ts +++ b/compat/add/operator/publishLast.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { publishLast } from 'rxjs/internal/patching/operator/publishLast'; +import { publishLast } from 'rxjs/internal-compatibility'; (Observable as any).prototype.publishLast = publishLast; diff --git a/compat/add/operator/publishReplay.ts b/compat/add/operator/publishReplay.ts index b507fb4db5..868ba64a48 100644 --- a/compat/add/operator/publishReplay.ts +++ b/compat/add/operator/publishReplay.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { publishReplay } from 'rxjs/internal/patching/operator/publishReplay'; +import { publishReplay } from 'rxjs/internal-compatibility'; (Observable as any).prototype.publishReplay = publishReplay; diff --git a/compat/add/operator/race.ts b/compat/add/operator/race.ts index 74d5c3dcf9..bf078b2253 100644 --- a/compat/add/operator/race.ts +++ b/compat/add/operator/race.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { race } from 'rxjs/internal/patching/operator/race'; +import { race } from 'rxjs/internal-compatibility'; (Observable as any).prototype.race = race; diff --git a/compat/add/operator/reduce.ts b/compat/add/operator/reduce.ts index 33872bd2ff..2cef7c6ae8 100644 --- a/compat/add/operator/reduce.ts +++ b/compat/add/operator/reduce.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { reduce } from 'rxjs/internal/patching/operator/reduce'; +import { reduce } from 'rxjs/internal-compatibility'; (Observable as any).prototype.reduce = reduce; diff --git a/compat/add/operator/repeat.ts b/compat/add/operator/repeat.ts index 53e168801f..d5fcc91a53 100644 --- a/compat/add/operator/repeat.ts +++ b/compat/add/operator/repeat.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { repeat } from 'rxjs/internal/patching/operator/repeat'; +import { repeat } from 'rxjs/internal-compatibility'; (Observable as any).prototype.repeat = repeat; diff --git a/compat/add/operator/repeatWhen.ts b/compat/add/operator/repeatWhen.ts index ea18f4c139..4ce9bbf59c 100644 --- a/compat/add/operator/repeatWhen.ts +++ b/compat/add/operator/repeatWhen.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { repeatWhen } from 'rxjs/internal/patching/operator/repeatWhen'; +import { repeatWhen } from 'rxjs/internal-compatibility'; (Observable as any).prototype.repeatWhen = repeatWhen; diff --git a/compat/add/operator/retry.ts b/compat/add/operator/retry.ts index 8a28705384..e303f5388f 100644 --- a/compat/add/operator/retry.ts +++ b/compat/add/operator/retry.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { retry } from 'rxjs/internal/patching/operator/retry'; +import { retry } from 'rxjs/internal-compatibility'; (Observable as any).prototype.retry = retry; diff --git a/compat/add/operator/retryWhen.ts b/compat/add/operator/retryWhen.ts index d1d1ffb50c..3be6b4ac1b 100644 --- a/compat/add/operator/retryWhen.ts +++ b/compat/add/operator/retryWhen.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { retryWhen } from 'rxjs/internal/patching/operator/retryWhen'; +import { retryWhen } from 'rxjs/internal-compatibility'; (Observable as any).prototype.retryWhen = retryWhen; diff --git a/compat/add/operator/sample.ts b/compat/add/operator/sample.ts index c569d93961..b3ca40638c 100644 --- a/compat/add/operator/sample.ts +++ b/compat/add/operator/sample.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { sample } from 'rxjs/internal/patching/operator/sample'; +import { sample } from 'rxjs/internal-compatibility'; (Observable as any).prototype.sample = sample; diff --git a/compat/add/operator/sampleTime.ts b/compat/add/operator/sampleTime.ts index 2c860bec5f..4b620d40d5 100644 --- a/compat/add/operator/sampleTime.ts +++ b/compat/add/operator/sampleTime.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { sampleTime } from 'rxjs/internal/patching/operator/sampleTime'; +import { sampleTime } from 'rxjs/internal-compatibility'; (Observable as any).prototype.sampleTime = sampleTime; diff --git a/compat/add/operator/scan.ts b/compat/add/operator/scan.ts index e8201e3cfc..8d953a8455 100644 --- a/compat/add/operator/scan.ts +++ b/compat/add/operator/scan.ts @@ -1,7 +1,7 @@ import { Observable } from 'rxjs'; -import { scan } from 'rxjs/internal/patching/operator/scan'; +import { scan } from 'rxjs/internal-compatibility'; (Observable as any).prototype.scan = scan; diff --git a/compat/add/operator/sequenceEqual.ts b/compat/add/operator/sequenceEqual.ts index 52fa0862de..c15cc857c1 100644 --- a/compat/add/operator/sequenceEqual.ts +++ b/compat/add/operator/sequenceEqual.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { sequenceEqual } from 'rxjs/internal/patching/operator/sequenceEqual'; +import { sequenceEqual } from 'rxjs/internal-compatibility'; (Observable as any).prototype.sequenceEqual = sequenceEqual; diff --git a/compat/add/operator/share.ts b/compat/add/operator/share.ts index 3f5a9eb9f0..ca8a84cd47 100644 --- a/compat/add/operator/share.ts +++ b/compat/add/operator/share.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { share } from 'rxjs/internal/patching/operator/share'; +import { share } from 'rxjs/internal-compatibility'; (Observable as any).prototype.share = share; diff --git a/compat/add/operator/shareReplay.ts b/compat/add/operator/shareReplay.ts index 54d3c5ecd3..ca3ce2cf61 100644 --- a/compat/add/operator/shareReplay.ts +++ b/compat/add/operator/shareReplay.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { shareReplay } from 'rxjs/internal/patching/operator/shareReplay'; +import { shareReplay } from 'rxjs/internal-compatibility'; (Observable as any).prototype.shareReplay = shareReplay; diff --git a/compat/add/operator/single.ts b/compat/add/operator/single.ts index 725cf56166..908f794d28 100644 --- a/compat/add/operator/single.ts +++ b/compat/add/operator/single.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { single } from 'rxjs/internal/patching/operator/single'; +import { single } from 'rxjs/internal-compatibility'; (Observable as any).prototype.single = single; diff --git a/compat/add/operator/skip.ts b/compat/add/operator/skip.ts index 433074b477..7eb13242a2 100644 --- a/compat/add/operator/skip.ts +++ b/compat/add/operator/skip.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { skip } from 'rxjs/internal/patching/operator/skip'; +import { skip } from 'rxjs/internal-compatibility'; (Observable as any).prototype.skip = skip; diff --git a/compat/add/operator/skipLast.ts b/compat/add/operator/skipLast.ts index f1e51d2fe4..7906695c5a 100644 --- a/compat/add/operator/skipLast.ts +++ b/compat/add/operator/skipLast.ts @@ -1,5 +1,5 @@ import { Observable } from 'rxjs'; -import { skipLast } from 'rxjs/internal/patching/operator/skipLast'; +import { skipLast } from 'rxjs/internal-compatibility'; (Observable as any).prototype.skipLast = skipLast; diff --git a/compat/add/operator/skipUntil.ts b/compat/add/operator/skipUntil.ts index bad31225d3..5e43b0a312 100644 --- a/compat/add/operator/skipUntil.ts +++ b/compat/add/operator/skipUntil.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { skipUntil } from 'rxjs/internal/patching/operator/skipUntil'; +import { skipUntil } from 'rxjs/internal-compatibility'; (Observable as any).prototype.skipUntil = skipUntil; diff --git a/compat/add/operator/skipWhile.ts b/compat/add/operator/skipWhile.ts index 6bcee97e21..9b4317e0db 100644 --- a/compat/add/operator/skipWhile.ts +++ b/compat/add/operator/skipWhile.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { skipWhile } from 'rxjs/internal/patching/operator/skipWhile'; +import { skipWhile } from 'rxjs/internal-compatibility'; (Observable as any).prototype.skipWhile = skipWhile; diff --git a/compat/add/operator/startWith.ts b/compat/add/operator/startWith.ts index e822c99494..31b5fbfaed 100644 --- a/compat/add/operator/startWith.ts +++ b/compat/add/operator/startWith.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { startWith } from 'rxjs/internal/patching/operator/startWith'; +import { startWith } from 'rxjs/internal-compatibility'; (Observable as any).prototype.startWith = startWith; diff --git a/compat/add/operator/subscribeOn.ts b/compat/add/operator/subscribeOn.ts index 57388cf7c0..bb13365ed3 100644 --- a/compat/add/operator/subscribeOn.ts +++ b/compat/add/operator/subscribeOn.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { subscribeOn } from 'rxjs/internal/patching/operator/subscribeOn'; +import { subscribeOn } from 'rxjs/internal-compatibility'; (Observable as any).prototype.subscribeOn = subscribeOn; diff --git a/compat/add/operator/switch.ts b/compat/add/operator/switch.ts index 8a8d9cea3b..e87c0d23c0 100644 --- a/compat/add/operator/switch.ts +++ b/compat/add/operator/switch.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { _switch } from 'rxjs/internal/patching/operator/switch'; +import { _switch } from 'rxjs/internal-compatibility'; (Observable as any).prototype.switch = _switch; (Observable as any).prototype._switch = _switch; diff --git a/compat/add/operator/switchMap.ts b/compat/add/operator/switchMap.ts index 198da1c852..575d599844 100644 --- a/compat/add/operator/switchMap.ts +++ b/compat/add/operator/switchMap.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { switchMap } from 'rxjs/internal/patching/operator/switchMap'; +import { switchMap } from 'rxjs/internal-compatibility'; (Observable as any).prototype.switchMap = switchMap; diff --git a/compat/add/operator/switchMapTo.ts b/compat/add/operator/switchMapTo.ts index 6a96dcdcbe..feb37063e8 100644 --- a/compat/add/operator/switchMapTo.ts +++ b/compat/add/operator/switchMapTo.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { switchMapTo } from 'rxjs/internal/patching/operator/switchMapTo'; +import { switchMapTo } from 'rxjs/internal-compatibility'; (Observable as any).prototype.switchMapTo = switchMapTo; diff --git a/compat/add/operator/take.ts b/compat/add/operator/take.ts index da4f6a9b82..80556936fe 100644 --- a/compat/add/operator/take.ts +++ b/compat/add/operator/take.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { take } from 'rxjs/internal/patching/operator/take'; +import { take } from 'rxjs/internal-compatibility'; (Observable as any).prototype.take = take; diff --git a/compat/add/operator/takeLast.ts b/compat/add/operator/takeLast.ts index daeb7f5420..3d7e4dca62 100644 --- a/compat/add/operator/takeLast.ts +++ b/compat/add/operator/takeLast.ts @@ -1,5 +1,5 @@ import { Observable } from 'rxjs'; -import { takeLast } from 'rxjs/internal/patching/operator/takeLast'; +import { takeLast } from 'rxjs/internal-compatibility'; (Observable as any).prototype.takeLast = takeLast; diff --git a/compat/add/operator/takeUntil.ts b/compat/add/operator/takeUntil.ts index 2cab3a79b5..53ebd96bef 100644 --- a/compat/add/operator/takeUntil.ts +++ b/compat/add/operator/takeUntil.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { takeUntil } from 'rxjs/internal/patching/operator/takeUntil'; +import { takeUntil } from 'rxjs/internal-compatibility'; (Observable as any).prototype.takeUntil = takeUntil; diff --git a/compat/add/operator/takeWhile.ts b/compat/add/operator/takeWhile.ts index 4895e95b95..6cdb3ebee2 100644 --- a/compat/add/operator/takeWhile.ts +++ b/compat/add/operator/takeWhile.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { takeWhile } from 'rxjs/internal/patching/operator/takeWhile'; +import { takeWhile } from 'rxjs/internal-compatibility'; (Observable as any).prototype.takeWhile = takeWhile; diff --git a/compat/add/operator/throttle.ts b/compat/add/operator/throttle.ts index c577695c7c..cbb762e4ed 100644 --- a/compat/add/operator/throttle.ts +++ b/compat/add/operator/throttle.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { throttle } from 'rxjs/internal/patching/operator/throttle'; +import { throttle } from 'rxjs/internal-compatibility'; (Observable as any).prototype.throttle = throttle; diff --git a/compat/add/operator/throttleTime.ts b/compat/add/operator/throttleTime.ts index 7082b7335b..ec147166e4 100644 --- a/compat/add/operator/throttleTime.ts +++ b/compat/add/operator/throttleTime.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { throttleTime } from 'rxjs/internal/patching/operator/throttleTime'; +import { throttleTime } from 'rxjs/internal-compatibility'; (Observable as any).prototype.throttleTime = throttleTime; diff --git a/compat/add/operator/timeInterval.ts b/compat/add/operator/timeInterval.ts index ec618b3655..3e2a981cde 100644 --- a/compat/add/operator/timeInterval.ts +++ b/compat/add/operator/timeInterval.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { timeInterval } from 'rxjs/internal/patching/operator/timeInterval'; +import { timeInterval } from 'rxjs/internal-compatibility'; (Observable as any).prototype.timeInterval = timeInterval; diff --git a/compat/add/operator/timeout.ts b/compat/add/operator/timeout.ts index dd16b518b5..f06a4540c4 100644 --- a/compat/add/operator/timeout.ts +++ b/compat/add/operator/timeout.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { timeout } from 'rxjs/internal/patching/operator/timeout'; +import { timeout } from 'rxjs/internal-compatibility'; (Observable as any).prototype.timeout = timeout; diff --git a/compat/add/operator/timeoutWith.ts b/compat/add/operator/timeoutWith.ts index ecf8d9459d..9b8e98bfcf 100644 --- a/compat/add/operator/timeoutWith.ts +++ b/compat/add/operator/timeoutWith.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { timeoutWith } from 'rxjs/internal/patching/operator/timeoutWith'; +import { timeoutWith } from 'rxjs/internal-compatibility'; (Observable as any).prototype.timeoutWith = timeoutWith; diff --git a/compat/add/operator/timestamp.ts b/compat/add/operator/timestamp.ts index 198df47637..f2133e6ffc 100644 --- a/compat/add/operator/timestamp.ts +++ b/compat/add/operator/timestamp.ts @@ -1,5 +1,5 @@ import { Observable } from 'rxjs'; -import { timestamp } from 'rxjs/internal/patching/operator/timestamp'; +import { timestamp } from 'rxjs/internal-compatibility'; (Observable as any).prototype.timestamp = timestamp; diff --git a/compat/add/operator/toArray.ts b/compat/add/operator/toArray.ts index 8ee9b82bcf..8c340f5387 100644 --- a/compat/add/operator/toArray.ts +++ b/compat/add/operator/toArray.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { toArray } from 'rxjs/internal/patching/operator/toArray'; +import { toArray } from 'rxjs/internal-compatibility'; (Observable as any).prototype.toArray = toArray; diff --git a/compat/add/operator/window.ts b/compat/add/operator/window.ts index 00312db273..1562968ee8 100644 --- a/compat/add/operator/window.ts +++ b/compat/add/operator/window.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { window } from 'rxjs/internal/patching/operator/window'; +import { window } from 'rxjs/internal-compatibility'; (Observable as any).prototype.window = window; diff --git a/compat/add/operator/windowCount.ts b/compat/add/operator/windowCount.ts index f3b99502c1..eb13cab38d 100644 --- a/compat/add/operator/windowCount.ts +++ b/compat/add/operator/windowCount.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { windowCount } from 'rxjs/internal/patching/operator/windowCount'; +import { windowCount } from 'rxjs/internal-compatibility'; (Observable as any).prototype.windowCount = windowCount; diff --git a/compat/add/operator/windowTime.ts b/compat/add/operator/windowTime.ts index 7cc2b837e9..88dafbc7ff 100644 --- a/compat/add/operator/windowTime.ts +++ b/compat/add/operator/windowTime.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { windowTime } from 'rxjs/internal/patching/operator/windowTime'; +import { windowTime } from 'rxjs/internal-compatibility'; (Observable as any).prototype.windowTime = windowTime; diff --git a/compat/add/operator/windowToggle.ts b/compat/add/operator/windowToggle.ts index b79adf1bb9..722c1f2b5b 100644 --- a/compat/add/operator/windowToggle.ts +++ b/compat/add/operator/windowToggle.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { windowToggle } from 'rxjs/internal/patching/operator/windowToggle'; +import { windowToggle } from 'rxjs/internal-compatibility'; (Observable as any).prototype.windowToggle = windowToggle; diff --git a/compat/add/operator/windowWhen.ts b/compat/add/operator/windowWhen.ts index 1d1d3ca147..0e3e3261ff 100644 --- a/compat/add/operator/windowWhen.ts +++ b/compat/add/operator/windowWhen.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { windowWhen } from 'rxjs/internal/patching/operator/windowWhen'; +import { windowWhen } from 'rxjs/internal-compatibility'; (Observable as any).prototype.windowWhen = windowWhen; diff --git a/compat/add/operator/withLatestFrom.ts b/compat/add/operator/withLatestFrom.ts index d2eeb1da2c..59aa8f5e0c 100644 --- a/compat/add/operator/withLatestFrom.ts +++ b/compat/add/operator/withLatestFrom.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { withLatestFrom } from 'rxjs/internal/patching/operator/withLatestFrom'; +import { withLatestFrom } from 'rxjs/internal-compatibility'; (Observable as any).prototype.withLatestFrom = withLatestFrom; diff --git a/compat/add/operator/zip.ts b/compat/add/operator/zip.ts index cd893b7247..e3fd280094 100644 --- a/compat/add/operator/zip.ts +++ b/compat/add/operator/zip.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { zipProto } from 'rxjs/internal/patching/operator/zip'; +import { zipProto } from 'rxjs/internal-compatibility'; (Observable as any).prototype.zip = zipProto; diff --git a/compat/add/operator/zipAll.ts b/compat/add/operator/zipAll.ts index 604dcec353..19480c1638 100644 --- a/compat/add/operator/zipAll.ts +++ b/compat/add/operator/zipAll.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; -import { zipAll } from 'rxjs/internal/patching/operator/zipAll'; +import { zipAll } from 'rxjs/internal-compatibility'; (Observable as any).prototype.zipAll = zipAll; diff --git a/src/internal-compatibility/index.ts b/src/internal-compatibility/index.ts new file mode 100644 index 0000000000..69a0950376 --- /dev/null +++ b/src/internal-compatibility/index.ts @@ -0,0 +1,105 @@ +export {audit} from '../internal/patching/operator/audit'; +export {auditTime} from '../internal/patching/operator/auditTime'; +export {buffer} from '../internal/patching/operator/buffer'; +export {bufferCount} from '../internal/patching/operator/bufferCount'; +export {bufferTime} from '../internal/patching/operator/bufferTime'; +export {bufferToggle} from '../internal/patching/operator/bufferToggle'; +export {bufferWhen} from '../internal/patching/operator/bufferWhen'; +export {_catch} from '../internal/patching/operator/catch'; +export {combineAll} from '../internal/patching/operator/combineAll'; +export {combineLatest} from '../internal/patching/operator/combineLatest'; +export {concat} from '../internal/patching/operator/concat'; +export {concatAll} from '../internal/patching/operator/concatAll'; +export {concatMap} from '../internal/patching/operator/concatMap'; +export {concatMapTo} from '../internal/patching/operator/concatMapTo'; +export {count} from '../internal/patching/operator/count'; +export {debounce} from '../internal/patching/operator/debounce'; +export {debounceTime} from '../internal/patching/operator/debounceTime'; +export {defaultIfEmpty} from '../internal/patching/operator/defaultIfEmpty'; +export {delay} from '../internal/patching/operator/delay'; +export {delayWhen} from '../internal/patching/operator/delayWhen'; +export {dematerialize} from '../internal/patching/operator/dematerialize'; +export {distinct} from '../internal/patching/operator/distinct'; +export {distinctUntilChanged} from '../internal/patching/operator/distinctUntilChanged'; +export {distinctUntilKeyChanged} from '../internal/patching/operator/distinctUntilKeyChanged'; +export {_do} from '../internal/patching/operator/do'; +export {elementAt} from '../internal/patching/operator/elementAt'; +export {every} from '../internal/patching/operator/every'; +export {exhaust} from '../internal/patching/operator/exhaust'; +export {exhaustMap} from '../internal/patching/operator/exhaustMap'; +export {expand} from '../internal/patching/operator/expand'; +export {filter} from '../internal/patching/operator/filter'; +export {_finally} from '../internal/patching/operator/finally'; +export {find} from '../internal/patching/operator/find'; +export {findIndex} from '../internal/patching/operator/findIndex'; +export {first} from '../internal/patching/operator/first'; +export {groupBy} from '../internal/patching/operator/groupBy'; +export {ignoreElements} from '../internal/patching/operator/ignoreElements'; +export {isEmpty} from '../internal/patching/operator/isEmpty'; +export {last} from '../internal/patching/operator/last'; +export {letProto} from '../internal/patching/operator/let'; +export {map} from '../internal/patching/operator/map'; +export {mapTo} from '../internal/patching/operator/mapTo'; +export {materialize} from '../internal/patching/operator/materialize'; +export {max} from '../internal/patching/operator/max'; +export {merge} from '../internal/patching/operator/merge'; +export {mergeAll} from '../internal/patching/operator/mergeAll'; +export {mergeMap} from '../internal/patching/operator/mergeMap'; +export {mergeMapTo} from '../internal/patching/operator/mergeMapTo'; +export {mergeScan} from '../internal/patching/operator/mergeScan'; +export {min} from '../internal/patching/operator/min'; +export {multicast} from '../internal/patching/operator/multicast'; +export {observeOn} from '../internal/patching/operator/observeOn'; +export {onErrorResumeNext} from '../internal/patching/operator/onErrorResumeNext'; +export {pairwise} from '../internal/patching/operator/pairwise'; +export {partition} from '../internal/patching/operator/partition'; +export {pluck} from '../internal/patching/operator/pluck'; +export {publish} from '../internal/patching/operator/publish'; +export {publishBehavior} from '../internal/patching/operator/publishBehavior'; +export {publishLast} from '../internal/patching/operator/publishLast'; +export {publishReplay} from '../internal/patching/operator/publishReplay'; +export {race} from '../internal/patching/operator/race'; +export {reduce} from '../internal/patching/operator/reduce'; +export {repeat} from '../internal/patching/operator/repeat'; +export {repeatWhen} from '../internal/patching/operator/repeatWhen'; +export {retry} from '../internal/patching/operator/retry'; +export {retryWhen} from '../internal/patching/operator/retryWhen'; +export {sample} from '../internal/patching/operator/sample'; +export {sampleTime} from '../internal/patching/operator/sampleTime'; +export {scan} from '../internal/patching/operator/scan'; +export {sequenceEqual} from '../internal/patching/operator/sequenceEqual'; +export {share} from '../internal/patching/operator/share'; +export {shareReplay} from '../internal/patching/operator/shareReplay'; +export {single} from '../internal/patching/operator/single'; +export {skip} from '../internal/patching/operator/skip'; +export {skipLast} from '../internal/patching/operator/skipLast'; +export {skipUntil} from '../internal/patching/operator/skipUntil'; +export {skipWhile} from '../internal/patching/operator/skipWhile'; +export {startWith} from '../internal/patching/operator/startWith'; +export {subscribeOn} from '../internal/patching/operator/subscribeOn'; +export {_switch} from '../internal/patching/operator/switch'; +export {switchMap} from '../internal/patching/operator/switchMap'; +export {switchMapTo} from '../internal/patching/operator/switchMapTo'; +export {take} from '../internal/patching/operator/take'; +export {takeLast} from '../internal/patching/operator/takeLast'; +export {takeUntil} from '../internal/patching/operator/takeUntil'; +export {takeWhile} from '../internal/patching/operator/takeWhile'; +export {throttle} from '../internal/patching/operator/throttle'; +export {throttleTime} from '../internal/patching/operator/throttleTime'; +export {timeInterval} from '../internal/patching/operator/timeInterval'; +export {timeout} from '../internal/patching/operator/timeout'; +export {timeoutWith} from '../internal/patching/operator/timeoutWith'; +export {timestamp} from '../internal/patching/operator/timestamp'; +export {toArray} from '../internal/patching/operator/toArray'; +export {toPromise} from '../internal/patching/operator/toPromise'; +export {window} from '../internal/patching/operator/window'; +export {windowCount} from '../internal/patching/operator/windowCount'; +export {windowTime} from '../internal/patching/operator/windowTime'; +export {windowToggle} from '../internal/patching/operator/windowToggle'; +export {windowWhen} from '../internal/patching/operator/windowWhen'; +export {withLatestFrom} from '../internal/patching/operator/withLatestFrom'; +export {zipProto} from '../internal/patching/operator/zip'; +export {zipAll} from '../internal/patching/operator/zipAll'; + +export {isArray} from '../internal/util/isArray'; +export {subscribeToResult} from '../internal/util/subscribeToResult'; \ No newline at end of file diff --git a/src/internal-compatibility/package.json b/src/internal-compatibility/package.json new file mode 100644 index 0000000000..5ff05a690d --- /dev/null +++ b/src/internal-compatibility/package.json @@ -0,0 +1,8 @@ +{ + "name": "rxjs/internal-compatibility", + "typings": "./index.d.ts", + "main": "./index.js", + "module": "../_esm5/internal-compatibility/index.js", + "es2015": "../_esm2015/internal-compatibility/index.js", + "sideEffects": false +} diff --git a/tsconfig.json b/tsconfig.json index 6baca8dd7f..4e6ae2df60 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,6 +5,7 @@ "paths": { "rxjs": ["./src/index"], "rxjs/*": ["./src/*"], + "rxjs/internal-compatibility": ["./src/internal-compatibility/index"], "rxjs-compat": ["./compat/index"], "rxjs-compat/*": ["./compat/*"] } diff --git a/tsconfig/compat/tsconfig.base.json b/tsconfig/compat/tsconfig.base.json index a56c6ba779..9848525782 100644 --- a/tsconfig/compat/tsconfig.base.json +++ b/tsconfig/compat/tsconfig.base.json @@ -5,7 +5,12 @@ "baseUrl": "../../compat", "paths": { "rxjs": ["../src/index"], - "rxjs/*": ["../src/*"] + "rxjs/*": ["../src/*"], + "rxjs/internal-compatibility": ["../src/internal-compatibility/index"], + "rxjs/testing": ["../src/testing/index"], + "rxjs/ajax": ["../src/ajax/index"], + "rxjs/operators": ["../src/operators/index"], + "rxjs/websocket": ["../src/websocket/index"] } }, "include": [ diff --git a/tsconfig/tsconfig.base.json b/tsconfig/tsconfig.base.json index f010fda441..18a8cffefd 100644 --- a/tsconfig/tsconfig.base.json +++ b/tsconfig/tsconfig.base.json @@ -11,16 +11,12 @@ "../dist/src/operators/index.ts", "../dist/src/testing/index.ts", "../dist/src/websocket/index.ts", + "../dist/src/internal-compatibility/index.ts", // legacy entry-points "../dist/src/internal/Rx.ts", // umd entry-point - "../dist/src/internal/umd.ts", - "../dist/src/index.ts", - "../dist/src/operators.ts", - "../dist/src/ajax.ts", - "../dist/src/websocket.ts", - "../dist/src/testing.ts" + "../dist/src/internal/umd.ts" ] } diff --git a/tsconfig/tsconfig.legacy-reexport.json b/tsconfig/tsconfig.legacy-reexport.json index d73350980a..ed561b08a7 100644 --- a/tsconfig/tsconfig.legacy-reexport.json +++ b/tsconfig/tsconfig.legacy-reexport.json @@ -11,6 +11,11 @@ "paths": { "rxjs": ["../dist/typings/index"], "rxjs/*": ["../dist/typings/*"], + "rxjs/internal-compatibility": ["../dist/typings/internal-compatibility/index"], + "rxjs/testing": ["../dist/typings/testing/index"], + "rxjs/ajax": ["../dist/typings/ajax/index"], + "rxjs/operators": ["../dist/typings/operators/index"], + "rxjs/websocket": ["../dist/typings/websocket/index"], "rxjs-compat": ["../dist-compat/typings/compat/Rx"], "rxjs-compat/*": ["../dist-compat/typings/compat/*"] } From 6e84e78e46e7512e09fa256bdab4c44a7ed93c35 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Tue, 13 Mar 2018 18:21:55 -0700 Subject: [PATCH 30/39] feat(compat): add concat operator to compatibility layer --- compat/operators/concat.ts | 16 ++++++++++++++++ legacy-reexport/operators/concat.ts | 1 + 2 files changed, 17 insertions(+) create mode 100644 compat/operators/concat.ts create mode 100644 legacy-reexport/operators/concat.ts diff --git a/compat/operators/concat.ts b/compat/operators/concat.ts new file mode 100644 index 0000000000..2fb1fd3e2e --- /dev/null +++ b/compat/operators/concat.ts @@ -0,0 +1,16 @@ +import { concat as concatStatic, Observable, ObservableInput, OperatorFunction, MonoTypeOperatorFunction, SchedulerLike } from 'rxjs'; + +/* tslint:disable:max-line-length */ +export function concat(scheduler?: SchedulerLike): MonoTypeOperatorFunction; +export function concat(v2: ObservableInput, scheduler?: SchedulerLike): OperatorFunction; +export function concat(v2: ObservableInput, v3: ObservableInput, scheduler?: SchedulerLike): OperatorFunction; +export function concat(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, scheduler?: SchedulerLike): OperatorFunction; +export function concat(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, v5: ObservableInput, scheduler?: SchedulerLike): OperatorFunction; +export function concat(v2: ObservableInput, v3: ObservableInput, v4: ObservableInput, v5: ObservableInput, v6: ObservableInput, scheduler?: SchedulerLike): OperatorFunction; +export function concat(...observables: Array | SchedulerLike>): MonoTypeOperatorFunction; +export function concat(...observables: Array | SchedulerLike>): OperatorFunction; +/* tslint:enable:max-line-length */ + +export function concat(...observables: Array | SchedulerLike>): OperatorFunction { + return (source: Observable) => source.lift.call(concatStatic(source, ...observables)); +} diff --git a/legacy-reexport/operators/concat.ts b/legacy-reexport/operators/concat.ts new file mode 100644 index 0000000000..d2b7050940 --- /dev/null +++ b/legacy-reexport/operators/concat.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/concat'; \ No newline at end of file From 613152998d1e3067f85dd8451826313444b77518 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Tue, 13 Mar 2018 18:40:11 -0700 Subject: [PATCH 31/39] chore(compat): adjust compatibility imports so ESM resolution will work --- compat/AsyncSubject.ts | 2 +- compat/InnerSubscriber.ts | 2 +- compat/Operator.ts | 2 +- compat/OuterSubscriber.ts | 2 +- compat/Rx.ts | 4 +- compat/Scheduler.ts | 2 +- compat/SubjectSubscription.ts | 2 +- compat/Subscriber.ts | 2 +- compat/add/observable/dom/ajax.ts | 2 +- compat/add/observable/fromPromise.ts | 6 +- compat/add/observable/never.ts | 3 +- compat/operators/combineLatest.ts | 4 +- compat/symbol/iterator.ts | 2 +- compat/symbol/observable.ts | 2 +- compat/symbol/rxSubscriber.ts | 2 +- src/internal-compatibility/index.ts | 222 ++++++++++++++------------- tsconfig.json | 7 +- 17 files changed, 141 insertions(+), 127 deletions(-) diff --git a/compat/AsyncSubject.ts b/compat/AsyncSubject.ts index 16413b0048..656ff9380c 100644 --- a/compat/AsyncSubject.ts +++ b/compat/AsyncSubject.ts @@ -1 +1 @@ -export {AsyncSubject} from 'rxjs/internal/AsyncSubject'; +export {AsyncSubject} from 'rxjs'; diff --git a/compat/InnerSubscriber.ts b/compat/InnerSubscriber.ts index 167d60f2ed..c37cb18933 100644 --- a/compat/InnerSubscriber.ts +++ b/compat/InnerSubscriber.ts @@ -1 +1 @@ -export {InnerSubscriber} from 'rxjs/internal/InnerSubscriber'; +export {InnerSubscriber} from 'rxjs/internal-compatibility'; diff --git a/compat/Operator.ts b/compat/Operator.ts index 462381152b..e8c7e3f976 100644 --- a/compat/Operator.ts +++ b/compat/Operator.ts @@ -1 +1 @@ -export {Operator} from 'rxjs/internal/Operator'; +export {Operator} from 'rxjs'; diff --git a/compat/OuterSubscriber.ts b/compat/OuterSubscriber.ts index a2be341392..40bb3564ae 100644 --- a/compat/OuterSubscriber.ts +++ b/compat/OuterSubscriber.ts @@ -1 +1 @@ -export {OuterSubscriber} from 'rxjs/internal/OuterSubscriber'; +export {OuterSubscriber} from 'rxjs/internal-compatibility'; diff --git a/compat/Rx.ts b/compat/Rx.ts index 6ab3b0a807..867e18f454 100644 --- a/compat/Rx.ts +++ b/compat/Rx.ts @@ -162,9 +162,7 @@ export { AjaxRequest, AjaxResponse, AjaxError, AjaxTimeoutError } from 'rxjs/aja import { asapScheduler, asyncScheduler, queueScheduler, animationFrameScheduler, SchedulerLike } from 'rxjs'; -import { rxSubscriber } from 'rxjs/internal/symbol/rxSubscriber'; -import { iterator } from 'rxjs/internal/symbol/iterator'; -import { observable } from 'rxjs/internal/symbol/observable'; +import { iterator, observable, rxSubscriber } from 'rxjs/internal-compatibility'; import * as _operators from 'rxjs/operators'; diff --git a/compat/Scheduler.ts b/compat/Scheduler.ts index 3fa8068b2c..80bce9b83f 100644 --- a/compat/Scheduler.ts +++ b/compat/Scheduler.ts @@ -1 +1 @@ -export {Scheduler} from 'rxjs/internal/Scheduler'; +export {Scheduler} from 'rxjs/internal-compatibility'; diff --git a/compat/SubjectSubscription.ts b/compat/SubjectSubscription.ts index 1897a0945c..00766b6957 100644 --- a/compat/SubjectSubscription.ts +++ b/compat/SubjectSubscription.ts @@ -1 +1 @@ -export {SubjectSubscription} from 'rxjs/internal/SubjectSubscription'; +export {SubjectSubscription} from 'rxjs/internal-compatibility'; diff --git a/compat/Subscriber.ts b/compat/Subscriber.ts index 48e2fae6fe..c48f65160c 100644 --- a/compat/Subscriber.ts +++ b/compat/Subscriber.ts @@ -1 +1 @@ -export {Subscriber} from 'rxjs/internal/Subscriber'; +export {Subscriber} from 'rxjs/internal-compatibility'; diff --git a/compat/add/observable/dom/ajax.ts b/compat/add/observable/dom/ajax.ts index 15f4114fc9..e7f4ef6f6a 100644 --- a/compat/add/observable/dom/ajax.ts +++ b/compat/add/observable/dom/ajax.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs'; import { ajax as staticAjax } from 'rxjs/ajax'; -import { AjaxCreationMethod } from 'rxjs/internal/observable/dom/AjaxObservable'; +import { AjaxCreationMethod } from 'rxjs/internal-compatibility'; Observable.ajax = staticAjax; diff --git a/compat/add/observable/fromPromise.ts b/compat/add/observable/fromPromise.ts index 2b705dd379..2ce2b0bab5 100644 --- a/compat/add/observable/fromPromise.ts +++ b/compat/add/observable/fromPromise.ts @@ -1,7 +1,7 @@ -import { Observable } from 'rxjs'; -import { fromPromise as staticFromPromise } from 'rxjs/internal/observable/fromPromise'; +import { Observable, from } from 'rxjs'; +import { fromPromise as staticFromPromise } from 'rxjs/internal-compatibility'; -(Observable as any).fromPromise = staticFromPromise; +(Observable as any).fromPromise = from; declare module 'rxjs/internal/Observable' { namespace Observable { diff --git a/compat/add/observable/never.ts b/compat/add/observable/never.ts index 3b32889941..6021aa279d 100644 --- a/compat/add/observable/never.ts +++ b/compat/add/observable/never.ts @@ -1,5 +1,4 @@ -import { Observable, interval } from 'rxjs'; -import { NEVER } from 'rxjs/internal/observable/never'; +import { Observable, interval, NEVER } from 'rxjs'; export function staticNever() { return NEVER; diff --git a/compat/operators/combineLatest.ts b/compat/operators/combineLatest.ts index 198fcf09f2..023f201d11 100644 --- a/compat/operators/combineLatest.ts +++ b/compat/operators/combineLatest.ts @@ -1,8 +1,6 @@ -import { isArray } from 'rxjs/internal/util/isArray'; -import { subscribeToResult } from 'rxjs/internal/util/subscribeToResult'; +import { isArray, CombineLatestOperator } from 'rxjs/internal-compatibility'; import { Observable, ObservableInput, Operator, OperatorFunction, from } from 'rxjs'; -import { CombineLatestOperator } from 'rxjs/internal/observable/combineLatest'; const none = {}; diff --git a/compat/symbol/iterator.ts b/compat/symbol/iterator.ts index d13717b3ea..37c5253b18 100644 --- a/compat/symbol/iterator.ts +++ b/compat/symbol/iterator.ts @@ -1 +1 @@ -export * from 'rxjs/internal/symbol/iterator'; +export {iterator} from 'rxjs/internal-compatibility'; diff --git a/compat/symbol/observable.ts b/compat/symbol/observable.ts index 1797979dc1..b3aeae9f8a 100644 --- a/compat/symbol/observable.ts +++ b/compat/symbol/observable.ts @@ -1 +1 @@ -export * from 'rxjs/internal/symbol/observable'; +export {observable} from 'rxjs/internal-compatibility'; diff --git a/compat/symbol/rxSubscriber.ts b/compat/symbol/rxSubscriber.ts index 98a66a01dd..0ea3230780 100644 --- a/compat/symbol/rxSubscriber.ts +++ b/compat/symbol/rxSubscriber.ts @@ -1 +1 @@ -export * from 'rxjs/internal/symbol/rxSubscriber'; +export {rxSubscriber} from 'rxjs/internal-compatibility'; diff --git a/src/internal-compatibility/index.ts b/src/internal-compatibility/index.ts index 69a0950376..2b9ac59a38 100644 --- a/src/internal-compatibility/index.ts +++ b/src/internal-compatibility/index.ts @@ -1,105 +1,119 @@ -export {audit} from '../internal/patching/operator/audit'; -export {auditTime} from '../internal/patching/operator/auditTime'; -export {buffer} from '../internal/patching/operator/buffer'; -export {bufferCount} from '../internal/patching/operator/bufferCount'; -export {bufferTime} from '../internal/patching/operator/bufferTime'; -export {bufferToggle} from '../internal/patching/operator/bufferToggle'; -export {bufferWhen} from '../internal/patching/operator/bufferWhen'; -export {_catch} from '../internal/patching/operator/catch'; -export {combineAll} from '../internal/patching/operator/combineAll'; -export {combineLatest} from '../internal/patching/operator/combineLatest'; -export {concat} from '../internal/patching/operator/concat'; -export {concatAll} from '../internal/patching/operator/concatAll'; -export {concatMap} from '../internal/patching/operator/concatMap'; -export {concatMapTo} from '../internal/patching/operator/concatMapTo'; -export {count} from '../internal/patching/operator/count'; -export {debounce} from '../internal/patching/operator/debounce'; -export {debounceTime} from '../internal/patching/operator/debounceTime'; -export {defaultIfEmpty} from '../internal/patching/operator/defaultIfEmpty'; -export {delay} from '../internal/patching/operator/delay'; -export {delayWhen} from '../internal/patching/operator/delayWhen'; -export {dematerialize} from '../internal/patching/operator/dematerialize'; -export {distinct} from '../internal/patching/operator/distinct'; -export {distinctUntilChanged} from '../internal/patching/operator/distinctUntilChanged'; -export {distinctUntilKeyChanged} from '../internal/patching/operator/distinctUntilKeyChanged'; -export {_do} from '../internal/patching/operator/do'; -export {elementAt} from '../internal/patching/operator/elementAt'; -export {every} from '../internal/patching/operator/every'; -export {exhaust} from '../internal/patching/operator/exhaust'; -export {exhaustMap} from '../internal/patching/operator/exhaustMap'; -export {expand} from '../internal/patching/operator/expand'; -export {filter} from '../internal/patching/operator/filter'; -export {_finally} from '../internal/patching/operator/finally'; -export {find} from '../internal/patching/operator/find'; -export {findIndex} from '../internal/patching/operator/findIndex'; -export {first} from '../internal/patching/operator/first'; -export {groupBy} from '../internal/patching/operator/groupBy'; -export {ignoreElements} from '../internal/patching/operator/ignoreElements'; -export {isEmpty} from '../internal/patching/operator/isEmpty'; -export {last} from '../internal/patching/operator/last'; -export {letProto} from '../internal/patching/operator/let'; -export {map} from '../internal/patching/operator/map'; -export {mapTo} from '../internal/patching/operator/mapTo'; -export {materialize} from '../internal/patching/operator/materialize'; -export {max} from '../internal/patching/operator/max'; -export {merge} from '../internal/patching/operator/merge'; -export {mergeAll} from '../internal/patching/operator/mergeAll'; -export {mergeMap} from '../internal/patching/operator/mergeMap'; -export {mergeMapTo} from '../internal/patching/operator/mergeMapTo'; -export {mergeScan} from '../internal/patching/operator/mergeScan'; -export {min} from '../internal/patching/operator/min'; -export {multicast} from '../internal/patching/operator/multicast'; -export {observeOn} from '../internal/patching/operator/observeOn'; -export {onErrorResumeNext} from '../internal/patching/operator/onErrorResumeNext'; -export {pairwise} from '../internal/patching/operator/pairwise'; -export {partition} from '../internal/patching/operator/partition'; -export {pluck} from '../internal/patching/operator/pluck'; -export {publish} from '../internal/patching/operator/publish'; -export {publishBehavior} from '../internal/patching/operator/publishBehavior'; -export {publishLast} from '../internal/patching/operator/publishLast'; -export {publishReplay} from '../internal/patching/operator/publishReplay'; -export {race} from '../internal/patching/operator/race'; -export {reduce} from '../internal/patching/operator/reduce'; -export {repeat} from '../internal/patching/operator/repeat'; -export {repeatWhen} from '../internal/patching/operator/repeatWhen'; -export {retry} from '../internal/patching/operator/retry'; -export {retryWhen} from '../internal/patching/operator/retryWhen'; -export {sample} from '../internal/patching/operator/sample'; -export {sampleTime} from '../internal/patching/operator/sampleTime'; -export {scan} from '../internal/patching/operator/scan'; -export {sequenceEqual} from '../internal/patching/operator/sequenceEqual'; -export {share} from '../internal/patching/operator/share'; -export {shareReplay} from '../internal/patching/operator/shareReplay'; -export {single} from '../internal/patching/operator/single'; -export {skip} from '../internal/patching/operator/skip'; -export {skipLast} from '../internal/patching/operator/skipLast'; -export {skipUntil} from '../internal/patching/operator/skipUntil'; -export {skipWhile} from '../internal/patching/operator/skipWhile'; -export {startWith} from '../internal/patching/operator/startWith'; -export {subscribeOn} from '../internal/patching/operator/subscribeOn'; -export {_switch} from '../internal/patching/operator/switch'; -export {switchMap} from '../internal/patching/operator/switchMap'; -export {switchMapTo} from '../internal/patching/operator/switchMapTo'; -export {take} from '../internal/patching/operator/take'; -export {takeLast} from '../internal/patching/operator/takeLast'; -export {takeUntil} from '../internal/patching/operator/takeUntil'; -export {takeWhile} from '../internal/patching/operator/takeWhile'; -export {throttle} from '../internal/patching/operator/throttle'; -export {throttleTime} from '../internal/patching/operator/throttleTime'; -export {timeInterval} from '../internal/patching/operator/timeInterval'; -export {timeout} from '../internal/patching/operator/timeout'; -export {timeoutWith} from '../internal/patching/operator/timeoutWith'; -export {timestamp} from '../internal/patching/operator/timestamp'; -export {toArray} from '../internal/patching/operator/toArray'; -export {toPromise} from '../internal/patching/operator/toPromise'; -export {window} from '../internal/patching/operator/window'; -export {windowCount} from '../internal/patching/operator/windowCount'; -export {windowTime} from '../internal/patching/operator/windowTime'; -export {windowToggle} from '../internal/patching/operator/windowToggle'; -export {windowWhen} from '../internal/patching/operator/windowWhen'; -export {withLatestFrom} from '../internal/patching/operator/withLatestFrom'; -export {zipProto} from '../internal/patching/operator/zip'; -export {zipAll} from '../internal/patching/operator/zipAll'; +export { audit } from '../internal/patching/operator/audit'; +export { auditTime } from '../internal/patching/operator/auditTime'; +export { buffer } from '../internal/patching/operator/buffer'; +export { bufferCount } from '../internal/patching/operator/bufferCount'; +export { bufferTime } from '../internal/patching/operator/bufferTime'; +export { bufferToggle } from '../internal/patching/operator/bufferToggle'; +export { bufferWhen } from '../internal/patching/operator/bufferWhen'; +export { _catch } from '../internal/patching/operator/catch'; +export { combineAll } from '../internal/patching/operator/combineAll'; +export { combineLatest } from '../internal/patching/operator/combineLatest'; +export { concat } from '../internal/patching/operator/concat'; +export { concatAll } from '../internal/patching/operator/concatAll'; +export { concatMap } from '../internal/patching/operator/concatMap'; +export { concatMapTo } from '../internal/patching/operator/concatMapTo'; +export { count } from '../internal/patching/operator/count'; +export { debounce } from '../internal/patching/operator/debounce'; +export { debounceTime } from '../internal/patching/operator/debounceTime'; +export { defaultIfEmpty } from '../internal/patching/operator/defaultIfEmpty'; +export { delay } from '../internal/patching/operator/delay'; +export { delayWhen } from '../internal/patching/operator/delayWhen'; +export { dematerialize } from '../internal/patching/operator/dematerialize'; +export { distinct } from '../internal/patching/operator/distinct'; +export { distinctUntilChanged } from '../internal/patching/operator/distinctUntilChanged'; +export { distinctUntilKeyChanged } from '../internal/patching/operator/distinctUntilKeyChanged'; +export { _do } from '../internal/patching/operator/do'; +export { elementAt } from '../internal/patching/operator/elementAt'; +export { every } from '../internal/patching/operator/every'; +export { exhaust } from '../internal/patching/operator/exhaust'; +export { exhaustMap } from '../internal/patching/operator/exhaustMap'; +export { expand } from '../internal/patching/operator/expand'; +export { filter } from '../internal/patching/operator/filter'; +export { _finally } from '../internal/patching/operator/finally'; +export { find } from '../internal/patching/operator/find'; +export { findIndex } from '../internal/patching/operator/findIndex'; +export { first } from '../internal/patching/operator/first'; +export { groupBy } from '../internal/patching/operator/groupBy'; +export { ignoreElements } from '../internal/patching/operator/ignoreElements'; +export { isEmpty } from '../internal/patching/operator/isEmpty'; +export { last } from '../internal/patching/operator/last'; +export { letProto } from '../internal/patching/operator/let'; +export { map } from '../internal/patching/operator/map'; +export { mapTo } from '../internal/patching/operator/mapTo'; +export { materialize } from '../internal/patching/operator/materialize'; +export { max } from '../internal/patching/operator/max'; +export { merge } from '../internal/patching/operator/merge'; +export { mergeAll } from '../internal/patching/operator/mergeAll'; +export { mergeMap } from '../internal/patching/operator/mergeMap'; +export { mergeMapTo } from '../internal/patching/operator/mergeMapTo'; +export { mergeScan } from '../internal/patching/operator/mergeScan'; +export { min } from '../internal/patching/operator/min'; +export { multicast } from '../internal/patching/operator/multicast'; +export { observeOn } from '../internal/patching/operator/observeOn'; +export { onErrorResumeNext } from '../internal/patching/operator/onErrorResumeNext'; +export { pairwise } from '../internal/patching/operator/pairwise'; +export { partition } from '../internal/patching/operator/partition'; +export { pluck } from '../internal/patching/operator/pluck'; +export { publish } from '../internal/patching/operator/publish'; +export { publishBehavior } from '../internal/patching/operator/publishBehavior'; +export { publishLast } from '../internal/patching/operator/publishLast'; +export { publishReplay } from '../internal/patching/operator/publishReplay'; +export { race } from '../internal/patching/operator/race'; +export { reduce } from '../internal/patching/operator/reduce'; +export { repeat } from '../internal/patching/operator/repeat'; +export { repeatWhen } from '../internal/patching/operator/repeatWhen'; +export { retry } from '../internal/patching/operator/retry'; +export { retryWhen } from '../internal/patching/operator/retryWhen'; +export { sample } from '../internal/patching/operator/sample'; +export { sampleTime } from '../internal/patching/operator/sampleTime'; +export { scan } from '../internal/patching/operator/scan'; +export { sequenceEqual } from '../internal/patching/operator/sequenceEqual'; +export { share } from '../internal/patching/operator/share'; +export { shareReplay } from '../internal/patching/operator/shareReplay'; +export { single } from '../internal/patching/operator/single'; +export { skip } from '../internal/patching/operator/skip'; +export { skipLast } from '../internal/patching/operator/skipLast'; +export { skipUntil } from '../internal/patching/operator/skipUntil'; +export { skipWhile } from '../internal/patching/operator/skipWhile'; +export { startWith } from '../internal/patching/operator/startWith'; +export { subscribeOn } from '../internal/patching/operator/subscribeOn'; +export { _switch } from '../internal/patching/operator/switch'; +export { switchMap } from '../internal/patching/operator/switchMap'; +export { switchMapTo } from '../internal/patching/operator/switchMapTo'; +export { take } from '../internal/patching/operator/take'; +export { takeLast } from '../internal/patching/operator/takeLast'; +export { takeUntil } from '../internal/patching/operator/takeUntil'; +export { takeWhile } from '../internal/patching/operator/takeWhile'; +export { throttle } from '../internal/patching/operator/throttle'; +export { throttleTime } from '../internal/patching/operator/throttleTime'; +export { timeInterval } from '../internal/patching/operator/timeInterval'; +export { timeout } from '../internal/patching/operator/timeout'; +export { timeoutWith } from '../internal/patching/operator/timeoutWith'; +export { timestamp } from '../internal/patching/operator/timestamp'; +export { toArray } from '../internal/patching/operator/toArray'; +export { toPromise } from '../internal/patching/operator/toPromise'; +export { window } from '../internal/patching/operator/window'; +export { windowCount } from '../internal/patching/operator/windowCount'; +export { windowTime } from '../internal/patching/operator/windowTime'; +export { windowToggle } from '../internal/patching/operator/windowToggle'; +export { windowWhen } from '../internal/patching/operator/windowWhen'; +export { withLatestFrom } from '../internal/patching/operator/withLatestFrom'; +export { zipProto } from '../internal/patching/operator/zip'; +export { zipAll } from '../internal/patching/operator/zipAll'; -export {isArray} from '../internal/util/isArray'; -export {subscribeToResult} from '../internal/util/subscribeToResult'; \ No newline at end of file +export { InnerSubscriber } from '../internal/InnerSubscriber'; +export { OuterSubscriber } from '../internal/OuterSubscriber'; +export { Scheduler } from '../internal/Scheduler'; +export { SubjectSubscription } from '../internal/SubjectSubscription'; +export { Subscriber } from '../internal/Subscriber'; + +export { fromPromise } from '../internal/observable/fromPromise'; +export { AjaxCreationMethod } from '../internal/observable/dom/AjaxObservable'; +export { CombineLatestOperator } from '../internal/observable/combineLatest'; + +export { rxSubscriber } from '../internal/symbol/rxSubscriber'; +export { iterator } from '../internal/symbol/iterator'; +export { observable } from '../internal/symbol/observable'; + +export { isArray } from '../internal/util/isArray'; +export { subscribeToResult } from '../internal/util/subscribeToResult'; \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 4e6ae2df60..24a6ab0c34 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,8 +6,13 @@ "rxjs": ["./src/index"], "rxjs/*": ["./src/*"], "rxjs/internal-compatibility": ["./src/internal-compatibility/index"], + "rxjs/ajax": ["./src/ajax/index"], + "rxjs/operators": ["./src/operators/index"], + "rxjs/testing": ["./src/testing/index"], + "rxjs/websocket": ["./src/websocket/index"], "rxjs-compat": ["./compat/index"], "rxjs-compat/*": ["./compat/*"] } - } + }, + "exclude": ["./dist", "./dist-compat"] } \ No newline at end of file From 916e968d8e6d4ea5af154dd15c40678ae74622c1 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Wed, 14 Mar 2018 13:15:16 -0700 Subject: [PATCH 32/39] fix(spec): get tests running using compatibility package --- compat/Rx.ts | 6 +++- compat/add/observable/throw.ts | 2 +- compat/scheduler/animationFrame.ts | 1 + compat/scheduler/asap.ts | 1 + compat/scheduler/async.ts | 1 + compat/scheduler/queue.ts | 1 + legacy-reexport/scheduler/animationFrame.ts | 1 + legacy-reexport/scheduler/asap.ts | 1 + legacy-reexport/scheduler/async.ts | 1 + legacy-reexport/scheduler/queue.ts | 1 + package-lock.json | 2 +- package.json | 2 +- spec/Notification-spec.ts | 2 +- spec/Observable-spec.ts | 2 +- spec/Scheduler-spec.ts | 2 +- spec/Subject-spec.ts | 2 +- spec/Subscriber-spec.ts | 2 +- spec/Subscription-spec.ts | 2 +- spec/ajax/index-spec.ts | 2 +- spec/exports-spec.ts | 30 +++---------------- spec/helpers/marble-testing.ts | 5 ++-- spec/helpers/test-helper.ts | 9 +++--- spec/helpers/testScheduler-ui.ts | 2 +- spec/helpers/tests2png/diagram-test-runner.ts | 4 +-- spec/helpers/tests2png/painter.ts | 2 +- spec/internal/rxjs-spec.ts | 12 ++++---- spec/observables/IteratorObservable-spec.ts | 6 ++-- spec/observables/ScalarObservable-spec.ts | 4 +-- .../observables/SubscribeOnObservable-spec.ts | 4 +-- spec/observables/bindCallback-spec.ts | 4 +-- spec/observables/bindNodeCallback-spec.ts | 4 +-- spec/observables/combineLatest-spec.ts | 2 +- spec/observables/concat-spec.ts | 2 +- spec/observables/defer-spec.ts | 4 +-- spec/observables/dom/ajax-spec.ts | 4 +-- spec/observables/dom/webSocket-spec.ts | 2 +- spec/observables/empty-spec.ts | 6 ++-- spec/observables/forkJoin-spec.ts | 2 +- spec/observables/from-promise-spec.ts | 2 +- spec/observables/from-spec.ts | 6 ++-- spec/observables/fromEvent-spec.ts | 4 +-- spec/observables/fromEventPattern-spec.ts | 4 +-- spec/observables/generate-spec.ts | 5 ++-- spec/observables/if-spec.ts | 2 +- spec/observables/interval-spec.ts | 5 ++-- spec/observables/merge-spec.ts | 2 +- spec/observables/never-spec.ts | 2 +- spec/observables/of-spec.ts | 4 +-- spec/observables/onErrorResumeNext-spec.ts | 2 +- spec/observables/pairs-spec.ts | 4 +-- spec/observables/race-spec.ts | 2 +- spec/observables/range-spec.ts | 8 ++--- spec/observables/throwError-spec.ts | 2 +- spec/observables/timer-spec.ts | 6 ++-- spec/observables/using-spec.ts | 2 +- spec/observables/zip-spec.ts | 2 +- spec/operators/audit-spec.ts | 2 +- spec/operators/auditTime-spec.ts | 2 +- spec/operators/buffer-spec.ts | 4 +-- spec/operators/bufferCount-spec.ts | 2 +- spec/operators/bufferTime-spec.ts | 2 +- spec/operators/bufferToggle-spec.ts | 2 +- spec/operators/bufferWhen-spec.ts | 2 +- spec/operators/catch-spec.ts | 2 +- spec/operators/combineAll-spec.ts | 2 +- spec/operators/combineLatest-spec.ts | 2 +- spec/operators/concat-spec.ts | 2 +- spec/operators/concatAll-spec.ts | 4 +-- spec/operators/concatMap-spec.ts | 2 +- spec/operators/concatMapTo-spec.ts | 2 +- spec/operators/count-spec.ts | 2 +- spec/operators/debounce-spec.ts | 4 +-- spec/operators/debounceTime-spec.ts | 2 +- spec/operators/defaultIfEmpty-spec.ts | 2 +- spec/operators/delay-spec.ts | 2 +- spec/operators/delayWhen-spec.ts | 2 +- spec/operators/dematerialize-spec.ts | 2 +- spec/operators/distinct-spec.ts | 2 +- spec/operators/distinctUntilChanged-spec.ts | 2 +- .../operators/distinctUntilKeyChanged-spec.ts | 2 +- spec/operators/do-spec.ts | 2 +- spec/operators/elementAt-spec.ts | 2 +- spec/operators/every-spec.ts | 2 +- spec/operators/exhaust-spec.ts | 2 +- spec/operators/exhaustMap-spec.ts | 2 +- spec/operators/expand-spec.ts | 4 +-- spec/operators/filter-spec.ts | 2 +- spec/operators/finally-spec.ts | 2 +- spec/operators/find-spec.ts | 2 +- spec/operators/findIndex-spec.ts | 2 +- spec/operators/first-spec.ts | 2 +- spec/operators/forkJoin-spec.ts | 4 +-- spec/operators/groupBy-spec.ts | 4 +-- spec/operators/ignoreElements-spec.ts | 2 +- spec/operators/index-spec.ts | 2 +- spec/operators/isEmpty-spec.ts | 2 +- spec/operators/last-spec.ts | 2 +- spec/operators/let-spec.ts | 2 +- spec/operators/map-spec.ts | 2 +- spec/operators/mapTo-spec.ts | 2 +- spec/operators/materialize-spec.ts | 2 +- spec/operators/max-spec.ts | 2 +- spec/operators/merge-spec.ts | 2 +- spec/operators/mergeAll-spec.ts | 4 +-- spec/operators/mergeMap-spec.ts | 4 +-- spec/operators/mergeMapTo-spec.ts | 4 +-- spec/operators/mergeScan-spec.ts | 7 ++--- spec/operators/min-spec.ts | 2 +- spec/operators/multicast-spec.ts | 2 +- spec/operators/observeOn-spec.ts | 2 +- spec/operators/onErrorResumeNext-spec.ts | 2 +- spec/operators/partition-spec.ts | 2 +- spec/operators/pluck-spec.ts | 2 +- spec/operators/publish-spec.ts | 2 +- spec/operators/publishBehavior-spec.ts | 2 +- spec/operators/publishLast-spec.ts | 2 +- spec/operators/publishReplay-spec.ts | 6 ++-- spec/operators/race-spec.ts | 4 +-- spec/operators/reduce-spec.ts | 2 +- spec/operators/refCount-spec.ts | 5 ++-- spec/operators/repeat-spec.ts | 2 +- spec/operators/repeatWhen-spec.ts | 2 +- spec/operators/retry-spec.ts | 2 +- spec/operators/retryWhen-spec.ts | 2 +- spec/operators/sample-spec.ts | 2 +- spec/operators/sampleTime-spec.ts | 2 +- spec/operators/scan-spec.ts | 2 +- spec/operators/share-spec.ts | 4 +-- spec/operators/shareReplay-spec.ts | 2 +- spec/operators/single-spec.ts | 2 +- spec/operators/skip-spec.ts | 2 +- spec/operators/skipLast-spec.ts | 2 +- spec/operators/skipUntil-spec.ts | 2 +- spec/operators/skipWhile-spec.ts | 2 +- spec/operators/startWith-spec.ts | 2 +- spec/operators/subscribeOn-spec.ts | 2 +- spec/operators/switch-spec.ts | 4 +-- spec/operators/switchMap-spec.ts | 2 +- spec/operators/switchMapTo-spec.ts | 2 +- spec/operators/take-spec.ts | 2 +- spec/operators/takeLast-spec.ts | 2 +- spec/operators/takeUntil-spec.ts | 2 +- spec/operators/takeWhile-spec.ts | 2 +- spec/operators/throttle-spec.ts | 2 +- spec/operators/throttleTime-spec.ts | 2 +- spec/operators/throwIfEmpty-spec.ts | 5 ++-- spec/operators/timeInterval-spec.ts | 2 +- spec/operators/timeout-spec.ts | 2 +- spec/operators/timeoutWith-spec.ts | 2 +- spec/operators/timestamp-spec.ts | 2 +- spec/operators/toArray-spec.ts | 2 +- spec/operators/toPromise-spec.ts | 2 +- spec/operators/window-spec.ts | 2 +- spec/operators/windowCount-spec.ts | 2 +- spec/operators/windowTime-spec.ts | 2 +- spec/operators/windowToggle-spec.ts | 6 ++-- spec/operators/windowWhen-spec.ts | 2 +- spec/operators/withLatestFrom-spec.ts | 2 +- spec/operators/zip-spec.ts | 2 +- spec/operators/zipAll-spec.ts | 2 +- spec/root-module-spec.ts | 2 +- .../AnimationFrameScheduler-spec.ts | 2 +- spec/schedulers/AsapScheduler-spec.ts | 2 +- spec/schedulers/QueueScheduler-spec.ts | 2 +- spec/schedulers/TestScheduler-spec.ts | 5 ++-- spec/schedulers/VirtualTimeScheduler-spec.ts | 4 +-- spec/subjects/AsyncSubject-spec.ts | 2 +- spec/subjects/BehaviorSubject-spec.ts | 2 +- spec/subjects/ReplaySubject-spec.ts | 2 +- spec/support/coverage.opts | 2 +- spec/symbol/rxSubscriber-spec.ts | 7 ++--- spec/testing/index-spec.ts | 2 +- spec/tsconfig.json | 4 +-- spec/util/Immediate-spec.ts | 2 +- spec/util/UnsubscriptionError-spec.ts | 2 +- spec/util/pipe-spec.ts | 2 +- spec/util/subscribeToResult-spec.ts | 8 ++--- spec/util/toSubscriber-spec.ts | 2 +- spec/websocket/index-spec.ts | 2 +- src/internal-compatibility/index.ts | 15 +++++++++- tsconfig.json | 6 +++- tsconfig/tsconfig.base.json | 16 +++++----- 182 files changed, 271 insertions(+), 279 deletions(-) create mode 100644 compat/scheduler/animationFrame.ts create mode 100644 compat/scheduler/asap.ts create mode 100644 compat/scheduler/async.ts create mode 100644 compat/scheduler/queue.ts create mode 100644 legacy-reexport/scheduler/animationFrame.ts create mode 100644 legacy-reexport/scheduler/asap.ts create mode 100644 legacy-reexport/scheduler/async.ts create mode 100644 legacy-reexport/scheduler/queue.ts diff --git a/compat/Rx.ts b/compat/Rx.ts index 867e18f454..cfd120fb0f 100644 --- a/compat/Rx.ts +++ b/compat/Rx.ts @@ -3,8 +3,11 @@ // Subject extends Observable and Observable references Subject in it's // definition export {Observable, Subject} from 'rxjs'; +export {AnonymousSubject} from 'rxjs/internal-compatibility'; /* tslint:enable:no-unused-variable */ +export { config } from 'rxjs/internal-compatibility'; + // statics /* tslint:disable:no-use-before-declare */ import './add/observable/bindCallback'; @@ -157,12 +160,13 @@ export { export {TestScheduler} from 'rxjs/testing'; -export { Operator, Subscriber, AsyncSubject, ConnectableObservable, TimeoutError, TimeInterval, Timestamp, VirtualTimeScheduler } from 'rxjs'; +export { Operator, Subscriber, AsyncSubject, ConnectableObservable, TimeoutError, VirtualTimeScheduler } from 'rxjs'; export { AjaxRequest, AjaxResponse, AjaxError, AjaxTimeoutError } from 'rxjs/ajax'; import { asapScheduler, asyncScheduler, queueScheduler, animationFrameScheduler, SchedulerLike } from 'rxjs'; import { iterator, observable, rxSubscriber } from 'rxjs/internal-compatibility'; +export { TimeInterval, Timestamp } from 'rxjs/internal-compatibility'; import * as _operators from 'rxjs/operators'; diff --git a/compat/add/observable/throw.ts b/compat/add/observable/throw.ts index 44fa0a0d35..e7008425bb 100644 --- a/compat/add/observable/throw.ts +++ b/compat/add/observable/throw.ts @@ -1,7 +1,7 @@ import { Observable, throwError as staticThrowError } from 'rxjs'; (Observable as any).throw = staticThrowError; -(Observable as any).throwError = staticThrowError; +Observable.throwError = staticThrowError; declare module 'rxjs/internal/Observable' { namespace Observable { diff --git a/compat/scheduler/animationFrame.ts b/compat/scheduler/animationFrame.ts new file mode 100644 index 0000000000..f408918882 --- /dev/null +++ b/compat/scheduler/animationFrame.ts @@ -0,0 +1 @@ +export { animationFrameScheduler as animationFrame } from 'rxjs'; diff --git a/compat/scheduler/asap.ts b/compat/scheduler/asap.ts new file mode 100644 index 0000000000..5de8e08754 --- /dev/null +++ b/compat/scheduler/asap.ts @@ -0,0 +1 @@ +export { asapScheduler as asap } from 'rxjs'; diff --git a/compat/scheduler/async.ts b/compat/scheduler/async.ts new file mode 100644 index 0000000000..fa65215b31 --- /dev/null +++ b/compat/scheduler/async.ts @@ -0,0 +1 @@ +export { asyncScheduler as async } from 'rxjs'; diff --git a/compat/scheduler/queue.ts b/compat/scheduler/queue.ts new file mode 100644 index 0000000000..d3ed980800 --- /dev/null +++ b/compat/scheduler/queue.ts @@ -0,0 +1 @@ +export { queueScheduler as queue } from 'rxjs'; diff --git a/legacy-reexport/scheduler/animationFrame.ts b/legacy-reexport/scheduler/animationFrame.ts new file mode 100644 index 0000000000..f293624484 --- /dev/null +++ b/legacy-reexport/scheduler/animationFrame.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/scheduler/animationFrame'; diff --git a/legacy-reexport/scheduler/asap.ts b/legacy-reexport/scheduler/asap.ts new file mode 100644 index 0000000000..934d4b55a7 --- /dev/null +++ b/legacy-reexport/scheduler/asap.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/scheduler/asap'; diff --git a/legacy-reexport/scheduler/async.ts b/legacy-reexport/scheduler/async.ts new file mode 100644 index 0000000000..ed5a61385b --- /dev/null +++ b/legacy-reexport/scheduler/async.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/scheduler/async'; diff --git a/legacy-reexport/scheduler/queue.ts b/legacy-reexport/scheduler/queue.ts new file mode 100644 index 0000000000..daea584555 --- /dev/null +++ b/legacy-reexport/scheduler/queue.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/scheduler/queue'; diff --git a/package-lock.json b/package-lock.json index 7e68ad39f9..7aad0d3bbe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@reactivex/rxjs", - "version": "6.0.0-alpha.3", + "version": "6.0.0-alpha.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index c969ffa053..3638488f2f 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "prepublish": "shx rm -rf ./typings && npm run build_all", "publish_docs": "./publish_docs.sh", "test_browser": "npm-run-all build_spec_browser && opn spec/support/mocha-browser-runner.html", - "test": "cross-env TS_NODE_FAST=true cross-env NODE_PATH=./dist-compat/package mocha --require ts-node/register --opts spec/support/coverage.opts \"spec/**/*-spec.ts\"", + "test": "cross-env TS_NODE_FAST=true NODE_PATH=./dist-compat:./dist mocha --require ts-node/register --opts spec/support/coverage.opts \"spec/**/*-spec.ts\"", "test:cover": "cross-env TS_NODE_FAST=true nyc npm test", "test:circular": "dependency-cruise --validate .dependency-cruiser.json -x \"^node_modules\" src", "test:systemjs": "node integration/systemjs/systemjs-compatibility-spec.js", diff --git a/spec/Notification-spec.ts b/spec/Notification-spec.ts index a9fd39f127..41637e9ed8 100644 --- a/spec/Notification-spec.ts +++ b/spec/Notification-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { expectObservable } from './helpers/marble-testing'; const Notification = Rx.Notification; diff --git a/spec/Observable-spec.ts b/spec/Observable-spec.ts index b15e8b1002..fa12c7ff61 100644 --- a/spec/Observable-spec.ts +++ b/spec/Observable-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import * as Rx from '../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { Observer, TeardownLogic } from '../src/internal/types'; import { cold, expectObservable, expectSubscriptions } from './helpers/marble-testing'; import { map } from '../src/internal/operators/map'; diff --git a/spec/Scheduler-spec.ts b/spec/Scheduler-spec.ts index 5b547f4d2e..9ca4c94886 100644 --- a/spec/Scheduler-spec.ts +++ b/spec/Scheduler-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; const Scheduler = Rx.Scheduler; diff --git a/spec/Subject-spec.ts b/spec/Subject-spec.ts index 56a9fb9a34..f074689329 100644 --- a/spec/Subject-spec.ts +++ b/spec/Subject-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, expectObservable } from './helpers/marble-testing'; const Subject = Rx.Subject; diff --git a/spec/Subscriber-spec.ts b/spec/Subscriber-spec.ts index bd62c9dfe6..9b57cfab74 100644 --- a/spec/Subscriber-spec.ts +++ b/spec/Subscriber-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; const Subscriber = Rx.Subscriber; diff --git a/spec/Subscription-spec.ts b/spec/Subscription-spec.ts index ab9b84a888..3d9ac956a2 100644 --- a/spec/Subscription-spec.ts +++ b/spec/Subscription-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; const Observable = Rx.Observable; const Subscription = Rx.Subscription; diff --git a/spec/ajax/index-spec.ts b/spec/ajax/index-spec.ts index 7827a82fa7..0bb1b590d9 100644 --- a/spec/ajax/index-spec.ts +++ b/spec/ajax/index-spec.ts @@ -1,4 +1,4 @@ -import * as index from '../../src/ajax/index'; +import * as index from 'rxjs/ajax'; import { expect } from 'chai'; describe('index', () => { diff --git a/spec/exports-spec.ts b/spec/exports-spec.ts index 5adc2eded9..b30e92db14 100644 --- a/spec/exports-spec.ts +++ b/spec/exports-spec.ts @@ -1,29 +1,7 @@ import { expect } from 'chai'; -import { bindCallback } from '../src/internal/observable/bindCallback'; -import { bindNodeCallback } from '../src/internal/observable/bindNodeCallback'; -import { combineLatest } from '../src/internal/observable/combineLatest'; -import { concat } from '../src/internal/observable/concat'; -import { defer } from '../src/internal/observable/defer'; -import { empty } from '../src/internal/observable/empty'; -import { forkJoin } from '../src/internal/observable/forkJoin'; -import { from } from '../src/internal/observable/from'; -import { fromEvent } from '../src/internal/observable/fromEvent'; -import { fromEventPattern } from '../src/internal/observable/fromEventPattern'; -import { fromPromise } from '../src/internal/observable/fromPromise'; -import { iif } from '../src/internal/observable/iif'; -import { interval } from '../src/internal/observable/interval'; -import { merge } from '../src/internal/observable/merge'; -import { never } from '../src/internal/observable/never'; -import { of } from '../src/internal/observable/of'; -import { onErrorResumeNext } from '../src/internal/observable/onErrorResumeNext'; -import { pairs } from '../src/internal/observable/pairs'; -import { race } from '../src/internal/observable/race'; -import { range } from '../src/internal/observable/range'; -import { throwError } from '../src/internal/observable/throwError'; -import { timer } from '../src/internal/observable/timer'; -import { using } from '../src/internal/observable/using'; -import { zip } from '../src/internal/observable/zip'; -import * as Rx from '../src/internal/Rx'; +import { bindCallback, bindNodeCallback, combineLatest, concat, defer, empty, forkJoin, from, fromEvent, fromEventPattern, + iif, interval, merge, NEVER, of, onErrorResumeNext, pairs, race, range, throwError, timer, using, zip } from 'rxjs'; +import * as Rx from 'rxjs/Rx'; describe('exports', () => { it('should have rxjs/observable/bindCallback', () => { @@ -67,7 +45,7 @@ describe('exports', () => { }); it('should have rxjs/observable/fromPromise', () => { - expect(fromPromise).to.equal(Rx.Observable.fromPromise); + expect(from).to.equal(Rx.Observable.fromPromise); }); it('should have rxjs/observable/iif', () => { diff --git a/spec/helpers/marble-testing.ts b/spec/helpers/marble-testing.ts index cfc6149a7d..4a9dd81182 100644 --- a/spec/helpers/marble-testing.ts +++ b/spec/helpers/marble-testing.ts @@ -1,8 +1,9 @@ -import { Observable } from '../../src/internal/Observable'; +import { Observable } from 'rxjs'; +import { TestScheduler } from 'rxjs/testing'; import { SubscriptionLog } from '../../src/internal/testing/SubscriptionLog'; import { ColdObservable } from '../../src/internal/testing/ColdObservable'; import { HotObservable } from '../../src/internal/testing/HotObservable'; -import { TestScheduler, observableToBeFn, subscriptionLogsToBeFn } from '../../src/internal/testing/TestScheduler'; +import { observableToBeFn, subscriptionLogsToBeFn } from '../../src/internal/testing/TestScheduler'; declare const global: any; diff --git a/spec/helpers/test-helper.ts b/spec/helpers/test-helper.ts index 49443ffad3..7a42b26b53 100644 --- a/spec/helpers/test-helper.ts +++ b/spec/helpers/test-helper.ts @@ -1,9 +1,8 @@ declare const global: any; -import * as Rx from '../../src/internal/Rx'; -import { ObservableInput } from '../../src/internal/types'; -import { root } from '../../src/internal/util/root'; -import { $$iterator } from '../../src/internal/symbol/iterator'; +import * as Rx from 'rxjs/Rx'; +import { ObservableInput } from 'rxjs'; +import { iterator, root } from 'rxjs/internal-compatibility'; import $$symbolObservable from 'symbol-observable'; export function lowerCaseO(...args: Array): Rx.Observable { @@ -30,7 +29,7 @@ export const createObservableInputs = (value: T) => Rx.Observable.of({ - [$$iterator]: () => { + [iterator]: () => { const iteratorResults = [ { value, done: false }, { done: true } diff --git a/spec/helpers/testScheduler-ui.ts b/spec/helpers/testScheduler-ui.ts index 2a1198a9d0..7d78ff7cc9 100644 --- a/spec/helpers/testScheduler-ui.ts +++ b/spec/helpers/testScheduler-ui.ts @@ -4,7 +4,7 @@ import * as _ from 'lodash'; import * as chai from 'chai'; import * as sinonChai from 'sinon-chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import * as marble from './marble-testing'; //tslint:disable:no-var-requires no-require-imports diff --git a/spec/helpers/tests2png/diagram-test-runner.ts b/spec/helpers/tests2png/diagram-test-runner.ts index 54a8ccd952..78e9f6e6bd 100644 --- a/spec/helpers/tests2png/diagram-test-runner.ts +++ b/spec/helpers/tests2png/diagram-test-runner.ts @@ -1,9 +1,9 @@ import { painter } from './painter'; -import { Observable } from '../../../src/internal/Observable'; +import { Observable } from 'rxjs'; +import { TestScheduler } from 'rxjs/testing'; import { TestMessage } from '../../../src/internal/testing/TestMessage'; import { ColdObservable } from '../../../src/internal/testing/ColdObservable'; import { HotObservable } from '../../../src/internal/testing/HotObservable'; -import { TestScheduler, observableToBeFn, subscriptionLogsToBeFn } from '../../../src/internal/testing/TestScheduler'; import { TestStream } from './types'; declare const global: any; diff --git a/spec/helpers/tests2png/painter.ts b/spec/helpers/tests2png/painter.ts index 0418965c05..c148d14935 100644 --- a/spec/helpers/tests2png/painter.ts +++ b/spec/helpers/tests2png/painter.ts @@ -3,7 +3,7 @@ import * as gm from 'gm'; import * as Color from 'color'; import { cloneDeep, isEqual} from 'lodash'; import { TestMessage } from '../../../src/internal/testing/TestMessage'; -import { Observable } from '../../../src/internal/Observable'; +import { Observable } from 'rxjs'; import { GMObject, MarbleContent, TestStream } from './types'; let canvasHeight: number | undefined; diff --git a/spec/internal/rxjs-spec.ts b/spec/internal/rxjs-spec.ts index 04758feb0d..32f7e57cfe 100644 --- a/spec/internal/rxjs-spec.ts +++ b/spec/internal/rxjs-spec.ts @@ -1,10 +1,10 @@ import { expect } from 'chai'; -import * as umd from '../../src/internal/umd'; -import * as rx_index from '../../src'; -import * as rx_operators from '../../src/operators'; -import * as rx_testing from '../../src/testing'; -import * as rx_ajax from '../../src/ajax'; -import * as rx_websocket from '../../src/websocket'; +import * as umd from 'rxjs/internal/umd'; +import * as rx_index from 'rxjs'; +import * as rx_operators from 'rxjs/operators'; +import * as rx_testing from 'rxjs/testing'; +import * as rx_ajax from 'rxjs/ajax'; +import * as rx_websocket from 'rxjs/websocket'; describe('rxjs exports', () => { Object.keys(rx_index).forEach(key => { diff --git a/spec/observables/IteratorObservable-spec.ts b/spec/observables/IteratorObservable-spec.ts index a19cb5d68f..61726b3654 100644 --- a/spec/observables/IteratorObservable-spec.ts +++ b/spec/observables/IteratorObservable-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; -import { queue } from '../../src/internal/scheduler/queue'; -import { fromIterable } from '../../src/internal/observable/fromIterable'; +import * as Rx from 'rxjs/Rx'; +import { queue } from 'rxjs/scheduler/queue'; +import { fromIterable } from 'rxjs/internal-compatibility'; declare const expectObservable: any; declare const rxTestScheduler: Rx.TestScheduler; diff --git a/spec/observables/ScalarObservable-spec.ts b/spec/observables/ScalarObservable-spec.ts index a92e0bfa51..1d9472e77f 100644 --- a/spec/observables/ScalarObservable-spec.ts +++ b/spec/observables/ScalarObservable-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; -import { scalar } from '../../src/internal/observable/scalar'; +import * as Rx from 'rxjs/Rx'; +import { scalar } from 'rxjs/internal-compatibility'; declare const rxTestScheduler: Rx.TestScheduler; diff --git a/spec/observables/SubscribeOnObservable-spec.ts b/spec/observables/SubscribeOnObservable-spec.ts index 3a174dba91..73a4ebcc95 100644 --- a/spec/observables/SubscribeOnObservable-spec.ts +++ b/spec/observables/SubscribeOnObservable-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import * as Rx from '../../src/internal/Rx'; -import { SubscribeOnObservable } from '../../src/internal/observable/SubscribeOnObservable'; +import * as Rx from 'rxjs/Rx'; +import { SubscribeOnObservable } from 'rxjs/internal-compatibility'; import { hot, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare const rxTestScheduler: Rx.TestScheduler; diff --git a/spec/observables/bindCallback-spec.ts b/spec/observables/bindCallback-spec.ts index 99233b9291..b1a4d41f2e 100644 --- a/spec/observables/bindCallback-spec.ts +++ b/spec/observables/bindCallback-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import { bindCallback } from '../../src/'; -import { TestScheduler } from '../../src/testing'; +import { bindCallback } from 'rxjs'; +import { TestScheduler } from 'rxjs/testing'; declare const rxTestScheduler: TestScheduler; diff --git a/spec/observables/bindNodeCallback-spec.ts b/spec/observables/bindNodeCallback-spec.ts index ce350cf6b4..57ed22ab6a 100644 --- a/spec/observables/bindNodeCallback-spec.ts +++ b/spec/observables/bindNodeCallback-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import { bindNodeCallback } from '../../src'; -import { TestScheduler } from '../../src/testing'; +import { bindNodeCallback } from 'rxjs'; +import { TestScheduler } from 'rxjs/testing'; declare const rxTestScheduler: TestScheduler; diff --git a/spec/observables/combineLatest-spec.ts b/spec/observables/combineLatest-spec.ts index d3ee8e3062..add08a80a1 100644 --- a/spec/observables/combineLatest-spec.ts +++ b/spec/observables/combineLatest-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare const type: Function; diff --git a/spec/observables/concat-spec.ts b/spec/observables/concat-spec.ts index cb75e4d1c1..57e771bd7c 100644 --- a/spec/observables/concat-spec.ts +++ b/spec/observables/concat-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { lowerCaseO } from '../helpers/test-helper'; import { hot, cold, emptySubs, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; diff --git a/spec/observables/defer-spec.ts b/spec/observables/defer-spec.ts index 93bac17bf7..6e4f142c08 100644 --- a/spec/observables/defer-spec.ts +++ b/spec/observables/defer-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import { defer } from '../../src/'; -import { Observable } from '../../src'; +import { defer } from 'rxjs'; +import { Observable } from 'rxjs'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/observables/dom/ajax-spec.ts b/spec/observables/dom/ajax-spec.ts index 5acb06e49c..daaf01bbc7 100644 --- a/spec/observables/dom/ajax-spec.ts +++ b/spec/observables/dom/ajax-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import * as Rx from '../../../src/internal/Rx'; -import { root } from '../../../src/internal/util/root'; +import * as Rx from 'rxjs/Rx'; +import { root } from 'rxjs/internal-compatibility'; declare const global: any; diff --git a/spec/observables/dom/webSocket-spec.ts b/spec/observables/dom/webSocket-spec.ts index 7d4eda35b6..515fd7dafa 100644 --- a/spec/observables/dom/webSocket-spec.ts +++ b/spec/observables/dom/webSocket-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import * as Rx from '../../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; declare const __root__: any; diff --git a/spec/observables/empty-spec.ts b/spec/observables/empty-spec.ts index 37160872f0..45f79b621d 100644 --- a/spec/observables/empty-spec.ts +++ b/spec/observables/empty-spec.ts @@ -1,8 +1,8 @@ import { expect } from 'chai'; import { expectObservable } from '../helpers/marble-testing'; -import { empty } from '../../src/'; -import { EMPTY } from '../../src'; -import { TestScheduler } from '../../src/testing'; +import { empty } from 'rxjs'; +import { EMPTY } from 'rxjs'; +import { TestScheduler } from 'rxjs/testing'; declare const asDiagram: any; declare const rxTestScheduler: TestScheduler; diff --git a/spec/observables/forkJoin-spec.ts b/spec/observables/forkJoin-spec.ts index 7e041c6c27..dcb342dedb 100644 --- a/spec/observables/forkJoin-spec.ts +++ b/spec/observables/forkJoin-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { Observable, forkJoin, of } from '../../src'; +import { Observable, forkJoin, of } from 'rxjs'; import { lowerCaseO } from '../helpers/test-helper'; import { hot, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; diff --git a/spec/observables/from-promise-spec.ts b/spec/observables/from-promise-spec.ts index 06205e9f4c..41f2a764d3 100644 --- a/spec/observables/from-promise-spec.ts +++ b/spec/observables/from-promise-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; declare const process: any; const Observable = Rx.Observable; diff --git a/spec/observables/from-spec.ts b/spec/observables/from-spec.ts index ee5e28054e..512fb9c62d 100644 --- a/spec/observables/from-spec.ts +++ b/spec/observables/from-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; -import { TestScheduler } from '../../src/testing'; -import { Observable, asapScheduler, asyncScheduler, Observer } from '../../src'; -import { of, from } from '../../src/'; +import { TestScheduler } from 'rxjs/testing'; +import { Observable, asapScheduler, asyncScheduler, Observer } from 'rxjs'; +import { of, from } from 'rxjs'; // tslint:disable:no-any declare const asDiagram: any; diff --git a/spec/observables/fromEvent-spec.ts b/spec/observables/fromEvent-spec.ts index d02455421e..ec9ae2fc11 100644 --- a/spec/observables/fromEvent-spec.ts +++ b/spec/observables/fromEvent-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { expectObservable } from '../helpers/marble-testing'; -import { fromEvent, NEVER, timer } from '../../src'; -import { TestScheduler } from '../../src/testing'; +import { fromEvent, NEVER, timer } from 'rxjs'; +import { TestScheduler } from 'rxjs/testing'; declare function asDiagram(arg: string): Function; declare const rxTestScheduler: TestScheduler; diff --git a/spec/observables/fromEventPattern-spec.ts b/spec/observables/fromEventPattern-spec.ts index cda75388c5..3cf587d102 100644 --- a/spec/observables/fromEventPattern-spec.ts +++ b/spec/observables/fromEventPattern-spec.ts @@ -2,8 +2,8 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; import { expectObservable } from '../helpers/marble-testing'; -import { fromEventPattern, noop, NEVER, timer } from '../../src'; -import { TestScheduler } from '../../src/testing'; +import { fromEventPattern, noop, NEVER, timer } from 'rxjs'; +import { TestScheduler } from 'rxjs/testing'; declare function asDiagram(arg: string): Function; declare const rxTestScheduler: TestScheduler; diff --git a/spec/observables/generate-spec.ts b/spec/observables/generate-spec.ts index e7bae18de7..c1250e2e35 100644 --- a/spec/observables/generate-spec.ts +++ b/spec/observables/generate-spec.ts @@ -1,8 +1,7 @@ -import { TestScheduler } from '../../src/testing'; +import { TestScheduler } from 'rxjs/testing'; import { expect } from 'chai'; import { expectObservable } from '../helpers/marble-testing'; -import { Subscriber } from '../../src/internal/Subscriber'; -import { generate } from '../../src'; +import { generate, Subscriber } from 'rxjs'; declare function asDiagram(arg: string): Function; declare const rxTestScheduler: TestScheduler; diff --git a/spec/observables/if-spec.ts b/spec/observables/if-spec.ts index 018ba3969d..f61a54c082 100644 --- a/spec/observables/if-spec.ts +++ b/spec/observables/if-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { iif, of } from '../../src'; +import { iif, of } from 'rxjs'; import { expectObservable } from '../helpers/marble-testing'; describe('iif', () => { diff --git a/spec/observables/interval-spec.ts b/spec/observables/interval-spec.ts index 4d7e8067a4..4b367defaf 100644 --- a/spec/observables/interval-spec.ts +++ b/spec/observables/interval-spec.ts @@ -1,9 +1,8 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; import { expectObservable } from '../helpers/marble-testing'; -import { NEVER, asapScheduler, Observable, animationFrameScheduler, queueScheduler } from '../../src'; -import { TestScheduler } from '../../src/testing'; -import { interval } from '../../src/'; +import { NEVER, interval, asapScheduler, Observable, animationFrameScheduler, queueScheduler } from 'rxjs'; +import { TestScheduler } from 'rxjs/testing'; declare const asDiagram: any; declare const rxTestScheduler: TestScheduler; diff --git a/spec/observables/merge-spec.ts b/spec/observables/merge-spec.ts index 8435b84198..a141c4233a 100644 --- a/spec/observables/merge-spec.ts +++ b/spec/observables/merge-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { lowerCaseO } from '../helpers/test-helper'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; diff --git a/spec/observables/never-spec.ts b/spec/observables/never-spec.ts index 4196f0af3b..b7fea66ddd 100644 --- a/spec/observables/never-spec.ts +++ b/spec/observables/never-spec.ts @@ -1,4 +1,4 @@ -import { NEVER } from '../../src/'; +import { NEVER } from 'rxjs'; import { expect } from 'chai'; import { expectObservable } from '../helpers/marble-testing'; diff --git a/spec/observables/of-spec.ts b/spec/observables/of-spec.ts index d2568a9166..eb642c92fc 100644 --- a/spec/observables/of-spec.ts +++ b/spec/observables/of-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; -import { empty } from '../../src/internal/observable/empty'; +import * as Rx from 'rxjs/Rx'; +import { empty } from 'rxjs'; import { expectObservable } from '../helpers/marble-testing'; declare const asDiagram: any; declare const rxTestScheduler: Rx.TestScheduler; diff --git a/spec/observables/onErrorResumeNext-spec.ts b/spec/observables/onErrorResumeNext-spec.ts index 5021b3743d..d69958d2ef 100644 --- a/spec/observables/onErrorResumeNext-spec.ts +++ b/spec/observables/onErrorResumeNext-spec.ts @@ -1,5 +1,5 @@ -import { onErrorResumeNext } from '../../src/'; +import { onErrorResumeNext } from 'rxjs'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; describe('onErrorResumeNext', () => { diff --git a/spec/observables/pairs-spec.ts b/spec/observables/pairs-spec.ts index f3386eceec..7e6e57b03b 100644 --- a/spec/observables/pairs-spec.ts +++ b/spec/observables/pairs-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { expectObservable } from '../helpers/marble-testing'; -import { TestScheduler } from '../../src/testing'; -import { pairs } from '../../src/'; +import { TestScheduler } from 'rxjs/testing'; +import { pairs } from 'rxjs'; declare const asDiagram: any; diff --git a/spec/observables/race-spec.ts b/spec/observables/race-spec.ts index 0bb49747b0..28e7f8e197 100644 --- a/spec/observables/race-spec.ts +++ b/spec/observables/race-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; const Observable = Rx.Observable; diff --git a/spec/observables/range-spec.ts b/spec/observables/range-spec.ts index 8a989ee4d7..c6563cc63b 100644 --- a/spec/observables/range-spec.ts +++ b/spec/observables/range-spec.ts @@ -1,11 +1,9 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import { Observable, asapScheduler as asap} from '../../src'; -import { range } from '../../src/'; -import { TestScheduler } from '../../src/testing'; +import { Observable, Subscriber, asapScheduler as asap, range} from 'rxjs'; +import { TestScheduler } from 'rxjs/testing'; import { expectObservable } from '../helpers/marble-testing'; -import { dispatch } from '../../src/internal/observable/range'; -import { Subscriber } from '../../src/internal/Subscriber'; +import { dispatch } from 'rxjs/internal-compatibility'; declare const asDiagram: any; diff --git a/spec/observables/throwError-spec.ts b/spec/observables/throwError-spec.ts index 94f5502261..b5b04675fb 100644 --- a/spec/observables/throwError-spec.ts +++ b/spec/observables/throwError-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import { TestScheduler } from '../../src/internal/testing/TestScheduler'; -import { throwError } from '../../src/'; +import { throwError } from 'rxjs'; import { expectObservable } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/observables/timer-spec.ts b/spec/observables/timer-spec.ts index 10a6bb1fb7..8a104f30d5 100644 --- a/spec/observables/timer-spec.ts +++ b/spec/observables/timer-spec.ts @@ -1,7 +1,7 @@ import { cold, expectObservable, time } from '../helpers/marble-testing'; -import { timer, NEVER, merge } from '../../src/'; -import { TestScheduler } from '../../src/testing'; -import { mergeMap } from '../../src/operators'; +import { timer, NEVER, merge } from 'rxjs'; +import { TestScheduler } from 'rxjs/testing'; +import { mergeMap } from 'rxjs/operators'; declare const asDiagram: any; declare const rxTestScheduler: TestScheduler; diff --git a/spec/observables/using-spec.ts b/spec/observables/using-spec.ts index 257c1a9970..fa05c0788f 100644 --- a/spec/observables/using-spec.ts +++ b/spec/observables/using-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { using, range, Subscription } from '../../src'; +import { using, range, Subscription } from 'rxjs'; describe('using', () => { it('should dispose of the resource when the subscription is disposed', (done) => { diff --git a/spec/observables/zip-spec.ts b/spec/observables/zip-spec.ts index f99b7dfaef..a98bed677e 100644 --- a/spec/observables/zip-spec.ts +++ b/spec/observables/zip-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare const type: Function; diff --git a/spec/operators/audit-spec.ts b/spec/operators/audit-spec.ts index c5c6f63171..7f4480d7f5 100644 --- a/spec/operators/audit-spec.ts +++ b/spec/operators/audit-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/auditTime-spec.ts b/spec/operators/auditTime-spec.ts index bc0e07ba3b..a116817bc2 100644 --- a/spec/operators/auditTime-spec.ts +++ b/spec/operators/auditTime-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/buffer-spec.ts b/spec/operators/buffer-spec.ts index 693e425c2b..6146ff07d0 100644 --- a/spec/operators/buffer-spec.ts +++ b/spec/operators/buffer-spec.ts @@ -1,6 +1,6 @@ import { hot, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; -import { buffer, mergeMap, take } from '../../src/operators'; -import { EMPTY, NEVER, throwError, of } from '../../src'; +import { buffer, mergeMap, take } from 'rxjs/operators'; +import { EMPTY, NEVER, throwError, of } from 'rxjs'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/bufferCount-spec.ts b/spec/operators/bufferCount-spec.ts index b8da1fca1a..c71400043b 100644 --- a/spec/operators/bufferCount-spec.ts +++ b/spec/operators/bufferCount-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { expect } from 'chai'; import { hot, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; diff --git a/spec/operators/bufferTime-spec.ts b/spec/operators/bufferTime-spec.ts index eb214aab32..912789ac79 100644 --- a/spec/operators/bufferTime-spec.ts +++ b/spec/operators/bufferTime-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions, time } from '../helpers/marble-testing'; declare const asDiagram: Function; diff --git a/spec/operators/bufferToggle-spec.ts b/spec/operators/bufferToggle-spec.ts index 17ae969b08..51864bb621 100644 --- a/spec/operators/bufferToggle-spec.ts +++ b/spec/operators/bufferToggle-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/bufferWhen-spec.ts b/spec/operators/bufferWhen-spec.ts index 12013b68f5..e5e54a0788 100644 --- a/spec/operators/bufferWhen-spec.ts +++ b/spec/operators/bufferWhen-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/catch-spec.ts b/spec/operators/catch-spec.ts index 4806b0e93e..a133fba88e 100644 --- a/spec/operators/catch-spec.ts +++ b/spec/operators/catch-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import * as sinon from 'sinon'; import { createObservableInputs } from '../helpers/test-helper'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; diff --git a/spec/operators/combineAll-spec.ts b/spec/operators/combineAll-spec.ts index 90f2ad9def..0fd80abbbc 100644 --- a/spec/operators/combineAll-spec.ts +++ b/spec/operators/combineAll-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/combineLatest-spec.ts b/spec/operators/combineLatest-spec.ts index 976f7d7dd6..c6e9c27b3f 100644 --- a/spec/operators/combineLatest-spec.ts +++ b/spec/operators/combineLatest-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/concat-spec.ts b/spec/operators/concat-spec.ts index 281cf8d99a..8b7dc7725f 100644 --- a/spec/operators/concat-spec.ts +++ b/spec/operators/concat-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/concatAll-spec.ts b/spec/operators/concatAll-spec.ts index c48570d1d9..0635a1bd85 100644 --- a/spec/operators/concatAll-spec.ts +++ b/spec/operators/concatAll-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; -import { throwError } from '../../src/internal/observable/throwError'; +import { throwError } from 'rxjs'; declare function asDiagram(arg: string): Function; declare const type: Function; diff --git a/spec/operators/concatMap-spec.ts b/spec/operators/concatMap-spec.ts index dcc3ea2901..c904b239b6 100644 --- a/spec/operators/concatMap-spec.ts +++ b/spec/operators/concatMap-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/concatMapTo-spec.ts b/spec/operators/concatMapTo-spec.ts index 2ef63cc40e..35b553db79 100644 --- a/spec/operators/concatMapTo-spec.ts +++ b/spec/operators/concatMapTo-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/count-spec.ts b/spec/operators/count-spec.ts index 9c03d007c8..fc5a8406a6 100644 --- a/spec/operators/count-spec.ts +++ b/spec/operators/count-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/debounce-spec.ts b/spec/operators/debounce-spec.ts index add01affdc..cbd64bb3e0 100644 --- a/spec/operators/debounce-spec.ts +++ b/spec/operators/debounce-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; -import { NEVER } from '../../src/internal/observable/never'; +import { NEVER } from 'rxjs'; declare const type; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/debounceTime-spec.ts b/spec/operators/debounceTime-spec.ts index 47834bf9e5..efc31ea2ca 100644 --- a/spec/operators/debounceTime-spec.ts +++ b/spec/operators/debounceTime-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; import { VirtualTimeScheduler } from '../../src/internal/scheduler/VirtualTimeScheduler'; diff --git a/spec/operators/defaultIfEmpty-spec.ts b/spec/operators/defaultIfEmpty-spec.ts index 4b164efdd0..1104fd80ff 100644 --- a/spec/operators/defaultIfEmpty-spec.ts +++ b/spec/operators/defaultIfEmpty-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/delay-spec.ts b/spec/operators/delay-spec.ts index 6ff4b33387..83d2b7e769 100644 --- a/spec/operators/delay-spec.ts +++ b/spec/operators/delay-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions, time } from '../helpers/marble-testing'; declare const asDiagram: Function; diff --git a/spec/operators/delayWhen-spec.ts b/spec/operators/delayWhen-spec.ts index fa8b65247b..35bdb76f7d 100644 --- a/spec/operators/delayWhen-spec.ts +++ b/spec/operators/delayWhen-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; import { expect } from 'chai'; diff --git a/spec/operators/dematerialize-spec.ts b/spec/operators/dematerialize-spec.ts index ca84533432..b2b81d72e1 100644 --- a/spec/operators/dematerialize-spec.ts +++ b/spec/operators/dematerialize-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/distinct-spec.ts b/spec/operators/distinct-spec.ts index 9a7bace286..d57e10c838 100644 --- a/spec/operators/distinct-spec.ts +++ b/spec/operators/distinct-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; const Observable = Rx.Observable; diff --git a/spec/operators/distinctUntilChanged-spec.ts b/spec/operators/distinctUntilChanged-spec.ts index e5f164ca01..c0be4e75fb 100644 --- a/spec/operators/distinctUntilChanged-spec.ts +++ b/spec/operators/distinctUntilChanged-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/distinctUntilKeyChanged-spec.ts b/spec/operators/distinctUntilKeyChanged-spec.ts index c609d46407..3e533af104 100644 --- a/spec/operators/distinctUntilKeyChanged-spec.ts +++ b/spec/operators/distinctUntilKeyChanged-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/do-spec.ts b/spec/operators/do-spec.ts index 44b31d974c..7694253ffb 100644 --- a/spec/operators/do-spec.ts +++ b/spec/operators/do-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/elementAt-spec.ts b/spec/operators/elementAt-spec.ts index 4f5f423b25..6209198963 100644 --- a/spec/operators/elementAt-spec.ts +++ b/spec/operators/elementAt-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/every-spec.ts b/spec/operators/every-spec.ts index f1b2ad8bfb..07ade9795a 100644 --- a/spec/operators/every-spec.ts +++ b/spec/operators/every-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/exhaust-spec.ts b/spec/operators/exhaust-spec.ts index e8d1060140..5235bcdef3 100644 --- a/spec/operators/exhaust-spec.ts +++ b/spec/operators/exhaust-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/exhaustMap-spec.ts b/spec/operators/exhaustMap-spec.ts index 2851af29b6..0d613082ed 100644 --- a/spec/operators/exhaustMap-spec.ts +++ b/spec/operators/exhaustMap-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/expand-spec.ts b/spec/operators/expand-spec.ts index 4cb38142ba..ee5bcd4ada 100644 --- a/spec/operators/expand-spec.ts +++ b/spec/operators/expand-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; -import { Subscribable } from '../../src/internal/Observable'; +import { Subscribable } from 'rxjs/Observable'; declare function asDiagram(arg: string): Function; declare const type: Function; diff --git a/spec/operators/filter-spec.ts b/spec/operators/filter-spec.ts index a0487bbea7..7e24712503 100644 --- a/spec/operators/filter-spec.ts +++ b/spec/operators/filter-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/finally-spec.ts b/spec/operators/finally-spec.ts index 35d1abf49e..0b0384b319 100644 --- a/spec/operators/finally-spec.ts +++ b/spec/operators/finally-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare const type: Function; diff --git a/spec/operators/find-spec.ts b/spec/operators/find-spec.ts index 114603faf9..a65e9eb842 100644 --- a/spec/operators/find-spec.ts +++ b/spec/operators/find-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/findIndex-spec.ts b/spec/operators/findIndex-spec.ts index 36b183176d..7ea30fe689 100644 --- a/spec/operators/findIndex-spec.ts +++ b/spec/operators/findIndex-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/first-spec.ts b/spec/operators/first-spec.ts index f0995ad3c8..6e26954c70 100644 --- a/spec/operators/first-spec.ts +++ b/spec/operators/first-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/forkJoin-spec.ts b/spec/operators/forkJoin-spec.ts index 5bffcf5433..c2aab4ec29 100644 --- a/spec/operators/forkJoin-spec.ts +++ b/spec/operators/forkJoin-spec.ts @@ -1,7 +1,7 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { expect } from 'chai'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; -import { forkJoin } from '../../src/internal/observable/forkJoin'; +import { forkJoin } from 'rxjs'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/groupBy-spec.ts b/spec/operators/groupBy-spec.ts index 7bb76a0b6b..f13684a5c4 100644 --- a/spec/operators/groupBy-spec.ts +++ b/spec/operators/groupBy-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; -import { GroupedObservable } from '../../src/internal/operators/groupBy'; +import * as Rx from 'rxjs/Rx'; +import { GroupedObservable } from 'rxjs/internal-compatibility'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/ignoreElements-spec.ts b/spec/operators/ignoreElements-spec.ts index 7ebdb3c4db..a63454b783 100644 --- a/spec/operators/ignoreElements-spec.ts +++ b/spec/operators/ignoreElements-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/index-spec.ts b/spec/operators/index-spec.ts index cd84628a9f..227b361985 100644 --- a/spec/operators/index-spec.ts +++ b/spec/operators/index-spec.ts @@ -1,4 +1,4 @@ -import * as index from '../../src/operators/index'; +import * as index from 'rxjs/operators'; import { expect } from 'chai'; describe('operators/index', () => { diff --git a/spec/operators/isEmpty-spec.ts b/spec/operators/isEmpty-spec.ts index a803404417..3c1e792661 100644 --- a/spec/operators/isEmpty-spec.ts +++ b/spec/operators/isEmpty-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/last-spec.ts b/spec/operators/last-spec.ts index 0aec35571f..c8f36bde85 100644 --- a/spec/operators/last-spec.ts +++ b/spec/operators/last-spec.ts @@ -1,5 +1,5 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/let-spec.ts b/spec/operators/let-spec.ts index e00591ccaf..aff139c936 100644 --- a/spec/operators/let-spec.ts +++ b/spec/operators/let-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; /** @test {let} */ describe('Observable.prototype.let', () => { diff --git a/spec/operators/map-spec.ts b/spec/operators/map-spec.ts index 3e891227e0..8e887e1d4c 100644 --- a/spec/operators/map-spec.ts +++ b/spec/operators/map-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/mapTo-spec.ts b/spec/operators/mapTo-spec.ts index b6be534403..d77554f4e5 100644 --- a/spec/operators/mapTo-spec.ts +++ b/spec/operators/mapTo-spec.ts @@ -1,5 +1,5 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/materialize-spec.ts b/spec/operators/materialize-spec.ts index 0ebe4892d7..77fc06acfa 100644 --- a/spec/operators/materialize-spec.ts +++ b/spec/operators/materialize-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/max-spec.ts b/spec/operators/max-spec.ts index 6b0739fe93..cab7565159 100644 --- a/spec/operators/max-spec.ts +++ b/spec/operators/max-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/merge-spec.ts b/spec/operators/merge-spec.ts index 386fec7704..efee23b866 100644 --- a/spec/operators/merge-spec.ts +++ b/spec/operators/merge-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/mergeAll-spec.ts b/spec/operators/mergeAll-spec.ts index 8c6a70c3ee..2806cb721f 100644 --- a/spec/operators/mergeAll-spec.ts +++ b/spec/operators/mergeAll-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; -import { throwError } from '../../src/internal/observable/throwError'; +import { throwError } from 'rxjs'; declare function asDiagram(arg: string): Function; declare const type: Function; diff --git a/spec/operators/mergeMap-spec.ts b/spec/operators/mergeMap-spec.ts index bd1db82d66..b608b0362a 100644 --- a/spec/operators/mergeMap-spec.ts +++ b/spec/operators/mergeMap-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import { mergeMap, map } from '../../src/operators'; -import { Observable, from, of } from '../../src'; +import { mergeMap, map } from 'rxjs/operators'; +import { Observable, from, of } from 'rxjs'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare const type: Function; diff --git a/spec/operators/mergeMapTo-spec.ts b/spec/operators/mergeMapTo-spec.ts index 8bbb2737a8..632307fc55 100644 --- a/spec/operators/mergeMapTo-spec.ts +++ b/spec/operators/mergeMapTo-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; -import { mergeMapTo, map } from '../../src/operators'; -import { from, of, Observable } from '../../src'; +import { mergeMapTo, map } from 'rxjs/operators'; +import { from, of, Observable } from 'rxjs'; declare const type: Function; declare const asDiagram: Function; diff --git a/spec/operators/mergeScan-spec.ts b/spec/operators/mergeScan-spec.ts index db974ada9b..2a0d484bd9 100644 --- a/spec/operators/mergeScan-spec.ts +++ b/spec/operators/mergeScan-spec.ts @@ -1,8 +1,7 @@ import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; -import { throwError } from '../../src/internal/observable/throwError'; -import { TestScheduler } from '../../src/testing'; -import { of, EMPTY, NEVER, concat } from '../../src'; -import { mergeScan, delay, mergeMap } from '../../src/operators'; +import { TestScheduler } from 'rxjs/testing'; +import { of, EMPTY, NEVER, concat, throwError } from 'rxjs'; +import { mergeScan, delay, mergeMap } from 'rxjs/operators'; declare const rxTestScheduler: TestScheduler; /** @test {mergeScan} */ diff --git a/spec/operators/min-spec.ts b/spec/operators/min-spec.ts index 5a45208e5b..c6c5296354 100644 --- a/spec/operators/min-spec.ts +++ b/spec/operators/min-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/multicast-spec.ts b/spec/operators/multicast-spec.ts index 83185d2b63..131f5ad4c6 100644 --- a/spec/operators/multicast-spec.ts +++ b/spec/operators/multicast-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions, time } from '../helpers/marble-testing'; declare const type: Function; diff --git a/spec/operators/observeOn-spec.ts b/spec/operators/observeOn-spec.ts index ac23281124..a51ce15325 100644 --- a/spec/operators/observeOn-spec.ts +++ b/spec/operators/observeOn-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { expect } from 'chai'; import { hot, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; diff --git a/spec/operators/onErrorResumeNext-spec.ts b/spec/operators/onErrorResumeNext-spec.ts index 8cc9198370..491ddabb03 100644 --- a/spec/operators/onErrorResumeNext-spec.ts +++ b/spec/operators/onErrorResumeNext-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/partition-spec.ts b/spec/operators/partition-spec.ts index 1134d7a5c9..13d1f207ac 100644 --- a/spec/operators/partition-spec.ts +++ b/spec/operators/partition-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/pluck-spec.ts b/spec/operators/pluck-spec.ts index bbc1375ae2..285376202a 100644 --- a/spec/operators/pluck-spec.ts +++ b/spec/operators/pluck-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/publish-spec.ts b/spec/operators/publish-spec.ts index bd5cbc98d0..69ab71faac 100644 --- a/spec/operators/publish-spec.ts +++ b/spec/operators/publish-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/publishBehavior-spec.ts b/spec/operators/publishBehavior-spec.ts index 87bf1406bb..56b9fb7fbd 100644 --- a/spec/operators/publishBehavior-spec.ts +++ b/spec/operators/publishBehavior-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/publishLast-spec.ts b/spec/operators/publishLast-spec.ts index 2152296b53..b1bcbf3d03 100644 --- a/spec/operators/publishLast-spec.ts +++ b/spec/operators/publishLast-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/publishReplay-spec.ts b/spec/operators/publishReplay-spec.ts index c4f52f888c..09228318c5 100644 --- a/spec/operators/publishReplay-spec.ts +++ b/spec/operators/publishReplay-spec.ts @@ -1,9 +1,7 @@ import { expect } from 'chai'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; -import { throwError } from '../../src/internal/observable/throwError'; -import { EMPTY, NEVER, of, Observable, Subscription } from '../../src'; -import { publishReplay } from '../../src/operators'; -import { ConnectableObservable } from '../../src/internal/observable/ConnectableObservable'; +import { throwError, ConnectableObservable, EMPTY, NEVER, of, Observable, Subscription } from 'rxjs'; +import { publishReplay } from 'rxjs/operators'; declare function asDiagram(arg: string): Function; declare const type: Function; diff --git a/spec/operators/race-spec.ts b/spec/operators/race-spec.ts index c63be1e4d5..ba64142756 100644 --- a/spec/operators/race-spec.ts +++ b/spec/operators/race-spec.ts @@ -1,8 +1,8 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; -import { NEVER } from '../../src/internal/observable/never'; +import { NEVER } from 'rxjs'; const Observable = Rx.Observable; diff --git a/spec/operators/reduce-spec.ts b/spec/operators/reduce-spec.ts index a346d130af..0bf51da895 100644 --- a/spec/operators/reduce-spec.ts +++ b/spec/operators/reduce-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare const type: Function; diff --git a/spec/operators/refCount-spec.ts b/spec/operators/refCount-spec.ts index 723914272b..cca1469563 100644 --- a/spec/operators/refCount-spec.ts +++ b/spec/operators/refCount-spec.ts @@ -1,8 +1,7 @@ import { expect } from 'chai'; import { cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; -import { refCount, publish, publishReplay } from '../../src/operators'; -import { ConnectableObservable } from '../../src/internal/observable/ConnectableObservable'; -import { NEVER, noop, Observable, Observer, Subject } from '../../src'; +import { refCount, publish, publishReplay } from 'rxjs/operators'; +import { NEVER, noop, Observable, Observer, Subject, ConnectableObservable } from 'rxjs'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/repeat-spec.ts b/spec/operators/repeat-spec.ts index 16094e09ef..8391e78cb3 100644 --- a/spec/operators/repeat-spec.ts +++ b/spec/operators/repeat-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/repeatWhen-spec.ts b/spec/operators/repeatWhen-spec.ts index 940cf45bc7..a02dfc6ced 100644 --- a/spec/operators/repeatWhen-spec.ts +++ b/spec/operators/repeatWhen-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/retry-spec.ts b/spec/operators/retry-spec.ts index 460092c560..e9c432a45b 100644 --- a/spec/operators/retry-spec.ts +++ b/spec/operators/retry-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/retryWhen-spec.ts b/spec/operators/retryWhen-spec.ts index b24880f965..4086decd39 100644 --- a/spec/operators/retryWhen-spec.ts +++ b/spec/operators/retryWhen-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/sample-spec.ts b/spec/operators/sample-spec.ts index 5507578c5b..e599031217 100644 --- a/spec/operators/sample-spec.ts +++ b/spec/operators/sample-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { expect } from 'chai'; import { hot, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; diff --git a/spec/operators/sampleTime-spec.ts b/spec/operators/sampleTime-spec.ts index 69ab957a5b..437dd8e1d1 100644 --- a/spec/operators/sampleTime-spec.ts +++ b/spec/operators/sampleTime-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/scan-spec.ts b/spec/operators/scan-spec.ts index 2b947d23e0..5d6d7d7b2a 100644 --- a/spec/operators/scan-spec.ts +++ b/spec/operators/scan-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare const type: Function; diff --git a/spec/operators/share-spec.ts b/spec/operators/share-spec.ts index 8cbddc7e8f..ec90ad5965 100644 --- a/spec/operators/share-spec.ts +++ b/spec/operators/share-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; -import { share } from '../../src/operators'; -import { Observable, EMPTY, NEVER } from '../../src'; +import { share } from 'rxjs/operators'; +import { Observable, EMPTY, NEVER } from 'rxjs'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/shareReplay-spec.ts b/spec/operators/shareReplay-spec.ts index 4af797cdc4..adaef1bd54 100644 --- a/spec/operators/shareReplay-spec.ts +++ b/spec/operators/shareReplay-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/single-spec.ts b/spec/operators/single-spec.ts index 696b89384f..862e531d10 100644 --- a/spec/operators/single-spec.ts +++ b/spec/operators/single-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/skip-spec.ts b/spec/operators/skip-spec.ts index f05d0caf45..f243b2469e 100644 --- a/spec/operators/skip-spec.ts +++ b/spec/operators/skip-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/skipLast-spec.ts b/spec/operators/skipLast-spec.ts index 7a0d27c5f8..dc740ac2bd 100644 --- a/spec/operators/skipLast-spec.ts +++ b/spec/operators/skipLast-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/skipUntil-spec.ts b/spec/operators/skipUntil-spec.ts index 0535980cad..8357c9f940 100644 --- a/spec/operators/skipUntil-spec.ts +++ b/spec/operators/skipUntil-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/skipWhile-spec.ts b/spec/operators/skipWhile-spec.ts index a2fbce29d5..e9e2c1f24e 100644 --- a/spec/operators/skipWhile-spec.ts +++ b/spec/operators/skipWhile-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/startWith-spec.ts b/spec/operators/startWith-spec.ts index 65f88d1507..e10f8377a4 100644 --- a/spec/operators/startWith-spec.ts +++ b/spec/operators/startWith-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/subscribeOn-spec.ts b/spec/operators/subscribeOn-spec.ts index 8fc5e713cf..d5d8466534 100644 --- a/spec/operators/subscribeOn-spec.ts +++ b/spec/operators/subscribeOn-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/switch-spec.ts b/spec/operators/switch-spec.ts index 278ab80d3f..6c1a9cb72b 100644 --- a/spec/operators/switch-spec.ts +++ b/spec/operators/switch-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; -import { Observable, of, NEVER, queueScheduler, Subject } from '../../src'; -import { switchAll } from '../../src/operators'; +import { Observable, of, NEVER, queueScheduler, Subject } from 'rxjs'; +import { switchAll } from 'rxjs/operators'; declare function asDiagram(arg: string): Function; declare const type: Function; diff --git a/spec/operators/switchMap-spec.ts b/spec/operators/switchMap-spec.ts index bc682eda83..c2950c87e8 100644 --- a/spec/operators/switchMap-spec.ts +++ b/spec/operators/switchMap-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/switchMapTo-spec.ts b/spec/operators/switchMapTo-spec.ts index 9ff96169c6..9570600198 100644 --- a/spec/operators/switchMapTo-spec.ts +++ b/spec/operators/switchMapTo-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/take-spec.ts b/spec/operators/take-spec.ts index ba6d0ca5b6..aa00185e96 100644 --- a/spec/operators/take-spec.ts +++ b/spec/operators/take-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/takeLast-spec.ts b/spec/operators/takeLast-spec.ts index fa40fb9634..669acdfd39 100644 --- a/spec/operators/takeLast-spec.ts +++ b/spec/operators/takeLast-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/takeUntil-spec.ts b/spec/operators/takeUntil-spec.ts index ac09b9dc96..6edd45eddc 100644 --- a/spec/operators/takeUntil-spec.ts +++ b/spec/operators/takeUntil-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/takeWhile-spec.ts b/spec/operators/takeWhile-spec.ts index db201d1334..a5a80f5c2b 100644 --- a/spec/operators/takeWhile-spec.ts +++ b/spec/operators/takeWhile-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/throttle-spec.ts b/spec/operators/throttle-spec.ts index f76f330d43..a5ad8448d5 100644 --- a/spec/operators/throttle-spec.ts +++ b/spec/operators/throttle-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare const type; diff --git a/spec/operators/throttleTime-spec.ts b/spec/operators/throttleTime-spec.ts index 3161956dc1..824b49d69d 100644 --- a/spec/operators/throttleTime-spec.ts +++ b/spec/operators/throttleTime-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/throwIfEmpty-spec.ts b/spec/operators/throwIfEmpty-spec.ts index cadd98b8cb..e588b69517 100644 --- a/spec/operators/throwIfEmpty-spec.ts +++ b/spec/operators/throwIfEmpty-spec.ts @@ -1,8 +1,7 @@ import { expect } from 'chai'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; -import { EMPTY, of } from '../../src'; -import { EmptyError } from '../../src/internal/util/EmptyError'; -import { throwIfEmpty } from '../../src/operators'; +import { EMPTY, of, EmptyError } from 'rxjs'; +import { throwIfEmpty } from 'rxjs/operators'; /** @test {timeout} */ describe('throwIfEmpty', () => { diff --git a/spec/operators/timeInterval-spec.ts b/spec/operators/timeInterval-spec.ts index 5f693b736d..aaf4ba12aa 100644 --- a/spec/operators/timeInterval-spec.ts +++ b/spec/operators/timeInterval-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/timeout-spec.ts b/spec/operators/timeout-spec.ts index 4270497996..184b63309e 100644 --- a/spec/operators/timeout-spec.ts +++ b/spec/operators/timeout-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/timeoutWith-spec.ts b/spec/operators/timeoutWith-spec.ts index 633e613f24..765e77bbbe 100644 --- a/spec/operators/timeoutWith-spec.ts +++ b/spec/operators/timeoutWith-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/timestamp-spec.ts b/spec/operators/timestamp-spec.ts index 7b068a1c7f..6fa29167c7 100644 --- a/spec/operators/timestamp-spec.ts +++ b/spec/operators/timestamp-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/operators/toArray-spec.ts b/spec/operators/toArray-spec.ts index 15f791fdcc..7476740f41 100644 --- a/spec/operators/toArray-spec.ts +++ b/spec/operators/toArray-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare const type: Function; diff --git a/spec/operators/toPromise-spec.ts b/spec/operators/toPromise-spec.ts index b61e9698f6..634cc340cb 100644 --- a/spec/operators/toPromise-spec.ts +++ b/spec/operators/toPromise-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; const Observable = Rx.Observable; diff --git a/spec/operators/window-spec.ts b/spec/operators/window-spec.ts index 62f2e44400..7057e554a7 100644 --- a/spec/operators/window-spec.ts +++ b/spec/operators/window-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare const type: Function; diff --git a/spec/operators/windowCount-spec.ts b/spec/operators/windowCount-spec.ts index 643e665b97..916a30c6a9 100644 --- a/spec/operators/windowCount-spec.ts +++ b/spec/operators/windowCount-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare const type: Function; diff --git a/spec/operators/windowTime-spec.ts b/spec/operators/windowTime-spec.ts index 349953a49c..a78fc71e0e 100644 --- a/spec/operators/windowTime-spec.ts +++ b/spec/operators/windowTime-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare const type: Function; diff --git a/spec/operators/windowToggle-spec.ts b/spec/operators/windowToggle-spec.ts index d934ec8c2f..2d9ce9fb3d 100644 --- a/spec/operators/windowToggle-spec.ts +++ b/spec/operators/windowToggle-spec.ts @@ -1,8 +1,8 @@ import { expect } from 'chai'; import { hot, cold, expectObservable, expectSubscriptions, time } from '../helpers/marble-testing'; -import { Observable, NEVER, of, ObjectUnsubscribedError } from '../../src'; -import { windowToggle, tap } from '../../src/operators'; -import { TestScheduler } from '../../src/testing'; +import { Observable, NEVER, of, ObjectUnsubscribedError } from 'rxjs'; +import { windowToggle, tap } from 'rxjs/operators'; +import { TestScheduler } from 'rxjs/testing'; declare const rxTestScheduler: TestScheduler; declare const type: Function; diff --git a/spec/operators/windowWhen-spec.ts b/spec/operators/windowWhen-spec.ts index 8408b8a607..3573af0bca 100644 --- a/spec/operators/windowWhen-spec.ts +++ b/spec/operators/windowWhen-spec.ts @@ -1,4 +1,4 @@ -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare const type: Function; diff --git a/spec/operators/withLatestFrom-spec.ts b/spec/operators/withLatestFrom-spec.ts index 1430db3087..f42a7f7f6d 100644 --- a/spec/operators/withLatestFrom-spec.ts +++ b/spec/operators/withLatestFrom-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { lowerCaseO } from '../helpers/test-helper'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; diff --git a/spec/operators/zip-spec.ts b/spec/operators/zip-spec.ts index 1d307f49bc..045ca425a7 100644 --- a/spec/operators/zip-spec.ts +++ b/spec/operators/zip-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare const type: Function; diff --git a/spec/operators/zipAll-spec.ts b/spec/operators/zipAll-spec.ts index 9ed246ee7c..97bfabf82b 100644 --- a/spec/operators/zipAll-spec.ts +++ b/spec/operators/zipAll-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/root-module-spec.ts b/spec/root-module-spec.ts index e5c300e626..d5449c3d57 100644 --- a/spec/root-module-spec.ts +++ b/spec/root-module-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; describe('Root Module', () => { it('should contain exports from commonjs modules', () => { diff --git a/spec/schedulers/AnimationFrameScheduler-spec.ts b/spec/schedulers/AnimationFrameScheduler-spec.ts index c19caf3a01..81cc800b41 100644 --- a/spec/schedulers/AnimationFrameScheduler-spec.ts +++ b/spec/schedulers/AnimationFrameScheduler-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; const animationFrame = Rx.Scheduler.animationFrame; diff --git a/spec/schedulers/AsapScheduler-spec.ts b/spec/schedulers/AsapScheduler-spec.ts index 4a72aaec2e..5642c97e54 100644 --- a/spec/schedulers/AsapScheduler-spec.ts +++ b/spec/schedulers/AsapScheduler-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; const asap = Rx.Scheduler.asap; diff --git a/spec/schedulers/QueueScheduler-spec.ts b/spec/schedulers/QueueScheduler-spec.ts index 58deaa19a5..52625a3d01 100644 --- a/spec/schedulers/QueueScheduler-spec.ts +++ b/spec/schedulers/QueueScheduler-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; const Scheduler = Rx.Scheduler; const queue = Scheduler.queue; diff --git a/spec/schedulers/TestScheduler-spec.ts b/spec/schedulers/TestScheduler-spec.ts index e082cd875f..6c2aed16ed 100644 --- a/spec/schedulers/TestScheduler-spec.ts +++ b/spec/schedulers/TestScheduler-spec.ts @@ -1,8 +1,7 @@ import { expect } from 'chai'; import { hot, cold, expectObservable, expectSubscriptions, time } from '../helpers/marble-testing'; -import { TestScheduler } from '../../src/testing'; -import { Notification } from '../../src/internal/Notification'; -import { Observable, NEVER, EMPTY, Subject, of } from '../../src'; +import { TestScheduler } from 'rxjs/testing'; +import { Observable, NEVER, EMPTY, Subject, of, Notification } from 'rxjs'; declare const rxTestScheduler: TestScheduler; diff --git a/spec/schedulers/VirtualTimeScheduler-spec.ts b/spec/schedulers/VirtualTimeScheduler-spec.ts index 0c98a4ccbc..09fc97ef05 100644 --- a/spec/schedulers/VirtualTimeScheduler-spec.ts +++ b/spec/schedulers/VirtualTimeScheduler-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; -import { VirtualAction } from '../../src/internal/scheduler/VirtualTimeScheduler'; +import * as Rx from 'rxjs/Rx'; +import { VirtualAction } from 'rxjs'; const VirtualTimeScheduler = Rx.VirtualTimeScheduler; diff --git a/spec/subjects/AsyncSubject-spec.ts b/spec/subjects/AsyncSubject-spec.ts index 2fac601196..f16a9ff144 100644 --- a/spec/subjects/AsyncSubject-spec.ts +++ b/spec/subjects/AsyncSubject-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; const AsyncSubject = Rx.AsyncSubject; diff --git a/spec/subjects/BehaviorSubject-spec.ts b/spec/subjects/BehaviorSubject-spec.ts index ed78821703..c386ac80dd 100644 --- a/spec/subjects/BehaviorSubject-spec.ts +++ b/spec/subjects/BehaviorSubject-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { hot, expectObservable } from '../helpers/marble-testing'; const BehaviorSubject = Rx.BehaviorSubject; diff --git a/spec/subjects/ReplaySubject-spec.ts b/spec/subjects/ReplaySubject-spec.ts index 27eb756003..90710498a4 100644 --- a/spec/subjects/ReplaySubject-spec.ts +++ b/spec/subjects/ReplaySubject-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; import { TestScheduler } from '../../src/internal/testing/TestScheduler'; import { hot, expectObservable } from '../helpers/marble-testing'; diff --git a/spec/support/coverage.opts b/spec/support/coverage.opts index e29f500896..d041c7ba95 100644 --- a/spec/support/coverage.opts +++ b/spec/support/coverage.opts @@ -8,4 +8,4 @@ --globals WebSocket,FormData,XDomainRequest,ActiveXObject --recursive ---timeout 5000 +--timeout 500 diff --git a/spec/symbol/rxSubscriber-spec.ts b/spec/symbol/rxSubscriber-spec.ts index cf52a04c82..388f44b98a 100644 --- a/spec/symbol/rxSubscriber-spec.ts +++ b/spec/symbol/rxSubscriber-spec.ts @@ -1,13 +1,12 @@ import { expect } from 'chai'; -import { root } from '../../src/internal/util/root'; -import {$$rxSubscriber} from '../../src/internal/symbol/rxSubscriber'; +import { root, rxSubscriber } from 'rxjs/internal-compatibility'; describe('rxSubscriber symbol', () => { it('should exist in the proper form', () => { if (root.Symbol && root.Symbol.for) { - expect($$rxSubscriber).to.equal(root.Symbol.for('rxSubscriber')); + expect(rxSubscriber).to.equal(root.Symbol.for('rxSubscriber')); } else { - expect($$rxSubscriber).to.equal('@@rxSubscriber'); + expect(rxSubscriber).to.equal('@@rxSubscriber'); } }); }); diff --git a/spec/testing/index-spec.ts b/spec/testing/index-spec.ts index 60d2f1643a..c3707d5f47 100644 --- a/spec/testing/index-spec.ts +++ b/spec/testing/index-spec.ts @@ -1,4 +1,4 @@ -import * as index from '../../src/testing/index'; +import * as index from 'rxjs/testing'; import { expect } from 'chai'; describe('index', () => { diff --git a/spec/tsconfig.json b/spec/tsconfig.json index 4da905f5a3..43199a8d86 100644 --- a/spec/tsconfig.json +++ b/spec/tsconfig.json @@ -1,5 +1,3 @@ { - "extends": "../tsconfig.json", - "compilerOptions": { - } + "extends": "../tsconfig.json" } \ No newline at end of file diff --git a/spec/util/Immediate-spec.ts b/spec/util/Immediate-spec.ts index 22cc7bd20a..3afa7f13c8 100644 --- a/spec/util/Immediate-spec.ts +++ b/spec/util/Immediate-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { Immediate } from '../../src/internal/util/Immediate'; +import { Immediate } from 'rxjs/internal-compatibility'; describe('Immediate', () => { it('should schedule on the next microtask', (done) => { diff --git a/spec/util/UnsubscriptionError-spec.ts b/spec/util/UnsubscriptionError-spec.ts index 3872117d75..de4c2fee85 100644 --- a/spec/util/UnsubscriptionError-spec.ts +++ b/spec/util/UnsubscriptionError-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; +import * as Rx from 'rxjs/Rx'; const { Observable, UnsubscriptionError } = Rx; diff --git a/spec/util/pipe-spec.ts b/spec/util/pipe-spec.ts index 8f89f7522d..77ec1ef1a2 100644 --- a/spec/util/pipe-spec.ts +++ b/spec/util/pipe-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { pipe } from '../../src/internal/util/pipe'; +import { pipe } from 'rxjs'; describe('pipe', () => { it('should exist', () => { diff --git a/spec/util/subscribeToResult-spec.ts b/spec/util/subscribeToResult-spec.ts index 9d51dfa258..7acdb27922 100644 --- a/spec/util/subscribeToResult-spec.ts +++ b/spec/util/subscribeToResult-spec.ts @@ -1,8 +1,6 @@ import { expect } from 'chai'; -import * as Rx from '../../src/internal/Rx'; -import { subscribeToResult } from '../../src/internal/util/subscribeToResult'; -import { OuterSubscriber } from '../../src/internal/OuterSubscriber'; -import { $$iterator } from '../../src/internal/symbol/iterator'; +import * as Rx from 'rxjs/Rx'; +import { iterator, subscribeToResult, OuterSubscriber } from 'rxjs/internal-compatibility'; import $$symbolObservable from 'symbol-observable'; describe('subscribeToResult', () => { @@ -104,7 +102,7 @@ describe('subscribeToResult', () => { ]; const iterable = { - [$$iterator]: () => { + [iterator]: () => { return { next: () => { return iteratorResults.shift(); diff --git a/spec/util/toSubscriber-spec.ts b/spec/util/toSubscriber-spec.ts index 6ce29c3d66..827ef17272 100644 --- a/spec/util/toSubscriber-spec.ts +++ b/spec/util/toSubscriber-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { toSubscriber } from '../../src/internal/util/toSubscriber'; +import { toSubscriber } from 'rxjs/internal-compatibility'; describe('toSubscriber', () => { it('should not be closed when other subscriber created with no arguments completes', () => { diff --git a/spec/websocket/index-spec.ts b/spec/websocket/index-spec.ts index 0958c2377c..7164ac3587 100644 --- a/spec/websocket/index-spec.ts +++ b/spec/websocket/index-spec.ts @@ -1,4 +1,4 @@ -import * as index from '../../src/websocket/index'; +import * as index from 'rxjs/websocket'; import { expect } from 'chai'; describe('index', () => { diff --git a/src/internal-compatibility/index.ts b/src/internal-compatibility/index.ts index 2b9ac59a38..2332d14933 100644 --- a/src/internal-compatibility/index.ts +++ b/src/internal-compatibility/index.ts @@ -101,19 +101,32 @@ export { withLatestFrom } from '../internal/patching/operator/withLatestFrom'; export { zipProto } from '../internal/patching/operator/zip'; export { zipAll } from '../internal/patching/operator/zipAll'; +export { config } from '../internal/config'; export { InnerSubscriber } from '../internal/InnerSubscriber'; export { OuterSubscriber } from '../internal/OuterSubscriber'; export { Scheduler } from '../internal/Scheduler'; +export { AnonymousSubject } from '../internal/Subject'; export { SubjectSubscription } from '../internal/SubjectSubscription'; export { Subscriber } from '../internal/Subscriber'; export { fromPromise } from '../internal/observable/fromPromise'; +export { fromIterable } from '../internal/observable/fromIterable'; export { AjaxCreationMethod } from '../internal/observable/dom/AjaxObservable'; export { CombineLatestOperator } from '../internal/observable/combineLatest'; +export { dispatch } from '../internal/observable/range'; +export { SubscribeOnObservable } from '../internal/observable/SubscribeOnObservable'; +export { scalar } from '../internal/observable/scalar'; + +export { Timestamp } from '../internal/operators/timestamp'; +export { TimeInterval } from '../internal/operators/timeInterval'; +export { GroupedObservable } from '../internal/operators/groupBy'; export { rxSubscriber } from '../internal/symbol/rxSubscriber'; export { iterator } from '../internal/symbol/iterator'; export { observable } from '../internal/symbol/observable'; +export { Immediate } from '../internal/util/Immediate'; export { isArray } from '../internal/util/isArray'; -export { subscribeToResult } from '../internal/util/subscribeToResult'; \ No newline at end of file +export { root } from '../internal/util/root'; +export { subscribeToResult } from '../internal/util/subscribeToResult'; +export { toSubscriber } from '../internal/util/toSubscriber'; diff --git a/tsconfig.json b/tsconfig.json index 24a6ab0c34..99303f3770 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,8 +4,12 @@ "baseUrl": ".", "paths": { "rxjs": ["./src/index"], - "rxjs/*": ["./src/*"], + "rxjs/*": ["./src/*", "./legacy-reexport/*"], "rxjs/internal-compatibility": ["./src/internal-compatibility/index"], + "rxjs/Rx": ["./legacy-reexport/Rx"], + "rxjs/operators/*": ["./legacy-reexport/operators/*"], + "rxjs/symbol/*": ["./legacy-reexport/symbol/*"], + "rxjs/scheduler/*": ["./legacy-reexport/scheduler/*"], "rxjs/ajax": ["./src/ajax/index"], "rxjs/operators": ["./src/operators/index"], "rxjs/testing": ["./src/testing/index"], diff --git a/tsconfig/tsconfig.base.json b/tsconfig/tsconfig.base.json index 18a8cffefd..754aa4166a 100644 --- a/tsconfig/tsconfig.base.json +++ b/tsconfig/tsconfig.base.json @@ -6,17 +6,17 @@ }, "files": [ // entry-points - "../dist/src/index.ts", - "../dist/src/ajax/index.ts", - "../dist/src/operators/index.ts", - "../dist/src/testing/index.ts", - "../dist/src/websocket/index.ts", - "../dist/src/internal-compatibility/index.ts", + "../src/index.ts", + "../src/ajax/index.ts", + "../src/operators/index.ts", + "../src/testing/index.ts", + "../src/websocket/index.ts", + "../src/internal-compatibility/index.ts", // legacy entry-points - "../dist/src/internal/Rx.ts", + "../src/internal/Rx.ts", // umd entry-point - "../dist/src/internal/umd.ts" + "../src/internal/umd.ts" ] } From daa12cdc1b2175e165a257516588b8b72a22a8cf Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Wed, 14 Mar 2018 15:17:52 -0700 Subject: [PATCH 33/39] refactor(compat): fix up export paths to clean up compatibility package --- compat/observable/ConnectableObservable.ts | 1 + compat/observable/SubscribeOnObservable.ts | 1 + compat/observable/bindCallback.ts | 1 + compat/observable/bindNodeCallback.ts | 1 + compat/observable/combineLatest.ts | 1 + compat/observable/concat.ts | 1 + compat/observable/defer.ts | 1 + compat/observable/empty.ts | 1 + compat/observable/forkJoin.ts | 1 + compat/observable/from.ts | 1 + compat/observable/fromArray.ts | 1 + compat/observable/fromEvent.ts | 1 + compat/observable/fromEventPattern.ts | 1 + compat/observable/fromIterable.ts | 1 + compat/observable/fromObservable.ts | 1 + compat/observable/fromPromise.ts | 1 + compat/observable/generate.ts | 1 + compat/observable/if.ts | 1 + compat/observable/interval.ts | 1 + compat/observable/merge.ts | 1 + compat/observable/never.ts | 5 +++++ compat/observable/of.ts | 1 + compat/observable/onErrorResumeNext.ts | 1 + compat/observable/pairs.ts | 1 + compat/observable/race.ts | 1 + compat/observable/range.ts | 1 + compat/observable/scalar.ts | 1 + compat/observable/throw.ts | 1 + compat/observable/timer.ts | 1 + compat/observable/using.ts | 1 + compat/observable/zip.ts | 1 + compat/operators/audit.ts | 1 + compat/operators/auditTime.ts | 1 + compat/operators/buffer.ts | 1 + compat/operators/bufferCount.ts | 1 + compat/operators/bufferTime.ts | 1 + compat/operators/bufferToggle.ts | 1 + compat/operators/bufferWhen.ts | 1 + compat/operators/catchError.ts | 1 + compat/operators/combineAll.ts | 1 + compat/operators/concatAll.ts | 1 + compat/operators/concatMap.ts | 1 + compat/operators/concatMapTo.ts | 1 + compat/operators/count.ts | 1 + compat/operators/debounce.ts | 1 + compat/operators/debounceTime.ts | 1 + compat/operators/defaultIfEmpty.ts | 1 + compat/operators/delay.ts | 1 + compat/operators/delayWhen.ts | 1 + compat/operators/dematerialize.ts | 1 + compat/operators/distinct.ts | 1 + compat/operators/distinctUntilChanged.ts | 1 + compat/operators/distinctUntilKeyChanged.ts | 1 + compat/operators/elementAt.ts | 1 + compat/operators/every.ts | 1 + compat/operators/exhaust.ts | 1 + compat/operators/exhaustMap.ts | 1 + compat/operators/expand.ts | 1 + compat/operators/filter.ts | 1 + compat/operators/finalize.ts | 1 + compat/operators/find.ts | 1 + compat/operators/findIndex.ts | 1 + compat/operators/first.ts | 1 + compat/operators/groupBy.ts | 2 ++ compat/operators/ignoreElements.ts | 1 + compat/operators/isEmpty.ts | 1 + compat/operators/last.ts | 1 + compat/operators/map.ts | 1 + compat/operators/mapTo.ts | 1 + compat/operators/materialize.ts | 1 + compat/operators/max.ts | 1 + compat/operators/mergeAll.ts | 1 + compat/operators/mergeMap.ts | 1 + compat/operators/mergeMapTo.ts | 1 + compat/operators/mergeScan.ts | 1 + compat/operators/min.ts | 1 + compat/operators/multicast.ts | 1 + compat/operators/observeOn.ts | 1 + compat/operators/onErrorResumeNext.ts | 1 + compat/operators/pairwise.ts | 1 + compat/operators/partition.ts | 1 + compat/operators/pluck.ts | 1 + compat/operators/publish.ts | 1 + compat/operators/publishBehavior.ts | 1 + compat/operators/publishLast.ts | 1 + compat/operators/publishReplay.ts | 1 + compat/operators/race.ts | 1 + compat/operators/reduce.ts | 1 + compat/operators/refCount.ts | 1 + compat/operators/repeat.ts | 1 + compat/operators/repeatWhen.ts | 1 + compat/operators/retry.ts | 1 + compat/operators/retryWhen.ts | 1 + compat/operators/sample.ts | 1 + compat/operators/sampleTime.ts | 1 + compat/operators/scan.ts | 1 + compat/operators/sequenceEqual.ts | 1 + compat/operators/share.ts | 1 + compat/operators/shareReplay.ts | 1 + compat/operators/single.ts | 1 + compat/operators/skip.ts | 1 + compat/operators/skipLast.ts | 1 + compat/operators/skipUntil.ts | 1 + compat/operators/skipWhile.ts | 1 + compat/operators/startWith.ts | 1 + compat/operators/subscribeOn.ts | 1 + compat/operators/switchAll.ts | 1 + compat/operators/switchMap.ts | 1 + compat/operators/switchMapTo.ts | 1 + compat/operators/take.ts | 1 + compat/operators/takeLast.ts | 1 + compat/operators/takeUntil.ts | 1 + compat/operators/takeWhile.ts | 1 + compat/operators/tap.ts | 1 + compat/operators/throttle.ts | 1 + compat/operators/throttleTime.ts | 1 + compat/operators/throwIfEmpty.ts | 1 + compat/operators/timeInterval.ts | 1 + compat/operators/timeout.ts | 1 + compat/operators/timeoutWith.ts | 1 + compat/operators/timestamp.ts | 1 + compat/operators/toArray.ts | 1 + compat/operators/window.ts | 1 + compat/operators/windowCount.ts | 1 + compat/operators/windowTime.ts | 1 + compat/operators/windowToggle.ts | 1 + compat/operators/windowWhen.ts | 1 + compat/operators/withLatestFrom.ts | 1 + compat/operators/zipAll.ts | 1 + compat/util/Immediate.ts | 1 + compat/util/root.ts | 1 + legacy-reexport/add/oecho | 0 legacy-reexport/add/operator/bufferTimecho | 0 legacy-reexport/observable/ConnectableObservable.ts | 1 + legacy-reexport/observable/SubscribeOnObservable.ts | 1 + legacy-reexport/observable/bindCallback.ts | 1 + legacy-reexport/observable/bindNodeCallback.ts | 1 + legacy-reexport/observable/combineLatest.ts | 1 + legacy-reexport/observable/concat.ts | 1 + legacy-reexport/observable/defer.ts | 1 + legacy-reexport/observable/empty.ts | 1 + legacy-reexport/observable/forkJoin.ts | 1 + legacy-reexport/observable/from.ts | 1 + legacy-reexport/observable/fromArray.ts | 1 + legacy-reexport/observable/fromEvent.ts | 1 + legacy-reexport/observable/fromEventPattern.ts | 1 + legacy-reexport/observable/fromIterable.ts | 1 + legacy-reexport/observable/fromObservable.ts | 1 + legacy-reexport/observable/fromPromise.ts | 1 + legacy-reexport/observable/generate.ts | 1 + legacy-reexport/observable/if.ts | 1 + legacy-reexport/observable/interval.ts | 1 + legacy-reexport/observable/merge.ts | 1 + legacy-reexport/observable/never.ts | 1 + legacy-reexport/observable/of.ts | 1 + legacy-reexport/observable/onErrorResumeNext.ts | 1 + legacy-reexport/observable/pairs.ts | 1 + legacy-reexport/observable/race.ts | 1 + legacy-reexport/observable/range.ts | 1 + legacy-reexport/observable/scalar.ts | 1 + legacy-reexport/observable/throw.ts | 1 + legacy-reexport/observable/timer.ts | 1 + legacy-reexport/observable/using.ts | 1 + legacy-reexport/observable/zip.ts | 1 + legacy-reexport/operators/audit.ts | 1 + legacy-reexport/operators/auditTime.ts | 1 + legacy-reexport/operators/buffer.ts | 1 + legacy-reexport/operators/bufferCount.ts | 1 + legacy-reexport/operators/bufferTime.ts | 1 + legacy-reexport/operators/bufferToggle.ts | 1 + legacy-reexport/operators/bufferWhen.ts | 1 + legacy-reexport/operators/catchError.ts | 1 + legacy-reexport/operators/combineAll.ts | 1 + legacy-reexport/operators/concatAll.ts | 1 + legacy-reexport/operators/concatMap.ts | 1 + legacy-reexport/operators/concatMapTo.ts | 1 + legacy-reexport/operators/count.ts | 1 + legacy-reexport/operators/debounce.ts | 1 + legacy-reexport/operators/debounceTime.ts | 1 + legacy-reexport/operators/defaultIfEmpty.ts | 1 + legacy-reexport/operators/delay.ts | 1 + legacy-reexport/operators/delayWhen.ts | 1 + legacy-reexport/operators/dematerialize.ts | 1 + legacy-reexport/operators/distinct.ts | 1 + legacy-reexport/operators/distinctUntilChanged.ts | 1 + legacy-reexport/operators/distinctUntilKeyChanged.ts | 1 + legacy-reexport/operators/elementAt.ts | 1 + legacy-reexport/operators/every.ts | 1 + legacy-reexport/operators/exhaust.ts | 1 + legacy-reexport/operators/exhaustMap.ts | 1 + legacy-reexport/operators/expand.ts | 1 + legacy-reexport/operators/filter.ts | 1 + legacy-reexport/operators/finalize.ts | 1 + legacy-reexport/operators/find.ts | 1 + legacy-reexport/operators/findIndex.ts | 1 + legacy-reexport/operators/first.ts | 1 + legacy-reexport/operators/groupBy.ts | 1 + legacy-reexport/operators/ignoreElements.ts | 1 + legacy-reexport/operators/isEmpty.ts | 1 + legacy-reexport/operators/last.ts | 1 + legacy-reexport/operators/map.ts | 1 + legacy-reexport/operators/mapTo.ts | 1 + legacy-reexport/operators/materialize.ts | 1 + legacy-reexport/operators/max.ts | 1 + legacy-reexport/operators/mergeAll.ts | 1 + legacy-reexport/operators/mergeMap.ts | 1 + legacy-reexport/operators/mergeMapTo.ts | 1 + legacy-reexport/operators/mergeScan.ts | 1 + legacy-reexport/operators/min.ts | 1 + legacy-reexport/operators/multicast.ts | 1 + legacy-reexport/operators/observeOn.ts | 1 + legacy-reexport/operators/onErrorResumeNext.ts | 1 + legacy-reexport/operators/pairwise.ts | 1 + legacy-reexport/operators/partition.ts | 1 + legacy-reexport/operators/pluck.ts | 1 + legacy-reexport/operators/publish.ts | 1 + legacy-reexport/operators/publishBehavior.ts | 1 + legacy-reexport/operators/publishLast.ts | 1 + legacy-reexport/operators/publishReplay.ts | 1 + legacy-reexport/operators/race.ts | 1 + legacy-reexport/operators/reduce.ts | 1 + legacy-reexport/operators/refCount.ts | 1 + legacy-reexport/operators/repeat.ts | 1 + legacy-reexport/operators/repeatWhen.ts | 1 + legacy-reexport/operators/retry.ts | 1 + legacy-reexport/operators/retryWhen.ts | 1 + legacy-reexport/operators/sample.ts | 1 + legacy-reexport/operators/sampleTime.ts | 1 + legacy-reexport/operators/scan.ts | 1 + legacy-reexport/operators/sequenceEqual.ts | 1 + legacy-reexport/operators/share.ts | 1 + legacy-reexport/operators/shareReplay.ts | 1 + legacy-reexport/operators/single.ts | 1 + legacy-reexport/operators/skip.ts | 1 + legacy-reexport/operators/skipLast.ts | 1 + legacy-reexport/operators/skipUntil.ts | 1 + legacy-reexport/operators/skipWhile.ts | 1 + legacy-reexport/operators/startWith.ts | 1 + legacy-reexport/operators/subscribeOn.ts | 1 + legacy-reexport/operators/switchAll.ts | 1 + legacy-reexport/operators/switchMap.ts | 1 + legacy-reexport/operators/switchMapTo.ts | 1 + legacy-reexport/operators/take.ts | 1 + legacy-reexport/operators/takeLast.ts | 1 + legacy-reexport/operators/takeUntil.ts | 1 + legacy-reexport/operators/takeWhile.ts | 1 + legacy-reexport/operators/tap.ts | 1 + legacy-reexport/operators/throttle.ts | 1 + legacy-reexport/operators/throttleTime.ts | 1 + legacy-reexport/operators/throwIfEmpty.ts | 1 + legacy-reexport/operators/timeInterval.ts | 1 + legacy-reexport/operators/timeout.ts | 1 + legacy-reexport/operators/timeoutWith.ts | 1 + legacy-reexport/operators/timestamp.ts | 1 + legacy-reexport/operators/toArray.ts | 1 + legacy-reexport/operators/window.ts | 1 + legacy-reexport/operators/windowCount.ts | 1 + legacy-reexport/operators/windowTime.ts | 1 + legacy-reexport/operators/windowToggle.ts | 1 + legacy-reexport/operators/windowWhen.ts | 1 + legacy-reexport/operators/withLatestFrom.ts | 1 + legacy-reexport/operators/zipAll.ts | 1 + legacy-reexport/symbol/{observable => observable.ts} | 0 legacy-reexport/util/Immediate.ts | 1 + legacy-reexport/util/root.ts | 1 + spec/helpers/test-helper.ts | 3 ++- spec/observables/IteratorObservable-spec.ts | 2 +- spec/observables/ScalarObservable-spec.ts | 2 +- spec/observables/SubscribeOnObservable-spec.ts | 2 +- spec/observables/dom/ajax-spec.ts | 2 +- spec/observables/range-spec.ts | 2 +- spec/operators/groupBy-spec.ts | 2 +- spec/symbol/rxSubscriber-spec.ts | 3 ++- spec/util/Immediate-spec.ts | 2 +- src/operators/index.ts | 10 +++------- 275 files changed, 281 insertions(+), 16 deletions(-) create mode 100644 compat/observable/ConnectableObservable.ts create mode 100644 compat/observable/SubscribeOnObservable.ts create mode 100644 compat/observable/bindCallback.ts create mode 100644 compat/observable/bindNodeCallback.ts create mode 100644 compat/observable/combineLatest.ts create mode 100644 compat/observable/concat.ts create mode 100644 compat/observable/defer.ts create mode 100644 compat/observable/empty.ts create mode 100644 compat/observable/forkJoin.ts create mode 100644 compat/observable/from.ts create mode 100644 compat/observable/fromArray.ts create mode 100644 compat/observable/fromEvent.ts create mode 100644 compat/observable/fromEventPattern.ts create mode 100644 compat/observable/fromIterable.ts create mode 100644 compat/observable/fromObservable.ts create mode 100644 compat/observable/fromPromise.ts create mode 100644 compat/observable/generate.ts create mode 100644 compat/observable/if.ts create mode 100644 compat/observable/interval.ts create mode 100644 compat/observable/merge.ts create mode 100644 compat/observable/never.ts create mode 100644 compat/observable/of.ts create mode 100644 compat/observable/onErrorResumeNext.ts create mode 100644 compat/observable/pairs.ts create mode 100644 compat/observable/race.ts create mode 100644 compat/observable/range.ts create mode 100644 compat/observable/scalar.ts create mode 100644 compat/observable/throw.ts create mode 100644 compat/observable/timer.ts create mode 100644 compat/observable/using.ts create mode 100644 compat/observable/zip.ts create mode 100644 compat/operators/audit.ts create mode 100644 compat/operators/auditTime.ts create mode 100644 compat/operators/buffer.ts create mode 100644 compat/operators/bufferCount.ts create mode 100644 compat/operators/bufferTime.ts create mode 100644 compat/operators/bufferToggle.ts create mode 100644 compat/operators/bufferWhen.ts create mode 100644 compat/operators/catchError.ts create mode 100644 compat/operators/combineAll.ts create mode 100644 compat/operators/concatAll.ts create mode 100644 compat/operators/concatMap.ts create mode 100644 compat/operators/concatMapTo.ts create mode 100644 compat/operators/count.ts create mode 100644 compat/operators/debounce.ts create mode 100644 compat/operators/debounceTime.ts create mode 100644 compat/operators/defaultIfEmpty.ts create mode 100644 compat/operators/delay.ts create mode 100644 compat/operators/delayWhen.ts create mode 100644 compat/operators/dematerialize.ts create mode 100644 compat/operators/distinct.ts create mode 100644 compat/operators/distinctUntilChanged.ts create mode 100644 compat/operators/distinctUntilKeyChanged.ts create mode 100644 compat/operators/elementAt.ts create mode 100644 compat/operators/every.ts create mode 100644 compat/operators/exhaust.ts create mode 100644 compat/operators/exhaustMap.ts create mode 100644 compat/operators/expand.ts create mode 100644 compat/operators/filter.ts create mode 100644 compat/operators/finalize.ts create mode 100644 compat/operators/find.ts create mode 100644 compat/operators/findIndex.ts create mode 100644 compat/operators/first.ts create mode 100644 compat/operators/groupBy.ts create mode 100644 compat/operators/ignoreElements.ts create mode 100644 compat/operators/isEmpty.ts create mode 100644 compat/operators/last.ts create mode 100644 compat/operators/map.ts create mode 100644 compat/operators/mapTo.ts create mode 100644 compat/operators/materialize.ts create mode 100644 compat/operators/max.ts create mode 100644 compat/operators/mergeAll.ts create mode 100644 compat/operators/mergeMap.ts create mode 100644 compat/operators/mergeMapTo.ts create mode 100644 compat/operators/mergeScan.ts create mode 100644 compat/operators/min.ts create mode 100644 compat/operators/multicast.ts create mode 100644 compat/operators/observeOn.ts create mode 100644 compat/operators/onErrorResumeNext.ts create mode 100644 compat/operators/pairwise.ts create mode 100644 compat/operators/partition.ts create mode 100644 compat/operators/pluck.ts create mode 100644 compat/operators/publish.ts create mode 100644 compat/operators/publishBehavior.ts create mode 100644 compat/operators/publishLast.ts create mode 100644 compat/operators/publishReplay.ts create mode 100644 compat/operators/race.ts create mode 100644 compat/operators/reduce.ts create mode 100644 compat/operators/refCount.ts create mode 100644 compat/operators/repeat.ts create mode 100644 compat/operators/repeatWhen.ts create mode 100644 compat/operators/retry.ts create mode 100644 compat/operators/retryWhen.ts create mode 100644 compat/operators/sample.ts create mode 100644 compat/operators/sampleTime.ts create mode 100644 compat/operators/scan.ts create mode 100644 compat/operators/sequenceEqual.ts create mode 100644 compat/operators/share.ts create mode 100644 compat/operators/shareReplay.ts create mode 100644 compat/operators/single.ts create mode 100644 compat/operators/skip.ts create mode 100644 compat/operators/skipLast.ts create mode 100644 compat/operators/skipUntil.ts create mode 100644 compat/operators/skipWhile.ts create mode 100644 compat/operators/startWith.ts create mode 100644 compat/operators/subscribeOn.ts create mode 100644 compat/operators/switchAll.ts create mode 100644 compat/operators/switchMap.ts create mode 100644 compat/operators/switchMapTo.ts create mode 100644 compat/operators/take.ts create mode 100644 compat/operators/takeLast.ts create mode 100644 compat/operators/takeUntil.ts create mode 100644 compat/operators/takeWhile.ts create mode 100644 compat/operators/tap.ts create mode 100644 compat/operators/throttle.ts create mode 100644 compat/operators/throttleTime.ts create mode 100644 compat/operators/throwIfEmpty.ts create mode 100644 compat/operators/timeInterval.ts create mode 100644 compat/operators/timeout.ts create mode 100644 compat/operators/timeoutWith.ts create mode 100644 compat/operators/timestamp.ts create mode 100644 compat/operators/toArray.ts create mode 100644 compat/operators/window.ts create mode 100644 compat/operators/windowCount.ts create mode 100644 compat/operators/windowTime.ts create mode 100644 compat/operators/windowToggle.ts create mode 100644 compat/operators/windowWhen.ts create mode 100644 compat/operators/withLatestFrom.ts create mode 100644 compat/operators/zipAll.ts create mode 100644 compat/util/Immediate.ts create mode 100644 compat/util/root.ts delete mode 100644 legacy-reexport/add/oecho delete mode 100644 legacy-reexport/add/operator/bufferTimecho create mode 100644 legacy-reexport/observable/ConnectableObservable.ts create mode 100644 legacy-reexport/observable/SubscribeOnObservable.ts create mode 100644 legacy-reexport/observable/bindCallback.ts create mode 100644 legacy-reexport/observable/bindNodeCallback.ts create mode 100644 legacy-reexport/observable/combineLatest.ts create mode 100644 legacy-reexport/observable/concat.ts create mode 100644 legacy-reexport/observable/defer.ts create mode 100644 legacy-reexport/observable/empty.ts create mode 100644 legacy-reexport/observable/forkJoin.ts create mode 100644 legacy-reexport/observable/from.ts create mode 100644 legacy-reexport/observable/fromArray.ts create mode 100644 legacy-reexport/observable/fromEvent.ts create mode 100644 legacy-reexport/observable/fromEventPattern.ts create mode 100644 legacy-reexport/observable/fromIterable.ts create mode 100644 legacy-reexport/observable/fromObservable.ts create mode 100644 legacy-reexport/observable/fromPromise.ts create mode 100644 legacy-reexport/observable/generate.ts create mode 100644 legacy-reexport/observable/if.ts create mode 100644 legacy-reexport/observable/interval.ts create mode 100644 legacy-reexport/observable/merge.ts create mode 100644 legacy-reexport/observable/never.ts create mode 100644 legacy-reexport/observable/of.ts create mode 100644 legacy-reexport/observable/onErrorResumeNext.ts create mode 100644 legacy-reexport/observable/pairs.ts create mode 100644 legacy-reexport/observable/race.ts create mode 100644 legacy-reexport/observable/range.ts create mode 100644 legacy-reexport/observable/scalar.ts create mode 100644 legacy-reexport/observable/throw.ts create mode 100644 legacy-reexport/observable/timer.ts create mode 100644 legacy-reexport/observable/using.ts create mode 100644 legacy-reexport/observable/zip.ts create mode 100644 legacy-reexport/operators/audit.ts create mode 100644 legacy-reexport/operators/auditTime.ts create mode 100644 legacy-reexport/operators/buffer.ts create mode 100644 legacy-reexport/operators/bufferCount.ts create mode 100644 legacy-reexport/operators/bufferTime.ts create mode 100644 legacy-reexport/operators/bufferToggle.ts create mode 100644 legacy-reexport/operators/bufferWhen.ts create mode 100644 legacy-reexport/operators/catchError.ts create mode 100644 legacy-reexport/operators/combineAll.ts create mode 100644 legacy-reexport/operators/concatAll.ts create mode 100644 legacy-reexport/operators/concatMap.ts create mode 100644 legacy-reexport/operators/concatMapTo.ts create mode 100644 legacy-reexport/operators/count.ts create mode 100644 legacy-reexport/operators/debounce.ts create mode 100644 legacy-reexport/operators/debounceTime.ts create mode 100644 legacy-reexport/operators/defaultIfEmpty.ts create mode 100644 legacy-reexport/operators/delay.ts create mode 100644 legacy-reexport/operators/delayWhen.ts create mode 100644 legacy-reexport/operators/dematerialize.ts create mode 100644 legacy-reexport/operators/distinct.ts create mode 100644 legacy-reexport/operators/distinctUntilChanged.ts create mode 100644 legacy-reexport/operators/distinctUntilKeyChanged.ts create mode 100644 legacy-reexport/operators/elementAt.ts create mode 100644 legacy-reexport/operators/every.ts create mode 100644 legacy-reexport/operators/exhaust.ts create mode 100644 legacy-reexport/operators/exhaustMap.ts create mode 100644 legacy-reexport/operators/expand.ts create mode 100644 legacy-reexport/operators/filter.ts create mode 100644 legacy-reexport/operators/finalize.ts create mode 100644 legacy-reexport/operators/find.ts create mode 100644 legacy-reexport/operators/findIndex.ts create mode 100644 legacy-reexport/operators/first.ts create mode 100644 legacy-reexport/operators/groupBy.ts create mode 100644 legacy-reexport/operators/ignoreElements.ts create mode 100644 legacy-reexport/operators/isEmpty.ts create mode 100644 legacy-reexport/operators/last.ts create mode 100644 legacy-reexport/operators/map.ts create mode 100644 legacy-reexport/operators/mapTo.ts create mode 100644 legacy-reexport/operators/materialize.ts create mode 100644 legacy-reexport/operators/max.ts create mode 100644 legacy-reexport/operators/mergeAll.ts create mode 100644 legacy-reexport/operators/mergeMap.ts create mode 100644 legacy-reexport/operators/mergeMapTo.ts create mode 100644 legacy-reexport/operators/mergeScan.ts create mode 100644 legacy-reexport/operators/min.ts create mode 100644 legacy-reexport/operators/multicast.ts create mode 100644 legacy-reexport/operators/observeOn.ts create mode 100644 legacy-reexport/operators/onErrorResumeNext.ts create mode 100644 legacy-reexport/operators/pairwise.ts create mode 100644 legacy-reexport/operators/partition.ts create mode 100644 legacy-reexport/operators/pluck.ts create mode 100644 legacy-reexport/operators/publish.ts create mode 100644 legacy-reexport/operators/publishBehavior.ts create mode 100644 legacy-reexport/operators/publishLast.ts create mode 100644 legacy-reexport/operators/publishReplay.ts create mode 100644 legacy-reexport/operators/race.ts create mode 100644 legacy-reexport/operators/reduce.ts create mode 100644 legacy-reexport/operators/refCount.ts create mode 100644 legacy-reexport/operators/repeat.ts create mode 100644 legacy-reexport/operators/repeatWhen.ts create mode 100644 legacy-reexport/operators/retry.ts create mode 100644 legacy-reexport/operators/retryWhen.ts create mode 100644 legacy-reexport/operators/sample.ts create mode 100644 legacy-reexport/operators/sampleTime.ts create mode 100644 legacy-reexport/operators/scan.ts create mode 100644 legacy-reexport/operators/sequenceEqual.ts create mode 100644 legacy-reexport/operators/share.ts create mode 100644 legacy-reexport/operators/shareReplay.ts create mode 100644 legacy-reexport/operators/single.ts create mode 100644 legacy-reexport/operators/skip.ts create mode 100644 legacy-reexport/operators/skipLast.ts create mode 100644 legacy-reexport/operators/skipUntil.ts create mode 100644 legacy-reexport/operators/skipWhile.ts create mode 100644 legacy-reexport/operators/startWith.ts create mode 100644 legacy-reexport/operators/subscribeOn.ts create mode 100644 legacy-reexport/operators/switchAll.ts create mode 100644 legacy-reexport/operators/switchMap.ts create mode 100644 legacy-reexport/operators/switchMapTo.ts create mode 100644 legacy-reexport/operators/take.ts create mode 100644 legacy-reexport/operators/takeLast.ts create mode 100644 legacy-reexport/operators/takeUntil.ts create mode 100644 legacy-reexport/operators/takeWhile.ts create mode 100644 legacy-reexport/operators/tap.ts create mode 100644 legacy-reexport/operators/throttle.ts create mode 100644 legacy-reexport/operators/throttleTime.ts create mode 100644 legacy-reexport/operators/throwIfEmpty.ts create mode 100644 legacy-reexport/operators/timeInterval.ts create mode 100644 legacy-reexport/operators/timeout.ts create mode 100644 legacy-reexport/operators/timeoutWith.ts create mode 100644 legacy-reexport/operators/timestamp.ts create mode 100644 legacy-reexport/operators/toArray.ts create mode 100644 legacy-reexport/operators/window.ts create mode 100644 legacy-reexport/operators/windowCount.ts create mode 100644 legacy-reexport/operators/windowTime.ts create mode 100644 legacy-reexport/operators/windowToggle.ts create mode 100644 legacy-reexport/operators/windowWhen.ts create mode 100644 legacy-reexport/operators/withLatestFrom.ts create mode 100644 legacy-reexport/operators/zipAll.ts rename legacy-reexport/symbol/{observable => observable.ts} (100%) create mode 100644 legacy-reexport/util/Immediate.ts create mode 100644 legacy-reexport/util/root.ts diff --git a/compat/observable/ConnectableObservable.ts b/compat/observable/ConnectableObservable.ts new file mode 100644 index 0000000000..48c94af1cc --- /dev/null +++ b/compat/observable/ConnectableObservable.ts @@ -0,0 +1 @@ +export { ConnectableObservable } from 'rxjs'; diff --git a/compat/observable/SubscribeOnObservable.ts b/compat/observable/SubscribeOnObservable.ts new file mode 100644 index 0000000000..c9175d4ba1 --- /dev/null +++ b/compat/observable/SubscribeOnObservable.ts @@ -0,0 +1 @@ +export { SubscribeOnObservable } from 'rxjs/internal-compatibility'; diff --git a/compat/observable/bindCallback.ts b/compat/observable/bindCallback.ts new file mode 100644 index 0000000000..cb385f99e4 --- /dev/null +++ b/compat/observable/bindCallback.ts @@ -0,0 +1 @@ +export { bindCallback } from 'rxjs'; diff --git a/compat/observable/bindNodeCallback.ts b/compat/observable/bindNodeCallback.ts new file mode 100644 index 0000000000..6c8de8d646 --- /dev/null +++ b/compat/observable/bindNodeCallback.ts @@ -0,0 +1 @@ +export { bindNodeCallback } from 'rxjs'; diff --git a/compat/observable/combineLatest.ts b/compat/observable/combineLatest.ts new file mode 100644 index 0000000000..cf31f18105 --- /dev/null +++ b/compat/observable/combineLatest.ts @@ -0,0 +1 @@ +export { combineLatest } from 'rxjs'; diff --git a/compat/observable/concat.ts b/compat/observable/concat.ts new file mode 100644 index 0000000000..7980da4884 --- /dev/null +++ b/compat/observable/concat.ts @@ -0,0 +1 @@ +export { concat } from 'rxjs'; diff --git a/compat/observable/defer.ts b/compat/observable/defer.ts new file mode 100644 index 0000000000..fdc3cef98d --- /dev/null +++ b/compat/observable/defer.ts @@ -0,0 +1 @@ +export { defer } from 'rxjs'; diff --git a/compat/observable/empty.ts b/compat/observable/empty.ts new file mode 100644 index 0000000000..f4e2468d7c --- /dev/null +++ b/compat/observable/empty.ts @@ -0,0 +1 @@ +export { empty } from 'rxjs'; diff --git a/compat/observable/forkJoin.ts b/compat/observable/forkJoin.ts new file mode 100644 index 0000000000..91e77b0cf8 --- /dev/null +++ b/compat/observable/forkJoin.ts @@ -0,0 +1 @@ +export { forkJoin } from 'rxjs'; diff --git a/compat/observable/from.ts b/compat/observable/from.ts new file mode 100644 index 0000000000..d3b18dd937 --- /dev/null +++ b/compat/observable/from.ts @@ -0,0 +1 @@ +export { from } from 'rxjs'; diff --git a/compat/observable/fromArray.ts b/compat/observable/fromArray.ts new file mode 100644 index 0000000000..16b338f283 --- /dev/null +++ b/compat/observable/fromArray.ts @@ -0,0 +1 @@ +export { from as fromArray } from 'rxjs'; diff --git a/compat/observable/fromEvent.ts b/compat/observable/fromEvent.ts new file mode 100644 index 0000000000..3d63d9efb0 --- /dev/null +++ b/compat/observable/fromEvent.ts @@ -0,0 +1 @@ +export { fromEvent } from 'rxjs'; diff --git a/compat/observable/fromEventPattern.ts b/compat/observable/fromEventPattern.ts new file mode 100644 index 0000000000..9746a4e71f --- /dev/null +++ b/compat/observable/fromEventPattern.ts @@ -0,0 +1 @@ +export { fromEventPattern } from 'rxjs'; diff --git a/compat/observable/fromIterable.ts b/compat/observable/fromIterable.ts new file mode 100644 index 0000000000..d5e2c88d77 --- /dev/null +++ b/compat/observable/fromIterable.ts @@ -0,0 +1 @@ +export { from as fromIterable } from 'rxjs'; diff --git a/compat/observable/fromObservable.ts b/compat/observable/fromObservable.ts new file mode 100644 index 0000000000..9959665ed0 --- /dev/null +++ b/compat/observable/fromObservable.ts @@ -0,0 +1 @@ +export { from as fromObservable } from 'rxjs'; diff --git a/compat/observable/fromPromise.ts b/compat/observable/fromPromise.ts new file mode 100644 index 0000000000..bcb38f4bcb --- /dev/null +++ b/compat/observable/fromPromise.ts @@ -0,0 +1 @@ +export { from as fromPromise } from 'rxjs'; diff --git a/compat/observable/generate.ts b/compat/observable/generate.ts new file mode 100644 index 0000000000..aae6ad6176 --- /dev/null +++ b/compat/observable/generate.ts @@ -0,0 +1 @@ +export { generate } from 'rxjs'; diff --git a/compat/observable/if.ts b/compat/observable/if.ts new file mode 100644 index 0000000000..00c2fe91ce --- /dev/null +++ b/compat/observable/if.ts @@ -0,0 +1 @@ +export { iif as _if } from 'rxjs'; diff --git a/compat/observable/interval.ts b/compat/observable/interval.ts new file mode 100644 index 0000000000..d78563f5b2 --- /dev/null +++ b/compat/observable/interval.ts @@ -0,0 +1 @@ +export { interval } from 'rxjs'; diff --git a/compat/observable/merge.ts b/compat/observable/merge.ts new file mode 100644 index 0000000000..2644a9abb1 --- /dev/null +++ b/compat/observable/merge.ts @@ -0,0 +1 @@ +export { merge } from 'rxjs'; diff --git a/compat/observable/never.ts b/compat/observable/never.ts new file mode 100644 index 0000000000..590495837f --- /dev/null +++ b/compat/observable/never.ts @@ -0,0 +1,5 @@ +import { Observable, NEVER } from 'rxjs'; + +export function never () { + return NEVER; +} \ No newline at end of file diff --git a/compat/observable/of.ts b/compat/observable/of.ts new file mode 100644 index 0000000000..092962f422 --- /dev/null +++ b/compat/observable/of.ts @@ -0,0 +1 @@ +export { of } from 'rxjs'; diff --git a/compat/observable/onErrorResumeNext.ts b/compat/observable/onErrorResumeNext.ts new file mode 100644 index 0000000000..03134df22f --- /dev/null +++ b/compat/observable/onErrorResumeNext.ts @@ -0,0 +1 @@ +export { onErrorResumeNext } from 'rxjs'; diff --git a/compat/observable/pairs.ts b/compat/observable/pairs.ts new file mode 100644 index 0000000000..71d39cacf4 --- /dev/null +++ b/compat/observable/pairs.ts @@ -0,0 +1 @@ +export { pairs } from 'rxjs'; diff --git a/compat/observable/race.ts b/compat/observable/race.ts new file mode 100644 index 0000000000..5b7f0e4e89 --- /dev/null +++ b/compat/observable/race.ts @@ -0,0 +1 @@ +export { race } from 'rxjs'; diff --git a/compat/observable/range.ts b/compat/observable/range.ts new file mode 100644 index 0000000000..2646d037c2 --- /dev/null +++ b/compat/observable/range.ts @@ -0,0 +1 @@ +export { range } from 'rxjs'; diff --git a/compat/observable/scalar.ts b/compat/observable/scalar.ts new file mode 100644 index 0000000000..23cd3d7181 --- /dev/null +++ b/compat/observable/scalar.ts @@ -0,0 +1 @@ +export { scalar } from 'rxjs/internal-compatibility'; diff --git a/compat/observable/throw.ts b/compat/observable/throw.ts new file mode 100644 index 0000000000..334241724d --- /dev/null +++ b/compat/observable/throw.ts @@ -0,0 +1 @@ +export { throwError as _throw } from 'rxjs'; diff --git a/compat/observable/timer.ts b/compat/observable/timer.ts new file mode 100644 index 0000000000..7a5a8e0376 --- /dev/null +++ b/compat/observable/timer.ts @@ -0,0 +1 @@ +export { timer } from 'rxjs'; diff --git a/compat/observable/using.ts b/compat/observable/using.ts new file mode 100644 index 0000000000..2970164f19 --- /dev/null +++ b/compat/observable/using.ts @@ -0,0 +1 @@ +export { using } from 'rxjs'; diff --git a/compat/observable/zip.ts b/compat/observable/zip.ts new file mode 100644 index 0000000000..f1089a8fd3 --- /dev/null +++ b/compat/observable/zip.ts @@ -0,0 +1 @@ +export { zip } from 'rxjs'; diff --git a/compat/operators/audit.ts b/compat/operators/audit.ts new file mode 100644 index 0000000000..7abb90bb25 --- /dev/null +++ b/compat/operators/audit.ts @@ -0,0 +1 @@ +export { audit } from 'rxjs/operators'; diff --git a/compat/operators/auditTime.ts b/compat/operators/auditTime.ts new file mode 100644 index 0000000000..78a10a7af4 --- /dev/null +++ b/compat/operators/auditTime.ts @@ -0,0 +1 @@ +export { auditTime } from 'rxjs/operators'; diff --git a/compat/operators/buffer.ts b/compat/operators/buffer.ts new file mode 100644 index 0000000000..de67cdebeb --- /dev/null +++ b/compat/operators/buffer.ts @@ -0,0 +1 @@ +export { buffer } from 'rxjs/operators'; diff --git a/compat/operators/bufferCount.ts b/compat/operators/bufferCount.ts new file mode 100644 index 0000000000..190aa7f21f --- /dev/null +++ b/compat/operators/bufferCount.ts @@ -0,0 +1 @@ +export { bufferCount } from 'rxjs/operators'; diff --git a/compat/operators/bufferTime.ts b/compat/operators/bufferTime.ts new file mode 100644 index 0000000000..bd075a61db --- /dev/null +++ b/compat/operators/bufferTime.ts @@ -0,0 +1 @@ +export { bufferTime } from 'rxjs/operators'; diff --git a/compat/operators/bufferToggle.ts b/compat/operators/bufferToggle.ts new file mode 100644 index 0000000000..a40add90cf --- /dev/null +++ b/compat/operators/bufferToggle.ts @@ -0,0 +1 @@ +export { bufferToggle } from 'rxjs/operators'; diff --git a/compat/operators/bufferWhen.ts b/compat/operators/bufferWhen.ts new file mode 100644 index 0000000000..03a2fb7bba --- /dev/null +++ b/compat/operators/bufferWhen.ts @@ -0,0 +1 @@ +export { bufferWhen } from 'rxjs/operators'; diff --git a/compat/operators/catchError.ts b/compat/operators/catchError.ts new file mode 100644 index 0000000000..7e16ee9e4c --- /dev/null +++ b/compat/operators/catchError.ts @@ -0,0 +1 @@ +export { catchError } from 'rxjs/operators'; diff --git a/compat/operators/combineAll.ts b/compat/operators/combineAll.ts new file mode 100644 index 0000000000..d1072c6f3a --- /dev/null +++ b/compat/operators/combineAll.ts @@ -0,0 +1 @@ +export { combineAll } from 'rxjs/operators'; diff --git a/compat/operators/concatAll.ts b/compat/operators/concatAll.ts new file mode 100644 index 0000000000..6206015ecb --- /dev/null +++ b/compat/operators/concatAll.ts @@ -0,0 +1 @@ +export { concatAll } from 'rxjs/operators'; diff --git a/compat/operators/concatMap.ts b/compat/operators/concatMap.ts new file mode 100644 index 0000000000..db74df7722 --- /dev/null +++ b/compat/operators/concatMap.ts @@ -0,0 +1 @@ +export { concatMap } from 'rxjs/operators'; diff --git a/compat/operators/concatMapTo.ts b/compat/operators/concatMapTo.ts new file mode 100644 index 0000000000..c5e8d7042e --- /dev/null +++ b/compat/operators/concatMapTo.ts @@ -0,0 +1 @@ +export { concatMapTo } from 'rxjs/operators'; diff --git a/compat/operators/count.ts b/compat/operators/count.ts new file mode 100644 index 0000000000..7812fe622e --- /dev/null +++ b/compat/operators/count.ts @@ -0,0 +1 @@ +export { count } from 'rxjs/operators'; diff --git a/compat/operators/debounce.ts b/compat/operators/debounce.ts new file mode 100644 index 0000000000..d887d2b210 --- /dev/null +++ b/compat/operators/debounce.ts @@ -0,0 +1 @@ +export { debounce } from 'rxjs/operators'; diff --git a/compat/operators/debounceTime.ts b/compat/operators/debounceTime.ts new file mode 100644 index 0000000000..c0eb6c244c --- /dev/null +++ b/compat/operators/debounceTime.ts @@ -0,0 +1 @@ +export { debounceTime } from 'rxjs/operators'; diff --git a/compat/operators/defaultIfEmpty.ts b/compat/operators/defaultIfEmpty.ts new file mode 100644 index 0000000000..059d0786e1 --- /dev/null +++ b/compat/operators/defaultIfEmpty.ts @@ -0,0 +1 @@ +export { defaultIfEmpty } from 'rxjs/operators'; diff --git a/compat/operators/delay.ts b/compat/operators/delay.ts new file mode 100644 index 0000000000..81cdbba946 --- /dev/null +++ b/compat/operators/delay.ts @@ -0,0 +1 @@ +export { delay } from 'rxjs/operators'; diff --git a/compat/operators/delayWhen.ts b/compat/operators/delayWhen.ts new file mode 100644 index 0000000000..1641efce75 --- /dev/null +++ b/compat/operators/delayWhen.ts @@ -0,0 +1 @@ +export { delayWhen } from 'rxjs/operators'; diff --git a/compat/operators/dematerialize.ts b/compat/operators/dematerialize.ts new file mode 100644 index 0000000000..367cfa9703 --- /dev/null +++ b/compat/operators/dematerialize.ts @@ -0,0 +1 @@ +export { dematerialize } from 'rxjs/operators'; diff --git a/compat/operators/distinct.ts b/compat/operators/distinct.ts new file mode 100644 index 0000000000..88d5471f19 --- /dev/null +++ b/compat/operators/distinct.ts @@ -0,0 +1 @@ +export { distinct } from 'rxjs/operators'; diff --git a/compat/operators/distinctUntilChanged.ts b/compat/operators/distinctUntilChanged.ts new file mode 100644 index 0000000000..1642098136 --- /dev/null +++ b/compat/operators/distinctUntilChanged.ts @@ -0,0 +1 @@ +export { distinctUntilChanged } from 'rxjs/operators'; diff --git a/compat/operators/distinctUntilKeyChanged.ts b/compat/operators/distinctUntilKeyChanged.ts new file mode 100644 index 0000000000..72a6dcd284 --- /dev/null +++ b/compat/operators/distinctUntilKeyChanged.ts @@ -0,0 +1 @@ +export { distinctUntilKeyChanged } from 'rxjs/operators'; diff --git a/compat/operators/elementAt.ts b/compat/operators/elementAt.ts new file mode 100644 index 0000000000..2cabdb1991 --- /dev/null +++ b/compat/operators/elementAt.ts @@ -0,0 +1 @@ +export { elementAt } from 'rxjs/operators'; diff --git a/compat/operators/every.ts b/compat/operators/every.ts new file mode 100644 index 0000000000..444dcd7e3f --- /dev/null +++ b/compat/operators/every.ts @@ -0,0 +1 @@ +export { every } from 'rxjs/operators'; diff --git a/compat/operators/exhaust.ts b/compat/operators/exhaust.ts new file mode 100644 index 0000000000..c3b0ee894d --- /dev/null +++ b/compat/operators/exhaust.ts @@ -0,0 +1 @@ +export { exhaust } from 'rxjs/operators'; diff --git a/compat/operators/exhaustMap.ts b/compat/operators/exhaustMap.ts new file mode 100644 index 0000000000..bd53120eb7 --- /dev/null +++ b/compat/operators/exhaustMap.ts @@ -0,0 +1 @@ +export { exhaustMap } from 'rxjs/operators'; diff --git a/compat/operators/expand.ts b/compat/operators/expand.ts new file mode 100644 index 0000000000..b1db5c52f8 --- /dev/null +++ b/compat/operators/expand.ts @@ -0,0 +1 @@ +export { expand } from 'rxjs/operators'; diff --git a/compat/operators/filter.ts b/compat/operators/filter.ts new file mode 100644 index 0000000000..c7b48e9735 --- /dev/null +++ b/compat/operators/filter.ts @@ -0,0 +1 @@ +export { filter } from 'rxjs/operators'; diff --git a/compat/operators/finalize.ts b/compat/operators/finalize.ts new file mode 100644 index 0000000000..01edcc7378 --- /dev/null +++ b/compat/operators/finalize.ts @@ -0,0 +1 @@ +export { finalize } from 'rxjs/operators'; diff --git a/compat/operators/find.ts b/compat/operators/find.ts new file mode 100644 index 0000000000..1d5ad45adf --- /dev/null +++ b/compat/operators/find.ts @@ -0,0 +1 @@ +export { find } from 'rxjs/operators'; diff --git a/compat/operators/findIndex.ts b/compat/operators/findIndex.ts new file mode 100644 index 0000000000..ca010da223 --- /dev/null +++ b/compat/operators/findIndex.ts @@ -0,0 +1 @@ +export { findIndex } from 'rxjs/operators'; diff --git a/compat/operators/first.ts b/compat/operators/first.ts new file mode 100644 index 0000000000..324ad42221 --- /dev/null +++ b/compat/operators/first.ts @@ -0,0 +1 @@ +export { first } from 'rxjs/operators'; diff --git a/compat/operators/groupBy.ts b/compat/operators/groupBy.ts new file mode 100644 index 0000000000..a577a9e84d --- /dev/null +++ b/compat/operators/groupBy.ts @@ -0,0 +1,2 @@ +export { groupBy } from 'rxjs/operators'; +export { GroupedObservable } from 'rxjs/internal-compatibility'; diff --git a/compat/operators/ignoreElements.ts b/compat/operators/ignoreElements.ts new file mode 100644 index 0000000000..db1ecd63ef --- /dev/null +++ b/compat/operators/ignoreElements.ts @@ -0,0 +1 @@ +export { ignoreElements } from 'rxjs/operators'; diff --git a/compat/operators/isEmpty.ts b/compat/operators/isEmpty.ts new file mode 100644 index 0000000000..fc632aed8f --- /dev/null +++ b/compat/operators/isEmpty.ts @@ -0,0 +1 @@ +export { isEmpty } from 'rxjs/operators'; diff --git a/compat/operators/last.ts b/compat/operators/last.ts new file mode 100644 index 0000000000..9c506613db --- /dev/null +++ b/compat/operators/last.ts @@ -0,0 +1 @@ +export { last } from 'rxjs/operators'; diff --git a/compat/operators/map.ts b/compat/operators/map.ts new file mode 100644 index 0000000000..ea79f28aac --- /dev/null +++ b/compat/operators/map.ts @@ -0,0 +1 @@ +export { map } from 'rxjs/operators'; diff --git a/compat/operators/mapTo.ts b/compat/operators/mapTo.ts new file mode 100644 index 0000000000..0f3b36096d --- /dev/null +++ b/compat/operators/mapTo.ts @@ -0,0 +1 @@ +export { mapTo } from 'rxjs/operators'; diff --git a/compat/operators/materialize.ts b/compat/operators/materialize.ts new file mode 100644 index 0000000000..f7d0b931f1 --- /dev/null +++ b/compat/operators/materialize.ts @@ -0,0 +1 @@ +export { materialize } from 'rxjs/operators'; diff --git a/compat/operators/max.ts b/compat/operators/max.ts new file mode 100644 index 0000000000..fc3eca301f --- /dev/null +++ b/compat/operators/max.ts @@ -0,0 +1 @@ +export { max } from 'rxjs/operators'; diff --git a/compat/operators/mergeAll.ts b/compat/operators/mergeAll.ts new file mode 100644 index 0000000000..d27ee1ac38 --- /dev/null +++ b/compat/operators/mergeAll.ts @@ -0,0 +1 @@ +export { mergeAll } from 'rxjs/operators'; diff --git a/compat/operators/mergeMap.ts b/compat/operators/mergeMap.ts new file mode 100644 index 0000000000..d089bc9d05 --- /dev/null +++ b/compat/operators/mergeMap.ts @@ -0,0 +1 @@ +export { mergeMap } from 'rxjs/operators'; diff --git a/compat/operators/mergeMapTo.ts b/compat/operators/mergeMapTo.ts new file mode 100644 index 0000000000..8326f74b05 --- /dev/null +++ b/compat/operators/mergeMapTo.ts @@ -0,0 +1 @@ +export { mergeMapTo } from 'rxjs/operators'; diff --git a/compat/operators/mergeScan.ts b/compat/operators/mergeScan.ts new file mode 100644 index 0000000000..375c4319bd --- /dev/null +++ b/compat/operators/mergeScan.ts @@ -0,0 +1 @@ +export { mergeScan } from 'rxjs/operators'; diff --git a/compat/operators/min.ts b/compat/operators/min.ts new file mode 100644 index 0000000000..6104962bce --- /dev/null +++ b/compat/operators/min.ts @@ -0,0 +1 @@ +export { min } from 'rxjs/operators'; diff --git a/compat/operators/multicast.ts b/compat/operators/multicast.ts new file mode 100644 index 0000000000..1768e809d0 --- /dev/null +++ b/compat/operators/multicast.ts @@ -0,0 +1 @@ +export { multicast } from 'rxjs/operators'; diff --git a/compat/operators/observeOn.ts b/compat/operators/observeOn.ts new file mode 100644 index 0000000000..1261152de9 --- /dev/null +++ b/compat/operators/observeOn.ts @@ -0,0 +1 @@ +export { observeOn } from 'rxjs/operators'; diff --git a/compat/operators/onErrorResumeNext.ts b/compat/operators/onErrorResumeNext.ts new file mode 100644 index 0000000000..3232fe895f --- /dev/null +++ b/compat/operators/onErrorResumeNext.ts @@ -0,0 +1 @@ +export { onErrorResumeNext } from 'rxjs/operators'; diff --git a/compat/operators/pairwise.ts b/compat/operators/pairwise.ts new file mode 100644 index 0000000000..311fc07903 --- /dev/null +++ b/compat/operators/pairwise.ts @@ -0,0 +1 @@ +export { pairwise } from 'rxjs/operators'; diff --git a/compat/operators/partition.ts b/compat/operators/partition.ts new file mode 100644 index 0000000000..2494573329 --- /dev/null +++ b/compat/operators/partition.ts @@ -0,0 +1 @@ +export { partition } from 'rxjs/operators'; diff --git a/compat/operators/pluck.ts b/compat/operators/pluck.ts new file mode 100644 index 0000000000..70b8ecc029 --- /dev/null +++ b/compat/operators/pluck.ts @@ -0,0 +1 @@ +export { pluck } from 'rxjs/operators'; diff --git a/compat/operators/publish.ts b/compat/operators/publish.ts new file mode 100644 index 0000000000..b680f09095 --- /dev/null +++ b/compat/operators/publish.ts @@ -0,0 +1 @@ +export { publish } from 'rxjs/operators'; diff --git a/compat/operators/publishBehavior.ts b/compat/operators/publishBehavior.ts new file mode 100644 index 0000000000..7c8395f49d --- /dev/null +++ b/compat/operators/publishBehavior.ts @@ -0,0 +1 @@ +export { publishBehavior } from 'rxjs/operators'; diff --git a/compat/operators/publishLast.ts b/compat/operators/publishLast.ts new file mode 100644 index 0000000000..cf8ef46f02 --- /dev/null +++ b/compat/operators/publishLast.ts @@ -0,0 +1 @@ +export { publishLast } from 'rxjs/operators'; diff --git a/compat/operators/publishReplay.ts b/compat/operators/publishReplay.ts new file mode 100644 index 0000000000..ee14a07cfc --- /dev/null +++ b/compat/operators/publishReplay.ts @@ -0,0 +1 @@ +export { publishReplay } from 'rxjs/operators'; diff --git a/compat/operators/race.ts b/compat/operators/race.ts new file mode 100644 index 0000000000..6ed8b42822 --- /dev/null +++ b/compat/operators/race.ts @@ -0,0 +1 @@ +export { race } from 'rxjs/operators'; diff --git a/compat/operators/reduce.ts b/compat/operators/reduce.ts new file mode 100644 index 0000000000..b96a6f987c --- /dev/null +++ b/compat/operators/reduce.ts @@ -0,0 +1 @@ +export { reduce } from 'rxjs/operators'; diff --git a/compat/operators/refCount.ts b/compat/operators/refCount.ts new file mode 100644 index 0000000000..dc75036ab4 --- /dev/null +++ b/compat/operators/refCount.ts @@ -0,0 +1 @@ +export { refCount } from 'rxjs/operators'; diff --git a/compat/operators/repeat.ts b/compat/operators/repeat.ts new file mode 100644 index 0000000000..8308e16d4d --- /dev/null +++ b/compat/operators/repeat.ts @@ -0,0 +1 @@ +export { repeat } from 'rxjs/operators'; diff --git a/compat/operators/repeatWhen.ts b/compat/operators/repeatWhen.ts new file mode 100644 index 0000000000..fb2faeccef --- /dev/null +++ b/compat/operators/repeatWhen.ts @@ -0,0 +1 @@ +export { repeatWhen } from 'rxjs/operators'; diff --git a/compat/operators/retry.ts b/compat/operators/retry.ts new file mode 100644 index 0000000000..3bff4c5647 --- /dev/null +++ b/compat/operators/retry.ts @@ -0,0 +1 @@ +export { retry } from 'rxjs/operators'; diff --git a/compat/operators/retryWhen.ts b/compat/operators/retryWhen.ts new file mode 100644 index 0000000000..087475fc1e --- /dev/null +++ b/compat/operators/retryWhen.ts @@ -0,0 +1 @@ +export { retryWhen } from 'rxjs/operators'; diff --git a/compat/operators/sample.ts b/compat/operators/sample.ts new file mode 100644 index 0000000000..a0f1bfeb28 --- /dev/null +++ b/compat/operators/sample.ts @@ -0,0 +1 @@ +export { sample } from 'rxjs/operators'; diff --git a/compat/operators/sampleTime.ts b/compat/operators/sampleTime.ts new file mode 100644 index 0000000000..be83fd2a2b --- /dev/null +++ b/compat/operators/sampleTime.ts @@ -0,0 +1 @@ +export { sampleTime } from 'rxjs/operators'; diff --git a/compat/operators/scan.ts b/compat/operators/scan.ts new file mode 100644 index 0000000000..047e81fc82 --- /dev/null +++ b/compat/operators/scan.ts @@ -0,0 +1 @@ +export { scan } from 'rxjs/operators'; diff --git a/compat/operators/sequenceEqual.ts b/compat/operators/sequenceEqual.ts new file mode 100644 index 0000000000..3f5b87a1c1 --- /dev/null +++ b/compat/operators/sequenceEqual.ts @@ -0,0 +1 @@ +export { sequenceEqual } from 'rxjs/operators'; diff --git a/compat/operators/share.ts b/compat/operators/share.ts new file mode 100644 index 0000000000..75171fb016 --- /dev/null +++ b/compat/operators/share.ts @@ -0,0 +1 @@ +export { share } from 'rxjs/operators'; diff --git a/compat/operators/shareReplay.ts b/compat/operators/shareReplay.ts new file mode 100644 index 0000000000..68c3089239 --- /dev/null +++ b/compat/operators/shareReplay.ts @@ -0,0 +1 @@ +export { shareReplay } from 'rxjs/operators'; diff --git a/compat/operators/single.ts b/compat/operators/single.ts new file mode 100644 index 0000000000..363468dfb8 --- /dev/null +++ b/compat/operators/single.ts @@ -0,0 +1 @@ +export { single } from 'rxjs/operators'; diff --git a/compat/operators/skip.ts b/compat/operators/skip.ts new file mode 100644 index 0000000000..ff1176d7c5 --- /dev/null +++ b/compat/operators/skip.ts @@ -0,0 +1 @@ +export { skip } from 'rxjs/operators'; diff --git a/compat/operators/skipLast.ts b/compat/operators/skipLast.ts new file mode 100644 index 0000000000..a1d15d90d9 --- /dev/null +++ b/compat/operators/skipLast.ts @@ -0,0 +1 @@ +export { skipLast } from 'rxjs/operators'; diff --git a/compat/operators/skipUntil.ts b/compat/operators/skipUntil.ts new file mode 100644 index 0000000000..e7ad35f69e --- /dev/null +++ b/compat/operators/skipUntil.ts @@ -0,0 +1 @@ +export { skipUntil } from 'rxjs/operators'; diff --git a/compat/operators/skipWhile.ts b/compat/operators/skipWhile.ts new file mode 100644 index 0000000000..97cb68bf8e --- /dev/null +++ b/compat/operators/skipWhile.ts @@ -0,0 +1 @@ +export { skipWhile } from 'rxjs/operators'; diff --git a/compat/operators/startWith.ts b/compat/operators/startWith.ts new file mode 100644 index 0000000000..f6a62bf776 --- /dev/null +++ b/compat/operators/startWith.ts @@ -0,0 +1 @@ +export { startWith } from 'rxjs/operators'; diff --git a/compat/operators/subscribeOn.ts b/compat/operators/subscribeOn.ts new file mode 100644 index 0000000000..f911d9ec00 --- /dev/null +++ b/compat/operators/subscribeOn.ts @@ -0,0 +1 @@ +export { subscribeOn } from 'rxjs/operators'; diff --git a/compat/operators/switchAll.ts b/compat/operators/switchAll.ts new file mode 100644 index 0000000000..c8db61e1ac --- /dev/null +++ b/compat/operators/switchAll.ts @@ -0,0 +1 @@ +export { switchAll } from 'rxjs/operators'; diff --git a/compat/operators/switchMap.ts b/compat/operators/switchMap.ts new file mode 100644 index 0000000000..4c7b479afa --- /dev/null +++ b/compat/operators/switchMap.ts @@ -0,0 +1 @@ +export { switchMap } from 'rxjs/operators'; diff --git a/compat/operators/switchMapTo.ts b/compat/operators/switchMapTo.ts new file mode 100644 index 0000000000..0e21e60790 --- /dev/null +++ b/compat/operators/switchMapTo.ts @@ -0,0 +1 @@ +export { switchMapTo } from 'rxjs/operators'; diff --git a/compat/operators/take.ts b/compat/operators/take.ts new file mode 100644 index 0000000000..6e391e5ac0 --- /dev/null +++ b/compat/operators/take.ts @@ -0,0 +1 @@ +export { take } from 'rxjs/operators'; diff --git a/compat/operators/takeLast.ts b/compat/operators/takeLast.ts new file mode 100644 index 0000000000..4736fb1130 --- /dev/null +++ b/compat/operators/takeLast.ts @@ -0,0 +1 @@ +export { takeLast } from 'rxjs/operators'; diff --git a/compat/operators/takeUntil.ts b/compat/operators/takeUntil.ts new file mode 100644 index 0000000000..3a66c0cb43 --- /dev/null +++ b/compat/operators/takeUntil.ts @@ -0,0 +1 @@ +export { takeUntil } from 'rxjs/operators'; diff --git a/compat/operators/takeWhile.ts b/compat/operators/takeWhile.ts new file mode 100644 index 0000000000..46d1e04185 --- /dev/null +++ b/compat/operators/takeWhile.ts @@ -0,0 +1 @@ +export { takeWhile } from 'rxjs/operators'; diff --git a/compat/operators/tap.ts b/compat/operators/tap.ts new file mode 100644 index 0000000000..132c4e59c7 --- /dev/null +++ b/compat/operators/tap.ts @@ -0,0 +1 @@ +export { tap } from 'rxjs/operators'; diff --git a/compat/operators/throttle.ts b/compat/operators/throttle.ts new file mode 100644 index 0000000000..960fccf538 --- /dev/null +++ b/compat/operators/throttle.ts @@ -0,0 +1 @@ +export { throttle } from 'rxjs/operators'; diff --git a/compat/operators/throttleTime.ts b/compat/operators/throttleTime.ts new file mode 100644 index 0000000000..b9d9ff256b --- /dev/null +++ b/compat/operators/throttleTime.ts @@ -0,0 +1 @@ +export { throttleTime } from 'rxjs/operators'; diff --git a/compat/operators/throwIfEmpty.ts b/compat/operators/throwIfEmpty.ts new file mode 100644 index 0000000000..d6148e7d5e --- /dev/null +++ b/compat/operators/throwIfEmpty.ts @@ -0,0 +1 @@ +export { throwIfEmpty } from 'rxjs/operators'; diff --git a/compat/operators/timeInterval.ts b/compat/operators/timeInterval.ts new file mode 100644 index 0000000000..88fb76a196 --- /dev/null +++ b/compat/operators/timeInterval.ts @@ -0,0 +1 @@ +export { timeInterval } from 'rxjs/operators'; diff --git a/compat/operators/timeout.ts b/compat/operators/timeout.ts new file mode 100644 index 0000000000..afaa955b9f --- /dev/null +++ b/compat/operators/timeout.ts @@ -0,0 +1 @@ +export { timeout } from 'rxjs/operators'; diff --git a/compat/operators/timeoutWith.ts b/compat/operators/timeoutWith.ts new file mode 100644 index 0000000000..d98752d302 --- /dev/null +++ b/compat/operators/timeoutWith.ts @@ -0,0 +1 @@ +export { timeoutWith } from 'rxjs/operators'; diff --git a/compat/operators/timestamp.ts b/compat/operators/timestamp.ts new file mode 100644 index 0000000000..bb78343ad5 --- /dev/null +++ b/compat/operators/timestamp.ts @@ -0,0 +1 @@ +export { timestamp } from 'rxjs/operators'; diff --git a/compat/operators/toArray.ts b/compat/operators/toArray.ts new file mode 100644 index 0000000000..03be7fc508 --- /dev/null +++ b/compat/operators/toArray.ts @@ -0,0 +1 @@ +export { toArray } from 'rxjs/operators'; diff --git a/compat/operators/window.ts b/compat/operators/window.ts new file mode 100644 index 0000000000..bb4f21cd2c --- /dev/null +++ b/compat/operators/window.ts @@ -0,0 +1 @@ +export { window } from 'rxjs/operators'; diff --git a/compat/operators/windowCount.ts b/compat/operators/windowCount.ts new file mode 100644 index 0000000000..10d56b289e --- /dev/null +++ b/compat/operators/windowCount.ts @@ -0,0 +1 @@ +export { windowCount } from 'rxjs/operators'; diff --git a/compat/operators/windowTime.ts b/compat/operators/windowTime.ts new file mode 100644 index 0000000000..c893ff0cc9 --- /dev/null +++ b/compat/operators/windowTime.ts @@ -0,0 +1 @@ +export { windowTime } from 'rxjs/operators'; diff --git a/compat/operators/windowToggle.ts b/compat/operators/windowToggle.ts new file mode 100644 index 0000000000..8d82d7351d --- /dev/null +++ b/compat/operators/windowToggle.ts @@ -0,0 +1 @@ +export { windowToggle } from 'rxjs/operators'; diff --git a/compat/operators/windowWhen.ts b/compat/operators/windowWhen.ts new file mode 100644 index 0000000000..beddc586a1 --- /dev/null +++ b/compat/operators/windowWhen.ts @@ -0,0 +1 @@ +export { windowWhen } from 'rxjs/operators'; diff --git a/compat/operators/withLatestFrom.ts b/compat/operators/withLatestFrom.ts new file mode 100644 index 0000000000..20e9d0c00c --- /dev/null +++ b/compat/operators/withLatestFrom.ts @@ -0,0 +1 @@ +export { withLatestFrom } from 'rxjs/operators'; diff --git a/compat/operators/zipAll.ts b/compat/operators/zipAll.ts new file mode 100644 index 0000000000..e2bb09fa9f --- /dev/null +++ b/compat/operators/zipAll.ts @@ -0,0 +1 @@ +export { zipAll } from 'rxjs/operators'; diff --git a/compat/util/Immediate.ts b/compat/util/Immediate.ts new file mode 100644 index 0000000000..0974ed1759 --- /dev/null +++ b/compat/util/Immediate.ts @@ -0,0 +1 @@ +export { Immediate } from 'rxjs/internal-compatibility'; diff --git a/compat/util/root.ts b/compat/util/root.ts new file mode 100644 index 0000000000..36c7250b9d --- /dev/null +++ b/compat/util/root.ts @@ -0,0 +1 @@ +export { root } from 'rxjs/internal-compatibility'; \ No newline at end of file diff --git a/legacy-reexport/add/oecho b/legacy-reexport/add/oecho deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/legacy-reexport/add/operator/bufferTimecho b/legacy-reexport/add/operator/bufferTimecho deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/legacy-reexport/observable/ConnectableObservable.ts b/legacy-reexport/observable/ConnectableObservable.ts new file mode 100644 index 0000000000..a21b3cc668 --- /dev/null +++ b/legacy-reexport/observable/ConnectableObservable.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/ConnectableObservable'; diff --git a/legacy-reexport/observable/SubscribeOnObservable.ts b/legacy-reexport/observable/SubscribeOnObservable.ts new file mode 100644 index 0000000000..64357278e3 --- /dev/null +++ b/legacy-reexport/observable/SubscribeOnObservable.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/SubscribeOnObservable'; diff --git a/legacy-reexport/observable/bindCallback.ts b/legacy-reexport/observable/bindCallback.ts new file mode 100644 index 0000000000..aab5734dbd --- /dev/null +++ b/legacy-reexport/observable/bindCallback.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/bindCallback'; diff --git a/legacy-reexport/observable/bindNodeCallback.ts b/legacy-reexport/observable/bindNodeCallback.ts new file mode 100644 index 0000000000..d5bfe5d908 --- /dev/null +++ b/legacy-reexport/observable/bindNodeCallback.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/bindNodeCallback'; diff --git a/legacy-reexport/observable/combineLatest.ts b/legacy-reexport/observable/combineLatest.ts new file mode 100644 index 0000000000..d4b703304f --- /dev/null +++ b/legacy-reexport/observable/combineLatest.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/combineLatest'; diff --git a/legacy-reexport/observable/concat.ts b/legacy-reexport/observable/concat.ts new file mode 100644 index 0000000000..673b315e22 --- /dev/null +++ b/legacy-reexport/observable/concat.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/concat'; diff --git a/legacy-reexport/observable/defer.ts b/legacy-reexport/observable/defer.ts new file mode 100644 index 0000000000..1a02f81fc4 --- /dev/null +++ b/legacy-reexport/observable/defer.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/defer'; diff --git a/legacy-reexport/observable/empty.ts b/legacy-reexport/observable/empty.ts new file mode 100644 index 0000000000..d7ed9cbaab --- /dev/null +++ b/legacy-reexport/observable/empty.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/empty'; diff --git a/legacy-reexport/observable/forkJoin.ts b/legacy-reexport/observable/forkJoin.ts new file mode 100644 index 0000000000..3720625de7 --- /dev/null +++ b/legacy-reexport/observable/forkJoin.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/forkJoin'; diff --git a/legacy-reexport/observable/from.ts b/legacy-reexport/observable/from.ts new file mode 100644 index 0000000000..37d2b3adbb --- /dev/null +++ b/legacy-reexport/observable/from.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/from'; diff --git a/legacy-reexport/observable/fromArray.ts b/legacy-reexport/observable/fromArray.ts new file mode 100644 index 0000000000..97f8377aa6 --- /dev/null +++ b/legacy-reexport/observable/fromArray.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/fromArray'; diff --git a/legacy-reexport/observable/fromEvent.ts b/legacy-reexport/observable/fromEvent.ts new file mode 100644 index 0000000000..0312e3e8d7 --- /dev/null +++ b/legacy-reexport/observable/fromEvent.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/fromEvent'; diff --git a/legacy-reexport/observable/fromEventPattern.ts b/legacy-reexport/observable/fromEventPattern.ts new file mode 100644 index 0000000000..6662550ab2 --- /dev/null +++ b/legacy-reexport/observable/fromEventPattern.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/fromEventPattern'; diff --git a/legacy-reexport/observable/fromIterable.ts b/legacy-reexport/observable/fromIterable.ts new file mode 100644 index 0000000000..ee359a269b --- /dev/null +++ b/legacy-reexport/observable/fromIterable.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/fromIterable'; diff --git a/legacy-reexport/observable/fromObservable.ts b/legacy-reexport/observable/fromObservable.ts new file mode 100644 index 0000000000..d201f2bdb0 --- /dev/null +++ b/legacy-reexport/observable/fromObservable.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/fromObservable'; diff --git a/legacy-reexport/observable/fromPromise.ts b/legacy-reexport/observable/fromPromise.ts new file mode 100644 index 0000000000..b580adc3c3 --- /dev/null +++ b/legacy-reexport/observable/fromPromise.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/fromPromise'; diff --git a/legacy-reexport/observable/generate.ts b/legacy-reexport/observable/generate.ts new file mode 100644 index 0000000000..ad23753b0f --- /dev/null +++ b/legacy-reexport/observable/generate.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/generate'; diff --git a/legacy-reexport/observable/if.ts b/legacy-reexport/observable/if.ts new file mode 100644 index 0000000000..71a71a4274 --- /dev/null +++ b/legacy-reexport/observable/if.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/if'; diff --git a/legacy-reexport/observable/interval.ts b/legacy-reexport/observable/interval.ts new file mode 100644 index 0000000000..273374ae4e --- /dev/null +++ b/legacy-reexport/observable/interval.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/interval'; diff --git a/legacy-reexport/observable/merge.ts b/legacy-reexport/observable/merge.ts new file mode 100644 index 0000000000..5cbace99f2 --- /dev/null +++ b/legacy-reexport/observable/merge.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/merge'; diff --git a/legacy-reexport/observable/never.ts b/legacy-reexport/observable/never.ts new file mode 100644 index 0000000000..8d8b24c1e9 --- /dev/null +++ b/legacy-reexport/observable/never.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/never'; diff --git a/legacy-reexport/observable/of.ts b/legacy-reexport/observable/of.ts new file mode 100644 index 0000000000..b61ca785f9 --- /dev/null +++ b/legacy-reexport/observable/of.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/of'; diff --git a/legacy-reexport/observable/onErrorResumeNext.ts b/legacy-reexport/observable/onErrorResumeNext.ts new file mode 100644 index 0000000000..8b46336f42 --- /dev/null +++ b/legacy-reexport/observable/onErrorResumeNext.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/onErrorResumeNext'; diff --git a/legacy-reexport/observable/pairs.ts b/legacy-reexport/observable/pairs.ts new file mode 100644 index 0000000000..59ea93eebe --- /dev/null +++ b/legacy-reexport/observable/pairs.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/pairs'; diff --git a/legacy-reexport/observable/race.ts b/legacy-reexport/observable/race.ts new file mode 100644 index 0000000000..5c05cde5e1 --- /dev/null +++ b/legacy-reexport/observable/race.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/race'; diff --git a/legacy-reexport/observable/range.ts b/legacy-reexport/observable/range.ts new file mode 100644 index 0000000000..297046c93d --- /dev/null +++ b/legacy-reexport/observable/range.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/range'; diff --git a/legacy-reexport/observable/scalar.ts b/legacy-reexport/observable/scalar.ts new file mode 100644 index 0000000000..8bc3f53cdc --- /dev/null +++ b/legacy-reexport/observable/scalar.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/scalar'; diff --git a/legacy-reexport/observable/throw.ts b/legacy-reexport/observable/throw.ts new file mode 100644 index 0000000000..30d43628d5 --- /dev/null +++ b/legacy-reexport/observable/throw.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/throw'; diff --git a/legacy-reexport/observable/timer.ts b/legacy-reexport/observable/timer.ts new file mode 100644 index 0000000000..ac3d4847c0 --- /dev/null +++ b/legacy-reexport/observable/timer.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/timer'; diff --git a/legacy-reexport/observable/using.ts b/legacy-reexport/observable/using.ts new file mode 100644 index 0000000000..2a9d0e73e8 --- /dev/null +++ b/legacy-reexport/observable/using.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/using'; diff --git a/legacy-reexport/observable/zip.ts b/legacy-reexport/observable/zip.ts new file mode 100644 index 0000000000..286e2255fb --- /dev/null +++ b/legacy-reexport/observable/zip.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/observable/zip'; diff --git a/legacy-reexport/operators/audit.ts b/legacy-reexport/operators/audit.ts new file mode 100644 index 0000000000..0e5b597d0e --- /dev/null +++ b/legacy-reexport/operators/audit.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/audit'; diff --git a/legacy-reexport/operators/auditTime.ts b/legacy-reexport/operators/auditTime.ts new file mode 100644 index 0000000000..72a4c00034 --- /dev/null +++ b/legacy-reexport/operators/auditTime.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/auditTime'; diff --git a/legacy-reexport/operators/buffer.ts b/legacy-reexport/operators/buffer.ts new file mode 100644 index 0000000000..7007461e74 --- /dev/null +++ b/legacy-reexport/operators/buffer.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/buffer'; diff --git a/legacy-reexport/operators/bufferCount.ts b/legacy-reexport/operators/bufferCount.ts new file mode 100644 index 0000000000..767b33c03f --- /dev/null +++ b/legacy-reexport/operators/bufferCount.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/bufferCount'; diff --git a/legacy-reexport/operators/bufferTime.ts b/legacy-reexport/operators/bufferTime.ts new file mode 100644 index 0000000000..085acfb968 --- /dev/null +++ b/legacy-reexport/operators/bufferTime.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/bufferTime'; diff --git a/legacy-reexport/operators/bufferToggle.ts b/legacy-reexport/operators/bufferToggle.ts new file mode 100644 index 0000000000..f554f73168 --- /dev/null +++ b/legacy-reexport/operators/bufferToggle.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/bufferToggle'; diff --git a/legacy-reexport/operators/bufferWhen.ts b/legacy-reexport/operators/bufferWhen.ts new file mode 100644 index 0000000000..7e0b79f1de --- /dev/null +++ b/legacy-reexport/operators/bufferWhen.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/bufferWhen'; diff --git a/legacy-reexport/operators/catchError.ts b/legacy-reexport/operators/catchError.ts new file mode 100644 index 0000000000..4ea9351459 --- /dev/null +++ b/legacy-reexport/operators/catchError.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/catchError'; diff --git a/legacy-reexport/operators/combineAll.ts b/legacy-reexport/operators/combineAll.ts new file mode 100644 index 0000000000..13f2758a20 --- /dev/null +++ b/legacy-reexport/operators/combineAll.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/combineAll'; diff --git a/legacy-reexport/operators/concatAll.ts b/legacy-reexport/operators/concatAll.ts new file mode 100644 index 0000000000..4e90bf3a26 --- /dev/null +++ b/legacy-reexport/operators/concatAll.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/concatAll'; diff --git a/legacy-reexport/operators/concatMap.ts b/legacy-reexport/operators/concatMap.ts new file mode 100644 index 0000000000..fb26bc0c29 --- /dev/null +++ b/legacy-reexport/operators/concatMap.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/concatMap'; diff --git a/legacy-reexport/operators/concatMapTo.ts b/legacy-reexport/operators/concatMapTo.ts new file mode 100644 index 0000000000..f5aef4099b --- /dev/null +++ b/legacy-reexport/operators/concatMapTo.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/concatMapTo'; diff --git a/legacy-reexport/operators/count.ts b/legacy-reexport/operators/count.ts new file mode 100644 index 0000000000..db7cfe3d9d --- /dev/null +++ b/legacy-reexport/operators/count.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/count'; diff --git a/legacy-reexport/operators/debounce.ts b/legacy-reexport/operators/debounce.ts new file mode 100644 index 0000000000..ed62cb8b3c --- /dev/null +++ b/legacy-reexport/operators/debounce.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/debounce'; diff --git a/legacy-reexport/operators/debounceTime.ts b/legacy-reexport/operators/debounceTime.ts new file mode 100644 index 0000000000..fb73d334b5 --- /dev/null +++ b/legacy-reexport/operators/debounceTime.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/debounceTime'; diff --git a/legacy-reexport/operators/defaultIfEmpty.ts b/legacy-reexport/operators/defaultIfEmpty.ts new file mode 100644 index 0000000000..04b9e612cf --- /dev/null +++ b/legacy-reexport/operators/defaultIfEmpty.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/defaultIfEmpty'; diff --git a/legacy-reexport/operators/delay.ts b/legacy-reexport/operators/delay.ts new file mode 100644 index 0000000000..d34f33d255 --- /dev/null +++ b/legacy-reexport/operators/delay.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/delay'; diff --git a/legacy-reexport/operators/delayWhen.ts b/legacy-reexport/operators/delayWhen.ts new file mode 100644 index 0000000000..4de1452900 --- /dev/null +++ b/legacy-reexport/operators/delayWhen.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/delayWhen'; diff --git a/legacy-reexport/operators/dematerialize.ts b/legacy-reexport/operators/dematerialize.ts new file mode 100644 index 0000000000..a689bf08f9 --- /dev/null +++ b/legacy-reexport/operators/dematerialize.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/dematerialize'; diff --git a/legacy-reexport/operators/distinct.ts b/legacy-reexport/operators/distinct.ts new file mode 100644 index 0000000000..9d8288a4fc --- /dev/null +++ b/legacy-reexport/operators/distinct.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/distinct'; diff --git a/legacy-reexport/operators/distinctUntilChanged.ts b/legacy-reexport/operators/distinctUntilChanged.ts new file mode 100644 index 0000000000..1fc4eda810 --- /dev/null +++ b/legacy-reexport/operators/distinctUntilChanged.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/distinctUntilChanged'; diff --git a/legacy-reexport/operators/distinctUntilKeyChanged.ts b/legacy-reexport/operators/distinctUntilKeyChanged.ts new file mode 100644 index 0000000000..d8fa76ae1b --- /dev/null +++ b/legacy-reexport/operators/distinctUntilKeyChanged.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/distinctUntilKeyChanged'; diff --git a/legacy-reexport/operators/elementAt.ts b/legacy-reexport/operators/elementAt.ts new file mode 100644 index 0000000000..4f5d5b3756 --- /dev/null +++ b/legacy-reexport/operators/elementAt.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/elementAt'; diff --git a/legacy-reexport/operators/every.ts b/legacy-reexport/operators/every.ts new file mode 100644 index 0000000000..15b9f46f7f --- /dev/null +++ b/legacy-reexport/operators/every.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/every'; diff --git a/legacy-reexport/operators/exhaust.ts b/legacy-reexport/operators/exhaust.ts new file mode 100644 index 0000000000..19a3637cfb --- /dev/null +++ b/legacy-reexport/operators/exhaust.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/exhaust'; diff --git a/legacy-reexport/operators/exhaustMap.ts b/legacy-reexport/operators/exhaustMap.ts new file mode 100644 index 0000000000..cf4ae30bed --- /dev/null +++ b/legacy-reexport/operators/exhaustMap.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/exhaustMap'; diff --git a/legacy-reexport/operators/expand.ts b/legacy-reexport/operators/expand.ts new file mode 100644 index 0000000000..0cef04ce50 --- /dev/null +++ b/legacy-reexport/operators/expand.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/expand'; diff --git a/legacy-reexport/operators/filter.ts b/legacy-reexport/operators/filter.ts new file mode 100644 index 0000000000..23b8666dd9 --- /dev/null +++ b/legacy-reexport/operators/filter.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/filter'; diff --git a/legacy-reexport/operators/finalize.ts b/legacy-reexport/operators/finalize.ts new file mode 100644 index 0000000000..9c32dfcf57 --- /dev/null +++ b/legacy-reexport/operators/finalize.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/finalize'; diff --git a/legacy-reexport/operators/find.ts b/legacy-reexport/operators/find.ts new file mode 100644 index 0000000000..98a272d7e0 --- /dev/null +++ b/legacy-reexport/operators/find.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/find'; diff --git a/legacy-reexport/operators/findIndex.ts b/legacy-reexport/operators/findIndex.ts new file mode 100644 index 0000000000..167707fb84 --- /dev/null +++ b/legacy-reexport/operators/findIndex.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/findIndex'; diff --git a/legacy-reexport/operators/first.ts b/legacy-reexport/operators/first.ts new file mode 100644 index 0000000000..c0266e31e9 --- /dev/null +++ b/legacy-reexport/operators/first.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/first'; diff --git a/legacy-reexport/operators/groupBy.ts b/legacy-reexport/operators/groupBy.ts new file mode 100644 index 0000000000..52c6f58474 --- /dev/null +++ b/legacy-reexport/operators/groupBy.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/groupBy'; diff --git a/legacy-reexport/operators/ignoreElements.ts b/legacy-reexport/operators/ignoreElements.ts new file mode 100644 index 0000000000..590bf883df --- /dev/null +++ b/legacy-reexport/operators/ignoreElements.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/ignoreElements'; diff --git a/legacy-reexport/operators/isEmpty.ts b/legacy-reexport/operators/isEmpty.ts new file mode 100644 index 0000000000..fd1d1afc02 --- /dev/null +++ b/legacy-reexport/operators/isEmpty.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/isEmpty'; diff --git a/legacy-reexport/operators/last.ts b/legacy-reexport/operators/last.ts new file mode 100644 index 0000000000..c8464bf4c2 --- /dev/null +++ b/legacy-reexport/operators/last.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/last'; diff --git a/legacy-reexport/operators/map.ts b/legacy-reexport/operators/map.ts new file mode 100644 index 0000000000..7e8cb1f837 --- /dev/null +++ b/legacy-reexport/operators/map.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/map'; diff --git a/legacy-reexport/operators/mapTo.ts b/legacy-reexport/operators/mapTo.ts new file mode 100644 index 0000000000..72b4d9e5c3 --- /dev/null +++ b/legacy-reexport/operators/mapTo.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/mapTo'; diff --git a/legacy-reexport/operators/materialize.ts b/legacy-reexport/operators/materialize.ts new file mode 100644 index 0000000000..e050f1e764 --- /dev/null +++ b/legacy-reexport/operators/materialize.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/materialize'; diff --git a/legacy-reexport/operators/max.ts b/legacy-reexport/operators/max.ts new file mode 100644 index 0000000000..044da470dd --- /dev/null +++ b/legacy-reexport/operators/max.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/max'; diff --git a/legacy-reexport/operators/mergeAll.ts b/legacy-reexport/operators/mergeAll.ts new file mode 100644 index 0000000000..b5c5b38f84 --- /dev/null +++ b/legacy-reexport/operators/mergeAll.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/mergeAll'; diff --git a/legacy-reexport/operators/mergeMap.ts b/legacy-reexport/operators/mergeMap.ts new file mode 100644 index 0000000000..af5c7c153b --- /dev/null +++ b/legacy-reexport/operators/mergeMap.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/mergeMap'; diff --git a/legacy-reexport/operators/mergeMapTo.ts b/legacy-reexport/operators/mergeMapTo.ts new file mode 100644 index 0000000000..67b6cb7bd4 --- /dev/null +++ b/legacy-reexport/operators/mergeMapTo.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/mergeMapTo'; diff --git a/legacy-reexport/operators/mergeScan.ts b/legacy-reexport/operators/mergeScan.ts new file mode 100644 index 0000000000..ef73adcb71 --- /dev/null +++ b/legacy-reexport/operators/mergeScan.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/mergeScan'; diff --git a/legacy-reexport/operators/min.ts b/legacy-reexport/operators/min.ts new file mode 100644 index 0000000000..3706e3fc50 --- /dev/null +++ b/legacy-reexport/operators/min.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/min'; diff --git a/legacy-reexport/operators/multicast.ts b/legacy-reexport/operators/multicast.ts new file mode 100644 index 0000000000..94702843b7 --- /dev/null +++ b/legacy-reexport/operators/multicast.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/multicast'; diff --git a/legacy-reexport/operators/observeOn.ts b/legacy-reexport/operators/observeOn.ts new file mode 100644 index 0000000000..0f6d414013 --- /dev/null +++ b/legacy-reexport/operators/observeOn.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/observeOn'; diff --git a/legacy-reexport/operators/onErrorResumeNext.ts b/legacy-reexport/operators/onErrorResumeNext.ts new file mode 100644 index 0000000000..0b19815c0e --- /dev/null +++ b/legacy-reexport/operators/onErrorResumeNext.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/onErrorResumeNext'; diff --git a/legacy-reexport/operators/pairwise.ts b/legacy-reexport/operators/pairwise.ts new file mode 100644 index 0000000000..f83f7320c2 --- /dev/null +++ b/legacy-reexport/operators/pairwise.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/pairwise'; diff --git a/legacy-reexport/operators/partition.ts b/legacy-reexport/operators/partition.ts new file mode 100644 index 0000000000..3c8284345f --- /dev/null +++ b/legacy-reexport/operators/partition.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/partition'; diff --git a/legacy-reexport/operators/pluck.ts b/legacy-reexport/operators/pluck.ts new file mode 100644 index 0000000000..2ac910af68 --- /dev/null +++ b/legacy-reexport/operators/pluck.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/pluck'; diff --git a/legacy-reexport/operators/publish.ts b/legacy-reexport/operators/publish.ts new file mode 100644 index 0000000000..a21951d7a2 --- /dev/null +++ b/legacy-reexport/operators/publish.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/publish'; diff --git a/legacy-reexport/operators/publishBehavior.ts b/legacy-reexport/operators/publishBehavior.ts new file mode 100644 index 0000000000..53cbc378aa --- /dev/null +++ b/legacy-reexport/operators/publishBehavior.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/publishBehavior'; diff --git a/legacy-reexport/operators/publishLast.ts b/legacy-reexport/operators/publishLast.ts new file mode 100644 index 0000000000..0fcb439984 --- /dev/null +++ b/legacy-reexport/operators/publishLast.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/publishLast'; diff --git a/legacy-reexport/operators/publishReplay.ts b/legacy-reexport/operators/publishReplay.ts new file mode 100644 index 0000000000..ff87a2d8a6 --- /dev/null +++ b/legacy-reexport/operators/publishReplay.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/publishReplay'; diff --git a/legacy-reexport/operators/race.ts b/legacy-reexport/operators/race.ts new file mode 100644 index 0000000000..95047c74db --- /dev/null +++ b/legacy-reexport/operators/race.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/race'; diff --git a/legacy-reexport/operators/reduce.ts b/legacy-reexport/operators/reduce.ts new file mode 100644 index 0000000000..abb05c3ed7 --- /dev/null +++ b/legacy-reexport/operators/reduce.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/reduce'; diff --git a/legacy-reexport/operators/refCount.ts b/legacy-reexport/operators/refCount.ts new file mode 100644 index 0000000000..3c38baa151 --- /dev/null +++ b/legacy-reexport/operators/refCount.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/refCount'; diff --git a/legacy-reexport/operators/repeat.ts b/legacy-reexport/operators/repeat.ts new file mode 100644 index 0000000000..1f36353630 --- /dev/null +++ b/legacy-reexport/operators/repeat.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/repeat'; diff --git a/legacy-reexport/operators/repeatWhen.ts b/legacy-reexport/operators/repeatWhen.ts new file mode 100644 index 0000000000..df052ac0a6 --- /dev/null +++ b/legacy-reexport/operators/repeatWhen.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/repeatWhen'; diff --git a/legacy-reexport/operators/retry.ts b/legacy-reexport/operators/retry.ts new file mode 100644 index 0000000000..b8d2feebb6 --- /dev/null +++ b/legacy-reexport/operators/retry.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/retry'; diff --git a/legacy-reexport/operators/retryWhen.ts b/legacy-reexport/operators/retryWhen.ts new file mode 100644 index 0000000000..00f9bdfd91 --- /dev/null +++ b/legacy-reexport/operators/retryWhen.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/retryWhen'; diff --git a/legacy-reexport/operators/sample.ts b/legacy-reexport/operators/sample.ts new file mode 100644 index 0000000000..0e05a4ba75 --- /dev/null +++ b/legacy-reexport/operators/sample.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/sample'; diff --git a/legacy-reexport/operators/sampleTime.ts b/legacy-reexport/operators/sampleTime.ts new file mode 100644 index 0000000000..5041a5130e --- /dev/null +++ b/legacy-reexport/operators/sampleTime.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/sampleTime'; diff --git a/legacy-reexport/operators/scan.ts b/legacy-reexport/operators/scan.ts new file mode 100644 index 0000000000..acaee73d15 --- /dev/null +++ b/legacy-reexport/operators/scan.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/scan'; diff --git a/legacy-reexport/operators/sequenceEqual.ts b/legacy-reexport/operators/sequenceEqual.ts new file mode 100644 index 0000000000..0a6e3cbc6a --- /dev/null +++ b/legacy-reexport/operators/sequenceEqual.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/sequenceEqual'; diff --git a/legacy-reexport/operators/share.ts b/legacy-reexport/operators/share.ts new file mode 100644 index 0000000000..fd113fdae8 --- /dev/null +++ b/legacy-reexport/operators/share.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/share'; diff --git a/legacy-reexport/operators/shareReplay.ts b/legacy-reexport/operators/shareReplay.ts new file mode 100644 index 0000000000..d489c81031 --- /dev/null +++ b/legacy-reexport/operators/shareReplay.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/shareReplay'; diff --git a/legacy-reexport/operators/single.ts b/legacy-reexport/operators/single.ts new file mode 100644 index 0000000000..096d4b42ff --- /dev/null +++ b/legacy-reexport/operators/single.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/single'; diff --git a/legacy-reexport/operators/skip.ts b/legacy-reexport/operators/skip.ts new file mode 100644 index 0000000000..002baeb91c --- /dev/null +++ b/legacy-reexport/operators/skip.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/skip'; diff --git a/legacy-reexport/operators/skipLast.ts b/legacy-reexport/operators/skipLast.ts new file mode 100644 index 0000000000..15d1c49652 --- /dev/null +++ b/legacy-reexport/operators/skipLast.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/skipLast'; diff --git a/legacy-reexport/operators/skipUntil.ts b/legacy-reexport/operators/skipUntil.ts new file mode 100644 index 0000000000..4193fe2c64 --- /dev/null +++ b/legacy-reexport/operators/skipUntil.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/skipUntil'; diff --git a/legacy-reexport/operators/skipWhile.ts b/legacy-reexport/operators/skipWhile.ts new file mode 100644 index 0000000000..34fb4d65f3 --- /dev/null +++ b/legacy-reexport/operators/skipWhile.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/skipWhile'; diff --git a/legacy-reexport/operators/startWith.ts b/legacy-reexport/operators/startWith.ts new file mode 100644 index 0000000000..901bbbae62 --- /dev/null +++ b/legacy-reexport/operators/startWith.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/startWith'; diff --git a/legacy-reexport/operators/subscribeOn.ts b/legacy-reexport/operators/subscribeOn.ts new file mode 100644 index 0000000000..eb1c233656 --- /dev/null +++ b/legacy-reexport/operators/subscribeOn.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/subscribeOn'; diff --git a/legacy-reexport/operators/switchAll.ts b/legacy-reexport/operators/switchAll.ts new file mode 100644 index 0000000000..37a8c202d1 --- /dev/null +++ b/legacy-reexport/operators/switchAll.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/switchAll'; diff --git a/legacy-reexport/operators/switchMap.ts b/legacy-reexport/operators/switchMap.ts new file mode 100644 index 0000000000..840c2c71dc --- /dev/null +++ b/legacy-reexport/operators/switchMap.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/switchMap'; diff --git a/legacy-reexport/operators/switchMapTo.ts b/legacy-reexport/operators/switchMapTo.ts new file mode 100644 index 0000000000..fbefdfe14e --- /dev/null +++ b/legacy-reexport/operators/switchMapTo.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/switchMapTo'; diff --git a/legacy-reexport/operators/take.ts b/legacy-reexport/operators/take.ts new file mode 100644 index 0000000000..1176ad74df --- /dev/null +++ b/legacy-reexport/operators/take.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/take'; diff --git a/legacy-reexport/operators/takeLast.ts b/legacy-reexport/operators/takeLast.ts new file mode 100644 index 0000000000..35e85f2df3 --- /dev/null +++ b/legacy-reexport/operators/takeLast.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/takeLast'; diff --git a/legacy-reexport/operators/takeUntil.ts b/legacy-reexport/operators/takeUntil.ts new file mode 100644 index 0000000000..828abef526 --- /dev/null +++ b/legacy-reexport/operators/takeUntil.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/takeUntil'; diff --git a/legacy-reexport/operators/takeWhile.ts b/legacy-reexport/operators/takeWhile.ts new file mode 100644 index 0000000000..c3edb4e3e3 --- /dev/null +++ b/legacy-reexport/operators/takeWhile.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/takeWhile'; diff --git a/legacy-reexport/operators/tap.ts b/legacy-reexport/operators/tap.ts new file mode 100644 index 0000000000..6190e75efb --- /dev/null +++ b/legacy-reexport/operators/tap.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/tap'; diff --git a/legacy-reexport/operators/throttle.ts b/legacy-reexport/operators/throttle.ts new file mode 100644 index 0000000000..f887a2feac --- /dev/null +++ b/legacy-reexport/operators/throttle.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/throttle'; diff --git a/legacy-reexport/operators/throttleTime.ts b/legacy-reexport/operators/throttleTime.ts new file mode 100644 index 0000000000..8fbd3c88a5 --- /dev/null +++ b/legacy-reexport/operators/throttleTime.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/throttleTime'; diff --git a/legacy-reexport/operators/throwIfEmpty.ts b/legacy-reexport/operators/throwIfEmpty.ts new file mode 100644 index 0000000000..6bb64cd32a --- /dev/null +++ b/legacy-reexport/operators/throwIfEmpty.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/throwIfEmpty'; diff --git a/legacy-reexport/operators/timeInterval.ts b/legacy-reexport/operators/timeInterval.ts new file mode 100644 index 0000000000..6af39119ad --- /dev/null +++ b/legacy-reexport/operators/timeInterval.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/timeInterval'; diff --git a/legacy-reexport/operators/timeout.ts b/legacy-reexport/operators/timeout.ts new file mode 100644 index 0000000000..c4a43f1c31 --- /dev/null +++ b/legacy-reexport/operators/timeout.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/timeout'; diff --git a/legacy-reexport/operators/timeoutWith.ts b/legacy-reexport/operators/timeoutWith.ts new file mode 100644 index 0000000000..2cfcad8617 --- /dev/null +++ b/legacy-reexport/operators/timeoutWith.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/timeoutWith'; diff --git a/legacy-reexport/operators/timestamp.ts b/legacy-reexport/operators/timestamp.ts new file mode 100644 index 0000000000..6580e38e31 --- /dev/null +++ b/legacy-reexport/operators/timestamp.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/timestamp'; diff --git a/legacy-reexport/operators/toArray.ts b/legacy-reexport/operators/toArray.ts new file mode 100644 index 0000000000..7f678db1d0 --- /dev/null +++ b/legacy-reexport/operators/toArray.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/toArray'; diff --git a/legacy-reexport/operators/window.ts b/legacy-reexport/operators/window.ts new file mode 100644 index 0000000000..2642141bf4 --- /dev/null +++ b/legacy-reexport/operators/window.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/window'; diff --git a/legacy-reexport/operators/windowCount.ts b/legacy-reexport/operators/windowCount.ts new file mode 100644 index 0000000000..b774707730 --- /dev/null +++ b/legacy-reexport/operators/windowCount.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/windowCount'; diff --git a/legacy-reexport/operators/windowTime.ts b/legacy-reexport/operators/windowTime.ts new file mode 100644 index 0000000000..2cbf76fc87 --- /dev/null +++ b/legacy-reexport/operators/windowTime.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/windowTime'; diff --git a/legacy-reexport/operators/windowToggle.ts b/legacy-reexport/operators/windowToggle.ts new file mode 100644 index 0000000000..b116f17e90 --- /dev/null +++ b/legacy-reexport/operators/windowToggle.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/windowToggle'; diff --git a/legacy-reexport/operators/windowWhen.ts b/legacy-reexport/operators/windowWhen.ts new file mode 100644 index 0000000000..782d4dc0ba --- /dev/null +++ b/legacy-reexport/operators/windowWhen.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/windowWhen'; diff --git a/legacy-reexport/operators/withLatestFrom.ts b/legacy-reexport/operators/withLatestFrom.ts new file mode 100644 index 0000000000..15f7450bf1 --- /dev/null +++ b/legacy-reexport/operators/withLatestFrom.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/withLatestFrom'; diff --git a/legacy-reexport/operators/zipAll.ts b/legacy-reexport/operators/zipAll.ts new file mode 100644 index 0000000000..3e69835c84 --- /dev/null +++ b/legacy-reexport/operators/zipAll.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/operators/zipAll'; diff --git a/legacy-reexport/symbol/observable b/legacy-reexport/symbol/observable.ts similarity index 100% rename from legacy-reexport/symbol/observable rename to legacy-reexport/symbol/observable.ts diff --git a/legacy-reexport/util/Immediate.ts b/legacy-reexport/util/Immediate.ts new file mode 100644 index 0000000000..f01cc7d950 --- /dev/null +++ b/legacy-reexport/util/Immediate.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/util/Immediate'; \ No newline at end of file diff --git a/legacy-reexport/util/root.ts b/legacy-reexport/util/root.ts new file mode 100644 index 0000000000..fb04f24ee3 --- /dev/null +++ b/legacy-reexport/util/root.ts @@ -0,0 +1 @@ +export * from 'rxjs-compat/util/root'; \ No newline at end of file diff --git a/spec/helpers/test-helper.ts b/spec/helpers/test-helper.ts index 7a42b26b53..3c8f598f64 100644 --- a/spec/helpers/test-helper.ts +++ b/spec/helpers/test-helper.ts @@ -2,7 +2,8 @@ declare const global: any; import * as Rx from 'rxjs/Rx'; import { ObservableInput } from 'rxjs'; -import { iterator, root } from 'rxjs/internal-compatibility'; +import { iterator } from 'rxjs/symbol/iterator'; +import { root } from 'rxjs/util/root'; import $$symbolObservable from 'symbol-observable'; export function lowerCaseO(...args: Array): Rx.Observable { diff --git a/spec/observables/IteratorObservable-spec.ts b/spec/observables/IteratorObservable-spec.ts index 61726b3654..cbfd008473 100644 --- a/spec/observables/IteratorObservable-spec.ts +++ b/spec/observables/IteratorObservable-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as Rx from 'rxjs/Rx'; import { queue } from 'rxjs/scheduler/queue'; -import { fromIterable } from 'rxjs/internal-compatibility'; +import { fromIterable } from 'rxjs/observable/fromIterable'; declare const expectObservable: any; declare const rxTestScheduler: Rx.TestScheduler; diff --git a/spec/observables/ScalarObservable-spec.ts b/spec/observables/ScalarObservable-spec.ts index 1d9472e77f..31ae60ff3e 100644 --- a/spec/observables/ScalarObservable-spec.ts +++ b/spec/observables/ScalarObservable-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import * as Rx from 'rxjs/Rx'; -import { scalar } from 'rxjs/internal-compatibility'; +import { scalar } from 'rxjs/observable/scalar'; declare const rxTestScheduler: Rx.TestScheduler; diff --git a/spec/observables/SubscribeOnObservable-spec.ts b/spec/observables/SubscribeOnObservable-spec.ts index 73a4ebcc95..a826c2928f 100644 --- a/spec/observables/SubscribeOnObservable-spec.ts +++ b/spec/observables/SubscribeOnObservable-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; import * as Rx from 'rxjs/Rx'; -import { SubscribeOnObservable } from 'rxjs/internal-compatibility'; +import { SubscribeOnObservable } from 'rxjs/observable/SubscribeOnObservable'; import { hot, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare const rxTestScheduler: Rx.TestScheduler; diff --git a/spec/observables/dom/ajax-spec.ts b/spec/observables/dom/ajax-spec.ts index daaf01bbc7..bbd929b49f 100644 --- a/spec/observables/dom/ajax-spec.ts +++ b/spec/observables/dom/ajax-spec.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; import * as Rx from 'rxjs/Rx'; -import { root } from 'rxjs/internal-compatibility'; +import { root } from 'rxjs/util/root'; declare const global: any; diff --git a/spec/observables/range-spec.ts b/spec/observables/range-spec.ts index c6563cc63b..1b3c540fea 100644 --- a/spec/observables/range-spec.ts +++ b/spec/observables/range-spec.ts @@ -3,7 +3,7 @@ import * as sinon from 'sinon'; import { Observable, Subscriber, asapScheduler as asap, range} from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; import { expectObservable } from '../helpers/marble-testing'; -import { dispatch } from 'rxjs/internal-compatibility'; +import { dispatch } from 'rxjs/observable/range'; declare const asDiagram: any; diff --git a/spec/operators/groupBy-spec.ts b/spec/operators/groupBy-spec.ts index f13684a5c4..68f44d5310 100644 --- a/spec/operators/groupBy-spec.ts +++ b/spec/operators/groupBy-spec.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import * as Rx from 'rxjs/Rx'; -import { GroupedObservable } from 'rxjs/internal-compatibility'; +import { GroupedObservable } from 'rxjs/operators/groupBy'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/symbol/rxSubscriber-spec.ts b/spec/symbol/rxSubscriber-spec.ts index 388f44b98a..99fdfd7a4b 100644 --- a/spec/symbol/rxSubscriber-spec.ts +++ b/spec/symbol/rxSubscriber-spec.ts @@ -1,5 +1,6 @@ import { expect } from 'chai'; -import { root, rxSubscriber } from 'rxjs/internal-compatibility'; +import { root } from 'rxjs/util/root'; +import { rxSubscriber } from 'rxjs/symbol/rxSubscriber'; describe('rxSubscriber symbol', () => { it('should exist in the proper form', () => { diff --git a/spec/util/Immediate-spec.ts b/spec/util/Immediate-spec.ts index 3afa7f13c8..932d3226a9 100644 --- a/spec/util/Immediate-spec.ts +++ b/spec/util/Immediate-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { Immediate } from 'rxjs/internal-compatibility'; +import { Immediate } from 'rxjs/util/Immediate'; describe('Immediate', () => { it('should schedule on the next microtask', (done) => { diff --git a/src/operators/index.ts b/src/operators/index.ts index a2ed912d6d..417eef4fbe 100644 --- a/src/operators/index.ts +++ b/src/operators/index.ts @@ -48,6 +48,7 @@ export { mergeScan } from '../internal/operators/mergeScan'; export { min } from '../internal/operators/min'; export { multicast } from '../internal/operators/multicast'; export { observeOn } from '../internal/operators/observeOn'; +export { onErrorResumeNext } from '../internal/operators/onErrorResumeNext'; export { pairwise } from '../internal/operators/pairwise'; export { partition } from '../internal/operators/partition'; export { pluck } from '../internal/operators/pluck'; @@ -55,6 +56,7 @@ export { publish } from '../internal/operators/publish'; export { publishBehavior } from '../internal/operators/publishBehavior'; export { publishLast } from '../internal/operators/publishLast'; export { publishReplay } from '../internal/operators/publishReplay'; +export { race } from '../internal/operators/race'; export { reduce } from '../internal/operators/reduce'; export { repeat } from '../internal/operators/repeat'; export { repeatWhen } from '../internal/operators/repeatWhen'; @@ -73,13 +75,7 @@ export { skipLast } from '../internal/operators/skipLast'; export { skipUntil } from '../internal/operators/skipUntil'; export { skipWhile } from '../internal/operators/skipWhile'; export { startWith } from '../internal/operators/startWith'; -/** - * TODO(https://github.com/ReactiveX/rxjs/issues/2900): Add back subscribeOn once it can be - * treeshaken. Currently if this export is added back, it - * forces apps to bring in asap scheduler along with - * Immediate, root, and other supporting code. - */ -// export { subscribeOn } from '../internal/operators/subscribeOn'; +export { subscribeOn } from '../internal/operators/subscribeOn'; export { switchAll } from '../internal/operators/switchAll'; export { switchMap } from '../internal/operators/switchMap'; export { switchMapTo } from '../internal/operators/switchMapTo'; From ef35257e3f1fccd78b0f60a9d0d2a1c7b676cae3 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Thu, 15 Mar 2018 10:58:45 -0700 Subject: [PATCH 34/39] refactor(compat): make build and tests pass --- .gitignore | 1 + compat/observable/fromIterable.ts | 2 +- compat/observable/range.ts | 1 + package.json | 10 ++++++---- spec/observables/defer-spec.ts | 3 +-- spec/observables/empty-spec.ts | 3 +-- spec/observables/from-spec.ts | 3 +-- spec/observables/throwError-spec.ts | 2 +- spec/support/coverage.opts | 6 +++--- tsconfig.base.json | 2 +- tsconfig.json | 11 +---------- tsconfig/tsconfig.base.json | 6 +++++- 12 files changed, 23 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index fab7bff263..54a14c1d05 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ tmp/ coverage/ img/ spec-js/ +spec-build/ .nyc_output/ .out/ diff --git a/compat/observable/fromIterable.ts b/compat/observable/fromIterable.ts index d5e2c88d77..026b809bd2 100644 --- a/compat/observable/fromIterable.ts +++ b/compat/observable/fromIterable.ts @@ -1 +1 @@ -export { from as fromIterable } from 'rxjs'; +export { fromIterable } from 'rxjs/internal-compatibility'; diff --git a/compat/observable/range.ts b/compat/observable/range.ts index 2646d037c2..be9c2f48f4 100644 --- a/compat/observable/range.ts +++ b/compat/observable/range.ts @@ -1 +1,2 @@ export { range } from 'rxjs'; +export { dispatch } from 'rxjs/internal-compatibility'; diff --git a/package.json b/package.json index 3638488f2f..647a1ccb7b 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "precommit": "lint-staged", "commitmsg": "validate-commit-msg", "info": "npm-scripts-info", - "build_all": "npm-run-all compat_build_all clean_dist copy_sources build_cjs build_esm5 build_esm2015 build_esm5_for_rollup build_umd build_legacy_reexport generate_packages", + "build_all": "npm-run-all compat_build_all clean_dist copy_sources build_cjs build_esm5 build_esm2015 build_esm5_for_rollup build_umd build_legacy_reexport generate_packages copy_for_tests", "build_cjs": "npm-run-all clean_dist_cjs compile_dist_cjs", "build_esm5": "npm-run-all clean_dist_esm5 compile_dist_esm5", "build_esm5_for_rollup": "npm-run-all clean_dist_esm5_for_rollup compile_dist_esm5_for_rollup && mkdirp dist/esm5_for_rollup/node_modules && shx cp -r ./dist-compat/package ./dist/esm5_for_rollup/node_modules/rxjs-compat", @@ -87,6 +87,8 @@ "build_umd": "npm-run-all clean_dist_global && mkdirp ./dist/global && node ./tools/make-umd-bundle.js && npm-run-all build_closure_core", "build_perf": "webdriver-manager update && npm-run-all build_cjs build_global perf", "build_docs": "npm-run-all build_global build_esm2015_for_docs build_cjs tests2png decision_tree_widget && esdoc -c esdoc.json && npm-run-all clean_dist_esm2015", + "build_spec": "npm-run-all build_cjs generate_packages copy_for_tests", + "build_spec_full": "npm-run-all compat_build_cjs compile_legacy_reexport compat_generate_packages build_spec", "build_spec_browser": "webpack --config spec/support/webpack.mocha.config.js", "clean_dist": "shx rm -rf ./dist", "clean_dist_cjs": "shx rm -rf ./dist/cjs", @@ -102,6 +104,7 @@ "compile_dist_esm5_for_rollup": "tsc -p ./tsconfig/tsconfig.esm5.rollup.json", "compile_legacy_reexport": "tsc -p ./tsconfig/tsconfig.legacy-reexport.json", "copy_sources": "mkdirp dist && shx cp -r ./src/ ./dist/src", + "copy_for_tests": "shx rm -rf ./spec-build && shx cp -r ./spec/ ./spec-build/ && mkdir ./spec-build/node_modules && shx cp -r ./dist/package/ ./spec-build/node_modules/rxjs && shx cp -r ./dist-compat/package/ ./spec-build/node_modules/rxjs-compat", "decision_tree_widget": "cd doc/decision-tree-widget && npm run build && cd ../..", "doctoc": "doctoc CONTRIBUTING.md", "generate_packages": "node .make-packages.js", @@ -114,12 +117,12 @@ "prepublish": "shx rm -rf ./typings && npm run build_all", "publish_docs": "./publish_docs.sh", "test_browser": "npm-run-all build_spec_browser && opn spec/support/mocha-browser-runner.html", - "test": "cross-env TS_NODE_FAST=true NODE_PATH=./dist-compat:./dist mocha --require ts-node/register --opts spec/support/coverage.opts \"spec/**/*-spec.ts\"", + "test": "cross-env TS_NODE_FAST=true mocha --require ts-node/register --opts spec-build/support/coverage.opts \"spec-build/**/*-spec.ts\"", "test:cover": "cross-env TS_NODE_FAST=true nyc npm test", "test:circular": "dependency-cruise --validate .dependency-cruiser.json -x \"^node_modules\" src", "test:systemjs": "node integration/systemjs/systemjs-compatibility-spec.js", "tests2png": "mkdirp tmp/docs/img && cross-env TS_NODE_FAST=true mocha --compilers ts:ts-node/register --opts spec/support/tests2png.opts \"spec/**/*-spec.ts\"", - "watch": "watch \"echo triggering build && npm run test && echo build completed\" src -d -u -w=15", + "watch": "watch \"echo triggering build && npm run build_spec && npm run test && echo build completed\" src -d -u -w=15", "compat_build_all": "npm-run-all compat_clean_dist compat_build_cjs compat_build_esm5 compat_build_esm2015 compat_generate_packages", "compat_build_cjs": "npm-run-all compat_clean_dist_cjs compat_compile_dist_cjs", "compat_build_esm5": "npm-run-all compat_clean_dist_esm5 compat_compile_dist_esm5", @@ -236,7 +239,6 @@ "rollup-plugin-inject": "2.0.0", "rollup-plugin-node-resolve": "2.0.0", "rx": "latest", - "rxjs": "latest", "shx": "0.2.2", "sinon": "4.3.0", "sinon-chai": "2.14.0", diff --git a/spec/observables/defer-spec.ts b/spec/observables/defer-spec.ts index 6e4f142c08..0b0d67a534 100644 --- a/spec/observables/defer-spec.ts +++ b/spec/observables/defer-spec.ts @@ -1,6 +1,5 @@ import { expect } from 'chai'; -import { defer } from 'rxjs'; -import { Observable } from 'rxjs'; +import { defer, Observable } from 'rxjs'; import { hot, cold, expectObservable, expectSubscriptions } from '../helpers/marble-testing'; declare function asDiagram(arg: string): Function; diff --git a/spec/observables/empty-spec.ts b/spec/observables/empty-spec.ts index 45f79b621d..2961b8dae2 100644 --- a/spec/observables/empty-spec.ts +++ b/spec/observables/empty-spec.ts @@ -1,7 +1,6 @@ import { expect } from 'chai'; import { expectObservable } from '../helpers/marble-testing'; -import { empty } from 'rxjs'; -import { EMPTY } from 'rxjs'; +import { empty, EMPTY } from 'rxjs'; import { TestScheduler } from 'rxjs/testing'; declare const asDiagram: any; diff --git a/spec/observables/from-spec.ts b/spec/observables/from-spec.ts index 512fb9c62d..4917927b85 100644 --- a/spec/observables/from-spec.ts +++ b/spec/observables/from-spec.ts @@ -1,7 +1,6 @@ import { expect } from 'chai'; import { TestScheduler } from 'rxjs/testing'; -import { Observable, asapScheduler, asyncScheduler, Observer } from 'rxjs'; -import { of, from } from 'rxjs'; +import { asyncScheduler, of, from, Observable, asapScheduler, Observer } from 'rxjs'; // tslint:disable:no-any declare const asDiagram: any; diff --git a/spec/observables/throwError-spec.ts b/spec/observables/throwError-spec.ts index b5b04675fb..a74ac8850c 100644 --- a/spec/observables/throwError-spec.ts +++ b/spec/observables/throwError-spec.ts @@ -1,5 +1,5 @@ import { expect } from 'chai'; -import { TestScheduler } from '../../src/internal/testing/TestScheduler'; +import { TestScheduler } from 'rxjs/testing'; import { throwError } from 'rxjs'; import { expectObservable } from '../helpers/marble-testing'; diff --git a/spec/support/coverage.opts b/spec/support/coverage.opts index d041c7ba95..9e26e6a0bd 100644 --- a/spec/support/coverage.opts +++ b/spec/support/coverage.opts @@ -1,7 +1,7 @@ --require ts-node/register ---require spec/helpers/polyfills.ts ---require spec/helpers/testScheduler-ui.ts ---ui spec/helpers/testScheduler-ui.ts +--require spec-build/helpers/polyfills.ts +--require spec-build/helpers/testScheduler-ui.ts +--ui spec-build/helpers/testScheduler-ui.ts --reporter dot diff --git a/tsconfig.base.json b/tsconfig.base.json index 992c41c3eb..6d0829bd41 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -8,7 +8,7 @@ "noImplicitReturns": true, "noImplicitThis": true, "suppressImplicitAnyIndexErrors": true, - "moduleResolution": "classic", // we intentionally use "classic" module resolution to be SystemJS-compatible after transpilation + "moduleResolution": "node", "stripInternal": false, "target": "es5", "outDir": "./.out", diff --git a/tsconfig.json b/tsconfig.json index 99303f3770..841f5836db 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,17 +3,8 @@ "compilerOptions": { "baseUrl": ".", "paths": { - "rxjs": ["./src/index"], + "rxjs": ["./src"], "rxjs/*": ["./src/*", "./legacy-reexport/*"], - "rxjs/internal-compatibility": ["./src/internal-compatibility/index"], - "rxjs/Rx": ["./legacy-reexport/Rx"], - "rxjs/operators/*": ["./legacy-reexport/operators/*"], - "rxjs/symbol/*": ["./legacy-reexport/symbol/*"], - "rxjs/scheduler/*": ["./legacy-reexport/scheduler/*"], - "rxjs/ajax": ["./src/ajax/index"], - "rxjs/operators": ["./src/operators/index"], - "rxjs/testing": ["./src/testing/index"], - "rxjs/websocket": ["./src/websocket/index"], "rxjs-compat": ["./compat/index"], "rxjs-compat/*": ["./compat/*"] } diff --git a/tsconfig/tsconfig.base.json b/tsconfig/tsconfig.base.json index 754aa4166a..68446a7fc2 100644 --- a/tsconfig/tsconfig.base.json +++ b/tsconfig/tsconfig.base.json @@ -2,7 +2,11 @@ "extends": "../tsconfig.base.json", "compilerOptions": { "noEmit": false, - "baseUrl": "../src" + "baseUrl": "../src", + "paths": { + "rxjs": ["./"], + "rxjs/*": ["./*"] + } }, "files": [ // entry-points From 16bd5732eebad3a4eec5f0ddbaea228bcda2c0e4 Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Thu, 15 Mar 2018 15:22:08 -0700 Subject: [PATCH 35/39] chore(spec): remove rxjs-spec in favor of systemjs-compatibility-spec --- spec/internal/rxjs-spec.ts | 39 -------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 spec/internal/rxjs-spec.ts diff --git a/spec/internal/rxjs-spec.ts b/spec/internal/rxjs-spec.ts deleted file mode 100644 index 32f7e57cfe..0000000000 --- a/spec/internal/rxjs-spec.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { expect } from 'chai'; -import * as umd from 'rxjs/internal/umd'; -import * as rx_index from 'rxjs'; -import * as rx_operators from 'rxjs/operators'; -import * as rx_testing from 'rxjs/testing'; -import * as rx_ajax from 'rxjs/ajax'; -import * as rx_websocket from 'rxjs/websocket'; - -describe('rxjs exports', () => { - Object.keys(rx_index).forEach(key => { - it(`should export rxjs.${key}`, () => { - expect(umd[key]).to.equal(rx_index[key]); - }); - }); - - Object.keys(rx_operators).forEach(key => { - it(`should export rxjs.operators.${key}`, () => { - expect(umd.operators[key]).to.equal(rx_operators[key]); - }); - }); - - Object.keys(rx_testing).forEach(key => { - it(`should export rxjs.testing.${key}`, () => { - expect(umd.testing[key]).to.equal(rx_testing[key]); - }); - }); - - Object.keys(rx_ajax).forEach(key => { - it(`should export rxjs.ajax.${key}`, () => { - expect(umd.ajax[key]).to.equal(rx_ajax[key]); - }); - }); - - Object.keys(rx_websocket).forEach(key => { - it(`should export rxjs.websocket.${key}`, () => { - expect(umd.websocket[key]).to.equal(rx_websocket[key]); - }); - }); -}); From d4b01165aec3d070e5527a58b9a7f2dbddc2dfec Mon Sep 17 00:00:00 2001 From: Jason Aden Date: Thu, 15 Mar 2018 15:27:05 -0700 Subject: [PATCH 36/39] chore: add back dependency on rxjs@latest for dangerjs --- package.json | 3 ++- spec/support/coverage.opts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 647a1ccb7b..b59f9d57ab 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "compile_dist_esm5_for_rollup": "tsc -p ./tsconfig/tsconfig.esm5.rollup.json", "compile_legacy_reexport": "tsc -p ./tsconfig/tsconfig.legacy-reexport.json", "copy_sources": "mkdirp dist && shx cp -r ./src/ ./dist/src", - "copy_for_tests": "shx rm -rf ./spec-build && shx cp -r ./spec/ ./spec-build/ && mkdir ./spec-build/node_modules && shx cp -r ./dist/package/ ./spec-build/node_modules/rxjs && shx cp -r ./dist-compat/package/ ./spec-build/node_modules/rxjs-compat", + "copy_for_tests": "shx rm -rf ./spec-build && shx cp -r ./spec/ ./spec-build/ && mkdirp ./spec-build/node_modules && shx cp -r ./dist/package/ ./spec-build/node_modules/rxjs && shx cp -r ./dist-compat/package/ ./spec-build/node_modules/rxjs-compat", "decision_tree_widget": "cd doc/decision-tree-widget && npm run build && cd ../..", "doctoc": "doctoc CONTRIBUTING.md", "generate_packages": "node .make-packages.js", @@ -239,6 +239,7 @@ "rollup-plugin-inject": "2.0.0", "rollup-plugin-node-resolve": "2.0.0", "rx": "latest", + "rxjs": "^5.5.7", "shx": "0.2.2", "sinon": "4.3.0", "sinon-chai": "2.14.0", diff --git a/spec/support/coverage.opts b/spec/support/coverage.opts index 9e26e6a0bd..66a533a6dd 100644 --- a/spec/support/coverage.opts +++ b/spec/support/coverage.opts @@ -8,4 +8,4 @@ --globals WebSocket,FormData,XDomainRequest,ActiveXObject --recursive ---timeout 500 +--timeout 5000 From 469afe8fc53c7bfbb199561a0a674cf0ee809231 Mon Sep 17 00:00:00 2001 From: Ben Lesh Date: Thu, 15 Mar 2018 21:34:18 -0700 Subject: [PATCH 37/39] fix(config): make sure that Promise config is undefined initially (#3440) We need to make sure promise is undefined initially because systems like Zones need to have a chance to pick up Promise and patch it, and we're doing a runtime check for configuration anyhow. This makes the runtime check worthwhile and solves the problem with Zones (without needing to reference Zones in anyway) --- spec/config-spec.ts | 9 +++++++++ src/internal/config.ts | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 spec/config-spec.ts diff --git a/spec/config-spec.ts b/spec/config-spec.ts new file mode 100644 index 0000000000..6e1129af93 --- /dev/null +++ b/spec/config-spec.ts @@ -0,0 +1,9 @@ +import { config } from '../src/internal/config'; +import { expect } from 'chai'; + +describe('config', () => { + it('should have a Promise property that defaults to nothing', () => { + expect(config).to.have.property('Promise'); + expect(config.Promise).to.be.undefined; + }); +}); \ No newline at end of file diff --git a/src/internal/config.ts b/src/internal/config.ts index 844ff99b70..5a7b6becd1 100644 --- a/src/internal/config.ts +++ b/src/internal/config.ts @@ -7,5 +7,5 @@ export const config = { * The promise constructor used by default for methods such as * {@link toPromise} and {@link forEach} */ - Promise + Promise: undefined as PromiseConstructorLike }; From 4287424ac70c03d92aecb5a4a7d444b553602c93 Mon Sep 17 00:00:00 2001 From: Ben Lesh Date: Thu, 15 Mar 2018 21:37:10 -0700 Subject: [PATCH 38/39] fix(config): expose configuration via rxjs exports (#3441) We weren't exposing configuration in a meaningful way from the rxjs module, this remedies that --- spec/index-spec.ts | 4 ++++ src/index.ts | 3 +++ 2 files changed, 7 insertions(+) diff --git a/spec/index-spec.ts b/spec/index-spec.ts index 64d6982465..0b469a36d1 100644 --- a/spec/index-spec.ts +++ b/spec/index-spec.ts @@ -78,4 +78,8 @@ describe('index', () => { expect(index.using).to.exist; expect(index.zip).to.exist; }); + + it('should expose configuration', () => { + expect(index.config).to.exist; + }); }); diff --git a/src/index.ts b/src/index.ts index 4175ed2a90..5f0676604f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -67,3 +67,6 @@ export { NEVER } from './internal/observable/never'; /* Types */ export * from './internal/types'; + +/* Config */ +export { config } from './internal/config'; \ No newline at end of file From 2128932ab219cdba0f18b512e552500e7fab4029 Mon Sep 17 00:00:00 2001 From: Claudio Rodriguez Date: Fri, 16 Mar 2018 01:42:20 -0400 Subject: [PATCH 39/39] fix(AjaxObservable): 1xx,2xx,3xx requests shouldn't error, only 4xx,5xx (#3438) w3 rfc2616 defines 4xx,5xx status codes as errors, but anything below is a valid response. AjaxObservable errors when a request status returns 1xx and 3xx, passing only 2xx requests. #3308 --- spec/observables/dom/ajax-spec.ts | 24 +++++++++---------- src/internal/observable/dom/AjaxObservable.ts | 3 ++- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/spec/observables/dom/ajax-spec.ts b/spec/observables/dom/ajax-spec.ts index bbd929b49f..75c248e065 100644 --- a/spec/observables/dom/ajax-spec.ts +++ b/spec/observables/dom/ajax-spec.ts @@ -262,8 +262,9 @@ describe('Observable.ajax', () => { expect(error.status).to.equal(404); }); - it('should fail on 404', () => { - let error; + it('should succeed on 300', () => { + let result; + let complete = false; const obj = { url: '/flibbertyJibbet', normalizeError: (e: any, xhr: any, type: any) => { @@ -273,13 +274,12 @@ describe('Observable.ajax', () => { method: '' }; - Rx.Observable.ajax(obj).subscribe(x => { - throw 'should not next'; - }, (err: any) => { - error = err; - }, () => { - throw 'should not complete'; - }); + Rx.Observable.ajax(obj) + .subscribe((x: any) => { + result = x; + }, null, () => { + complete = true; + }); expect(MockXMLHttpRequest.mostRecent.url).to.equal('/flibbertyJibbet'); @@ -289,9 +289,9 @@ describe('Observable.ajax', () => { 'responseText': 'Wee! I am text!' }); - expect(error instanceof Rx.AjaxError).to.be.true; - expect(error.message).to.equal('ajax error 300'); - expect(error.status).to.equal(300); + expect(result.xhr).exist; + expect(result.response).to.deep.equal('Wee! I am text!'); + expect(complete).to.be.true; }); it('should succeed no settings', () => { diff --git a/src/internal/observable/dom/AjaxObservable.ts b/src/internal/observable/dom/AjaxObservable.ts index b60082be92..310f162be9 100644 --- a/src/internal/observable/dom/AjaxObservable.ts +++ b/src/internal/observable/dom/AjaxObservable.ts @@ -365,7 +365,8 @@ export class AjaxSubscriber extends Subscriber { status = response ? 200 : 0; } - if (200 <= status && status < 300) { + // 4xx and 5xx should error (https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html) + if (status < 400) { if (progressSubscriber) { progressSubscriber.complete(); }