Skip to content

Commit e6ebcfd

Browse files
committed
Updates dependencies.
Removes semi-colons.
1 parent 2441363 commit e6ebcfd

19 files changed

+817
-431
lines changed

.eslintrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
"defaultParams": true
1616
},
1717
"rules": {
18+
// Going hipster
19+
"semi": [2, "never"],
20+
21+
// Annoying rules
1822
"react/jsx-filename-extension": 0,
1923
"react/sort-comp": 0
2024
}

.flowconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ suppress_comment= \\(.\\|\n\\)*\\$FlowIgnore
4242
suppress_comment= \\(.\\|\n\\)*\\$FlowFixMe
4343

4444
[version]
45-
0.38.0
45+
0.39.0

package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,29 @@
4646
},
4747
"devDependencies": {
4848
"app-root-dir": "1.0.2",
49-
"babel-cli": "6.18.0",
50-
"babel-core": "6.21.0",
49+
"babel-cli": "6.22.2",
50+
"babel-core": "6.22.1",
5151
"babel-eslint": "7.1.1",
5252
"babel-jest": "18.0.0",
5353
"babel-loader": "6.2.10",
54-
"babel-polyfill": "6.20.0",
54+
"babel-polyfill": "6.22.0",
5555
"babel-preset-env": "1.1.8",
56-
"babel-preset-latest": "6.16.0",
57-
"babel-preset-react": "6.16.0",
58-
"babel-preset-stage-3": "6.17.0",
59-
"babel-register": "6.18.0",
56+
"babel-preset-latest": "6.22.0",
57+
"babel-preset-react": "6.22.0",
58+
"babel-preset-stage-3": "6.22.0",
59+
"babel-register": "6.22.0",
6060
"codecov": "1.0.1",
6161
"cross-env": "3.1.4",
62-
"enzyme": "2.7.0",
62+
"enzyme": "2.7.1",
6363
"enzyme-to-json": "1.4.5",
64-
"eslint": "3.13.1",
65-
"eslint-config-airbnb": "14.0.0",
64+
"eslint": "3.15.0",
65+
"eslint-config-airbnb": "14.1.0",
6666
"eslint-plugin-flowtype": "2.30.0",
6767
"eslint-plugin-import": "2.2.0",
68-
"eslint-plugin-jsx-a11y": "3.0.2",
68+
"eslint-plugin-jsx-a11y": "4.0.0",
6969
"eslint-plugin-react": "6.9.0",
70-
"flow-bin": "0.38.0",
71-
"flow-coverage-report": "0.2.0",
70+
"flow-bin": "0.39.0",
71+
"flow-coverage-report": "0.3.0",
7272
"flow-typed": "2.0.0",
7373
"ghooks": "2.0.0",
7474
"gzip-size": "3.0.0",
@@ -79,12 +79,12 @@
7979
"react": "15.4.2",
8080
"react-addons-test-utils": "15.4.2",
8181
"react-dom": "15.4.2",
82-
"readline-sync": "1.4.5",
82+
"readline-sync": "1.4.6",
8383
"rimraf": "2.5.4",
8484
"sinon": "1.17.7",
85-
"webpack": "2.2.0-rc.3",
86-
"webpack-dev-middleware": "1.9.0",
87-
"webpack-hot-middleware": "2.15.0"
85+
"webpack": "2.2.1",
86+
"webpack-dev-middleware": "1.10.0",
87+
"webpack-hot-middleware": "2.16.1"
8888
},
8989
"config": {
9090
"ghooks": {

src/AsyncComponentProvider.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* @flow */
22

3-
import React from 'react';
4-
import type { ExecContext, ProviderChildContext } from './types';
3+
import React from 'react'
4+
import type { ExecContext, ProviderChildContext } from './types'
55

66
type Props = {
77
// eslint-disable-next-line
@@ -19,11 +19,11 @@ class AsyncComponentProvider extends React.Component {
1919
getComponent: this.props.execContext.getComponent,
2020
registerComponent: this.props.execContext.registerComponent,
2121
},
22-
};
22+
}
2323
}
2424

2525
render() {
26-
return React.Children.only(this.props.children);
26+
return React.Children.only(this.props.children)
2727
}
2828
}
2929

@@ -34,14 +34,14 @@ AsyncComponentProvider.propTypes = {
3434
getComponent: React.PropTypes.func.isRequired,
3535
registerComponent: React.PropTypes.func.isRequired,
3636
}).isRequired,
37-
};
37+
}
3838

3939
AsyncComponentProvider.childContextTypes = {
4040
asyncComponents: React.PropTypes.shape({
4141
getNextId: React.PropTypes.func.isRequired,
4242
getComponent: React.PropTypes.func.isRequired,
4343
registerComponent: React.PropTypes.func.isRequired,
4444
}).isRequired,
45-
};
45+
}
4646

47-
export default AsyncComponentProvider;
47+
export default AsyncComponentProvider
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import React from 'react';
2-
import sinon from 'sinon';
3-
import { mount } from 'enzyme';
1+
import React from 'react'
2+
import sinon from 'sinon'
3+
import { mount } from 'enzyme'
44

5-
import createAsyncComponent from '../createAsyncComponent';
5+
import createAsyncComponent from '../createAsyncComponent'
66

77
describe('createAsyncComponent', () => {
88
const contextStub = {
@@ -11,23 +11,23 @@ describe('createAsyncComponent', () => {
1111
getComponent: () => undefined,
1212
registerComponent: () => undefined,
1313
},
14-
};
14+
}
1515

1616
it('should handle unmounting ensuring that resolved promises do not call setState', () => {
17-
const resolveDelay = 10;
17+
const resolveDelay = 10
1818
const Bob = createAsyncComponent({
1919
resolve: () => new Promise(resolve =>
2020
setTimeout(
2121
() => resolve(() => <div>bob</div>),
2222
resolveDelay,
2323
),
2424
),
25-
});
26-
const setStateSpy = sinon.spy(Bob.prototype, 'setState');
27-
const renderWrapper = mount(<Bob />, { context: contextStub });
28-
expect(setStateSpy.callCount).toEqual(0);
29-
renderWrapper.unmount();
25+
})
26+
const setStateSpy = sinon.spy(Bob.prototype, 'setState')
27+
const renderWrapper = mount(<Bob />, { context: contextStub })
28+
expect(setStateSpy.callCount).toEqual(0)
29+
renderWrapper.unmount()
3030
return new Promise(resolve => setTimeout(resolve, resolveDelay + 2))
31-
.then(() => expect(setStateSpy.callCount).toEqual(0));
32-
});
33-
});
31+
.then(() => expect(setStateSpy.callCount).toEqual(0))
32+
})
33+
})

src/__tests__/integration.test.js

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
/* @flow */
22

3-
import React from 'react';
4-
import { renderToStaticMarkup } from 'react-dom/server';
5-
import { mount } from 'enzyme';
6-
import { createAsyncComponent, withAsyncComponents } from '../';
7-
import { STATE_IDENTIFIER } from '../constants';
3+
import React from 'react'
4+
import { renderToStaticMarkup } from 'react-dom/server'
5+
import { mount } from 'enzyme'
6+
import { createAsyncComponent, withAsyncComponents } from '../'
7+
import { STATE_IDENTIFIER } from '../constants'
88

99
function Bob({ children }) {
10-
return (<div>{children}</div>);
10+
return (<div>{children}</div>)
1111
}
12-
Bob.propTypes = { children: React.PropTypes.node };
13-
Bob.defaultProps = { children: null };
12+
Bob.propTypes = { children: React.PropTypes.node }
13+
Bob.defaultProps = { children: null }
1414

1515
const AsyncBob = createAsyncComponent({
1616
resolve: () => new Promise(resolve => setTimeout(() => resolve(Bob), 10)),
1717
name: 'AsyncBob',
18-
});
18+
})
1919

2020
const AsyncBobTwo = createAsyncComponent({
2121
resolve: () => new Promise(resolve => setTimeout(() => resolve(Bob), 10)),
2222
name: 'AsyncBobTwo',
23-
});
23+
})
2424

2525
const AsyncBobThree = createAsyncComponent({
2626
resolve: () => new Promise(resolve => setTimeout(() => resolve(Bob), 10)),
2727
name: 'AsyncBobThree',
28-
});
28+
})
2929

3030
const DeferredAsyncBob = createAsyncComponent({
3131
resolve: () => new Promise(resolve => setTimeout(() => resolve(Bob), 10)),
3232
ssrMode: 'defer',
3333
name: 'DeferredAsyncBob',
34-
});
34+
})
3535

3636
const BoundaryAsyncBob = createAsyncComponent({
3737
resolve: () => new Promise(resolve => setTimeout(() => resolve(Bob), 10)),
3838
ssrMode: 'boundary',
3939
name: 'BoundaryAsyncBob',
40-
});
40+
})
4141

4242
const app = (
4343
<AsyncBob>
@@ -56,36 +56,36 @@ const app = (
5656
</BoundaryAsyncBob>
5757
</div>
5858
</AsyncBob>
59-
);
59+
)
6060

6161
describe('integration', () => {
6262
afterEach(() => {
63-
delete global.window[STATE_IDENTIFIER];
64-
});
63+
delete global.window[STATE_IDENTIFIER]
64+
})
6565

66-
it('works', () => {
67-
const windowTemp = global.window;
66+
it('render server and client', () => {
67+
const windowTemp = global.window
6868
// we have to delete the window to emulate a server only environment
69-
delete global.window;
69+
delete global.window
7070

7171
// "Server" side render...
7272
return withAsyncComponents(app)
7373
.then(({ appWithAsyncComponents, state, STATE_IDENTIFIER: STATE_ID }) => {
74-
const serverString = renderToStaticMarkup(appWithAsyncComponents);
75-
expect(serverString).toMatchSnapshot();
74+
const serverString = renderToStaticMarkup(appWithAsyncComponents)
75+
expect(serverString).toMatchSnapshot()
7676
// Restore the window and attach the state to the "window" for the client
77-
global.window = windowTemp;
78-
global.window[STATE_ID] = state;
79-
return serverString;
77+
global.window = windowTemp
78+
global.window[STATE_ID] = state
79+
return serverString
8080
})
8181
.then(serverHTML =>
8282
// "Client" side render...
8383
withAsyncComponents(app)
8484
.then(({ appWithAsyncComponents }) => {
85-
const clientRenderWrapper = mount(appWithAsyncComponents);
86-
expect(clientRenderWrapper).toMatchSnapshot();
87-
expect(renderToStaticMarkup(appWithAsyncComponents)).toEqual(serverHTML);
88-
return clientRenderWrapper;
85+
const clientRenderWrapper = mount(appWithAsyncComponents)
86+
expect(clientRenderWrapper).toMatchSnapshot()
87+
expect(renderToStaticMarkup(appWithAsyncComponents)).toEqual(serverHTML)
88+
return clientRenderWrapper
8989
})
9090
// Now give the client side components time to resolve
9191
.then(clientRenderWrapper => new Promise(resolve =>
@@ -95,6 +95,6 @@ describe('integration', () => {
9595
.then(clientRenderWrapper =>
9696
expect(clientRenderWrapper).toMatchSnapshot(),
9797
),
98-
);
99-
});
100-
});
98+
)
99+
})
100+
})

src/constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
/* @flow */
22
/* eslint-disable import/prefer-default-export */
33

4-
export const STATE_IDENTIFIER = '__REACT_ASYNC_COMPONENTS_STATE__';
4+
export const STATE_IDENTIFIER = '__REACT_ASYNC_COMPONENTS_STATE__'

0 commit comments

Comments
 (0)