Skip to content
This repository was archived by the owner on Nov 26, 2018. It is now read-only.

Commit 94c58c8

Browse files
authored
Merge pull request #110 from neoziro/upgrade-dependencies
chore: upgrade dependencies
2 parents 4e2d650 + d1bab83 commit 94c58c8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1688
-775
lines changed

.eslintrc.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@
33
"extends": ["airbnb", "prettier"],
44
"rules": {
55
"semi": ["error", "never"],
6+
"lines-between-class-members": "off",
7+
8+
"react/forbid-prop-types": "off",
9+
"react/forbid-foreign-prop-types": "off",
10+
"react/no-access-state-in-setstate": "off",
11+
"react/destructuring-assignment": "off",
612
"react/sort-comp": "off",
713
"react/require-default-props": "off",
8-
"react/jsx-filename-extension": ["error", {"extensions": [".js"]}],
14+
"react/jsx-filename-extension": ["error", { "extensions": [".js"] }],
915
"react/jsx-wrap-multilines": "off",
16+
"react/jsx-one-expression-per-line": "off",
17+
1018
"import/no-extraneous-dependencies": "off"
1119
}
1220
}

examples/RecompactCounter.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@ export default compose(
1616
withHandlers({
1717
onIncrement: ({ count, onChange }) => () => onChange(count + 1),
1818
}),
19-
)(({ onIncrement, count }) => <button onClick={onIncrement}>{count}</button>)
19+
)(({ onIncrement, count }) => (
20+
<button type="button" onClick={onIncrement}>
21+
{count}
22+
</button>
23+
))

examples/RecomposeCounter.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,8 @@ export default compose(
1616
withHandlers({
1717
onIncrement: ({ count, onChange }) => () => onChange(count + 1),
1818
}),
19-
)(({ onIncrement, count }) => <button onClick={onIncrement}>{count}</button>)
19+
)(({ onIncrement, count }) => (
20+
<button type="button" onClick={onIncrement}>
21+
{count}
22+
</button>
23+
))

package.json

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"type": "git"
99
},
1010
"scripts": {
11+
"benchmark": "NODE_ENV=production babel-node src/__benchmarks__/operators.js",
1112
"build": "yarn build:dist && yarn build:doc && yarn build:site",
1213
"build:doc": "NODE_ENV=production babel-node ./scripts/build-doc",
1314
"build:dist": "./scripts/build-dist.sh",
@@ -50,52 +51,52 @@
5051
"react": "^15.0.0 || ^16.3.0"
5152
},
5253
"dependencies": {
53-
"fbjs": "^0.8.16",
54-
"hoist-non-react-statics": "^2.3.1",
54+
"fbjs": "^0.8.17",
55+
"hoist-non-react-statics": "^3.0.1",
5556
"object.omit": "^3.0.0",
5657
"object.pick": "^1.3.0",
5758
"symbol-observable": "^1.1.0",
58-
"warning": "^3.0.0"
59+
"warning": "^4.0.2"
5960
},
6061
"devDependencies": {
6162
"babel-cli": "^6.26.0",
62-
"babel-eslint": "^8.0.3",
63-
"babel-jest": "^21.2.0",
64-
"babel-loader": "^7.1.2",
63+
"babel-eslint": "^8.2.6",
64+
"babel-jest": "^23.4.2",
65+
"babel-loader": "^7.1.5",
6566
"babel-plugin-transform-class-properties": "^6.24.1",
6667
"babel-plugin-transform-object-rest-spread": "^6.26.0",
6768
"babel-preset-env": "^1.6.1",
6869
"babel-preset-react": "^6.24.1",
6970
"benchmark": "^2.1.4",
70-
"codecov": "^3.0.0",
71-
"conventional-github-releaser": "^2.0.0",
71+
"codecov": "^3.0.4",
72+
"conventional-github-releaser": "^3.1.2",
7273
"create-react-class": "^15.6.2",
7374
"docdown": "neoziro/docdown#multiple-files-support",
7475
"ejs": "^2.5.7",
75-
"enzyme": "^3.2.0",
76-
"enzyme-adapter-react-16": "^1.1.0",
77-
"eslint": "^4.13.1",
78-
"eslint-config-airbnb": "^16.1.0",
79-
"eslint-config-prettier": "^2.9.0",
80-
"eslint-plugin-import": "^2.8.0",
81-
"eslint-plugin-jsx-a11y": "^6.0.2",
82-
"eslint-plugin-react": "^7.5.1",
83-
"fs-extra": "^5.0.0",
84-
"html-webpack-plugin": "^2.30.1",
85-
"jest": "^21.2.1",
86-
"jsdom": "^11.5.1",
87-
"marky-markdown": "^11.3.2",
76+
"enzyme": "^3.4.4",
77+
"enzyme-adapter-react-16": "^1.2.0",
78+
"eslint": "^5.4.0",
79+
"eslint-config-airbnb": "^17.1.0",
80+
"eslint-config-prettier": "^3.0.1",
81+
"eslint-plugin-import": "^2.14.0",
82+
"eslint-plugin-jsx-a11y": "^6.1.1",
83+
"eslint-plugin-react": "^7.11.1",
84+
"fs-extra": "^7.0.0",
85+
"html-webpack-plugin": "^3.2.0",
86+
"jest": "^23.5.0",
87+
"jsdom": "^12.0.0",
88+
"marky-markdown": "^12.0.0",
8889
"microtime": "^2.1.8",
89-
"prettier": "^1.9.2",
90-
"prop-types": "^15.6.0",
90+
"prettier": "^1.14.2",
91+
"prop-types": "^15.6.2",
9192
"raf": "^3.4.0",
92-
"react": "^16.2.0",
93-
"react-dom": "^16.2.0",
94-
"react-test-renderer": "^16.2.0",
93+
"react": "^16.4.2",
94+
"react-dom": "^16.4.2",
95+
"react-test-renderer": "^16.4.2",
9596
"reassemble": "^0.5.6",
96-
"recompose": "^0.26.0",
97+
"recompose": "^0.28.2",
9798
"rxjs": "^5.5.5",
9899
"standard-version": "^4.2.0",
99-
"webpack": "^3.10.0"
100+
"webpack": "^4.16.5"
100101
}
101102
}

src/__benchmarks__/complexComponent.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import React from 'react'
44
import ReactDOM from 'react-dom'
55
import * as recompose from 'recompose'
66
import * as reassemble from 'reassemble'
7-
import * as recompact from '../'
7+
import * as recompact from '..'
88
import { runBenchmark, series } from './utils'
99

1010
const createComponent = ({

src/__benchmarks__/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import ReactDOM from 'react-dom'
44
import Benchmark from 'benchmark'
55
import * as recompose from 'recompose'
66
import * as reassemble from 'reassemble'
7-
import * as recompact from '../'
7+
import * as recompact from '..'
88
import './setup'
99

1010
const TIME_BETWEEN = 1000

src/__tests__/branch.test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import { mount } from 'enzyme'
3-
import { branch, compose, identity, withProps, withState } from '../'
3+
import { branch, compose, identity, withProps, withState } from '..'
44

55
describe('branch', () => {
66
it('should test props and applies one of two HoCs, for true and false', () => {
@@ -15,7 +15,9 @@ describe('branch', () => {
1515
<div>
1616
<div className="isBad">{isBad ? 'true' : 'false'}</div>
1717
<div className="name">{name}</div>
18-
<button onClick={() => updateIsBad(b => !b)}>Toggle</button>
18+
<button type="button" onClick={() => updateIsBad(b => !b)}>
19+
Toggle
20+
</button>
1921
</div>
2022
))
2123

src/__tests__/componentFromProp.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable react/prop-types */
22
import React from 'react'
33
import { mount } from 'enzyme'
4-
import { componentFromProp } from '../'
4+
import { componentFromProp } from '..'
55

66
describe('componentFromProp', () => {
77
it('creates a component that takes a component as a prop and renders it with the rest of the props', () => {

src/__tests__/componentFromStream.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react'
22
import { mount } from 'enzyme'
33
import { Observable, Subject } from 'rxjs'
44
import rxjsConfig from '../rxjsObservableConfig'
5-
import { componentFromStream, setObservableConfig } from '../'
5+
import { componentFromStream, setObservableConfig } from '..'
66

77
setObservableConfig(rxjsConfig)
88

src/__tests__/compose.test.js

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,30 @@ describe('compose', () => {
55
const double = x => x * 2
66
const square = x => x * x
77
expect(compose(square)(5)).toBe(25)
8-
expect(compose(square, double)(5)).toBe(100)
9-
expect(compose(double, square, double)(5)).toBe(200)
8+
expect(
9+
compose(
10+
square,
11+
double,
12+
)(5),
13+
).toBe(100)
14+
expect(
15+
compose(
16+
double,
17+
square,
18+
double,
19+
)(5),
20+
).toBe(200)
1021
})
1122

1223
it('can be seeded with multiple arguments', () => {
1324
const square = x => x * x
1425
const add = (x, y) => x + y
15-
expect(compose(square, add)(1, 2)).toBe(9)
26+
expect(
27+
compose(
28+
square,
29+
add,
30+
)(1, 2),
31+
).toBe(9)
1632
})
1733

1834
it('should return the identity function if given no arguments', () => {

0 commit comments

Comments
 (0)