From 76474751837b48629f49fa9fdb916146129f7129 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 1 Jun 2021 19:57:37 +0000 Subject: [PATCH] Update dependency highlight.js to v11 (#1292) * Update dependency highlight.js to v11 Signed-off-by: Renovate Bot * Migrate code Signed-off-by: Tilman Vatteroth Co-authored-by: Renovate Bot Co-authored-by: Tilman Vatteroth --- package.json | 3 +-- src/components/common/hljs/hljs.ts | 8 ++++---- .../highlighted-code/highlighted-code.scss | 3 ++- src/external-types/highlight.js/core.d.ts | 12 ------------ yarn.lock | 10 +++++----- 5 files changed, 12 insertions(+), 24 deletions(-) delete mode 100644 src/external-types/highlight.js/core.d.ts diff --git a/package.json b/package.json index 25b5bcd6b..c05e6701f 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "@types/d3-graphviz": "2.6.6", "@types/diff": "5.0.0", "@types/domhandler": "2.4.1", - "@types/highlight.js": "9.12.4", "@types/jest": "26.0.23", "@types/js-yaml": "4.0.1", "@types/luxon": "1.26.5", @@ -52,7 +51,7 @@ "firacode": "5.2.0", "flowchart.js": "1.15.0", "fork-awesome": "1.1.7", - "highlight.js": "10.7.2", + "highlight.js": "11.0.0", "i18next": "20.3.1", "i18next-browser-languagedetector": "6.1.1", "i18next-http-backend": "1.2.6", diff --git a/src/components/common/hljs/hljs.ts b/src/components/common/hljs/hljs.ts index 9a62f3c51..6bfc226ae 100644 --- a/src/components/common/hljs/hljs.ts +++ b/src/components/common/hljs/hljs.ts @@ -26,7 +26,6 @@ import bash from 'highlight.js/lib/languages/bash' import basic from 'highlight.js/lib/languages/basic' import bnf from 'highlight.js/lib/languages/bnf' import brainfuck from 'highlight.js/lib/languages/brainfuck' -import c_like from 'highlight.js/lib/languages/c-like' import c from 'highlight.js/lib/languages/c' import cal from 'highlight.js/lib/languages/cal' import capnproto from 'highlight.js/lib/languages/capnproto' @@ -83,7 +82,6 @@ import handlebars from 'highlight.js/lib/languages/handlebars' import haskell from 'highlight.js/lib/languages/haskell' import haxe from 'highlight.js/lib/languages/haxe' import hsp from 'highlight.js/lib/languages/hsp' -import htmlbars from 'highlight.js/lib/languages/htmlbars' import http from 'highlight.js/lib/languages/http' import hy from 'highlight.js/lib/languages/hy' import inform7 from 'highlight.js/lib/languages/inform7' @@ -193,6 +191,8 @@ import x86asm from 'highlight.js/lib/languages/x86asm' import xl from 'highlight.js/lib/languages/xl' import xquery from 'highlight.js/lib/languages/xquery' import zephir from 'highlight.js/lib/languages/zephir' +import wasm from 'highlight.js/lib/languages/wasm' +import nestedtext from 'highlight.js/lib/languages/nestedtext' hljs.registerLanguage('abnf', abnf) hljs.registerLanguage('accesslog', accesslog) @@ -216,7 +216,6 @@ hljs.registerLanguage('bash', bash) hljs.registerLanguage('basic', basic) hljs.registerLanguage('bnf', bnf) hljs.registerLanguage('brainfuck', brainfuck) -hljs.registerLanguage('c-like', c_like) hljs.registerLanguage('c', c) hljs.registerLanguage('cal', cal) hljs.registerLanguage('capnproto', capnproto) @@ -274,7 +273,6 @@ hljs.registerLanguage('haskell', haskell) hljs.registerLanguage('haxe', haxe) hljs.registerLanguage('hsp', hsp) hljs.registerLanguage('html', xml) -hljs.registerLanguage('htmlbars', htmlbars) hljs.registerLanguage('http', http) hljs.registerLanguage('hy', hy) hljs.registerLanguage('inform7', inform7) @@ -312,6 +310,7 @@ hljs.registerLanguage('perl', perl) hljs.registerLanguage('mojolicious', mojolicious) hljs.registerLanguage('monkey', monkey) hljs.registerLanguage('moonscript', moonscript) +hljs.registerLanguage('nestedtext', nestedtext) hljs.registerLanguage('n1ql', n1ql) hljs.registerLanguage('nginx', nginx) hljs.registerLanguage('nim', nim) @@ -385,5 +384,6 @@ hljs.registerLanguage('x86asm', x86asm) hljs.registerLanguage('xl', xl) hljs.registerLanguage('xquery', xquery) hljs.registerLanguage('zephir', zephir) +hljs.registerLanguage('wasmn', wasm) export default hljs diff --git a/src/components/markdown-renderer/replace-components/highlighted-fence/highlighted-code/highlighted-code.scss b/src/components/markdown-renderer/replace-components/highlighted-fence/highlighted-code/highlighted-code.scss index fb42511e5..8be0f856c 100644 --- a/src/components/markdown-renderer/replace-components/highlighted-fence/highlighted-code/highlighted-code.scss +++ b/src/components/markdown-renderer/replace-components/highlighted-fence/highlighted-code/highlighted-code.scss @@ -8,10 +8,11 @@ @import '../../../../../../node_modules/highlight.js/styles/github'; body.dark & { - @import '../../../../../../node_modules/highlight.js/styles/tomorrow-night'; + @import '../../../../../../node_modules/highlight.js/styles/tomorrow-night-blue'; } code.hljs { + overflow-x: auto; background-color: rgba(27, 31, 35, .05); body.dark & { diff --git a/src/external-types/highlight.js/core.d.ts b/src/external-types/highlight.js/core.d.ts deleted file mode 100644 index 0a8dfff4e..000000000 --- a/src/external-types/highlight.js/core.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -/* - SPDX-FileCopyrightText: Copyright (c) 2006, Ivan Sagalaev - - SPDX-License-Identifier: BSD-3-Clause - */ -declare module 'highlight.js/lib/core' { - export = hljs; -} - -declare module 'highlight.js/lib/languages/*' { - export default function (hljs?: hljs): LanguageDetail; -} diff --git a/yarn.lock b/yarn.lock index 61ac82eac..5734b80ab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2260,7 +2260,7 @@ dependencies: "@types/node" "*" -"@types/highlight.js@9.12.4", "@types/highlight.js@^9.7.0": +"@types/highlight.js@^9.7.0": version "9.12.4" resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-9.12.4.tgz#8c3496bd1b50cc04aeefd691140aa571d4dbfa34" integrity sha512-t2szdkwmg2JJyuCM20e8kR2X59WCE5Zkl4bzm1u1Oukjm79zpbiAv+QjnwLnuuV0WHEcX2NgUItu0pAMKuOPww== @@ -7494,10 +7494,10 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -highlight.js@10.7.2: - version "10.7.2" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.2.tgz#89319b861edc66c48854ed1e6da21ea89f847360" - integrity sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg== +highlight.js@11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-11.0.0.tgz#e22ac9ca45edc4f87a2187685d591a108ceb8449" + integrity sha512-ByaTMfsSuoqerTwemOgpIhfULEIaK52JJYhky/sK7/Yqc0+t7Uh5DHay9vIC94YXSupnQ1Vqfc9VXrYP4eXW3Q== history@^4.9.0: version "4.10.1"