Merge pull request #1063 from nextcloud/renovate/highlight.js-11.x

Update dependency highlight.js to v11
nextcloud · Sep 23, 2023 · d8c067a · d8c067a
2 parents 9185d90 + 2789a14
commit d8c067a
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - **Node.js:** Now requires `v20` or higher.
 - **npm:** Now requires `v9` or higher.
 - Updated python dependencies.
+- Updated `highlight.js` dependency to last major version. #1063
 
 ## [4.3.2]  - 2023-09-23
 

diff --git a/nextcloudappstore/core/static/assets/app/dom/Markdown.ts b/nextcloudappstore/core/static/assets/app/dom/Markdown.ts
@@ -1,4 +1,4 @@
-import * as hljs from 'highlight.js';
+import hljs from 'highlight.js';
 import * as markdownit from 'markdown-it';
 import {noReferrerLinks} from './Templating';
 
@@ -7,7 +7,7 @@ export function renderMd(html: string): string {
         highlight: (str, lang) => {
             if (lang && hljs.getLanguage(lang)) {
                 try {
-                    return hljs.highlight(lang, str).value;
+                    return hljs.highlight(str, {language: lang, ignoreIllegals: false}).value;
                 } catch (e) {
                     console.error(e);
                 }

diff --git a/nextcloudappstore/core/static/assets/app/dom/MarkdownSpec.ts b/nextcloudappstore/core/static/assets/app/dom/MarkdownSpec.ts
@@ -7,7 +7,8 @@ describe('Markdown rendering', () => {
         const expected = '<p>' +
             '<a href="http://google.com" rel="noopener noreferrer">link</a>' +
             '</p>\n' +
-            '<pre><code class="language-js">alert(<span class="hljs-number">' +
+            '<pre><code class="language-js">' +
+            '<span class="hljs-title function_">alert</span>(<span class="hljs-number">' +
             '1</span>);\n</code></pre>';
         expect(renderMd(md).trim()).toEqual(expected.trim());
     });

diff --git a/nextcloudappstore/core/static/assets/patches/hl.js b/nextcloudappstore/core/static/assets/patches/hl.js
@@ -7,7 +7,6 @@ var hljs = require('highlight.js/lib/core');
 hljs.registerLanguage('apache', require('highlight.js/lib/languages/apache'));
 hljs.registerLanguage('xml', require('highlight.js/lib/languages/xml'));
 hljs.registerLanguage('bash', require('highlight.js/lib/languages/bash'));
-hljs.registerLanguage('c-like', require('highlight.js/lib/languages/c-like'));
 hljs.registerLanguage('c', require('highlight.js/lib/languages/c'));
 hljs.registerLanguage('clojure', require('highlight.js/lib/languages/clojure'));
 hljs.registerLanguage('clojure-repl', require('highlight.js/lib/languages/clojure-repl'));
@@ -33,7 +32,6 @@ hljs.registerLanguage('go', require('highlight.js/lib/languages/go'));
 hljs.registerLanguage('groovy', require('highlight.js/lib/languages/groovy'));
 hljs.registerLanguage('handlebars', require('highlight.js/lib/languages/handlebars'));
 hljs.registerLanguage('haskell', require('highlight.js/lib/languages/haskell'));
-hljs.registerLanguage('htmlbars', require('highlight.js/lib/languages/htmlbars'));
 hljs.registerLanguage('http', require('highlight.js/lib/languages/http'));
 hljs.registerLanguage('ini', require('highlight.js/lib/languages/ini'));
 hljs.registerLanguage('java', require('highlight.js/lib/languages/java'));
@@ -69,7 +67,6 @@ hljs.registerLanguage('scala', require('highlight.js/lib/languages/scala'));
 hljs.registerLanguage('scheme', require('highlight.js/lib/languages/scheme'));
 hljs.registerLanguage('scss', require('highlight.js/lib/languages/scss'));
 hljs.registerLanguage('shell', require('highlight.js/lib/languages/shell'));
-hljs.registerLanguage('sql_more', require('highlight.js/lib/languages/sql_more'));
 hljs.registerLanguage('sql', require('highlight.js/lib/languages/sql'));
 hljs.registerLanguage('stan', require('highlight.js/lib/languages/stan'));
 hljs.registerLanguage('swift', require('highlight.js/lib/languages/swift'));

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "blazy": "^1.8.2",
     "bootstrap": "^3.3.7",
     "bootstrap.native": "^2.0.19",
-    "highlight.js": "^10.4.1",
+    "highlight.js": "^11.0.0",
     "markdown-it": "^13.0.0",
     "screenfull": "^6.0.0"
   },

diff --git a/tslint.json b/tslint.json
@@ -5,7 +5,7 @@
         "no-duplicate-variable": true,
         "indent": [true, "spaces"],
         "quotemark": [true, "single"],
-        "max-line-length": [true, 80],
+        "max-line-length": [true, 120],
         "prefer-const": true,
         "no-console": ["log", {"allow": ["warn", "error"]}]
     }