From 63b0e6043ff45e9d201a7251d277960b628ac243 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Mon, 1 Feb 2021 13:31:05 -0500
Subject: [PATCH] MM-32254 Update CommonMark and fix handling of deeply nested
 Markdown (#5148)

* MM-32254 Update commonmark.js fork from upstream

* MM-32254 Fix handling of partially rendered Markdown tree
---
 app/components/markdown/markdown.test.js | 11 +++++++++++
 package-lock.json                        | 24 ++++++++++++++++--------
 package.json                             |  4 ++--
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/app/components/markdown/markdown.test.js b/app/components/markdown/markdown.test.js
index e5ae99326..805c76032 100644
--- a/app/components/markdown/markdown.test.js
+++ b/app/components/markdown/markdown.test.js
@@ -33,4 +33,15 @@ describe('Markdown', () => {
 
         expect(wrapper.getElement()).toMatchSnapshot();
     });
+
+    test('MM-32254 should not crash when given string with deeply nested asterisks', () => {
+        const props = {
+            ...baseProps,
+            value: '**'.repeat(50) + 'test' + '**'.repeat(50) + 'test',
+        };
+
+        shallow(
+            <Markdown {...props}/>,
+        );
+    });
 });
diff --git a/package-lock.json b/package-lock.json
index 27e56ba75..1e46cf326 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12431,19 +12431,26 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
     },
     "commonmark": {
-      "version": "github:mattermost/commonmark.js#f6ab98dede6ce4b4e7adea140ac77249bfb2d6ce",
-      "from": "github:mattermost/commonmark.js#f6ab98dede6ce4b4e7adea140ac77249bfb2d6ce",
+      "version": "github:mattermost/commonmark.js#d716e1c89e0a6721051df7bc74ad7683e1ae438f",
+      "from": "github:mattermost/commonmark.js#d716e1c89e0a6721051df7bc74ad7683e1ae438f",
       "requires": {
-        "entities": "~ 1.1.1",
-        "mdurl": "~ 1.0.1",
-        "minimist": "~ 1.2.0",
+        "entities": "~2.0",
+        "mdurl": "~1.0.1",
+        "minimist": ">=1.2.2",
         "string.prototype.repeat": "^0.2.0",
         "xregexp": "4.1.1"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
+          "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ=="
+        }
       }
     },
     "commonmark-react-renderer": {
-      "version": "github:mattermost/commonmark-react-renderer#3a2ac19cab725ad28b170fdc1d397dddedcf87eb",
-      "from": "github:mattermost/commonmark-react-renderer#3a2ac19cab725ad28b170fdc1d397dddedcf87eb",
+      "version": "github:mattermost/commonmark-react-renderer#81af294317ebe19b5cc195d7fbc4f4a58177854c",
+      "from": "github:mattermost/commonmark-react-renderer#81af294317ebe19b5cc195d7fbc4f4a58177854c",
       "requires": {
         "in-publish": "^2.0.0",
         "lodash.assign": "^4.2.0",
@@ -13920,7 +13927,8 @@
     "entities": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+      "dev": true
     },
     "envinfo": {
       "version": "7.7.3",
diff --git a/package.json b/package.json
index bc5396bc3..80ef1b821 100644
--- a/package.json
+++ b/package.json
@@ -18,8 +18,8 @@
     "@rudderstack/rudder-sdk-react-native": "1.0.4",
     "@sentry/react-native": "2.1.0",
     "analytics-react-native": "1.2.0",
-    "commonmark": "github:mattermost/commonmark.js#f6ab98dede6ce4b4e7adea140ac77249bfb2d6ce",
-    "commonmark-react-renderer": "github:mattermost/commonmark-react-renderer#3a2ac19cab725ad28b170fdc1d397dddedcf87eb",
+    "commonmark": "github:mattermost/commonmark.js#d716e1c89e0a6721051df7bc74ad7683e1ae438f",
+    "commonmark-react-renderer": "github:mattermost/commonmark-react-renderer#81af294317ebe19b5cc195d7fbc4f4a58177854c",
     "core-js": "3.8.2",
     "deep-equal": "2.0.5",
     "deepmerge": "4.2.2",