Skip to content

Commit 0eaa02c

Browse files
authored
Merge pull request #141 from rtfpessoa/update-dependencies
Update dependencies
2 parents 564f44f + 7c3b7a1 commit 0eaa02c

File tree

13 files changed

+1210
-960
lines changed

13 files changed

+1210
-960
lines changed

.circleci/config.yml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
version: 2
2+
jobs:
3+
build-common: &common-build
4+
docker:
5+
- image: node
6+
working_directory: ~/diff2html
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
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_0.12:
37+
<<: *common-build
38+
docker:
39+
- image: node:0.12
40+
41+
build-node_4:
42+
<<: *common-build
43+
docker:
44+
- image: node:4
45+
46+
build-node_5:
47+
<<: *common-build
48+
docker:
49+
- image: node:5
50+
51+
build-node_6:
52+
<<: *common-build
53+
docker:
54+
- image: node:6
55+
56+
build-node_7:
57+
<<: *common-build
58+
docker:
59+
- image: node:7
60+
61+
build-node_8:
62+
<<: *latest-build
63+
docker:
64+
- image: node:8
65+
66+
workflows:
67+
version: 2
68+
build:
69+
jobs:
70+
- build-node_0.12
71+
- build-node_4
72+
- build-node_5
73+
- build-node_6
74+
- build-node_7
75+
- build-node_8

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
* Before sending a pull request make sure your code is tested.
1010

11-
* Before sending a pull request for a feature, be sure to run tests with `npm test`.
11+
* Before sending a pull request for a feature, be sure to run tests with `yarn test`.
1212

13-
* Use the same coding style as the rest of the codebase, most of the check can be performed with `npm run style`.
13+
* Use the same coding style as the rest of the codebase, most of the check can be performed with `yarn run lint`.
1414

1515
* Use `git rebase` (not `git merge`) to sync your work from time to time with the master branch.
1616

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,13 @@ If your favourite language is not included in the default package also add its j
151151

152152
```html
153153
<!-- Stylesheet -->
154-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/styles/github.min.css">
154+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/github.min.css">
155155
<link rel="stylesheet" type="text/css" href="dist/diff2html.css">
156156

157157
<!-- Javascripts -->
158158
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.3/jquery.js"></script>
159-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/highlight.min.js"></script>
160-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/languages/scala.min.js"></script>
159+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
160+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/scala.min.js"></script>
161161
<script type="text/javascript" src="dist/diff2html-ui.js"></script>
162162
```
163163

circle.yml

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

docs/demo.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<!-- Custom styles for this template -->
3434
<link href="main.min.css" rel="stylesheet">
3535

36-
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/styles/github.min.css">
36+
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/github.min.css">
3737

3838
<!-- diff2html -->
3939
<link rel="stylesheet" type="text/css" href="assets/diff2html.min.css">
@@ -240,8 +240,8 @@ <h3>Thank you</h3>
240240
}
241241
</script>
242242

243-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js"></script>
244-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/languages/scala.min.js"></script>
243+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
244+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/scala.min.js"></script>
245245

246246
<!-- diff2html -->
247247
<script type="text/javascript" src="assets/diff2html.min.js"></script>

docs/demo.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/main.css

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/main.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)