Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support RxJS 6 #23

Merged
merged 1 commit into from Sep 23, 2019
Merged

Support RxJS 6 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions browser/tests/shortcut-rxjs-all.js
View file
Open in desktop
@@ -1,14 +1,17 @@
require('../../register/rxjs-all'); // eslint-disable-line import/no-unassigned-import

const assert = require('assert');
const RxJsObservable = require('rxjs/Observable').Observable;
const RxJsObservable = require('rxjs').Observable;
const RxJsOf = require('rxjs').of;
const RxJsFrom = require('rxjs').from;
const RxJsMap = require('rxjs/operators').map;
const AnyObservable = require('../..');
const implementation = require('../../implementation');

it('rxjs-all', () => {
assert.strictEqual(AnyObservable, RxJsObservable);
assert.strictEqual(implementation, 'rxjs');
assert.strictEqual(typeof RxJsObservable.of, 'function');
assert.strictEqual(typeof RxJsObservable.from, 'function');
assert.strictEqual(typeof RxJsObservable.prototype.map, 'function');
assert.strictEqual(typeof RxJsOf, 'function');
assert.strictEqual(typeof RxJsFrom, 'function');
assert.strictEqual(typeof RxJsMap, 'function');
});
4 changes: 2 additions & 2 deletions browser/tests/shortcut-rxjs-min.js
View file
Open in desktop
@@ -1,13 +1,13 @@
require('../../register/rxjs-min'); // eslint-disable-line import/no-unassigned-import

const assert = require('assert');
const RxJsObservable = require('rxjs/Observable').Observable;
const RxJsObservable = require('rxjs').Observable;
const AnyObservable = require('../..');
const implementation = require('../../implementation');

it('rxjs', () => {
assert.strictEqual(AnyObservable, RxJsObservable);
assert.strictEqual(implementation, 'rxjs/Observable');
assert.strictEqual(implementation, 'rxjs');
assert.strictEqual(typeof RxJsObservable.of, 'undefined');
assert.strictEqual(typeof RxJsObservable.from, 'undefined');
assert.strictEqual(typeof RxJsObservable.prototype.map, 'undefined');
Expand Down
10 changes: 6 additions & 4 deletions browser/tests/shortcut-rxjs.js
View file
Open in desktop
@@ -1,14 +1,16 @@
require('../../register/rxjs'); // eslint-disable-line import/no-unassigned-import

const assert = require('assert');
const RxJsObservable = require('rxjs/Observable').Observable;
const RxJsObservable = require('rxjs').Observable;
const RxJsOf = require('rxjs').of;
const RxJsFrom = require('rxjs').from;
const AnyObservable = require('../..');
const implementation = require('../../implementation');

it('rxjs-min', () => {
assert.strictEqual(AnyObservable, RxJsObservable);
assert.strictEqual(implementation, 'rxjs/Observable');
assert.strictEqual(typeof RxJsObservable.of, 'function');
assert.strictEqual(typeof RxJsObservable.from, 'function');
assert.strictEqual(implementation, 'rxjs');
assert.strictEqual(typeof RxJsOf, 'function');
assert.strictEqual(typeof RxJsFrom, 'function');
assert.strictEqual(typeof RxJsObservable.prototype.map, 'undefined');
});
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@
"karma-chrome-launcher": "^2.2.0",
"karma-mocha": "^1.3.0",
"mocha": "^6.1.4",
"rxjs": "^5.5.10",
"rxjs": "^6.5.3",
"watchify": "^3.11.0",
"xo": "^0.24.0",
"zen-observable": "^0.8.8"
Expand Down
4 changes: 3 additions & 1 deletion register-shim.js
View file
Open in desktop
Expand Up @@ -9,7 +9,9 @@ To register a custom implementation, use the `Observable` option.
*/
function loadImplementation() {
if (typeof window.Observable === 'undefined') {
throw new TypeError('any-observable browser requires a polyfill or explicit registration, for example:\nrequire(\'any-observable/register\')(\'rxjs\', {Observable: require(\'rxjs/Observable\').Observable})');
throw new TypeError(
'any-observable browser requires a polyfill or explicit registration, for example:\nrequire("any-observable/register")("rxjs", {Observable: require("rxjs").Observable})'
);
}

return {
Expand Down
4 changes: 3 additions & 1 deletion register/rxjs-min.js
View file
Open in desktop
@@ -1,2 +1,4 @@
'use strict';
require('../register')('rxjs/Observable', {Observable: require('rxjs/Observable').Observable});
require('../register')('rxjs', {
Observable: require('rxjs').Observable
});
8 changes: 5 additions & 3 deletions register/rxjs.js
View file
Open in desktop
@@ -1,4 +1,6 @@
'use strict';
require('../register')('rxjs/Observable', {Observable: require('rxjs/Observable').Observable});
require('rxjs/add/observable/of'); // eslint-disable-line import/no-unassigned-import
require('rxjs/add/observable/from'); // eslint-disable-line import/no-unassigned-import
require('../register')('rxjs', {
Observable: require('rxjs').Observable
});
require('rxjs').of; // eslint-disable-line no-unused-expressions
require('rxjs').from; // eslint-disable-line no-unused-expressions
2 changes: 1 addition & 1 deletion test/defaults.js
View file
Open in desktop
@@ -1,7 +1,7 @@
const test = require('ava');
const RxJsObservable = require('rxjs').Observable;
const AnyObservable = require('..');
const implementation = require('../implementation');
const AnyObservable = require('..');

test('main', t => {
t.is(AnyObservable, RxJsObservable);
Expand Down
8 changes: 4 additions & 4 deletions test/rxjs-observable.js
View file
Open in desktop
@@ -1,10 +1,10 @@
require('../register')('rxjs/Observable');
require('../register')('rxjs');
const test = require('ava');
const RxJsObservable = require('rxjs/Observable').Observable;
const AnyObservable = require('..');
const RxJsObservable = require('rxjs').Observable;
const implementation = require('../implementation');
const AnyObservable = require('..');

test('main', t => {
t.is(AnyObservable, RxJsObservable);
t.is(implementation, 'rxjs/Observable');
t.is(implementation, 'rxjs');
});
2 changes: 1 addition & 1 deletion test/rxjs.js
View file
Open in desktop
@@ -1,8 +1,8 @@
require('../register')('rxjs');
const test = require('ava');
const RxJsObservable = require('rxjs').Observable;
const AnyObservable = require('..');
const implementation = require('../implementation');
const AnyObservable = require('..');

test('main', t => {
t.is(AnyObservable, RxJsObservable);
Expand Down
5 changes: 3 additions & 2 deletions test/shortcut-rxjs-all.js
View file
Open in desktop
@@ -1,11 +1,12 @@
import '../register/rxjs-all'; // eslint-disable-line import/no-unassigned-import
import test from 'ava';
import {Observable as RxJsObservable} from 'rxjs';
import AnyObservable from '..';
import {map} from 'rxjs/operators';
import implementation from '../implementation';
import AnyObservable from '..';

test('main', t => {
t.is(AnyObservable, RxJsObservable);
t.is(implementation, 'rxjs');
t.is(typeof RxJsObservable.prototype.map, 'function');
t.is(typeof map, 'function');
});
6 changes: 3 additions & 3 deletions test/shortcut-rxjs-min.js
View file
Open in desktop
@@ -1,12 +1,12 @@
import '../register/rxjs-min'; // eslint-disable-line import/no-unassigned-import
import test from 'ava';
import {Observable as RxJsObservable} from 'rxjs/Observable';
import AnyObservable from '..';
import {Observable as RxJsObservable} from 'rxjs';
import implementation from '../implementation';
import AnyObservable from '..';

test('main', t => {
t.is(AnyObservable, RxJsObservable);
t.is(implementation, 'rxjs/Observable');
t.is(implementation, 'rxjs');
t.is(typeof RxJsObservable.of, 'undefined');
t.is(typeof RxJsObservable.from, 'undefined');
t.is(typeof RxJsObservable.prototype.map, 'undefined');
Expand Down
14 changes: 9 additions & 5 deletions test/shortcut-rxjs.js
View file
Open in desktop
@@ -1,13 +1,17 @@
import '../register/rxjs'; // eslint-disable-line import/no-unassigned-import
import test from 'ava';
import {Observable as RxJsObservable} from 'rxjs/Observable';
import AnyObservable from '..';
import {
Observable as RxJsObservable,
of as RxJsOf,
from as RxJsFrom
} from 'rxjs';
import implementation from '../implementation';
import AnyObservable from '..';

test('main', t => {
t.is(AnyObservable, RxJsObservable);
t.is(implementation, 'rxjs/Observable');
t.is(typeof RxJsObservable.of, 'function');
t.is(typeof RxJsObservable.from, 'function');
t.is(implementation, 'rxjs');
t.is(typeof RxJsOf, 'function');
t.is(typeof RxJsFrom, 'function');
t.is(typeof RxJsObservable.prototype.map, 'undefined');
});
2 changes: 1 addition & 1 deletion test/shortcut-zen.js
View file
Open in desktop
@@ -1,8 +1,8 @@
import '../register/zen'; // eslint-disable-line import/no-unassigned-import
import test from 'ava';
import ZenObservable from 'zen-observable';
import AnyObservable from '..';
import implementation from '../implementation';
import AnyObservable from '..';

test('main', t => {
t.is(AnyObservable, ZenObservable);
Expand Down
2 changes: 1 addition & 1 deletion test/zen.js
View file
Open in desktop
@@ -1,8 +1,8 @@
require('../register')('zen-observable');
const test = require('ava');
const ZenObservable = require('zen-observable');
const AnyObservable = require('..');
const implementation = require('../implementation');
const AnyObservable = require('..');

test('main', t => {
t.is(AnyObservable, ZenObservable);
Expand Down