Skip to content

Commit 6c837f6

Browse files
author
Corjen Moll
committed
fix: update deps & fix tests
1 parent e99552e commit 6c837f6

File tree

4 files changed

+1671
-1475
lines changed

4 files changed

+1671
-1475
lines changed

jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ module.exports = {
66
testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.tsx?$',
77
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
88
snapshotSerializers: ['enzyme-to-json/serializer'],
9-
setupTestFrameworkScriptFile: '<rootDir>/other/setupEnzyme.ts'
9+
setupFilesAfterEnv: '<rootDir>/other/setupEnzyme.ts'
1010
}

package.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,44 +32,44 @@
3232
},
3333
"homepage": "https://github.com/Corjen/react-data-sort#readme",
3434
"devDependencies": {
35-
"@types/enzyme": "^3.1.15",
36-
"@types/enzyme-adapter-react-16": "^1.0.3",
37-
"@types/jest": "^23.3.12",
38-
"@types/lodash.sortby": "^4.7.4",
39-
"@types/match-sorter": "^2.2.0",
40-
"@types/react": "^16.7.18",
41-
"@types/react-dom": "^16.0.11",
35+
"@types/enzyme": "^3.9.4",
36+
"@types/enzyme-adapter-react-16": "^1.0.5",
37+
"@types/jest": "^24.0.15",
38+
"@types/lodash.sortby": "^4.7.6",
39+
"@types/match-sorter": "^2.3.0",
40+
"@types/react": "^16.8.22",
41+
"@types/react-dom": "^16.8.4",
4242
"cz-conventional-changelog": "2.1.0",
43-
"enzyme": "^3.8.0",
44-
"enzyme-adapter-react-16": "^1.7.1",
43+
"enzyme": "^3.10.0",
44+
"enzyme-adapter-react-16": "^1.14.0",
4545
"enzyme-to-json": "^3.3.5",
46-
"eslint": "^5.12.0",
47-
"eslint-config-prettier": "^3.3.0",
46+
"eslint": "^6.0.1",
47+
"eslint-config-prettier": "^6.0.0",
4848
"eslint-config-standard": "^12.0.0",
49-
"eslint-plugin-import": "^2.14.0",
50-
"eslint-plugin-node": "^6.0.1",
51-
"eslint-plugin-promise": "^4.0.1",
52-
"eslint-plugin-react": "^7.12.3",
49+
"eslint-plugin-import": "^2.18.0",
50+
"eslint-plugin-node": "^9.1.0",
51+
"eslint-plugin-promise": "^4.2.1",
52+
"eslint-plugin-react": "^7.14.2",
5353
"eslint-plugin-standard": "^4.0.0",
54-
"jest": "^23.6.0",
55-
"prettier": "^1.11.1",
56-
"react": "^16.7.0",
57-
"react-dom": "^16.7.0",
54+
"jest": "^24.8.0",
55+
"prettier": "^1.18.2",
56+
"react": "^16.8.6",
57+
"react-dom": "^16.8.6",
5858
"rimraf": "^2.6.3",
59-
"rollup": "^1.0.2",
60-
"rollup-plugin-typescript2": "^0.18.1",
61-
"semantic-release": "^15.13.2",
62-
"ts-jest": "^23.10.5",
63-
"tslib": "^1.9.3",
64-
"typescript": "^3.2.2"
59+
"rollup": "^1.16.2",
60+
"rollup-plugin-typescript2": "^0.21.2",
61+
"semantic-release": "^15.13.18",
62+
"ts-jest": "^24.0.2",
63+
"tslib": "^1.10.0",
64+
"typescript": "^3.5.2"
6565
},
6666
"peerDependencies": {
6767
"prop-types": "^15.6.1",
6868
"react": "^16.3.2"
6969
},
7070
"dependencies": {
7171
"lodash.sortby": "^4.7.0",
72-
"match-sorter": "^2.2.1"
72+
"match-sorter": "^3.1.1"
7373
},
7474
"config": {
7575
"commitizen": {

src/__tests__/index.root.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ const data = [{ id: 1, name: 'b' }, { id: 2, name: 'a' }, { id: 3, name: 'c' }]
66

77
test('render nothing', () => {
88
const Component = () => <DataSort data={data} />
9-
expect(mount(<Component />).html()).toBe(null)
9+
expect(mount(<Component />).html()).toEqual('')
1010
})
1111

1212
test('render prop is null, then render null', () => {
1313
const Component = () => <DataSort data={data} render={() => null} />
14-
expect(mount(<Component />).html()).toBe(null)
14+
expect(mount(<Component />).html()).toEqual('')
1515
})
1616

1717
test('render fine', () => {

0 commit comments

Comments
 (0)