fix: catch html to jsx errors (closes #547)
This commit is contained in:
		
							parent
							
								
									dc834015d0
								
							
						
					
					
						commit
						60b3bc34cb
					
				
					 7 changed files with 29 additions and 21 deletions
				
			
		| 
						 | 
				
			
			@ -33,9 +33,12 @@ TagList.css = `
 | 
			
		|||
  gap: 0.4rem;
 | 
			
		||||
  margin: 1rem 0;
 | 
			
		||||
  flex-wrap: wrap;
 | 
			
		||||
  justify-content: flex-end;
 | 
			
		||||
  justify-self: end;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.section-ul .tags {
 | 
			
		||||
  justify-content: flex-end;
 | 
			
		||||
}
 | 
			
		||||
  
 | 
			
		||||
.tags > li {
 | 
			
		||||
  display: inline-block;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,10 +1,8 @@
 | 
			
		|||
import { htmlToJsx } from "../../util/jsx"
 | 
			
		||||
import { QuartzComponentConstructor, QuartzComponentProps } from "../types"
 | 
			
		||||
import { Fragment, jsx, jsxs } from "preact/jsx-runtime"
 | 
			
		||||
import { toJsxRuntime } from "hast-util-to-jsx-runtime"
 | 
			
		||||
 | 
			
		||||
function Content({ tree }: QuartzComponentProps) {
 | 
			
		||||
  // @ts-ignore (preact makes it angry)
 | 
			
		||||
  const content = toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: "html" })
 | 
			
		||||
function Content({ fileData, tree }: QuartzComponentProps) {
 | 
			
		||||
  const content = htmlToJsx(fileData.filePath!, tree)
 | 
			
		||||
  return <article class="popover-hint">{content}</article>
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,4 @@
 | 
			
		|||
import { QuartzComponentConstructor, QuartzComponentProps } from "../types"
 | 
			
		||||
import { Fragment, jsx, jsxs } from "preact/jsx-runtime"
 | 
			
		||||
import { toJsxRuntime } from "hast-util-to-jsx-runtime"
 | 
			
		||||
import path from "path"
 | 
			
		||||
 | 
			
		||||
import style from "../styles/listPage.scss"
 | 
			
		||||
| 
						 | 
				
			
			@ -8,6 +6,7 @@ import { PageList } from "../PageList"
 | 
			
		|||
import { _stripSlashes, simplifySlug } from "../../util/path"
 | 
			
		||||
import { Root } from "hast"
 | 
			
		||||
import { pluralize } from "../../util/lang"
 | 
			
		||||
import { htmlToJsx } from "../../util/jsx"
 | 
			
		||||
 | 
			
		||||
function FolderContent(props: QuartzComponentProps) {
 | 
			
		||||
  const { tree, fileData, allFiles } = props
 | 
			
		||||
| 
						 | 
				
			
			@ -29,8 +28,7 @@ function FolderContent(props: QuartzComponentProps) {
 | 
			
		|||
  const content =
 | 
			
		||||
    (tree as Root).children.length === 0
 | 
			
		||||
      ? fileData.description
 | 
			
		||||
      : // @ts-ignore
 | 
			
		||||
        toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: "html" })
 | 
			
		||||
      : htmlToJsx(fileData.filePath!, tree)
 | 
			
		||||
 | 
			
		||||
  return (
 | 
			
		||||
    <div class="popover-hint">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,12 +1,11 @@
 | 
			
		|||
import { QuartzComponentConstructor, QuartzComponentProps } from "../types"
 | 
			
		||||
import { Fragment, jsx, jsxs } from "preact/jsx-runtime"
 | 
			
		||||
import { toJsxRuntime } from "hast-util-to-jsx-runtime"
 | 
			
		||||
import style from "../styles/listPage.scss"
 | 
			
		||||
import { PageList } from "../PageList"
 | 
			
		||||
import { FullSlug, getAllSegmentPrefixes, simplifySlug } from "../../util/path"
 | 
			
		||||
import { QuartzPluginData } from "../../plugins/vfile"
 | 
			
		||||
import { Root } from "hast"
 | 
			
		||||
import { pluralize } from "../../util/lang"
 | 
			
		||||
import { htmlToJsx } from "../../util/jsx"
 | 
			
		||||
 | 
			
		||||
const numPages = 10
 | 
			
		||||
function TagContent(props: QuartzComponentProps) {
 | 
			
		||||
| 
						 | 
				
			
			@ -26,8 +25,7 @@ function TagContent(props: QuartzComponentProps) {
 | 
			
		|||
  const content =
 | 
			
		||||
    (tree as Root).children.length === 0
 | 
			
		||||
      ? fileData.description
 | 
			
		||||
      : // @ts-ignore
 | 
			
		||||
        toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: "html" })
 | 
			
		||||
      : htmlToJsx(fileData.filePath!, tree)
 | 
			
		||||
 | 
			
		||||
  if (tag === "") {
 | 
			
		||||
    const tags = [...new Set(allFiles.flatMap((data) => data.frontmatter?.tags ?? []))]
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										15
									
								
								quartz/util/jsx.ts
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								quartz/util/jsx.ts
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,15 @@
 | 
			
		|||
import { toJsxRuntime } from "hast-util-to-jsx-runtime"
 | 
			
		||||
import { QuartzPluginData } from "../plugins/vfile"
 | 
			
		||||
import { Node, Root } from "hast"
 | 
			
		||||
import { Fragment, jsx, jsxs } from "preact/jsx-runtime"
 | 
			
		||||
import { trace } from "./trace"
 | 
			
		||||
import { type FilePath } from "./path"
 | 
			
		||||
 | 
			
		||||
export function htmlToJsx(fp: FilePath, tree: Node<QuartzPluginData>) {
 | 
			
		||||
  try {
 | 
			
		||||
    // @ts-ignore (preact makes it angry)
 | 
			
		||||
    return toJsxRuntime(tree as Root, { Fragment, jsx, jsxs, elementAttributeNameCase: "html" })
 | 
			
		||||
  } catch (e) {
 | 
			
		||||
    trace(`Failed to parse Markdown in \`${fp}\` into JSX`, e as Error)
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -4,7 +4,7 @@ import { isMainThread } from "workerpool"
 | 
			
		|||
 | 
			
		||||
const rootFile = /.*at file:/
 | 
			
		||||
export function trace(msg: string, err: Error) {
 | 
			
		||||
  const stack = err.stack
 | 
			
		||||
  let stack = err.stack ?? ""
 | 
			
		||||
 | 
			
		||||
  const lines: string[] = []
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -12,15 +12,11 @@ export function trace(msg: string, err: Error) {
 | 
			
		|||
  lines.push(
 | 
			
		||||
    "\n" +
 | 
			
		||||
      chalk.bgRed.black.bold(" ERROR ") +
 | 
			
		||||
      "\n" +
 | 
			
		||||
      "\n\n" +
 | 
			
		||||
      chalk.red(` ${msg}`) +
 | 
			
		||||
      (err.message.length > 0 ? `: ${err.message}` : ""),
 | 
			
		||||
  )
 | 
			
		||||
 | 
			
		||||
  if (!stack) {
 | 
			
		||||
    return
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  let reachedEndOfLegibleTrace = false
 | 
			
		||||
  for (const line of stack.split("\n").slice(1)) {
 | 
			
		||||
    if (reachedEndOfLegibleTrace) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue