Merge pull request #322 from rtfpessoa/update-codacy-coverage

Update codacy coverage and bump dependencies

Author: rtfpessoa

.circleci/config.yml

@@ -46,16 +46,12 @@ jobs:
             yarn -v
       - run:
           name: Install dependencies
-          command: yarn
+          command: yarn install --ignore-engines
       - save_cache:
           key: yarn-cache-{{ checksum "yarn.lock" }}
           paths:
             - /usr/local/share/.cache/yarn
-      - run: yarn run validate
-      - store_artifacts:
-          path: coverage
-      - store_test_results:
-          path: coverage
+      - run: yarn run build:templates && yarn run build
 
   build-latest: &latest-build
     docker:
@@ -90,11 +86,6 @@ jobs:
             - '*'
 
   build-node-10:
-    <<: *common-build
-    docker:
-      - image: node:10
-
-  build-node-11:
     <<: *common-build
     docker:
       - image: node:11
@@ -104,14 +95,14 @@ jobs:
     docker:
       - image: node:12
 
-  build-node-13:
+  build-node-14:
     <<: *latest-build
     docker:
-      - image: node:13
+      - image: node:14
 
   tag_version:
     docker:
-      - image: node:13
+      - image: node:14
     working_directory: ~/workdir
     steps:
       - attach_workspace:
@@ -129,7 +120,7 @@ jobs:
 
   publish_library:
     docker:
-      - image: node:13
+      - image: node:14
     working_directory: ~/workdir
     steps:
       - attach_workspace:
@@ -203,22 +194,18 @@ workflows:
       - build-node-10:
           requires:
             - checkout-and-version
-      - build-node-11:
-          requires:
-            - checkout-and-version
       - build-node-12:
           requires:
             - checkout-and-version
-      - build-node-13:
+      - build-node-14:
           requires:
             - checkout-and-version
       - publish_approval:
           type: approval
           requires:
             - build-node-10
-            - build-node-11
             - build-node-12
-            - build-node-13
+            - build-node-14
       - tag_version:
           requires:
             - publish_approval

package.json

@@ -32,7 +32,7 @@
     "url": "https://www.github.com/rtfpessoa/diff2html/issues"
   },
   "engines": {
-    "node": ">=10.13"
+    "node": ">=10"
   },
   "scripts": {
     "eslint": "eslint --ignore-path .gitignore \"**/*.{js,jsx,ts,tsx,json}\"",
@@ -56,7 +56,7 @@
     "test:watch": "jest --watch",
     "test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand --watch",
     "coverage:open": "yarn run test:coverage && open ./coverage/index.html",
-    "coverage:push": "cat ./coverage/lcov.info | codacy-coverage",
+    "coverage:push": "curl -Ls https://coverage.codacy.com/get.sh | bash",
     "validate": "yarn run build:templates && yarn run format:check && yarn run lint:check && yarn run build && yarn run test:coverage",
     "fix": "yarn run format:fix && yarn run lint:fix",
     "start": "yarn run start:website",
@@ -89,7 +89,7 @@
     "hogan.js": "3.0.2"
   },
   "optionalDependencies": {
-    "highlight.js": "9.18.1"
+    "highlight.js": "10.0.2"
   },
   "devDependencies": {
     "@types/clipboard": "2.0.1",
@@ -98,57 +98,56 @@
     "@types/highlight.js": "9.12.3",
     "@types/hogan.js": "3.0.0",
     "@types/html-webpack-plugin": "3.2.2",
-    "@types/jest": "25.1.4",
+    "@types/jest": "25.2.1",
     "@types/mini-css-extract-plugin": "0.9.1",
     "@types/mkdirp": "1.0.0",
-    "@types/node": "13.9.1",
+    "@types/node": "13.13.5",
     "@types/nopt": "3.0.29",
-    "@types/webpack": "4.41.7",
-    "@typescript-eslint/eslint-plugin": "2.23.0",
-    "@typescript-eslint/parser": "2.23.0",
-    "autoprefixer": "9.7.4",
+    "@types/webpack": "4.41.12",
+    "@typescript-eslint/eslint-plugin": "2.31.0",
+    "@typescript-eslint/parser": "2.31.0",
+    "autoprefixer": "9.7.6",
     "bulma": "^0.8.0",
     "clipboard": "2.0.6",
-    "codacy-coverage": "3.4.0",
     "copy-webpack-plugin": "5.1.1",
-    "css-loader": "3.4.2",
+    "css-loader": "3.5.3",
     "cssnano": "4.1.10",
-    "eslint": "6.8.0",
-    "eslint-config-prettier": "6.10.0",
-    "eslint-plugin-import": "2.20.1",
-    "eslint-plugin-jest": "23.8.2",
-    "eslint-plugin-json": "2.1.0",
-    "eslint-plugin-node": "11.0.0",
-    "eslint-plugin-optimize-regex": "1.1.7",
+    "eslint": "7.0.0",
+    "eslint-config-prettier": "6.11.0",
+    "eslint-plugin-import": "2.20.2",
+    "eslint-plugin-jest": "23.10.0",
+    "eslint-plugin-json": "2.1.1",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-optimize-regex": "1.2.0",
     "eslint-plugin-promise": "4.2.1",
     "eslint-plugin-sonarjs": "0.5.0",
-    "file-loader": "5.1.0",
-    "handlebars": "4.7.3",
+    "file-loader": "6.0.0",
+    "handlebars": "4.7.6",
     "handlebars-loader": "1.7.1",
-    "html-webpack-plugin": "3.2.0",
-    "husky": "4.2.3",
+    "html-webpack-plugin": "4.3.0",
+    "husky": "4.2.5",
     "image-webpack-loader": "6.0.0",
     "is-ci-cli": "2.0.0",
-    "jest": "25.1.0",
-    "lint-staged": "10.0.8",
+    "jest": "26.0.1",
+    "lint-staged": "10.2.2",
     "markdown-toc": "^1.2.0",
     "mini-css-extract-plugin": "0.9.0",
-    "mkdirp": "1.0.3",
+    "mkdirp": "1.0.4",
     "nopt": "4.0.3",
-    "postcss": "7.0.27",
-    "postcss-cli": "7.1.0",
+    "postcss": "7.0.29",
+    "postcss-cli": "7.1.1",
     "postcss-import": "12.0.1",
     "postcss-loader": "3.0.0",
     "postcss-preset-env": "6.7.0",
-    "prettier": "1.19.1",
-    "ts-jest": "25.2.1",
-    "ts-loader": "6.2.1",
-    "ts-node": "8.6.2",
+    "prettier": "2.0.5",
+    "ts-jest": "25.5.1",
+    "ts-loader": "7.0.3",
+    "ts-node": "8.10.1",
     "typescript": "3.8.3",
-    "url-loader": "3.0.0",
-    "webpack": "4.42.0",
+    "url-loader": "4.1.0",
+    "webpack": "4.43.0",
     "webpack-cli": "3.3.11",
-    "webpack-dev-server": "3.10.3",
+    "webpack-dev-server": "3.11.0",
     "whatwg-fetch": "3.0.0"
   },
   "resolutions": {

src/render-utils.ts

@@ -186,9 +186,7 @@ export function filenameDiff(file: DiffFileName): string {
  * Generates a unique string numerical identifier based on the names of the file diff
  */
 export function getHtmlId(file: DiffFileName): string {
-  return `d2h-${hashCode(filenameDiff(file))
-    .toString()
-    .slice(-6)}`;
+  return `d2h-${hashCode(filenameDiff(file)).toString().slice(-6)}`;
 }
 
 /**

src/ui/js/diff2html-ui-base.ts

@@ -1,4 +1,4 @@
-import * as HighlightJS from 'highlight.js/lib/highlight.js';
+import * as HighlightJS from 'highlight.js/lib/core';
 import { ICompiledMode, IHighlightResult, IAutoHighlightResult } from 'highlight.js';
 import { nodeStream, mergeStreams } from './highlight.js-helpers';
 

src/ui/js/highlight.js-helpers.ts

@@ -5,11 +5,8 @@
 
 /* Utility functions */
 
-function escape(value: string): string {
-  return value
-    .replace(/&/gm, '&')
-    .replace(/</gm, '&lt;')
-    .replace(/>/gm, '&gt;');
+function escapeHTML(value: string): string {
+  return value.replace(/&/gm, '&amp;').replace(/</gm, '&lt;').replace(/>/gm, '&gt;');
 }
 
 function tag(node: Node): string {
@@ -97,7 +94,7 @@ export function mergeStreams(original: NodeEvent[], highlighted: NodeEvent[], va
     }
 
     result += `<${tag(node)} ${Array<Attr>()
-      .map.call(node.attributes, attr => `${attr.nodeName}="${escape(attr.value)}"`)
+      .map.call(node.attributes, attr => `${attr.nodeName}="${escapeHTML(attr.value).replace(/"/g, '&quot;')}"`)
       .join(' ')}>`;
   }
 
@@ -111,7 +108,7 @@ export function mergeStreams(original: NodeEvent[], highlighted: NodeEvent[], va
 
   while (original.length || highlighted.length) {
     let stream = selectStream();
-    result += escape(value.substring(processed, stream[0].offset));
+    result += escapeHTML(value.substring(processed, stream[0].offset));
     processed = stream[0].offset;
     if (stream === original) {
       /*
@@ -135,5 +132,6 @@ export function mergeStreams(original: NodeEvent[], highlighted: NodeEvent[], va
       render(stream.splice(0, 1)[0]);
     }
   }
-  return result + escape(value.substr(processed));
+
+  return result + escapeHTML(value.substr(processed));
 }