From 514858ecf009baf1d6b61c3ae1a28f90b1b97d8c Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Wed, 22 Jul 2020 10:29:08 -0300 Subject: [PATCH] Attempt to fix commonmark fork --- .../__snapshots__/Storyshots.test.js.snap | 2725 ++++++++++++++++- package.json | 2 +- yarn.lock | 4 +- 3 files changed, 2726 insertions(+), 5 deletions(-) diff --git a/__tests__/__snapshots__/Storyshots.test.js.snap b/__tests__/__snapshots__/Storyshots.test.js.snap index 4b04cc4a8..00afce885 100644 --- a/__tests__/__snapshots__/Storyshots.test.js.snap +++ b/__tests__/__snapshots__/Storyshots.test.js.snap @@ -80,6 +80,36 @@ exports[`Storyshots Markdown list Markdown 1`] = ` > This is Rocket.Chat + + + + + + This is Rocket.Chat + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + + + + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + + + + a + + + + + + + b + + + + + + + c + + + + + + + + + + + d + + + + + + + + + + + + + + + e + + + + + + This is edited + + + + + + + + @unknown + + + + + + + rocket.cat + + + + + + name1 + + + + + + all + + + + + + here + + + + + + @unknown + + + + + + + Rocket Cat + + + + + + Name + + + + + + all + + + + + + here + + + + + + #unknown + + + + + + + test-channel + + + Unicode: 😃😇👍 + + + + + + Unicode: 😃😇👍 + 👍 + + + + + + Shortnames: + + + 😂 + + + 👍 + + + + + + + + + + + Custom emojis: + + + + + + + + + + + + + + + + + + + + + + 😃 + + + 👍 + + + This is block quote + + + + + + This is block quote + @@ -1688,6 +2816,36 @@ exports[`Storyshots Markdown list Markdown 1`] = ` > this is a normal line + + + + + + this is a normal line + [description](url) + + + + + + + Markdown link + + + + : + + + [description](url) + <url|description> + + + + + + + Formatted Link + + + + : + + + <url|description> + + + + + + + + + Header 1 + + + + + Header 2 + + + + + Header 3 + + + + + Header 4 + + + + + Header 5 + + + + + Header 6 + + inline code + + + + + + This is + + + inline code + it. + + + + + + Inline + + + code + + + has + + + back-ticks around + + + it. + - Code block + + + + + Code block + + + + + + Code block + + + + + + + + • + + + + + + Open Source + + + + + + + + • + + + + + + Rocket.Chat + + + + + + + + ◦ + + + + + + nodejs + + + + + + + + ◦ + + + + + + ReactNative + + + + + + + + Open Source + + + + + + + + 3. + + + + + + Rocket.Chat + + + + + + + + 4. + + underscores + + + + + + Strong emphasis, aka bold, with + + + asterisks + + + or + + + underscores + + > + + + First Header | Second Header + + + + + + + First Header | Second Header + + + + + + + ------------ | ------------- + + + + + + + ------------ | ------------- + + + + + + + Content from cell 1 | Content from cell 2 + + + + + + + Content from cell 1 | Content from cell 2 + + + + + + + Content in the first column | Content in the second column + + + + + + + Content in the first column | Content in the second column + + + `; @@ -4328,6 +6987,37 @@ exports[`Storyshots Message list message 1`] = ` > This message has error + + + + + + This message has error + @@ -4434,6 +7124,37 @@ exports[`Storyshots Message list message 1`] = ` > This message has error too + + + + + + This message has error too + diff --git a/package.json b/package.json index 1f7dd4f17..1ae755752 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@rocket.chat/sdk": "djorkaeffalexandre/Rocket.Chat.js.SDK#test.fix-ddp", "@rocket.chat/ui-kit": "0.13.0", "bugsnag-react-native": "2.23.10", - "commonmark": "git+https://github.com/RocketChat/commonmark.js.git", + "commonmark": "RocketChat/commonmark.js#fix.update-fork", "commonmark-react-renderer": "git+https://github.com/RocketChat/commonmark-react-renderer.git", "deep-equal": "2.0.3", "ejson": "2.2.0", diff --git a/yarn.lock b/yarn.lock index 8ea560782..03dfb4ff9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5129,9 +5129,9 @@ commondir@^1.0.1: pascalcase "^0.1.1" xss-filters "^1.2.6" -"commonmark@git+https://github.com/RocketChat/commonmark.js.git": +commonmark@RocketChat/commonmark.js#fix.update-fork: version "0.29.2" - resolved "git+https://github.com/RocketChat/commonmark.js.git#020b5af060459ac2010e382e9ae431d48ed39777" + resolved "https://codeload.github.com/RocketChat/commonmark.js/tar.gz/66a60dfa1b1b8fa78b46eb6de81369394353baff" dependencies: entities "~2.0" mdurl "~1.0.1"