Skip to content

Commit

Permalink
Add support for markdown wikilinks (aka piped links)
Browse files Browse the repository at this point in the history
  • Loading branch information
Mexator committed Aug 24, 2024
1 parent d1b4c8c commit 930dd83
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 1 deletion.
4 changes: 4 additions & 0 deletions client/components/editor/editor-markdown.vue
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ import mdAbbr from 'markdown-it-abbr'
import mdSup from 'markdown-it-sup'
import mdSub from 'markdown-it-sub'
import mdMark from 'markdown-it-mark'
import mdWikiLinks from 'markdown-it-wikilinks'
import mdMultiTable from 'markdown-it-multimd-table'
import mdFootnote from 'markdown-it-footnote'
import mdImsize from 'markdown-it-imsize'
Expand Down Expand Up @@ -276,6 +277,9 @@ const md = new MarkdownIt({
.use(mdMark)
.use(mdFootnote)
.use(mdImsize)
.use(mdWikiLinks({
uriSuffix: ''
}))
// DOMPurify fix for draw.io
DOMPurify.addHook('uponSanitizeElement', (elm) => {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
"markdown-it-sub": "1.0.0",
"markdown-it-sup": "1.0.0",
"markdown-it-task-lists": "2.1.1",
"markdown-it-wikilinks": "1.4.0",
"mathjax": "3.2.2",
"mime-types": "2.1.35",
"moment": "2.29.4",
Expand Down
5 changes: 5 additions & 0 deletions server/modules/rendering/markdown-core/renderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const md = require('markdown-it')
const mdAttrs = require('markdown-it-attrs')
const mdDecorate = require('markdown-it-decorate')
const _ = require('lodash')
const mdWikilinks = require('markdown-it-wikilinks')
const underline = require('./underline')

const quoteStyles = {
Expand Down Expand Up @@ -36,6 +37,10 @@ module.exports = {
}
})

mkdown.use(mdWikilinks({
uriSuffix: ''
}))

if (this.config.underline) {
mkdown.use(underline)
}
Expand Down
30 changes: 29 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13199,6 +13199,11 @@ [email protected]:
nd-table "^1.2.2"
string-math "^1.2.2"

markdown-it-regexp@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/markdown-it-regexp/-/markdown-it-regexp-0.4.0.tgz#d64d713eecec55ce4cfdeb321750ecc099e2c2dc"
integrity sha512-0XQmr46K/rMKnI93Y3CLXsHj4jIioRETTAiVnJnjrZCEkGaDOmUxTbZj/aZ17G5NlRcVpWBYjqpwSlQ9lj+Kxw==

[email protected]:
version "1.0.0"
resolved "https://registry.yarnpkg.com/markdown-it-sub/-/markdown-it-sub-1.0.0.tgz#375fd6026eae7ddcb012497f6411195ea1e3afe8"
Expand All @@ -13214,6 +13219,16 @@ [email protected]:
resolved "https://registry.yarnpkg.com/markdown-it-task-lists/-/markdown-it-task-lists-2.1.1.tgz#f68f4d2ac2bad5a2c373ba93081a1a6848417088"
integrity sha512-TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA==

[email protected]:
version "1.4.0"
resolved "https://registry.yarnpkg.com/markdown-it-wikilinks/-/markdown-it-wikilinks-1.4.0.tgz#861f1a2f9ee5b79c15d66ec2c88f9422240ddea5"
integrity sha512-LJhRWett3Do9doMMkpodOV5pvAMZjOOODqcifPfd+jdobhdg3UY8i824L5657UBWx7HSbOqicwNUzcVjOiswgw==
dependencies:
extend "^3.0.2"
markdown-it-regexp "^0.4.0"
reurl "git+https://github.com/jsepia/reurl.git#commonjs"
sanitize-filename "^1.6.3"

[email protected], markdown-it@^11.0.0:
version "11.0.1"
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-11.0.1.tgz#b54f15ec2a2193efa66dda1eb4173baea08993d6"
Expand Down Expand Up @@ -17598,6 +17613,12 @@ [email protected], retry@^0.12.0:
resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=

"reurl@git+https://github.com/jsepia/reurl.git#commonjs":
version "1.0.0-rc.2"
resolved "git+https://github.com/jsepia/reurl.git#a3210117636c115fb139517fcfb2ea929025cded"
dependencies:
spec-url "^2.0.0-dev.1"

reusify@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
Expand Down Expand Up @@ -17772,7 +17793,7 @@ sane@^4.0.3:
minimist "^1.1.1"
walker "~1.0.5"

[email protected]:
[email protected], sanitize-filename@^1.6.3:
version "1.6.3"
resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378"
integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==
Expand Down Expand Up @@ -18376,6 +18397,13 @@ spdx-license-ids@^3.0.0:
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654"
integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==

spec-url@^2.0.0-dev.1:
version "2.0.0-dev.1"
resolved "https://registry.yarnpkg.com/spec-url/-/spec-url-2.0.0-dev.1.tgz#b22311a55575fb5a0f2e98360d8dc3774ccb7f0c"
integrity sha512-NKE2wT6tsvYa4xfVFcnjxSDFJwDOwU1NU2NhfnxFksutZrOShZ2p7pgQWS98Evq0cHMGBBjGQlbwrcAHLDywfw==
dependencies:
punycode "^2.1.1"

split-string@^3.0.1, split-string@^3.0.2:
version "3.1.0"
resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
Expand Down

0 comments on commit 930dd83

Please sign in to comment.