Skip to content

Commit f91d7f1

Browse files
committed
2.0.0
1 parent 31d31d3 commit f91d7f1

File tree

6 files changed

+4159
-28
lines changed

6 files changed

+4159
-28
lines changed

.flowconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
node_modules
99

1010
[libs]
11-
node_modules/flow-interfaces/interfaces
1211
interfaces
1312

1413
[options]

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# 2.0.0 - 2016-04-01
2+
3+
- react 16 compat
4+
- update props type via babel-plugin-flow-react-proptypes
5+
- use of babel-preset-env for transpilation instead of es2015
6+
17
# 1.0.0 - 2016-04-01
28

39
✨ Initial release

package.json

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-topbar-progress-indicator",
3-
"version": "1.0.0",
3+
"version": "2.0.0",
44
"description": "topbar progress indicator React component",
55
"keywords": [
66
"react",
@@ -25,27 +25,26 @@
2525
},
2626
"devDependencies": {
2727
"ava": "^0.13.0",
28-
"babel-cli": "^6.3.17",
29-
"babel-core": "^6.3.26",
30-
"babel-eslint": "^6.0.0-beta.6",
28+
"babel-cli": "^6.4.0",
29+
"babel-core": "^6.4.0",
30+
"babel-eslint": "^6.0.0",
3131
"babel-plugin-flow-react-proptypes": "^2.2.1",
32-
"babel-preset-es2015": "^6.3.13",
33-
"babel-preset-react": "^6.3.13",
34-
"babel-preset-stage-1": "^6.3.13",
32+
"babel-preset-env": "^1.6.0",
33+
"babel-preset-react": "^6.4.0",
34+
"babel-preset-stage-2": "^6.4.0",
3535
"coveralls": "^2.11.9",
3636
"eslint": "^2.0.0",
3737
"eslint-config-i-am-meticulous": "^4.1.0",
3838
"eslint-loader": "^1.3.0",
3939
"eslint-plugin-ava": "^1.3.1",
4040
"eslint-plugin-flow-vars": "^0.2.1",
4141
"eslint-plugin-react": "^4.0.0",
42-
"flow-bin": "^0.22.1",
43-
"flow-interfaces": "^0.5.0",
42+
"flow-bin": "^0.54.0",
4443
"npmpub": "^3.0.0",
4544
"nyc": "^6.1.1",
46-
"react": "^15.0.0-rc.2",
47-
"react-addons-test-utils": "^15.0.0-rc.2",
48-
"react-dom": "^15.0.0-rc.2"
45+
"react": "^16.0.0",
46+
"react-dom": "^16.0.0",
47+
"react-test-renderer": "^16.0.0"
4948
},
5049
"scripts": {
5150
"transpile": "babel --ignore __tests__ --copy-files src --out-dir lib",
@@ -63,9 +62,9 @@
6362
},
6463
"babel": {
6564
"presets": [
66-
"babel-preset-react",
67-
"babel-preset-es2015",
68-
"babel-preset-stage-1"
65+
"babel-preset-env",
66+
"babel-preset-stage-2",
67+
"babel-preset-react"
6968
],
7069
"env": {
7170
"development": {

src/__tests__/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import test from "ava"
22

33
import React from "react"
4-
import { createRenderer } from "react-addons-test-utils"
4+
import ShallowRenderer from "react-test-renderer/shallow"
55

66
import ReactTopBar from "../index"
77

@@ -15,7 +15,7 @@ test("ReactTopBar can show topbar", (t) => {
1515
hide() {},
1616
}
1717

18-
const renderer = createRenderer()
18+
const renderer = new ShallowRenderer()
1919
renderer.render(<ReactTopBar topbar={ topbar } />)
2020
renderer.getRenderOutput()
2121
renderer.unmount()
@@ -31,7 +31,7 @@ test("ReactTopBar can hide topbar", (t) => {
3131
},
3232
}
3333

34-
const renderer = createRenderer()
34+
const renderer = new ShallowRenderer()
3535
renderer.render(<ReactTopBar topbar={ topbar } />)
3636
renderer.getRenderOutput()
3737
renderer.unmount()
@@ -49,7 +49,7 @@ test("ReactTopBar can show/hide topbar", (t) => {
4949
},
5050
}
5151

52-
const renderer = createRenderer()
52+
const renderer = new ShallowRenderer()
5353
renderer.render(<ReactTopBar topbar={ topbar } />)
5454
renderer.getRenderOutput()
5555
renderer.unmount()
@@ -68,10 +68,10 @@ test("ReactTopBar can show/hide topbar even with multiples call, but once",
6868
},
6969
}
7070

71-
const renderer = createRenderer()
71+
const renderer = new ShallowRenderer()
7272
renderer.render(<ReactTopBar topbar={ topbar } />)
7373
renderer.getRenderOutput()
74-
const renderer2 = createRenderer()
74+
const renderer2 = new ShallowRenderer()
7575
renderer2.render(<ReactTopBar topbar={ topbar } />)
7676
renderer2.getRenderOutput()
7777

src/index.js

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

33
/* eslint-disable no-unused-vars */
44
// for React, since flow type is converted to props
@@ -26,26 +26,26 @@ const getTopBar = (props: Props): Topbar => {
2626
return props.topbar || topbar
2727
}
2828

29-
class TopBar extends Component<void, Props, void> {
29+
class TopBar extends Component<Props> {
3030
props: Props;
3131

32-
static config: Function = topbar.config;
32+
static config = topbar.config;
3333

34-
componentWillMount(): void {
34+
componentWillMount() {
3535
if (semaphore === 0) {
3636
getTopBar(this.props).show()
3737
}
3838
semaphore++
3939
}
4040

41-
componentWillUnmount(): void {
41+
componentWillUnmount() {
4242
semaphore--
4343
if (semaphore === 0) {
4444
getTopBar(this.props).hide()
4545
}
4646
}
4747

48-
render(): null {
48+
render() {
4949
return null
5050
}
5151
}

0 commit comments

Comments
 (0)