Merge pull request #5347 from nickgros/SWC-6145

SWC-6145 - markdown-it & plugins pulled from npm
Sage-Bionetworks · Apr 30, 2024 · 9ba032c · 9ba032c
2 parents 9f3667b + 1bc145c
commit 9ba032c
Show file tree

Hide file tree

Showing 19 changed files with 133 additions and 66 deletions.
diff --git a/package.json b/package.json
@@ -1,11 +1,24 @@
 {
   "dependencies": {
+    "@sage-bionetworks/markdown-it-container": "^4.0.1",
     "@sage-bionetworks/react-base-table": "1.13.4",
     "croppie": "2.6.5",
     "font-awesome": "4.7.0",
     "jquery": "3.5.1",
-    "katex": "^0.16.10",
     "jsplumb": "2.13.2",
+    "katex": "^0.16.10",
+    "markdown-it": "^14.1.0",
+    "markdown-it-br": "^1.0.0",
+    "markdown-it-center-text": "^1.0.4",
+    "markdown-it-emphasis-alt": "^1.0.8",
+    "markdown-it-inline-comments": "^1.0.1",
+    "markdown-it-math": "^4.1.1",
+    "markdown-it-strikethrough-alt": "^1.0.0",
+    "markdown-it-sub": "^2.0.0",
+    "markdown-it-sup": "^2.0.0",
+    "markdown-it-synapse": "^1.1.14",
+    "markdown-it-synapse-heading": "^1.0.1",
+    "markdown-it-synapse-table": "^1.0.6",
     "moment": "^2.29.4",
     "papaparse": "^5.4.1",
     "pica": "6.0.0",

diff --git a/pom.xml b/pom.xml
@@ -502,6 +502,71 @@
                   file="${project.basedir}/node_modules/papaparse/papaparse.min.js"
                   tofile="src/main/webapp/generated/papaparse.min.js"
                 />
+                <copy todir="src/main/webapp/generated/katex">
+                  <fileset dir="${project.basedir}/node_modules/katex/dist" />
+                </copy>
+                <copy
+                  file="${project.basedir}/node_modules/markdown-it/dist/markdown-it.min.js"
+                  tofile="src/main/webapp/generated/markdown-it.js"
+                />
+                <copy
+                  file="${project.basedir}/node_modules/markdown-it-br/dist/markdown-it-br.min.js"
+                  tofile="src/main/webapp/generated/markdown-it-br.js"
+                />
+                <copy
+                  file="${project.basedir}/node_modules/markdown-it-center-text/dist/markdown-it-center-text.min.js"
+                  tofile="src/main/webapp/generated/markdown-it-center-text.js"
+                />
+                <copy
+                  file="${project.basedir}/node_modules/@sage-bionetworks/markdown-it-container/dist/markdown-it-container.min.js"
+                  tofile="src/main/webapp/generated/markdown-it-container.js"
+                />
+                <copy
+                  file="${project.basedir}/node_modules/markdown-it-emphasis-alt/dist/markdown-it-emphasis-alt.min.js"
+                  tofile="src/main/webapp/generated/markdown-it-emphasis-alt.js"
+                />
+                <copy
+                  file="${project.basedir}/node_modules/markdown-it-inline-comments/dist/markdown-it-inline-comments.min.js"
+                  tofile="src/main/webapp/generated/markdown-it-inline-comments.js"
+                />
+
+                <copy
+                  file="${project.basedir}/node_modules/markdown-it-math/dist/markdown-it-math.min.js"
+                  tofile="src/main/webapp/generated/markdown-it-math.js"
+                />
+
+                <copy
+                  file="${project.basedir}/node_modules/markdown-it-strikethrough-alt/dist/markdown-it-strikethrough-alt.min.js"
+                  tofile="src/main/webapp/generated/markdown-it-strikethrough-alt.js"
+                />
+                <copy
+                  file="${project.basedir}/node_modules/markdown-it-sub-alt/dist/markdown-it-sub.min.js"
+                  tofile="src/main/webapp/generated/markdown-it-sub.js"
+                />
+                <copy
+                  file="${project.basedir}/node_modules/markdown-it-sup-alt/dist/markdown-it-sup.min.js"
+                  tofile="src/main/webapp/generated/markdown-it-sup.js"
+                />
+
+                <copy
+                  file="${project.basedir}/node_modules/markdown-it-synapse/dist/index.global.js"
+                  tofile="src/main/webapp/generated/markdown-it-synapse.js"
+                />
+
+                <copy
+                  file="${project.basedir}/node_modules/markdown-it-synapse-heading/dist/markdown-it-synapse-heading.min.js"
+                  tofile="src/main/webapp/generated/markdown-it-synapse-heading.js"
+                />
+
+                <copy
+                  file="${project.basedir}/node_modules/markdown-it-synapse-math/dist/markdown-it-synapse-math.min.js"
+                  tofile="src/main/webapp/generated/markdown-it-synapse-math.js"
+                />
+
+                <copy
+                  file="${project.basedir}/node_modules/markdown-it-synapse-table/dist/markdown-it-synapse-table.min.js"
+                  tofile="src/main/webapp/generated/markdown-it-synapse-table.js"
+                />
                 <copy
                   file="${project.basedir}/node_modules/xss/dist/xss.min.js"
                   tofile="src/main/webapp/generated/xss.min.js"

diff --git a/src/main/webapp/Portal.html b/src/main/webapp/Portal.html
@@ -189,8 +189,22 @@
       loadCss(cdnEndpoint + 'generated/font-awesome.css')
       loadJs(cdnEndpoint + 'js/highlight.pack.js')
       loadJs(cdnEndpoint + 'js/init-nchart.js')
-      loadJs(cdnEndpoint + 'js/markdown-it.min.js')
-      loadJs(cdnEndpoint + 'js/markdown-it-plugins-18.min.js')
+      loadJs(cdnEndpoint + 'generated/markdown-it.js')
+      loadJs(cdnEndpoint + 'generated/markdown-it-br.js')
+      loadJs(cdnEndpoint + 'generated/markdown-it-center-text.js')
+      loadJs(cdnEndpoint + 'generated/markdown-it-container.js')
+      loadJs(cdnEndpoint + 'generated/markdown-it-emphasis-alt.js')
+      loadJs(cdnEndpoint + 'generated/markdown-it-inline-comments.js')
+      loadJs(cdnEndpoint + 'generated/markdown-it-math.js')
+      loadJs(cdnEndpoint + 'generated/markdown-it-strikethrough-alt.js')
+      loadJs(cdnEndpoint + 'generated/markdown-it-sub.js')
+      loadJs(cdnEndpoint + 'generated/markdown-it-sup.js')
+      loadJs(cdnEndpoint + 'generated/markdown-it-synapse.js')
+      loadJs(cdnEndpoint + 'generated/markdown-it-synapse-heading.js')
+      loadJs(cdnEndpoint + 'generated/markdown-it-synapse-math.js')
+      loadJs(cdnEndpoint + 'generated/markdown-it-synapse-table.js')
+      loadJs(cdnEndpoint + 'generated/katex/katex.min.js')
+      loadCss(cdnEndpoint + 'generated/katex/katex.min.css')
       loadJs(cdnEndpoint + 'js/polyfill-2.js')
       loadJs(cdnEndpoint + 'generated/xss.min.js')
       loadJs(cdnEndpoint + 'generated/pica.min.js')
@@ -204,9 +218,6 @@
       loadJs(cdnEndpoint + 'generated/react-router-dom.min.js')
       loadJs(cdnEndpoint + 'generated/universalCookie.min.js')
       loadJs(cdnEndpoint + 'generated/react-bootstrap.min.js')
-      loadJs(cdnEndpoint + 'generated/katex.min.js')
-      loadCss(cdnEndpoint + 'generated/katex.css')
-
       loadJs(srcPath) // We don't load SRC's scss because we include it in our own compiled scss
       loadJs(cdnEndpoint + 'generated/croppie.min.js')
       loadCss(cdnEndpoint + 'js/diff/diffview.css')
@@ -217,7 +228,6 @@
       )
       loadJs(cdnEndpoint + 'js/linkify.min.js')
       loadJs(cdnEndpoint + 'js/linkify-string.min.js')
-
       loadJs('//cdn.statuspage.io/se-v2.js')
       // loadJs("//kh896k90gyvg.statuspage.io/embed/script.js");
       loadJs(cdnEndpoint + 'generated/papaparse.min.js')