luciano/diff2html
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Update codacy coverage and bump dependencies
This commit is contained in:
Rodrigo Fernandes 2020-05-09 13:17:47 +01:00 committed by GitHub
commit d7d08f0c36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 2017 additions and 2130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
.circleci/config.yml
View file

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

67
package.json
View file

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

4
src/render-utils.ts
View file

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

2
src/ui/js/diff2html-ui-base.ts
View file

@ -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 { ICompiledMode, IHighlightResult, IAutoHighlightResult } from 'highlight.js';
import { nodeStream, mergeStreams } from './highlight.js-helpers'; import { nodeStream, mergeStreams } from './highlight.js-helpers';

14
src/ui/js/highlight.js-helpers.ts
View file

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

130
src/ui/js/highlight.js-slim.ts
View file

@ -1,11 +1,11 @@
// Require the highlight.js library without languages // Require the highlight.js library without languages
import highlightJS from 'highlight.js/lib/highlight.js'; import highlightJS from 'highlight.js/lib/core';
// Convert to imports // Convert to imports
// ^highlightJS\.registerLanguage\('(.+)', require\('highlight.js\/lib\/languages\/(.+)'\)\);$ // ^hljs\.registerLanguage\('(.+)', require\('\./languages\/(.+)'\)\);$
// import $1 from 'highlight.js/lib/languages/$2'; // import $1 from 'highlight.js/lib/languages/$2';
// import 1c from 'highlight.js/lib/languages/1c'; // import _1c from 'highlight.js/lib/languages/1c';
// import abnf from 'highlight.js/lib/languages/abnf'; // import abnf from 'highlight.js/lib/languages/abnf';
// import accesslog from 'highlight.js/lib/languages/accesslog'; // import accesslog from 'highlight.js/lib/languages/accesslog';
// import actionscript from 'highlight.js/lib/languages/actionscript'; // import actionscript from 'highlight.js/lib/languages/actionscript';
@ -14,6 +14,7 @@ import highlightJS from 'highlight.js/lib/highlight.js';
// import apache from 'highlight.js/lib/languages/apache'; // import apache from 'highlight.js/lib/languages/apache';
// import applescript from 'highlight.js/lib/languages/applescript'; // import applescript from 'highlight.js/lib/languages/applescript';
// import arcade from 'highlight.js/lib/languages/arcade'; // import arcade from 'highlight.js/lib/languages/arcade';
import cLike from 'highlight.js/lib/languages/c-like';
import cpp from 'highlight.js/lib/languages/cpp'; import cpp from 'highlight.js/lib/languages/cpp';
// import arduino from 'highlight.js/lib/languages/arduino'; // import arduino from 'highlight.js/lib/languages/arduino';
// import armasm from 'highlight.js/lib/languages/armasm'; // import armasm from 'highlight.js/lib/languages/armasm';
@ -29,27 +30,28 @@ import bash from 'highlight.js/lib/languages/bash';
// import basic from 'highlight.js/lib/languages/basic'; // import basic from 'highlight.js/lib/languages/basic';
// import bnf from 'highlight.js/lib/languages/bnf'; // import bnf from 'highlight.js/lib/languages/bnf';
// import brainfuck from 'highlight.js/lib/languages/brainfuck'; // import brainfuck from 'highlight.js/lib/languages/brainfuck';
import c from 'highlight.js/lib/languages/c';
// import cal from 'highlight.js/lib/languages/cal'; // import cal from 'highlight.js/lib/languages/cal';
// import capnproto from 'highlight.js/lib/languages/capnproto'; // import capnproto from 'highlight.js/lib/languages/capnproto';
// import ceylon from 'highlight.js/lib/languages/ceylon'; // import ceylon from 'highlight.js/lib/languages/ceylon';
// import clean from 'highlight.js/lib/languages/clean'; // import clean from 'highlight.js/lib/languages/clean';
import clojure from 'highlight.js/lib/languages/clojure'; import clojure from 'highlight.js/lib/languages/clojure';
import clojureRepl from 'highlight.js/lib/languages/clojure-repl'; // import clojureRepl from 'highlight.js/lib/languages/clojure-repl';
import cmake from 'highlight.js/lib/languages/cmake'; // import cmake from 'highlight.js/lib/languages/cmake';
import coffeescript from 'highlight.js/lib/languages/coffeescript'; // import coffeescript from 'highlight.js/lib/languages/coffeescript';
// import coq from 'highlight.js/lib/languages/coq'; // import coq from 'highlight.js/lib/languages/coq';
// import cos from 'highlight.js/lib/languages/cos'; // import cos from 'highlight.js/lib/languages/cos';
// import crmsh from 'highlight.js/lib/languages/crmsh'; // import crmsh from 'highlight.js/lib/languages/crmsh';
import crystal from 'highlight.js/lib/languages/crystal'; import crystal from 'highlight.js/lib/languages/crystal';
import cs from 'highlight.js/lib/languages/cs'; import csharp from 'highlight.js/lib/languages/csharp';
import csp from 'highlight.js/lib/languages/csp'; import csp from 'highlight.js/lib/languages/csp';
import css from 'highlight.js/lib/languages/css'; import css from 'highlight.js/lib/languages/css';
import d from 'highlight.js/lib/languages/d'; // import d from 'highlight.js/lib/languages/d';
import markdown from 'highlight.js/lib/languages/markdown'; import markdown from 'highlight.js/lib/languages/markdown';
import dart from 'highlight.js/lib/languages/dart'; import dart from 'highlight.js/lib/languages/dart';
// import delphi from 'highlight.js/lib/languages/delphi'; // import delphi from 'highlight.js/lib/languages/delphi';
import diff from 'highlight.js/lib/languages/diff'; import diff from 'highlight.js/lib/languages/diff';
import django from 'highlight.js/lib/languages/django'; // import django from 'highlight.js/lib/languages/django';
// import dns from 'highlight.js/lib/languages/dns'; // import dns from 'highlight.js/lib/languages/dns';
import dockerfile from 'highlight.js/lib/languages/dockerfile'; import dockerfile from 'highlight.js/lib/languages/dockerfile';
// import dos from 'highlight.js/lib/languages/dos'; // import dos from 'highlight.js/lib/languages/dos';
@ -60,10 +62,10 @@ import dockerfile from 'highlight.js/lib/languages/dockerfile';
import elixir from 'highlight.js/lib/languages/elixir'; import elixir from 'highlight.js/lib/languages/elixir';
import elm from 'highlight.js/lib/languages/elm'; import elm from 'highlight.js/lib/languages/elm';
import ruby from 'highlight.js/lib/languages/ruby'; import ruby from 'highlight.js/lib/languages/ruby';
import erb from 'highlight.js/lib/languages/erb'; // import erb from 'highlight.js/lib/languages/erb';
import erlangRepl from 'highlight.js/lib/languages/erlang-repl'; // import erlangRepl from 'highlight.js/lib/languages/erlang-repl';
import erlang from 'highlight.js/lib/languages/erlang'; import erlang from 'highlight.js/lib/languages/erlang';
import excel from 'highlight.js/lib/languages/excel'; // import excel from 'highlight.js/lib/languages/excel';
// import fix from 'highlight.js/lib/languages/fix'; // import fix from 'highlight.js/lib/languages/fix';
// import flix from 'highlight.js/lib/languages/flix'; // import flix from 'highlight.js/lib/languages/flix';
// import fortran from 'highlight.js/lib/languages/fortran'; // import fortran from 'highlight.js/lib/languages/fortran';
@ -83,8 +85,8 @@ import handlebars from 'highlight.js/lib/languages/handlebars';
import haskell from 'highlight.js/lib/languages/haskell'; import haskell from 'highlight.js/lib/languages/haskell';
// import haxe from 'highlight.js/lib/languages/haxe'; // import haxe from 'highlight.js/lib/languages/haxe';
// import hsp from 'highlight.js/lib/languages/hsp'; // import hsp from 'highlight.js/lib/languages/hsp';
import htmlbars from 'highlight.js/lib/languages/htmlbars'; // import htmlbars from 'highlight.js/lib/languages/htmlbars';
import http from 'highlight.js/lib/languages/http'; // import http from 'highlight.js/lib/languages/http';
// import hy from 'highlight.js/lib/languages/hy'; // import hy from 'highlight.js/lib/languages/hy';
// import inform7 from 'highlight.js/lib/languages/inform7'; // import inform7 from 'highlight.js/lib/languages/inform7';
import ini from 'highlight.js/lib/languages/ini'; import ini from 'highlight.js/lib/languages/ini';
@ -92,24 +94,25 @@ import ini from 'highlight.js/lib/languages/ini';
// import isbl from 'highlight.js/lib/languages/isbl'; // import isbl from 'highlight.js/lib/languages/isbl';
import java from 'highlight.js/lib/languages/java'; import java from 'highlight.js/lib/languages/java';
import javascript from 'highlight.js/lib/languages/javascript'; import javascript from 'highlight.js/lib/languages/javascript';
// import jboss-cli from 'highlight.js/lib/languages/jboss-cli'; // import jbossCli from 'highlight.js/lib/languages/jboss-cli';
import json from 'highlight.js/lib/languages/json'; import json from 'highlight.js/lib/languages/json';
import julia from 'highlight.js/lib/languages/julia'; // import julia from 'highlight.js/lib/languages/julia';
import juliaRepl from 'highlight.js/lib/languages/julia-repl'; // import juliaRepl from 'highlight.js/lib/languages/julia-repl';
import kotlin from 'highlight.js/lib/languages/kotlin'; import kotlin from 'highlight.js/lib/languages/kotlin';
// import lasso from 'highlight.js/lib/languages/lasso'; // import lasso from 'highlight.js/lib/languages/lasso';
// import latex from 'highlight.js/lib/languages/latex';
// import ldif from 'highlight.js/lib/languages/ldif'; // import ldif from 'highlight.js/lib/languages/ldif';
// import leaf from 'highlight.js/lib/languages/leaf'; // import leaf from 'highlight.js/lib/languages/leaf';
import less from 'highlight.js/lib/languages/less'; import less from 'highlight.js/lib/languages/less';
import lisp from 'highlight.js/lib/languages/lisp'; import lisp from 'highlight.js/lib/languages/lisp';
// import livecodeserver from 'highlight.js/lib/languages/livecodeserver'; // import livecodeserver from 'highlight.js/lib/languages/livecodeserver';
// import livescript from 'highlight.js/lib/languages/livescript'; // import livescript from 'highlight.js/lib/languages/livescript';
import llvm from 'highlight.js/lib/languages/llvm'; // import llvm from 'highlight.js/lib/languages/llvm';
// import lsl from 'highlight.js/lib/languages/lsl'; // import lsl from 'highlight.js/lib/languages/lsl';
import lua from 'highlight.js/lib/languages/lua'; import lua from 'highlight.js/lib/languages/lua';
import makefile from 'highlight.js/lib/languages/makefile'; import makefile from 'highlight.js/lib/languages/makefile';
import mathematica from 'highlight.js/lib/languages/mathematica'; // import mathematica from 'highlight.js/lib/languages/mathematica';
import matlab from 'highlight.js/lib/languages/matlab'; // import matlab from 'highlight.js/lib/languages/matlab';
// import maxima from 'highlight.js/lib/languages/maxima'; // import maxima from 'highlight.js/lib/languages/maxima';
// import mel from 'highlight.js/lib/languages/mel'; // import mel from 'highlight.js/lib/languages/mel';
// import mercury from 'highlight.js/lib/languages/mercury'; // import mercury from 'highlight.js/lib/languages/mercury';
@ -121,17 +124,18 @@ import perl from 'highlight.js/lib/languages/perl';
// import moonscript from 'highlight.js/lib/languages/moonscript'; // import moonscript from 'highlight.js/lib/languages/moonscript';
// import n1ql from 'highlight.js/lib/languages/n1ql'; // import n1ql from 'highlight.js/lib/languages/n1ql';
import nginx from 'highlight.js/lib/languages/nginx'; import nginx from 'highlight.js/lib/languages/nginx';
// import nimrod from 'highlight.js/lib/languages/nimrod'; // import nim from 'highlight.js/lib/languages/nim';
import nix from 'highlight.js/lib/languages/nix'; // import nix from 'highlight.js/lib/languages/nix';
// import nsis from 'highlight.js/lib/languages/nsis'; // import nsis from 'highlight.js/lib/languages/nsis';
import objectivec from 'highlight.js/lib/languages/objectivec'; import objectivec from 'highlight.js/lib/languages/objectivec';
import ocaml from 'highlight.js/lib/languages/ocaml'; // import ocaml from 'highlight.js/lib/languages/ocaml';
// import openscad from 'highlight.js/lib/languages/openscad'; // import openscad from 'highlight.js/lib/languages/openscad';
// import oxygene from 'highlight.js/lib/languages/oxygene'; // import oxygene from 'highlight.js/lib/languages/oxygene';
// import parser3 from 'highlight.js/lib/languages/parser3'; // import parser3 from 'highlight.js/lib/languages/parser3';
// import pf from 'highlight.js/lib/languages/pf'; // import pf from 'highlight.js/lib/languages/pf';
import pgsql from 'highlight.js/lib/languages/pgsql'; import pgsql from 'highlight.js/lib/languages/pgsql';
import php from 'highlight.js/lib/languages/php'; import php from 'highlight.js/lib/languages/php';
// import phpTemplate from 'highlight.js/lib/languages/php-template';
import plaintext from 'highlight.js/lib/languages/plaintext'; import plaintext from 'highlight.js/lib/languages/plaintext';
// import pony from 'highlight.js/lib/languages/pony'; // import pony from 'highlight.js/lib/languages/pony';
import powershell from 'highlight.js/lib/languages/powershell'; import powershell from 'highlight.js/lib/languages/powershell';
@ -140,13 +144,14 @@ import powershell from 'highlight.js/lib/languages/powershell';
// import prolog from 'highlight.js/lib/languages/prolog'; // import prolog from 'highlight.js/lib/languages/prolog';
import properties from 'highlight.js/lib/languages/properties'; import properties from 'highlight.js/lib/languages/properties';
import protobuf from 'highlight.js/lib/languages/protobuf'; import protobuf from 'highlight.js/lib/languages/protobuf';
import puppet from 'highlight.js/lib/languages/puppet'; // import puppet from 'highlight.js/lib/languages/puppet';
// import purebasic from 'highlight.js/lib/languages/purebasic'; // import purebasic from 'highlight.js/lib/languages/purebasic';
import python from 'highlight.js/lib/languages/python'; import python from 'highlight.js/lib/languages/python';
// import pythonRepl from 'highlight.js/lib/languages/python-repl';
// import q from 'highlight.js/lib/languages/q'; // import q from 'highlight.js/lib/languages/q';
// import qml from 'highlight.js/lib/languages/qml'; // import qml from 'highlight.js/lib/languages/qml';
import r from 'highlight.js/lib/languages/r'; // import r from 'highlight.js/lib/languages/r';
import reasonml from 'highlight.js/lib/languages/reasonml'; // import reasonml from 'highlight.js/lib/languages/reasonml';
// import rib from 'highlight.js/lib/languages/rib'; // import rib from 'highlight.js/lib/languages/rib';
// import roboconf from 'highlight.js/lib/languages/roboconf'; // import roboconf from 'highlight.js/lib/languages/roboconf';
// import routeros from 'highlight.js/lib/languages/routeros'; // import routeros from 'highlight.js/lib/languages/routeros';
@ -155,7 +160,7 @@ import reasonml from 'highlight.js/lib/languages/reasonml';
import rust from 'highlight.js/lib/languages/rust'; import rust from 'highlight.js/lib/languages/rust';
// import sas from 'highlight.js/lib/languages/sas'; // import sas from 'highlight.js/lib/languages/sas';
import scala from 'highlight.js/lib/languages/scala'; import scala from 'highlight.js/lib/languages/scala';
import scheme from 'highlight.js/lib/languages/scheme'; // import scheme from 'highlight.js/lib/languages/scheme';
// import scilab from 'highlight.js/lib/languages/scilab'; // import scilab from 'highlight.js/lib/languages/scilab';
import scss from 'highlight.js/lib/languages/scss'; import scss from 'highlight.js/lib/languages/scss';
import shell from 'highlight.js/lib/languages/shell'; import shell from 'highlight.js/lib/languages/shell';
@ -167,14 +172,13 @@ import sql from 'highlight.js/lib/languages/sql';
// import stan from 'highlight.js/lib/languages/stan'; // import stan from 'highlight.js/lib/languages/stan';
// import stata from 'highlight.js/lib/languages/stata'; // import stata from 'highlight.js/lib/languages/stata';
// import step21 from 'highlight.js/lib/languages/step21'; // import step21 from 'highlight.js/lib/languages/step21';
import stylus from 'highlight.js/lib/languages/stylus'; // import stylus from 'highlight.js/lib/languages/stylus';
// import subunit from 'highlight.js/lib/languages/subunit'; // import subunit from 'highlight.js/lib/languages/subunit';
import swift from 'highlight.js/lib/languages/swift'; import swift from 'highlight.js/lib/languages/swift';
// import taggerscript from 'highlight.js/lib/languages/taggerscript'; // import taggerscript from 'highlight.js/lib/languages/taggerscript';
import yaml from 'highlight.js/lib/languages/yaml'; import yaml from 'highlight.js/lib/languages/yaml';
// import tap from 'highlight.js/lib/languages/tap'; // import tap from 'highlight.js/lib/languages/tap';
// import tcl from 'highlight.js/lib/languages/tcl'; // import tcl from 'highlight.js/lib/languages/tcl';
import tex from 'highlight.js/lib/languages/tex';
// import thrift from 'highlight.js/lib/languages/thrift'; // import thrift from 'highlight.js/lib/languages/thrift';
// import tp from 'highlight.js/lib/languages/tp'; // import tp from 'highlight.js/lib/languages/tp';
// import twig from 'highlight.js/lib/languages/twig'; // import twig from 'highlight.js/lib/languages/twig';
@ -182,21 +186,21 @@ import typescript from 'highlight.js/lib/languages/typescript';
// import vala from 'highlight.js/lib/languages/vala'; // import vala from 'highlight.js/lib/languages/vala';
// import vbnet from 'highlight.js/lib/languages/vbnet'; // import vbnet from 'highlight.js/lib/languages/vbnet';
// import vbscript from 'highlight.js/lib/languages/vbscript'; // import vbscript from 'highlight.js/lib/languages/vbscript';
// import vbscript-html from 'highlight.js/lib/languages/vbscript-html'; // import vbscriptHtml from 'highlight.js/lib/languages/vbscript-html';
// import verilog from 'highlight.js/lib/languages/verilog'; // import verilog from 'highlight.js/lib/languages/verilog';
// import vhdl from 'highlight.js/lib/languages/vhdl'; // import vhdl from 'highlight.js/lib/languages/vhdl';
import vim from 'highlight.js/lib/languages/vim'; // import vim from 'highlight.js/lib/languages/vim';
// import x86asm from 'highlight.js/lib/languages/x86asm'; // import x86asm from 'highlight.js/lib/languages/x86asm';
// import xl from 'highlight.js/lib/languages/xl'; // import xl from 'highlight.js/lib/languages/xl';
// import xquery from 'highlight.js/lib/languages/xquery'; // import xquery from 'highlight.js/lib/languages/xquery';
// import zephir from 'highlight.js/lib/languages/zephir'; // import zephir from 'highlight.js/lib/languages/zephir';
// Convert to registerLanguage // Convert to registerLanguage
// ^highlightJS\.registerLanguage\('(.+)', require\('highlight.js\/lib\/languages\/(.+)'\)\);$ // ^hljs\.registerLanguage\('(.+)', require\('\./languages\/(.+)'\)\);$
// highlightJS.registerLanguage('$1', $1); // highlightJS.registerLanguage('$1', $1);
// Separately require languages // Separately require languages
// highlightJS.registerLanguage('1c', 1c); // highlightJS.registerLanguage('1c', _1c);
// highlightJS.registerLanguage('abnf', abnf); // highlightJS.registerLanguage('abnf', abnf);
// highlightJS.registerLanguage('accesslog', accesslog); // highlightJS.registerLanguage('accesslog', accesslog);
// highlightJS.registerLanguage('actionscript', actionscript); // highlightJS.registerLanguage('actionscript', actionscript);
@ -205,6 +209,7 @@ import vim from 'highlight.js/lib/languages/vim';
// highlightJS.registerLanguage('apache', apache); // highlightJS.registerLanguage('apache', apache);
// highlightJS.registerLanguage('applescript', applescript); // highlightJS.registerLanguage('applescript', applescript);
// highlightJS.registerLanguage('arcade', arcade); // highlightJS.registerLanguage('arcade', arcade);
highlightJS.registerLanguage('c-like', cLike);
highlightJS.registerLanguage('cpp', cpp); highlightJS.registerLanguage('cpp', cpp);
// highlightJS.registerLanguage('arduino', arduino); // highlightJS.registerLanguage('arduino', arduino);
// highlightJS.registerLanguage('armasm', armasm); // highlightJS.registerLanguage('armasm', armasm);
@ -220,27 +225,28 @@ highlightJS.registerLanguage('bash', bash);
// highlightJS.registerLanguage('basic', basic); // highlightJS.registerLanguage('basic', basic);
// highlightJS.registerLanguage('bnf', bnf); // highlightJS.registerLanguage('bnf', bnf);
// highlightJS.registerLanguage('brainfuck', brainfuck); // highlightJS.registerLanguage('brainfuck', brainfuck);
highlightJS.registerLanguage('c', c);
// highlightJS.registerLanguage('cal', cal); // highlightJS.registerLanguage('cal', cal);
// highlightJS.registerLanguage('capnproto', capnproto); // highlightJS.registerLanguage('capnproto', capnproto);
// highlightJS.registerLanguage('ceylon', ceylon); // highlightJS.registerLanguage('ceylon', ceylon);
// highlightJS.registerLanguage('clean', clean); // highlightJS.registerLanguage('clean', clean);
highlightJS.registerLanguage('clojure', clojure); highlightJS.registerLanguage('clojure', clojure);
highlightJS.registerLanguage('clojure-repl', clojureRepl); // highlightJS.registerLanguage('clojure-repl', clojureRepl);
highlightJS.registerLanguage('cmake', cmake); // highlightJS.registerLanguage('cmake', cmake);
highlightJS.registerLanguage('coffeescript', coffeescript); // highlightJS.registerLanguage('coffeescript', coffeescript);
// highlightJS.registerLanguage('coq', coq); // highlightJS.registerLanguage('coq', coq);
// highlightJS.registerLanguage('cos', cos); // highlightJS.registerLanguage('cos', cos);
// highlightJS.registerLanguage('crmsh', crmsh); // highlightJS.registerLanguage('crmsh', crmsh);
highlightJS.registerLanguage('crystal', crystal); highlightJS.registerLanguage('crystal', crystal);
highlightJS.registerLanguage('cs', cs); highlightJS.registerLanguage('csharp', csharp);
highlightJS.registerLanguage('csp', csp); highlightJS.registerLanguage('csp', csp);
highlightJS.registerLanguage('css', css); highlightJS.registerLanguage('css', css);
highlightJS.registerLanguage('d', d); // highlightJS.registerLanguage('d', d);
highlightJS.registerLanguage('markdown', markdown); highlightJS.registerLanguage('markdown', markdown);
highlightJS.registerLanguage('dart', dart); highlightJS.registerLanguage('dart', dart);
// highlightJS.registerLanguage('delphi', delphi); // highlightJS.registerLanguage('delphi', delphi);
highlightJS.registerLanguage('diff', diff); highlightJS.registerLanguage('diff', diff);
highlightJS.registerLanguage('django', django); // highlightJS.registerLanguage('django', django);
// highlightJS.registerLanguage('dns', dns); // highlightJS.registerLanguage('dns', dns);
highlightJS.registerLanguage('dockerfile', dockerfile); highlightJS.registerLanguage('dockerfile', dockerfile);
// highlightJS.registerLanguage('dos', dos); // highlightJS.registerLanguage('dos', dos);
@ -251,10 +257,10 @@ highlightJS.registerLanguage('dockerfile', dockerfile);
highlightJS.registerLanguage('elixir', elixir); highlightJS.registerLanguage('elixir', elixir);
highlightJS.registerLanguage('elm', elm); highlightJS.registerLanguage('elm', elm);
highlightJS.registerLanguage('ruby', ruby); highlightJS.registerLanguage('ruby', ruby);
highlightJS.registerLanguage('erb', erb); // highlightJS.registerLanguage('erb', erb);
highlightJS.registerLanguage('erlang-repl', erlangRepl); // highlightJS.registerLanguage('erlang-repl', erlangRepl);
highlightJS.registerLanguage('erlang', erlang); highlightJS.registerLanguage('erlang', erlang);
highlightJS.registerLanguage('excel', excel); // highlightJS.registerLanguage('excel', excel);
// highlightJS.registerLanguage('fix', fix); // highlightJS.registerLanguage('fix', fix);
// highlightJS.registerLanguage('flix', flix); // highlightJS.registerLanguage('flix', flix);
// highlightJS.registerLanguage('fortran', fortran); // highlightJS.registerLanguage('fortran', fortran);
@ -274,8 +280,8 @@ highlightJS.registerLanguage('handlebars', handlebars);
highlightJS.registerLanguage('haskell', haskell); highlightJS.registerLanguage('haskell', haskell);
// highlightJS.registerLanguage('haxe', haxe); // highlightJS.registerLanguage('haxe', haxe);
// highlightJS.registerLanguage('hsp', hsp); // highlightJS.registerLanguage('hsp', hsp);
highlightJS.registerLanguage('htmlbars', htmlbars); // highlightJS.registerLanguage('htmlbars', htmlbars);
highlightJS.registerLanguage('http', http); // highlightJS.registerLanguage('http', http);
// highlightJS.registerLanguage('hy', hy); // highlightJS.registerLanguage('hy', hy);
// highlightJS.registerLanguage('inform7', inform7); // highlightJS.registerLanguage('inform7', inform7);
highlightJS.registerLanguage('ini', ini); highlightJS.registerLanguage('ini', ini);
@ -283,24 +289,25 @@ highlightJS.registerLanguage('ini', ini);
// highlightJS.registerLanguage('isbl', isbl); // highlightJS.registerLanguage('isbl', isbl);
highlightJS.registerLanguage('java', java); highlightJS.registerLanguage('java', java);
highlightJS.registerLanguage('javascript', javascript); highlightJS.registerLanguage('javascript', javascript);
// highlightJS.registerLanguage('jboss-cli', jboss-cli); // highlightJS.registerLanguage('jboss-cli', jbossCli);
highlightJS.registerLanguage('json', json); highlightJS.registerLanguage('json', json);
highlightJS.registerLanguage('julia', julia); // highlightJS.registerLanguage('julia', julia);
highlightJS.registerLanguage('julia-repl', juliaRepl); // highlightJS.registerLanguage('julia-repl', juliaRepl);
highlightJS.registerLanguage('kotlin', kotlin); highlightJS.registerLanguage('kotlin', kotlin);
// highlightJS.registerLanguage('lasso', lasso); // highlightJS.registerLanguage('lasso', lasso);
// highlightJS.registerLanguage('latex', latex);
// highlightJS.registerLanguage('ldif', ldif); // highlightJS.registerLanguage('ldif', ldif);
// highlightJS.registerLanguage('leaf', leaf); // highlightJS.registerLanguage('leaf', leaf);
highlightJS.registerLanguage('less', less); highlightJS.registerLanguage('less', less);
highlightJS.registerLanguage('lisp', lisp); highlightJS.registerLanguage('lisp', lisp);
// highlightJS.registerLanguage('livecodeserver', livecodeserver); // highlightJS.registerLanguage('livecodeserver', livecodeserver);
// highlightJS.registerLanguage('livescript', livescript); // highlightJS.registerLanguage('livescript', livescript);
highlightJS.registerLanguage('llvm', llvm); // highlightJS.registerLanguage('llvm', llvm);
// highlightJS.registerLanguage('lsl', lsl); // highlightJS.registerLanguage('lsl', lsl);
highlightJS.registerLanguage('lua', lua); highlightJS.registerLanguage('lua', lua);
highlightJS.registerLanguage('makefile', makefile); highlightJS.registerLanguage('makefile', makefile);
highlightJS.registerLanguage('mathematica', mathematica); // highlightJS.registerLanguage('mathematica', mathematica);
highlightJS.registerLanguage('matlab', matlab); // highlightJS.registerLanguage('matlab', matlab);
// highlightJS.registerLanguage('maxima', maxima); // highlightJS.registerLanguage('maxima', maxima);
// highlightJS.registerLanguage('mel', mel); // highlightJS.registerLanguage('mel', mel);
// highlightJS.registerLanguage('mercury', mercury); // highlightJS.registerLanguage('mercury', mercury);
@ -312,17 +319,18 @@ highlightJS.registerLanguage('perl', perl);
// highlightJS.registerLanguage('moonscript', moonscript); // highlightJS.registerLanguage('moonscript', moonscript);
// highlightJS.registerLanguage('n1ql', n1ql); // highlightJS.registerLanguage('n1ql', n1ql);
highlightJS.registerLanguage('nginx', nginx); highlightJS.registerLanguage('nginx', nginx);
// highlightJS.registerLanguage('nimrod', nimrod); // highlightJS.registerLanguage('nim', nim);
highlightJS.registerLanguage('nix', nix); // highlightJS.registerLanguage('nix', nix);
// highlightJS.registerLanguage('nsis', nsis); // highlightJS.registerLanguage('nsis', nsis);
highlightJS.registerLanguage('objectivec', objectivec); highlightJS.registerLanguage('objectivec', objectivec);
highlightJS.registerLanguage('ocaml', ocaml); // highlightJS.registerLanguage('ocaml', ocaml);
// highlightJS.registerLanguage('openscad', openscad); // highlightJS.registerLanguage('openscad', openscad);
// highlightJS.registerLanguage('oxygene', oxygene); // highlightJS.registerLanguage('oxygene', oxygene);
// highlightJS.registerLanguage('parser3', parser3); // highlightJS.registerLanguage('parser3', parser3);
// highlightJS.registerLanguage('pf', pf); // highlightJS.registerLanguage('pf', pf);
highlightJS.registerLanguage('pgsql', pgsql); highlightJS.registerLanguage('pgsql', pgsql);
highlightJS.registerLanguage('php', php); highlightJS.registerLanguage('php', php);
// highlightJS.registerLanguage('php-template', phpTemplate);
highlightJS.registerLanguage('plaintext', plaintext); highlightJS.registerLanguage('plaintext', plaintext);
// highlightJS.registerLanguage('pony', pony); // highlightJS.registerLanguage('pony', pony);
highlightJS.registerLanguage('powershell', powershell); highlightJS.registerLanguage('powershell', powershell);
@ -331,13 +339,14 @@ highlightJS.registerLanguage('powershell', powershell);
// highlightJS.registerLanguage('prolog', prolog); // highlightJS.registerLanguage('prolog', prolog);
highlightJS.registerLanguage('properties', properties); highlightJS.registerLanguage('properties', properties);
highlightJS.registerLanguage('protobuf', protobuf); highlightJS.registerLanguage('protobuf', protobuf);
highlightJS.registerLanguage('puppet', puppet); // highlightJS.registerLanguage('puppet', puppet);
// highlightJS.registerLanguage('purebasic', purebasic); // highlightJS.registerLanguage('purebasic', purebasic);
highlightJS.registerLanguage('python', python); highlightJS.registerLanguage('python', python);
// highlightJS.registerLanguage('python-repl', pythonRepl);
// highlightJS.registerLanguage('q', q); // highlightJS.registerLanguage('q', q);
// highlightJS.registerLanguage('qml', qml); // highlightJS.registerLanguage('qml', qml);
highlightJS.registerLanguage('r', r); // highlightJS.registerLanguage('r', r);
highlightJS.registerLanguage('reasonml', reasonml); // highlightJS.registerLanguage('reasonml', reasonml);
// highlightJS.registerLanguage('rib', rib); // highlightJS.registerLanguage('rib', rib);
// highlightJS.registerLanguage('roboconf', roboconf); // highlightJS.registerLanguage('roboconf', roboconf);
// highlightJS.registerLanguage('routeros', routeros); // highlightJS.registerLanguage('routeros', routeros);
@ -346,7 +355,7 @@ highlightJS.registerLanguage('reasonml', reasonml);
highlightJS.registerLanguage('rust', rust); highlightJS.registerLanguage('rust', rust);
// highlightJS.registerLanguage('sas', sas); // highlightJS.registerLanguage('sas', sas);
highlightJS.registerLanguage('scala', scala); highlightJS.registerLanguage('scala', scala);
highlightJS.registerLanguage('scheme', scheme); // highlightJS.registerLanguage('scheme', scheme);
// highlightJS.registerLanguage('scilab', scilab); // highlightJS.registerLanguage('scilab', scilab);
highlightJS.registerLanguage('scss', scss); highlightJS.registerLanguage('scss', scss);
highlightJS.registerLanguage('shell', shell); highlightJS.registerLanguage('shell', shell);
@ -358,14 +367,13 @@ highlightJS.registerLanguage('sql', sql);
// highlightJS.registerLanguage('stan', stan); // highlightJS.registerLanguage('stan', stan);
// highlightJS.registerLanguage('stata', stata); // highlightJS.registerLanguage('stata', stata);
// highlightJS.registerLanguage('step21', step21); // highlightJS.registerLanguage('step21', step21);
highlightJS.registerLanguage('stylus', stylus); // highlightJS.registerLanguage('stylus', stylus);
// highlightJS.registerLanguage('subunit', subunit); // highlightJS.registerLanguage('subunit', subunit);
highlightJS.registerLanguage('swift', swift); highlightJS.registerLanguage('swift', swift);
// highlightJS.registerLanguage('taggerscript', taggerscript); // highlightJS.registerLanguage('taggerscript', taggerscript);
highlightJS.registerLanguage('yaml', yaml); highlightJS.registerLanguage('yaml', yaml);
// highlightJS.registerLanguage('tap', tap); // highlightJS.registerLanguage('tap', tap);
// highlightJS.registerLanguage('tcl', tcl); // highlightJS.registerLanguage('tcl', tcl);
highlightJS.registerLanguage('tex', tex);
// highlightJS.registerLanguage('thrift', thrift); // highlightJS.registerLanguage('thrift', thrift);
// highlightJS.registerLanguage('tp', tp); // highlightJS.registerLanguage('tp', tp);
// highlightJS.registerLanguage('twig', twig); // highlightJS.registerLanguage('twig', twig);
@ -373,10 +381,10 @@ highlightJS.registerLanguage('typescript', typescript);
// highlightJS.registerLanguage('vala', vala); // highlightJS.registerLanguage('vala', vala);
// highlightJS.registerLanguage('vbnet', vbnet); // highlightJS.registerLanguage('vbnet', vbnet);
// highlightJS.registerLanguage('vbscript', vbscript); // highlightJS.registerLanguage('vbscript', vbscript);
// highlightJS.registerLanguage('vbscript-html', vbscript-html); // highlightJS.registerLanguage('vbscript-html', vbscriptHtml);
// highlightJS.registerLanguage('verilog', verilog); // highlightJS.registerLanguage('verilog', verilog);
// highlightJS.registerLanguage('vhdl', vhdl); // highlightJS.registerLanguage('vhdl', vhdl);
highlightJS.registerLanguage('vim', vim); // highlightJS.registerLanguage('vim', vim);
// highlightJS.registerLanguage('x86asm', x86asm); // highlightJS.registerLanguage('x86asm', x86asm);
// highlightJS.registerLanguage('xl', xl); // highlightJS.registerLanguage('xl', xl);
// highlightJS.registerLanguage('xquery', xquery); // highlightJS.registerLanguage('xquery', xquery);

2
typings/highlight.js/highlight.js.d.ts vendored
View file

@ -1,4 +1,4 @@
declare module 'highlight.js/lib/highlight.js' { declare module 'highlight.js/lib/core' {
import hljs from 'highlight.js'; import hljs from 'highlight.js';
export = hljs; export = hljs;

3897
yarn.lock
View file

File diff suppressed because it is too large Load diff