Skip to content

Commit 950baf3

Browse files
authored
Merge pull request #29 from rtfpessoa/release-minor-updates
Update dependencies
2 parents 67c9ee4 + 35c9036 commit 950baf3

File tree

4 files changed

+734
-466
lines changed

4 files changed

+734
-466
lines changed

.circleci/config.yml

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
version: 2
2+
jobs:
3+
build-common: &common-build
4+
docker:
5+
- image: node
6+
working_directory: ~/diff2html-cli
7+
steps: &common-steps
8+
- checkout
9+
- restore_cache:
10+
key: dependency-cache-{{ checksum "yarn.lock" }}
11+
- run: npm install
12+
- save_cache:
13+
key: dependency-cache-{{ checksum "yarn.lock" }}
14+
paths:
15+
- ./node_modules
16+
- run: npm run coverage
17+
- run: npm run check-coverage
18+
19+
build-latest: &latest-build
20+
docker:
21+
- image: node
22+
working_directory: ~/diff2html-cli
23+
steps:
24+
- checkout
25+
- restore_cache:
26+
key: dependency-cache-{{ checksum "yarn.lock" }}
27+
- run: yarn
28+
- save_cache:
29+
key: dependency-cache-{{ checksum "yarn.lock" }}
30+
paths:
31+
- ./node_modules
32+
- run: yarn run test
33+
- run: yarn run lint
34+
- run: yarn run codacy
35+
36+
build-node_4:
37+
<<: *common-build
38+
docker:
39+
- image: node:4
40+
41+
build-node_5:
42+
<<: *common-build
43+
docker:
44+
- image: node:5
45+
46+
build-node_6:
47+
<<: *common-build
48+
docker:
49+
- image: node:6
50+
51+
build-node_7:
52+
<<: *common-build
53+
docker:
54+
- image: node:7
55+
56+
build-node_8:
57+
<<: *latest-build
58+
docker:
59+
- image: node:8
60+
61+
workflows:
62+
version: 2
63+
build:
64+
jobs:
65+
- build-node_4
66+
- build-node_5
67+
- build-node_6
68+
- build-node_7
69+
- build-node_8

circle.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

package.json

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,17 @@
3232
"url": "https://www.github.com/rtfpessoa/diff2html-cli/issues"
3333
},
3434
"engines": {
35-
"node": ">=0.12.0"
35+
"node": ">=4.0.0"
3636
},
3737
"preferGlobal": true,
3838
"scripts": {
39-
"style": "eslint .",
39+
"lint": "eslint .",
40+
"style": "yarn run lint",
4041
"coverage": "istanbul cover _mocha -- -u exports -R spec ./test/**/*",
41-
"check-coverage": "istanbul check-coverage --statements 90 --functions 90 --branches 85 --lines 90 ./coverage/coverage.json",
42-
"test": "npm run coverage",
42+
"check-coverage": "istanbul check-coverage --statements 50 --functions 40 --branches 0 --lines 50 ./coverage/coverage.json",
43+
"test": "yarn run coverage",
4344
"codacy": "cat ./coverage/lcov.info | codacy-coverage",
44-
"preversion": "npm test",
45+
"preversion": "yarn run test",
4546
"postversion": "git push && git push --tags"
4647
},
4748
"bin": {
@@ -50,19 +51,19 @@
5051
"main": "./src/main.js",
5152
"dependencies": {
5253
"copy-paste": "^1.3.0",
53-
"diff2html": "^2.3.0",
54-
"extend": "^3.0.0",
54+
"diff2html": "^2.3.1",
55+
"extend": "^3.0.1",
5556
"open": "^0.0.5",
56-
"request": "^2.81.0",
57-
"yargs": "^7.0.2"
57+
"request": "^2.83.0",
58+
"yargs": "^9.0.1"
5859
},
5960
"devDependencies": {
60-
"codacy-coverage": "^2.0.1",
61-
"eslint": "^3.18.0",
61+
"codacy-coverage": "^2.0.3",
62+
"eslint": "^4.8.0",
6263
"eslint-plugin-promise": "^3.5.0",
63-
"eslint-plugin-standard": "^2.1.1",
64+
"eslint-plugin-standard": "^3.0.1",
6465
"istanbul": "^0.4.5",
65-
"mocha": "^3.2.0"
66+
"mocha": "^4.0.0"
6667
},
6768
"license": "MIT",
6869
"files": [

0 commit comments

Comments
 (0)