Skip to content
This repository was archived by the owner on May 17, 2019. It is now read-only.

Commit 5799c27

Browse files
KevinGrandonfusion-bot[bot]
KevinGrandon
authored and
fusion-bot[bot]
committed
Fix issues surfaced by the release verification pipeline
#59
1 parent 84e7251 commit 5799c27

File tree

4 files changed

+239
-278
lines changed

4 files changed

+239
-278
lines changed

‎package.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,34 +22,34 @@
2222
"./dist/browser.es2015.es.js": "./dist/browser.es2017.es.js"
2323
},
2424
"dependencies": {
25-
"fusion-plugin-rpc": "^0.6.0",
26-
"fusion-rpc-redux": "^0.3.3"
25+
"fusion-plugin-rpc": "^0.6.3",
26+
"fusion-rpc-redux": "^0.3.6"
2727
},
2828
"peerDependencies": {
29-
"fusion-core": "0.3.0-5",
30-
"fusion-react": "0.4.1",
31-
"fusion-tokens": "0.0.5",
29+
"fusion-core": "0.3.6",
30+
"fusion-react": "0.4.3",
31+
"fusion-tokens": "0.0.6",
3232
"prop-types": "^15.6.0",
3333
"react": "14.x - 16.x"
3434
},
3535
"devDependencies": {
3636
"babel-eslint": "^8.2.1",
3737
"babel-plugin-transform-flow-strip-types": "^6.22.0",
38-
"create-universal-package": "^3.3.0",
39-
"eslint": "^4.16.0",
38+
"create-universal-package": "^3.4.0",
39+
"eslint": "^4.17.0",
4040
"eslint-config-fusion": "^0.2.1",
4141
"eslint-plugin-cup": "^1.0.0",
4242
"eslint-plugin-flowtype": "^2.42.0",
4343
"eslint-plugin-import": "^2.8.0",
44-
"eslint-plugin-prettier": "^2.5.0",
45-
"eslint-plugin-react": "^7.6.0",
46-
"flow-bin": "^0.64.0",
47-
"fusion-core": "0.3.0-5",
48-
"fusion-plugin-universal-events": "0.3.0",
49-
"fusion-react": "0.4.1",
50-
"fusion-react-async": "0.1.4",
44+
"eslint-plugin-prettier": "^2.6.0",
45+
"eslint-plugin-react": "^7.6.1",
46+
"flow-bin": "^0.65.0",
47+
"fusion-core": "0.3.6",
48+
"fusion-plugin-universal-events": "0.3.4",
49+
"fusion-react": "0.4.3",
50+
"fusion-react-async": "0.2.0",
5151
"fusion-test-utils": "^0.4.2",
52-
"fusion-tokens": "0.0.5",
52+
"fusion-tokens": "0.0.6",
5353
"nyc": "^11.4.1",
5454
"prettier": "1.10.2",
5555
"prop-types": "^15.6.0",

‎src/__tests__/index.browser.js‎

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {Provider, connect} from 'react-redux';
1313
import App from 'fusion-react';
1414
import {getSimulator} from 'fusion-test-utils';
1515
import {reactorEnhancer} from 'redux-reactors';
16-
import {UniversalEventsToken} from 'fusion-plugin-universal-events';
1716
import {FetchToken} from 'fusion-tokens';
1817
import {mock as RPCPluginMock, RPCHandlersToken} from '../index';
1918
import Plugin from '../plugin';
@@ -33,9 +32,6 @@ function teardown() {
3332

3433
test('browser plugin integration test withRPCRedux', async t => {
3534
setup();
36-
const EventEmitter = {
37-
from() {},
38-
};
3935
const fetch = (url, options) => {
4036
t.equal(url, '/api/test', 'fetches to expected url');
4137
t.deepLooseEqual(
@@ -90,8 +86,6 @@ test('browser plugin integration test withRPCRedux', async t => {
9086
);
9187
const app = new App(element);
9288
app.register(Plugin);
93-
app.register(RPCHandlersToken, {});
94-
app.register(UniversalEventsToken, EventEmitter);
9589
app.register(FetchToken, fetch);
9690
await getSimulator(app).render('/');
9791
t.equal(expectedActions.length, 0, 'dispatches all actions');
@@ -102,9 +96,6 @@ test('browser plugin integration test withRPCRedux', async t => {
10296

10397
test('browser plugin integration test withRPCRedux - failure', async t => {
10498
setup();
105-
const EventEmitter = {
106-
from() {},
107-
};
10899
const fetch = (url, options) => {
109100
t.equal(url, '/api/test', 'fetches to expected url');
110101
t.deepLooseEqual(
@@ -165,8 +156,6 @@ test('browser plugin integration test withRPCRedux - failure', async t => {
165156
);
166157
const app = new App(element);
167158
app.register(Plugin);
168-
app.register(RPCHandlersToken, {});
169-
app.register(UniversalEventsToken, EventEmitter);
170159
app.register(FetchToken, fetch);
171160
await getSimulator(app).render('/');
172161
t.equal(expectedActions.length, 0, 'dispatches all actions');
@@ -176,9 +165,6 @@ test('browser plugin integration test withRPCRedux - failure', async t => {
176165

177166
test('browser mock integration test withRPCRedux', async t => {
178167
setup();
179-
const EventEmitter = {
180-
from() {},
181-
};
182168
const handlers = {
183169
test(args) {
184170
t.deepLooseEqual(
@@ -224,8 +210,6 @@ test('browser mock integration test withRPCRedux', async t => {
224210
const app = new App(element);
225211
app.register(RPCPluginMock);
226212
app.register(RPCHandlersToken, handlers);
227-
app.register(UniversalEventsToken, EventEmitter);
228-
app.register(FetchToken, fetch);
229213
await getSimulator(app).render('/');
230214
t.equal(expectedActions.length, 0, 'dispatches all actions');
231215
teardown();
@@ -234,9 +218,6 @@ test('browser mock integration test withRPCRedux', async t => {
234218

235219
test('browser mock integration test withRPCRedux - failure', async t => {
236220
setup();
237-
const EventEmitter = {
238-
from() {},
239-
};
240221
const e = new Error('message');
241222
e.code = 'code';
242223
e.meta = {hello: 'world'};
@@ -289,8 +270,6 @@ test('browser mock integration test withRPCRedux - failure', async t => {
289270
const app = new App(element);
290271
app.register(RPCPluginMock);
291272
app.register(RPCHandlersToken, handlers);
292-
app.register(UniversalEventsToken, EventEmitter);
293-
app.register(FetchToken, fetch);
294273
await getSimulator(app).render('/');
295274
t.equal(expectedActions.length, 0, 'dispatches all actions');
296275
teardown();
@@ -299,9 +278,6 @@ test('browser mock integration test withRPCRedux - failure', async t => {
299278

300279
test('browser plugin integration test withRPCReactor', async t => {
301280
setup();
302-
const EventEmitter = {
303-
from() {},
304-
};
305281
const fetch = (url, options) => {
306282
t.equal(url, '/api/test', 'fetches to expected url');
307283
t.deepLooseEqual(
@@ -387,8 +363,6 @@ test('browser plugin integration test withRPCReactor', async t => {
387363
);
388364
const app = new App(element);
389365
app.register(Plugin);
390-
app.register(RPCHandlersToken, {});
391-
app.register(UniversalEventsToken, EventEmitter);
392366
app.register(FetchToken, fetch);
393367
await getSimulator(app).render('/');
394368
t.equal(expectedActions.length, 0, 'dispatches all actions');
@@ -400,9 +374,6 @@ test('browser plugin integration test withRPCReactor', async t => {
400374

401375
test('browser mock plugin integration test withRPCReactor', async t => {
402376
setup();
403-
const EventEmitter = {
404-
from() {},
405-
};
406377
const handlers = {
407378
test(args) {
408379
t.deepLooseEqual(
@@ -480,8 +451,6 @@ test('browser mock plugin integration test withRPCReactor', async t => {
480451
const app = new App(element);
481452
app.register(RPCPluginMock);
482453
app.register(RPCHandlersToken, handlers);
483-
app.register(UniversalEventsToken, EventEmitter);
484-
app.register(FetchToken, fetch);
485454
await getSimulator(app).render('/');
486455
t.equal(expectedActions.length, 0, 'dispatches all actions');
487456
t.equal(flags.start, true, 'dispatches start action');
@@ -492,9 +461,6 @@ test('browser mock plugin integration test withRPCReactor', async t => {
492461

493462
test('browser plugin integration test withRPCReactor - failure', async t => {
494463
setup();
495-
const EventEmitter = {
496-
from() {},
497-
};
498464
const e = new Error('Some failure');
499465
e.code = 'ERR_CODE';
500466
e.meta = {error: 'meta'};
@@ -580,8 +546,6 @@ test('browser plugin integration test withRPCReactor - failure', async t => {
580546
const app = new App(element);
581547
app.register(RPCPluginMock);
582548
app.register(RPCHandlersToken, handlers);
583-
app.register(UniversalEventsToken, EventEmitter);
584-
app.register(FetchToken, fetch);
585549
await getSimulator(app).render('/');
586550
t.equal(expectedActions.length, 0, 'dispatches all actions');
587551
t.equal(flags.start, true, 'dispatches start action');
@@ -590,14 +554,11 @@ test('browser plugin integration test withRPCReactor - failure', async t => {
590554
t.end();
591555
});
592556

593-
test('browser plugin integration test withRPCReactor - failure', async t => {
557+
test('browser plugin integration test withRPCReactor - failure 2', async t => {
594558
setup();
595559
const e = new Error('Some failure');
596560
e.code = 'ERR_CODE';
597561
e.meta = {error: 'meta'};
598-
const EventEmitter = {
599-
from() {},
600-
};
601562
const fetch = (url, options) => {
602563
t.equal(url, '/api/test', 'fetches to expected url');
603564
t.deepLooseEqual(
@@ -690,8 +651,6 @@ test('browser plugin integration test withRPCReactor - failure', async t => {
690651
);
691652
const app = new App(element);
692653
app.register(Plugin);
693-
app.register(RPCHandlersToken, {});
694-
app.register(UniversalEventsToken, EventEmitter);
695654
app.register(FetchToken, fetch);
696655
await getSimulator(app).render('/');
697656
t.equal(expectedActions.length, 0, 'dispatches all actions');

‎src/index.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,22 @@
33
* This source code is licensed under the MIT license found in the
44
* LICENSE file in the root directory of this source tree.
55
*/
6-
6+
import {
7+
RPCToken,
8+
RPCHandlersToken,
9+
RPCRoutePrefixConfigToken,
10+
} from 'fusion-plugin-rpc';
11+
import {createRPCReducer} from 'fusion-rpc-redux';
12+
import {withRPCRedux, withRPCReactor} from './hoc';
713
import plugin, {mock} from './plugin';
814

9-
export {createRPCReducer} from 'fusion-rpc-redux';
10-
export {withRPCRedux, withRPCReactor} from './hoc';
11-
1215
export default plugin;
13-
export {mock};
1416
export {
17+
createRPCReducer,
18+
mock,
1519
RPCToken,
1620
RPCHandlersToken,
1721
RPCRoutePrefixConfigToken,
18-
} from 'fusion-plugin-rpc';
22+
withRPCRedux,
23+
withRPCReactor,
24+
};

0 commit comments

Comments
 (0)