Skip to content

Commit cfaa9b6

Browse files
committedSep 1, 2020
Merge branch 'release/1.5.0'
2 parents 1d50ded + 3e86f87 commit cfaa9b6

File tree

8 files changed

+30
-25
lines changed

8 files changed

+30
-25
lines changed
 

‎.eslintrc.json

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@
55
"indent": ["error", "tab"],
66
"linebreak-style": "off",
77
"no-tabs": "off",
8-
"react/jsx-filename-extension": "off"
9-
}
8+
"react/jsx-filename-extension": "off",
9+
"react/no-deprecated": "off"
10+
},
11+
"overrides": [
12+
{
13+
"files": ["**/*.spec.js"],
14+
"env": {
15+
"jest": true
16+
},
17+
"rules": {
18+
"max-classes-per-file": "off",
19+
"react/jsx-props-no-spreading": "off"
20+
}
21+
}
22+
]
1023
}

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: node_js
22
node_js:
33
- "node"
4-
- "6"
4+
- "10"
55
env:
66
- REACT=0.13
77
- REACT=0.14

‎README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
[![Build Status](https://travis-ci.org/wimpyprogrammer/react-component-update.svg?branch=master)](https://travis-ci.org/wimpyprogrammer/react-component-update)
66
[![codecov](https://codecov.io/gh/wimpyprogrammer/react-component-update/branch/master/graph/badge.svg)](https://codecov.io/gh/wimpyprogrammer/react-component-update)
77
[![Known Vulnerabilities](https://snyk.io/test/github/wimpyprogrammer/react-component-update/badge.svg)](https://snyk.io/test/github/wimpyprogrammer/react-component-update)
8-
[![Greenkeeper badge](https://badges.greenkeeper.io/wimpyprogrammer/react-component-update.svg)](https://greenkeeper.io/)
98

109
Adds convenience lifecycle events to your React components.
1110

‎package.json

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
22
"name": "react-component-update",
3-
"version": "1.4.1",
3+
"version": "1.5.0",
44
"description": "Extends the native React Component to streamline updates",
55
"main": "lib/index.js",
66
"files": [
77
"lib/**/!(*.spec).js"
88
],
99
"engines": {
10-
"node": ">=6"
10+
"node": ">=10"
1111
},
1212
"scripts": {
1313
"clean": "rimraf lib",
1414
"build": "npm run clean && babel src --out-dir lib",
1515
"build-and-test": "npm run test && npm run build",
1616
"install-react": "enzyme-adapter-react-install 16",
17-
"lint": "eslint ./",
17+
"lint": "eslint ./ --report-unused-disable-directives",
1818
"test": "jest",
1919
"travisci": "npm run install-react && npm run lint && npm run test && codecov",
20-
"publish-please": "publish-please",
21-
"prepublish": "publish-please guard"
20+
"prepublish": "npx publish-please guard",
21+
"publish-please": "npx publish-please"
2222
},
2323
"repository": {
2424
"type": "git",
@@ -35,27 +35,26 @@
3535
"@babel/core": "^7.2.2",
3636
"@babel/preset-env": "^7.2.0",
3737
"@babel/preset-react": "^7.0.0",
38-
"babel-jest": "^23.0.0",
38+
"babel-jest": "^26.3.0",
3939
"chai": "^4.0.2",
4040
"codecov": "^3.0.0",
4141
"create-react-class": "^15.6.0",
4242
"dirty-chai": "^2.0.0",
4343
"enzyme": "^3.6.0",
4444
"enzyme-adapter-react-16": "^1.5.0",
4545
"enzyme-adapter-react-helper": "^1.3.0",
46-
"eslint": "^5.0.1",
47-
"eslint-config-airbnb": "^17.1.0",
46+
"eslint": "^7.8.0",
47+
"eslint-config-airbnb": "^18.2.0",
4848
"eslint-plugin-import": "^2.13.0",
4949
"eslint-plugin-jsx-a11y": "^6.1.0",
5050
"eslint-plugin-react": "^7.11.0",
51-
"jest": "^24.3.1",
51+
"jest": "^26.4.2",
5252
"lodash.uniqueid": "^4.0.1",
53-
"publish-please": "^5.4.3",
5453
"react": "*",
5554
"react-dom": "*",
5655
"react-test-renderer": "*",
57-
"rimraf": "^2.6.1",
58-
"sinon": "^7.2.7",
56+
"rimraf": "^3.0.2",
57+
"sinon": "^9.0.3",
5958
"sinon-chai": "^3.0.0"
6059
},
6160
"peerDependencies": {

‎src/component.spec.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/* eslint-env jest */
2-
/* eslint-disable react/no-multi-comp */
31
import chai, { expect } from 'chai';
42
import dirtyChai from 'dirty-chai';
53
import { shallow } from 'enzyme';

‎src/pureComponent.spec.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/* eslint-env jest */
2-
/* eslint-disable react/no-multi-comp */
31
import chai, { expect } from 'chai';
42
import dirtyChai from 'dirty-chai';
53
import { shallow } from 'enzyme';
@@ -26,7 +24,7 @@ function getUniqueProps() {
2624
const descriptor = React.PureComponent ? describe : describe.skip;
2725

2826
descriptor('PureComponent extension', () => {
29-
const { PureComponent } = require('./'); // eslint-disable-line global-require
27+
const { PureComponent } = require('.'); // eslint-disable-line global-require
3028

3129
class TestComponent extends PureComponent {
3230
constructor(props) {
@@ -170,7 +168,7 @@ descriptor('PureComponent extension', () => {
170168
});
171169

172170
descriptor('PureComponent extension with overrides calling super()', () => {
173-
const { PureComponent } = require('./'); // eslint-disable-line global-require
171+
const { PureComponent } = require('.'); // eslint-disable-line global-require
174172

175173
const userComponentWillMountBefore = sandbox.spy();
176174
const userComponentWillMountAfter = sandbox.spy();
@@ -297,7 +295,7 @@ descriptor('PureComponent extension with overrides calling super()', () => {
297295
});
298296

299297
descriptor('Component extension with overrides not calling super()', () => {
300-
const { PureComponent } = require('./'); // eslint-disable-line global-require
298+
const { PureComponent } = require('.'); // eslint-disable-line global-require
301299

302300
class TestComponentWithoutSuper extends PureComponent {
303301
componentWillMount() { }

‎src/withEvents.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env jest */
21
import chai, { expect } from 'chai';
32
import createReactClass from 'create-react-class';
43
import dirtyChai from 'dirty-chai';

‎test-setup.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* eslint-env mocha */
21
import configure from 'enzyme-adapter-react-helper';
32

43
configure();

0 commit comments

Comments
 (0)