Skip to content
This repository was archived by the owner on Jun 5, 2019. It is now read-only.

Commit 716521a

Browse files
authored
Merge pull request #46 from skellock/bump-deps
Bump deps
2 parents 9f4fd86 + 1cc6178 commit 716521a

File tree

3 files changed

+63
-45
lines changed

3 files changed

+63
-45
lines changed

package-lock.json

+56-39
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646
"mobx": "3.2.2",
4747
"mobx-react": "4.2.2",
4848
"mousetrap": "1.6.1",
49-
"popmotion-react": "^1.1.0",
49+
"popmotion-react": "1.1.0",
5050
"ramda": "0.24.1",
5151
"react": "15.6.1",
5252
"react-dom": "15.6.1",
53-
"react-transition-group": "^2.2.0"
53+
"react-transition-group": "2.2.0"
5454
},
5555
"description": "An electron starter project.",
5656
"devDependencies": {
@@ -66,14 +66,14 @@
6666
"electron-builder": "19.19.1",
6767
"fuse-box": "2.2.1",
6868
"husky": "0.14.3",
69-
"lint-staged": "4.0.2",
69+
"lint-staged": "4.0.3",
7070
"npm-run-all": "4.0.2",
7171
"npm-scripts-info": "0.3.6",
7272
"prettier": "1.5.3",
7373
"react-test-renderer": "15.6.1",
74-
"standard": "10.0.2",
74+
"standard": "10.0.3",
7575
"ts-node": "3.3.0",
76-
"tslint": "5.5.0",
76+
"tslint": "5.6.0",
7777
"tslint-eslint-rules": "4.1.1",
7878
"tslint-react": "3.2.0",
7979
"tslint-react-recommended": "1.0.15",

tslint.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"member-ordering": [false],
99
"trailing-comma": [true, { "singleline": "never", "multiline": "always" }],
1010
"no-empty": false,
11-
"ter-indent": [true, 2, { "SwitchCase": 1 }]
11+
"ter-indent": [true, 2, { "SwitchCase": 1 }],
12+
"no-duplicate-imports": false
1213
}
1314
}

0 commit comments

Comments
 (0)