merge upstream changes

Author: xy-241

package-lock.json

@@ -37,7 +37,7 @@
     "@clack/prompts": "^0.7.0",
     "@floating-ui/dom": "^1.6.3",
     "@napi-rs/simple-git": "0.1.16",
-    "async-mutex": "^0.4.1",
+    "async-mutex": "^0.5.0",
     "chalk": "^5.3.0",
     "chokidar": "^3.6.0",
     "cli-spinner": "^0.2.10",
@@ -103,6 +103,6 @@
     "esbuild": "^0.19.9",
     "prettier": "^3.2.4",
     "tsx": "^4.7.1",
-    "typescript": "^5.3.3"
+    "typescript": "^5.4.2"
   }
 }

package.json

@@ -3,16 +3,20 @@ import { QuartzComponentConstructor, QuartzComponentProps } from "./types"
 import readingTime from "reading-time"
 import { classNames } from "../util/lang"
 import { i18n } from "../i18n"
+import { JSX } from "preact"
+import style from "./styles/contentMeta.scss"
 
 interface ContentMetaOptions {
   /**
    * Whether to display reading time
    */
   showReadingTime: boolean
+  showComma: boolean
 }
 
 const defaultOptions: ContentMetaOptions = {
   showReadingTime: true,
+  showComma: true,
 }
 
 export default ((opts?: Partial<ContentMetaOptions>) => {
@@ -25,7 +29,7 @@ export default ((opts?: Partial<ContentMetaOptions>) => {
     if (text) {
       var modifiedSegment: string = ""
       var createdSegment: string = ""
-      // const segments: string[] = []
+      //const segments: (string | JSX.Element)[] = []
 
       if (fileData.dates) {
         const cfgDefaultDataType = cfg.defaultDateType // For backward compatibility, just in case this is used somewhere else by the original author
@@ -59,16 +63,19 @@ export default ((opts?: Partial<ContentMetaOptions>) => {
           Created: &nbsp;{createdSegment} <br /> Modified: {modifiedSegment} <br /> {readingTimeStr}
         </p>
       )
+
+      /*const segmentsElements = segments.map((segment) => <span>{segment}</span>)
+      return (
+        <p show-comma={options.showComma} class={classNames(displayClass, "content-meta")}>
+          {segmentsElements}
+        </p>
+      )*/
     } else {
       return null
     }
   }
 
-  ContentMetadata.css = `
-  .content-meta {
-    margin-top: 0;
-    color: var(--gray);
-  }
-  `
+  ContentMetadata.css = style
+
   return ContentMetadata
 }) satisfies QuartzComponentConstructor

quartz/components/ContentMeta.tsx

@@ -0,0 +1,14 @@
+.content-meta {
+  margin-top: 0;
+  color: var(--gray);
+
+  &[show-comma="true"] {
+    > span:not(:last-child) {
+      margin-right: 8px;
+
+      &::after {
+        content: ",";
+      }
+    }
+  }
+}

quartz/components/styles/contentMeta.scss

@@ -63,7 +63,7 @@ export default {
       lastFewNotes: ({ count }) => `Les dernières ${count} notes`,
     },
     error: {
-      title: "Pas trouvé",
+      title: "Introuvable",
       notFound: "Cette page est soit privée, soit elle n'existe pas.",
     },
     folderContent: {