Update marked to resolve security vulnerability

pull/396/head
Jeroen Akkerman 2 years ago
parent a56badd0dc
commit 6159ed1383

@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
### Fixed ### Fixed
- Incorrect initial line and column count in status bar. - Incorrect initial line and column count in status bar.
- Security issue in `marked` dependency.
## [2.16.0] - 2022-01-11 ## [2.16.0] - 2022-01-11
### Added ### Added

30
package-lock.json generated

@ -10,10 +10,10 @@
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@types/codemirror": "^5.60.4", "@types/codemirror": "^5.60.4",
"@types/marked": "^3.0.1", "@types/marked": "^4.0.1",
"codemirror": "^5.63.1", "codemirror": "^5.63.1",
"codemirror-spell-checker": "1.1.2", "codemirror-spell-checker": "1.1.2",
"marked": "^3.0.4" "marked": "^4.0.10"
}, },
"devDependencies": { "devDependencies": {
"browserify": "^17.0.0", "browserify": "^17.0.0",
@ -192,9 +192,9 @@
"integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==" "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw=="
}, },
"node_modules/@types/marked": { "node_modules/@types/marked": {
"version": "3.0.3", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/@types/marked/-/marked-3.0.3.tgz", "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.1.tgz",
"integrity": "sha512-ZgAr847Wl68W+B0sWH7F4fDPxTzerLnRuUXjUpp1n4NjGSs8hgPAjAp7NQIXblG34MXTrf5wWkAK8PVJ2LIlVg==" "integrity": "sha512-ZigEmCWdNUU7IjZEuQ/iaimYdDHWHfTe3kg8ORfKjyGYd9RWumPoOJRQXB0bO+XLkNwzCthW3wUIQtANaEZ1ag=="
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "14.18.5", "version": "14.18.5",
@ -5328,11 +5328,11 @@
} }
}, },
"node_modules/marked": { "node_modules/marked": {
"version": "3.0.8", "version": "4.0.10",
"resolved": "https://registry.npmjs.org/marked/-/marked-3.0.8.tgz", "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz",
"integrity": "sha512-0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw==", "integrity": "sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw==",
"bin": { "bin": {
"marked": "bin/marked" "marked": "bin/marked.js"
}, },
"engines": { "engines": {
"node": ">= 12" "node": ">= 12"
@ -9060,9 +9060,9 @@
"integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==" "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw=="
}, },
"@types/marked": { "@types/marked": {
"version": "3.0.3", "version": "4.0.1",
"resolved": "https://registry.npmjs.org/@types/marked/-/marked-3.0.3.tgz", "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.1.tgz",
"integrity": "sha512-ZgAr847Wl68W+B0sWH7F4fDPxTzerLnRuUXjUpp1n4NjGSs8hgPAjAp7NQIXblG34MXTrf5wWkAK8PVJ2LIlVg==" "integrity": "sha512-ZigEmCWdNUU7IjZEuQ/iaimYdDHWHfTe3kg8ORfKjyGYd9RWumPoOJRQXB0bO+XLkNwzCthW3wUIQtANaEZ1ag=="
}, },
"@types/node": { "@types/node": {
"version": "14.18.5", "version": "14.18.5",
@ -13192,9 +13192,9 @@
} }
}, },
"marked": { "marked": {
"version": "3.0.8", "version": "4.0.10",
"resolved": "https://registry.npmjs.org/marked/-/marked-3.0.8.tgz", "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.10.tgz",
"integrity": "sha512-0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw==" "integrity": "sha512-+QvuFj0nGgO970fySghXGmuw+Fd0gD2x3+MqCWLIPf5oxdv1Ka6b2q+z9RP01P/IaKPMEramy+7cNy/Lw8c3hw=="
}, },
"matchdep": { "matchdep": {
"version": "2.0.0", "version": "2.0.0",

@ -20,10 +20,10 @@
"author": "Jeroen Akkerman", "author": "Jeroen Akkerman",
"dependencies": { "dependencies": {
"@types/codemirror": "^5.60.4", "@types/codemirror": "^5.60.4",
"@types/marked": "^3.0.1", "@types/marked": "^4.0.1",
"codemirror": "^5.63.1", "codemirror": "^5.63.1",
"codemirror-spell-checker": "1.1.2", "codemirror-spell-checker": "1.1.2",
"marked": "^3.0.4" "marked": "^4.0.10"
}, },
"devDependencies": { "devDependencies": {
"browserify": "^17.0.0", "browserify": "^17.0.0",

@ -12,7 +12,7 @@ require('codemirror/addon/search/searchcursor.js');
require('codemirror/mode/gfm/gfm.js'); require('codemirror/mode/gfm/gfm.js');
require('codemirror/mode/xml/xml.js'); require('codemirror/mode/xml/xml.js');
var CodeMirrorSpellChecker = require('codemirror-spell-checker'); var CodeMirrorSpellChecker = require('codemirror-spell-checker');
var marked = require('marked/lib/marked'); var marked = require('marked').marked;
// Some variables // Some variables
@ -1986,7 +1986,7 @@ EasyMDE.prototype.markdown = function (text) {
marked.setOptions(markedOptions); marked.setOptions(markedOptions);
// Convert the markdown to HTML // Convert the markdown to HTML
var htmlText = marked(text); var htmlText = marked.parse(text);
// Sanitize HTML // Sanitize HTML
if (this.options.renderingConfig && typeof this.options.renderingConfig.sanitizerFunction === 'function') { if (this.options.renderingConfig && typeof this.options.renderingConfig.sanitizerFunction === 'function') {

@ -20,7 +20,8 @@
// SOFTWARE. // SOFTWARE.
/// <reference types="codemirror"/> /// <reference types="codemirror"/>
/// <reference types="marked"/>
import { marked } from 'marked';
interface ArrayOneOrMore<T> extends Array<T> { interface ArrayOneOrMore<T> extends Array<T> {
0: T; 0: T;
@ -178,7 +179,7 @@ declare namespace EasyMDE {
autoDownloadFontAwesome?: boolean; autoDownloadFontAwesome?: boolean;
autofocus?: boolean; autofocus?: boolean;
autosave?: AutoSaveOptions; autosave?: AutoSaveOptions;
autoRefresh?: boolean | { delay: number }; autoRefresh?: boolean | { delay: number; };
blockStyles?: BlockStyleOptions; blockStyles?: BlockStyleOptions;
element?: HTMLElement; element?: HTMLElement;
forceSync?: boolean; forceSync?: boolean;

Loading…
Cancel
Save