Merge pull request #141 from rtfpessoa/update-dependencies

Update dependencies

.circleci/config.yml

@@ -0,0 +1,75 @@
+version: 2
+jobs:
+  build-common: &common-build
+    docker:
+      - image: node
+    working_directory: ~/diff2html
+    steps: &common-steps
+      - checkout
+      - restore_cache:
+          key: dependency-cache-{{ checksum "yarn.lock" }}
+      - run: npm install
+      - save_cache:
+          key: dependency-cache-{{ checksum "yarn.lock" }}
+          paths:
+            - ./node_modules
+      - run: npm run coverage
+      - run: npm run check-coverage
+
+  build-latest: &latest-build
+    docker:
+      - image: node
+    working_directory: ~/diff2html
+    steps:
+      - checkout
+      - restore_cache:
+          key: dependency-cache-{{ checksum "yarn.lock" }}
+      - run: yarn
+      - save_cache:
+          key: dependency-cache-{{ checksum "yarn.lock" }}
+          paths:
+            - ./node_modules
+      - run: yarn run test
+      - run: yarn run lint
+      - run: yarn run codacy
+
+  build-node_0.12:
+    <<: *common-build
+    docker:
+      - image: node:0.12
+
+  build-node_4:
+    <<: *common-build
+    docker:
+      - image: node:4
+
+  build-node_5:
+    <<: *common-build
+    docker:
+      - image: node:5
+
+  build-node_6:
+    <<: *common-build
+    docker:
+      - image: node:6
+
+  build-node_7:
+    <<: *common-build
+    docker:
+      - image: node:7
+
+  build-node_8:
+    <<: *latest-build
+    docker:
+      - image: node:8
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - build-node_0.12
+      - build-node_4
+      - build-node_5
+      - build-node_6
+      - build-node_7
+      - build-node_8

CONTRIBUTING.md

@@ -8,9 +8,9 @@
 
 * Before sending a pull request make sure your code is tested.
 
-* Before sending a pull request for a feature, be sure to run tests with `npm test`.
+* Before sending a pull request for a feature, be sure to run tests with `yarn test`.
 
-* Use the same coding style as the rest of the codebase, most of the check can be performed with `npm run style`.
+* Use the same coding style as the rest of the codebase, most of the check can be performed with `yarn run lint`.
 
 * Use `git rebase` (not `git merge`) to sync your work from time to time with the master branch.
 

README.md

@@ -151,13 +151,13 @@ If your favourite language is not included in the default package also add its j
 
 ```html
 <!-- Stylesheet -->
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/styles/github.min.css">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/github.min.css">
 <link rel="stylesheet" type="text/css" href="dist/diff2html.css">
 
 <!-- Javascripts -->
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.3/jquery.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/highlight.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/languages/scala.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/scala.min.js"></script>
 <script type="text/javascript" src="dist/diff2html-ui.js"></script>
 ```
 

docs/demo.html

@@ -33,7 +33,7 @@
     <!-- Custom styles for this template -->
     <link href="main.min.css" rel="stylesheet">
 
-    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/styles/github.min.css">
+    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/github.min.css">
 
     <!-- diff2html -->
     <link rel="stylesheet" type="text/css" href="assets/diff2html.min.css">
@@ -240,8 +240,8 @@ <h3>Thank you</h3>
 }
 </script>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/languages/scala.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/scala.min.js"></script>
 
 <!-- diff2html -->
 <script type="text/javascript" src="assets/diff2html.min.js"></script>