diff --git a/package-lock.json b/package-lock.json index e8c7ffceb..7ac2585a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36,7 +36,7 @@ "lodash": "^4.17.21", "marked": "13.0.3", "marked-definition-lists": "^1.0.1", - "marked-emoji": "^1.4.3", + "marked-emoji": "^2.0.0", "marked-extended-tables": "^2.0.0", "marked-gfm-heading-id": "^4.0.1", "marked-smartypants-lite": "^1.0.3", @@ -9886,9 +9886,10 @@ } }, "node_modules/marked-emoji": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/marked-emoji/-/marked-emoji-1.4.3.tgz", - "integrity": "sha512-HDZx1VOmzu7XT2QNKWfrHGbNRMTWKj9XD78yrcH1madD30HpGLMODPOmKr/e7CA7NKKXkpXXNdndQn++ysXmHg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/marked-emoji/-/marked-emoji-2.0.0.tgz", + "integrity": "sha512-oTZ8fqbdVDHFQnqCE1tg4ND7zEd7cUVNHliR9Ldu4eys0J86uz/5Uksjd2mt5xcX16OOScDEr3MmPjajI/ZDHA==", + "license": "MIT", "peerDependencies": { "marked": ">=4 <16" } diff --git a/package.json b/package.json index 0c5d83f5d..d54781080 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "lodash": "^4.17.21", "marked": "13.0.3", "marked-definition-lists": "^1.0.1", - "marked-emoji": "^1.4.3", + "marked-emoji": "^2.0.0", "marked-extended-tables": "^2.0.0", "marked-gfm-heading-id": "^4.0.1", "marked-smartypants-lite": "^1.0.3", diff --git a/shared/naturalcrit/markdown.js b/shared/naturalcrit/markdown.js index bfa3a9186..3160b1b8d 100644 --- a/shared/naturalcrit/markdown.js +++ b/shared/naturalcrit/markdown.js @@ -687,7 +687,7 @@ Marked.use({ extensions : [justifiedParagraphs, forcedParagraphBreaks, Marked.use(mustacheInjectBlock); Marked.use(MarkedSubSuperText()); Marked.use({ renderer: renderer, tokenizer: tokenizer, mangle: false }); -Marked.use(MarkedExtendedTables(tableTerminators), MarkedGFMHeadingId({ globalSlugs: true }), +Marked.use(MarkedExtendedTables({interruptPatterns : tableTerminators}), MarkedGFMHeadingId({ globalSlugs: true }), MarkedSmartypantsLite(), MarkedEmojis(MarkedEmojiOptions)); function cleanUrl(href) { diff --git a/themes/V3/5ePHB/snippets/monsterblock.gen.js b/themes/V3/5ePHB/snippets/monsterblock.gen.js index e61c206f0..dffb59d04 100644 --- a/themes/V3/5ePHB/snippets/monsterblock.gen.js +++ b/themes/V3/5ePHB/snippets/monsterblock.gen.js @@ -148,7 +148,7 @@ const genAction = function(){ 'Turnbuckle Roll' ]); - return `***${name}.*** *Melee Weapon Attack:* +4 to hit, reach 5ft., one target. *Hit* 5 (1d6 + 2) `; + return `***${name}.*** *Melee Weapon Attack:* +4 to hit, reach 5 ft., one target. *Hit:* 5 (1d6 + 2) `; }; @@ -161,8 +161,8 @@ module.exports = { *${getType()}, ${getAlignment()}* ___ **Armor Class** :: ${_.random(10, 20)} (chain mail, shield) - **Hit Points** :: ${_.random(1, 150)}(1d4 + 5) - **Speed** :: ${_.random(0, 50)}ft. + **Hit Points** :: ${_.random(1, 150)} (1d4 + 5) + **Speed** :: ${_.random(0, 50)} ft. ___ | STR | DEX | CON | INT | WIS | CHA | |:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|