diff --git a/package-lock.json b/package-lock.json index ad278906c..79a9307ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "MIT", "dependencies": { - "marked": "^1.2.9", + "marked": "^4.2.12", "medium-zoom": "^1.0.8", "opencollective-postinstall": "^2.0.2", "prismjs": "^1.29.0", @@ -16253,14 +16253,14 @@ } }, "node_modules/marked": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/marked/-/marked-1.2.9.tgz", - "integrity": "sha512-H8lIX2SvyitGX+TRdtS06m1jHMijKN/XjfH6Ooii9fvxMlh8QdqBfBDkGUpMWH2kQNrtixjzYUa3SH8ROTgRRw==", + "version": "4.2.12", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.12.tgz", + "integrity": "sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw==", "bin": { - "marked": "bin/marked" + "marked": "bin/marked.js" }, "engines": { - "node": ">= 8.16.2" + "node": ">= 12" } }, "node_modules/mdn-data": { @@ -35781,9 +35781,9 @@ } }, "marked": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/marked/-/marked-1.2.9.tgz", - "integrity": "sha512-H8lIX2SvyitGX+TRdtS06m1jHMijKN/XjfH6Ooii9fvxMlh8QdqBfBDkGUpMWH2kQNrtixjzYUa3SH8ROTgRRw==" + "version": "4.2.12", + "resolved": "https://registry.npmjs.org/marked/-/marked-4.2.12.tgz", + "integrity": "sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw==" }, "mdn-data": { "version": "2.0.4", diff --git a/package.json b/package.json index eb8ac9adc..cb2c0b021 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "*.js": "eslint --fix" }, "dependencies": { - "marked": "^1.2.9", + "marked": "^4.2.12", "medium-zoom": "^1.0.8", "opencollective-postinstall": "^2.0.2", "prismjs": "^1.29.0", diff --git a/src/core/global-api.js b/src/core/global-api.js index 536959754..cb89e2bee 100644 --- a/src/core/global-api.js +++ b/src/core/global-api.js @@ -1,5 +1,5 @@ import prism from 'prismjs'; -import marked from 'marked'; +import { marked } from 'marked'; import * as util from './util'; import * as dom from './util/dom'; import { Compiler } from './render/compiler'; diff --git a/src/core/render/compiler.js b/src/core/render/compiler.js index 38e33b9f0..32c794769 100644 --- a/src/core/render/compiler.js +++ b/src/core/render/compiler.js @@ -1,4 +1,4 @@ -import marked from 'marked'; +import { marked } from 'marked'; import { isAbsolutePath, getPath, getParentPath } from '../router/util'; import { isFn, merge, cached, isPrimitive } from '../util/core'; import { tree as treeTpl } from './tpl'; diff --git a/src/plugins/search/search.js b/src/plugins/search/search.js index f8d7cd3ab..88f9f1a4e 100644 --- a/src/plugins/search/search.js +++ b/src/plugins/search/search.js @@ -57,11 +57,9 @@ function getAllPaths(router) { function getTableData(token) { if (!token.text && token.type === 'table') { - token.cells.unshift(token.header); - token.text = token.cells - .map(function (rows) { - return rows.join(' | '); - }) + token.rows.unshift(token.header); + token.text = token.rows + .map(columns => columns.map(r => r.text).join(' | ')) .join(' |\n '); } return token.text;