Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependency highlight.js to v11 #1063

Merged
merged 4 commits into from
Sep 23, 2023
Merged

Update dependency highlight.js to v11 #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe466b2
Update dependency highlight.js to v11
renovate[bot] Sep 23, 2023
1c4388f
adjusted test for the new package version
bigcat88 Sep 23, 2023
a0a981a
to calm tslint
bigcat88 Sep 23, 2023
2789a14
updated CHANGELOG.md
bigcat88 Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions nextcloudappstore/core/static/assets/app/dom/Markdown.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';

Expand All @@ -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);
}
Expand Down
3 changes: 2 additions & 1 deletion nextcloudappstore/core/static/assets/app/dom/MarkdownSpec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
});
Expand Down
3 changes: 0 additions & 3 deletions nextcloudappstore/core/static/assets/patches/hl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand All @@ -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'));
Expand Down Expand Up @@ -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'));
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
2 changes: 1 addition & 1 deletion tslint.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]}]
}
Expand Down
Loading