Merge branch 'quantizor:main' into feature/improve-html-block-regex

quantizor · Mar 13, 2024 · 993f992 · 993f992
2 parents 32fd5cd + b5f4701
commit 993f992
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/.yarn/cache/ip-npm-2.0.0-204facb3cc-1270b11e53.zip b/.yarn/cache/ip-npm-2.0.0-204facb3cc-1270b11e53.zip
diff --git a/.yarn/cache/ip-npm-2.0.1-ee48691f03-d6dd154e1b.zip b/.yarn/cache/ip-npm-2.0.1-ee48691f03-d6dd154e1b.zip
diff --git a/__snapshots__/index.compiler.spec.tsx.snap b/__snapshots__/index.compiler.spec.tsx.snap
@@ -542,15 +542,12 @@ Markdown's email-style
     Setext-style headers are "underlined" using equal signs (for first-level
 headers) and dashes (for second-level headers). For example:
   </p>
-  <pre>
-    <code>
-      This is an H1
-=============
-
-This is an H2
--------------
-    </code>
-  </pre>
+  <h1>
+    This is an H1
+  </h1>
+  <h2>
+    This is an H2
+  </h2>
   <p>
     Any number of underlining
     <code>

diff --git a/docs/markdown-to-jsx.js b/docs/markdown-to-jsx.js
diff --git a/docs/markdown-to-jsx.js.map b/docs/markdown-to-jsx.js.map
diff --git a/index.tsx b/index.tsx
@@ -736,6 +736,8 @@ function parserFor(
     // Sort based on increasing order
     if (orderA !== orderB) {
       return orderA - orderB
+    } else if (typeA < typeB) {
+      return -1
     }
 
     return 1
@@ -1080,7 +1082,7 @@ export function compiler(
 
   function compile(input: string): JSX.Element {
     input = input.replace(FRONT_MATTER_R, '')
-    
+
     let inline = false
 
     if (options.forceInline) {

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "description": "Convert markdown to JSX with ease for React and React-like projects. Super lightweight and highly configurable.",
   "homepage": "https://markdown-to-jsx.quantizor.dev",
   "license": "MIT",
-  "version": "7.4.1",
+  "version": "7.4.3",
   "engines": {
     "node": ">= 10"
   },
@@ -86,7 +86,7 @@
     "prebuild": "rimraf dist && mkdirp dist",
     "build": "microbundle --tsconfig tsconfig.json -f cjs,umd index.cjs.tsx --name MarkdownToJSX --define process.env.NODE_ENV=production --globals react=React && microbundle --tsconfig tsconfig.json -f es,modern --name MarkdownToJSX --define process.env.NODE_ENV=production",
     "release": "microbundle site.tsx -o docs -f iife --tsconfig tsconfig.site.json --define process.env.NODE_ENV=production --jsx React.createElement --external react,react-dom,styled-components,katex --globals react=React,react-dom=ReactDOM,styled-components=styled --no-pkg-main",
-    "dev": "microbundle watch site.tsx -o docs -f iife --tsconfig tsconfig.site.json --define process.env.NODE_ENV=development --jsx React.createElement --external react,react-dom,styled-components --globals react=React,react-dom=ReactDOM,styled-components=styled --no-pkg-main",
+    "dev": "microbundle watch site.tsx -o docs -f iife --tsconfig tsconfig.site.json --define process.env.NODE_ENV=development --jsx React.createElement --external react,react-dom,styled-components,katex --globals react=React,react-dom=ReactDOM,styled-components=styled --no-pkg-main",
     "test": "jest --verbose",
     "size": "size-limit",
     "benchmark": "node benchmark.js"

diff --git a/yarn.lock b/yarn.lock
@@ -4925,9 +4925,9 @@ __metadata:
   linkType: hard
 
 "ip@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "ip@npm:2.0.0"
-  checksum: 1270b11e534a466fb4cf4426cbcc3a907c429389f7f4e4e3b288b42823562e88d6a509ceda8141a507de147ca506141f745005c0aa144569d94cf24a54eb52bc
+  version: 2.0.1
+  resolution: "ip@npm:2.0.1"
+  checksum: d6dd154e1bc5e8725adfdd6fb92218635b9cbe6d873d051bd63b178f009777f751a5eea4c67021723a7056325fc3052f8b6599af0a2d56f042c93e684b4a0349
   languageName: node
   linkType: hard