expensify-common 2.0.44 → 2.0.46

package/dist/ExpensiMark.js

@@ -368,8 +368,13 @@ class ExpensiMark {
                 // \B will match everything that \b doesn't, so it works
                 // for * and ~: https://www.rexegg.com/regex-boundaries.html#notb
                 name: 'bold',
-                regex: /(?<!<[^>]*)\B\*(?![^<]*(?:<\/pre>|<\/code>|<\/a>))((?![\s*])[\s\S]*?[^\s*](?<!\s))\*\B(?![^<]*>)(?![^<]*(<\/pre>|<\/code>|<\/a>))/g,
-                replacement: (_extras, match, g1) => (g1.includes('</pre>') || this.containsNonPairTag(g1) ? match : `<strong>${g1}</strong>`),
+                regex: /(?<!<[^>]*)(\b_|\B)\*(?![^<]*(?:<\/pre>|<\/code>|<\/a>))((?![\s*])[\s\S]*?[^\s*](?<!\s))\*\B(?![^<]*>)(?![^<]*(<\/pre>|<\/code>|<\/a>))/g,
+                replacement: (_extras, match, g1, g2) => {
+                    if (g1.includes('_')) {
+                        return `${g1}<strong>${g2}</strong>`;
+                    }
+                    return g2.includes('</pre>') || this.containsNonPairTag(g2) ? match : `<strong>${g2}</strong>`;
+                },
             },
             {
                 name: 'strikethrough',
@@ -862,6 +867,9 @@ class ExpensiMark {
             const replacedMatch = shouldKeepRawInput ? replacement(EXTRAS_DEFAULT, match[0], linkText, match[2], match[3]) : replacement(EXTRAS_DEFAULT, match[0], linkText, match[3]);
             replacedText = replacedText.concat(replacedMatch);
             startIndex = match.index + match[0].length;
+            // Line breaks (`\n`) followed by empty contents are already removed
+            // but line breaks inside contents should be parsed to <br/> to skip `autoEmail` rule
+            replacedText = this.replace(replacedText, { filterRules: ['newline'], shouldEscapeText: false });
             // Now we move to the next match that the js regex found in the text
             match = regex.exec(textToCheck);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify-common",
-  "version": "2.0.44",
+  "version": "2.0.46",
   "author": "Expensify, Inc.",
   "description": "Expensify libraries and components shared across different repos",
   "homepage": "https://expensify.com",