perf fix, simple back on

micromingle · Dec 3, 2018 · ec71fb1 · ec71fb1
1 parent 522e4e2
commit ec71fb1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/shared/common-adapters/markdown/shared.js b/shared/common-adapters/markdown/shared.js
@@ -106,20 +106,25 @@ function parseMarkdown(
   }
 }
 
+const _makeLinkRegex = () => {
+  const valid = `[:,!]*[\\w=#%~\\-_~&@+\\u00c0-\\uffff]`
+  const paranthesisPaired = `([(]${valid}+[)])`
+  const afterDomain = `(?:\\/|${paranthesisPaired}|${valid}|[.?]+[\\w/=])`
+  return new RegExp(
+    `^( *)((https?:\\/\\/)?[\\w-]+(\\.[\\w-]+)+(:\\d+)?((?:\\/|\\?[\\w=])${afterDomain}*)?)`,
+    'i'
+  )
+}
+
+const _linkRegex = _makeLinkRegex()
+
 // TODO, when named groups are supported on mobile, we can use this instead
 // const linkRegex = /^( *)((https?:\/\/)?[\w-]+(?<tld>\.[\w-]+)+\.?(:\d+)?(\/\S*)?)\b/i
 // This copies the functionality of this named group
 // $FlowIssue treat this like a RegExp
 const linkRegex: RegExp = {
   exec: source => {
-    const valid = `[:,!]*[\\w=#%~\\-_~&@+\\u00c0-\\uffff]`
-    const paranthesisPaired = `([(]${valid}+[)])`
-    const afterDomain = `(?:\\/|${paranthesisPaired}|${valid}|[.?]+[\\w/=])`
-    const r = new RegExp(
-      `^( *)((https?:\\/\\/)?[\\w-]+(\\.[\\w-]+)+(:\\d+)?((?:\\/|\\?[\\w=])${afterDomain}*)?)`,
-      'i'
-    )
-    const result = r.exec(source)
+    const result = _linkRegex.exec(source)
     if (result) {
       result.groups = {tld: result[4]}
       return result

diff --git a/shared/util/feature-flags.desktop.js b/shared/util/feature-flags.desktop.js
@@ -21,14 +21,13 @@ const ff: FeatureFlags = {
   newTeamBuildingForChatAllowMakeTeam: false,
   outOfDateBanner: false,
   plansEnabled: false,
-  useSimpleMarkdown: false,
+  useSimpleMarkdown: true,
   walletsEnabled: false,
 }
 
 const inAdmin: {[key: $Keys<FeatureFlags>]: boolean} = {
   chatIndexProfilingEnabled: true,
   moveOrCopy: true,
-  useSimpleMarkdown: true,
   walletsEnabled: true,
 }
 

diff --git a/shared/util/feature-flags.native.js b/shared/util/feature-flags.native.js
@@ -17,7 +17,7 @@ const ff: FeatureFlags = {
   newTeamBuildingForChatAllowMakeTeam: false,
   outOfDateBanner: false,
   plansEnabled: false,
-  useSimpleMarkdown: false,
+  useSimpleMarkdown: true,
   walletsEnabled: false,
 }