Merge 1038d1bac70a8bac3b94763c5bc608b9e7c7f359 into 7be47742a6dc86f22d148ca9d304f7a9eea318cf

chore(deps): bump the production-dependencies group across 1 directory with 3 updates (#1744 )
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-05-18 14:34:23 +02:00 · 2025-01-31 06:46:47 -05:00 · 2025-01-31 06:46:45 -05:00 · 2025-01-18 06:20:06 +02:00
5 changed files with 34 additions and 22 deletions
--- a/docs/plugins/ObsidianFlavoredMarkdown.md
+++ b/docs/plugins/ObsidianFlavoredMarkdown.md
@ -16,7 +16,7 @@ This plugin accepts the following configuration options:
 - `wikilinks`:If `true` (default), turns [[wikilinks]] into regular links.
 - `callouts`: If `true` (default), adds support for [[callouts|callout]] blocks for emphasizing content.
 - `mermaid`: If `true` (default), enables [[Mermaid diagrams|Mermaid diagram]] rendering within Markdown files.
- `parseTags`: If `true` (default), parses and links tags within the content.
+- `parseTags`: If `true` (default), parses and links tags within the content. This marks the page as tagged with those tags, you can set `parseTags` to `"link-only"` to only turn content tags into links.
 - `parseArrows`: If `true` (default), transforms arrow symbols into their HTML character equivalents.
 - `parseBlockReferences`: If `true` (default), handles block references, linking to specific content blocks.
 - `enableInHtmlEmbed`: If `true`, allows embedding of content directly within HTML. Defaults to `false`.
--- a/package-lock.json
+++ b/package-lock.json
@ -34,7 +34,7 @@
        "mdast-util-to-hast": "^13.2.0",
        "mdast-util-to-string": "^4.0.0",
        "micromorph": "^0.4.5",
-        "pixi.js": "^8.6.6",
+        "pixi.js": "^8.7.3",
        "preact": "^10.25.4",
        "preact-render-to-string": "^6.5.13",
        "pretty-bytes": "^6.1.1",
@ -79,10 +79,10 @@
        "@types/d3": "^7.4.3",
        "@types/hast": "^3.0.4",
        "@types/js-yaml": "^4.0.9",
-        "@types/node": "^22.10.6",
+        "@types/node": "^22.12.0",
        "@types/pretty-time": "^1.1.5",
        "@types/source-map-support": "^0.5.10",
-        "@types/ws": "^8.5.13",
+        "@types/ws": "^8.5.14",
        "@types/yargs": "^17.0.33",
        "esbuild": "^0.24.2",
        "prettier": "^3.4.2",
@ -1914,10 +1914,11 @@
      }
    },
    "node_modules/@types/node": {
-      "version": "22.10.6",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.6.tgz",
-      "integrity": "sha512-qNiuwC4ZDAUNcY47xgaSuS92cjf8JbSUoaKS77bmLG1rU7MlATVSiw/IlrjtIyyskXBZ8KkNfjK/P5na7rgXbQ==",
+      "version": "22.12.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.12.0.tgz",
+      "integrity": "sha512-Fll2FZ1riMjNmlmJOdAyY5pUbkftXslB5DgEzlIuNaiWhXd00FhWxVC/r4yV/4wBb9JfImTu+jiSvXTkJ7F/gA==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "undici-types": "~6.20.0"
      }
@ -1943,10 +1944,11 @@
      "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ=="
    },
    "node_modules/@types/ws": {
-      "version": "8.5.13",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz",
-      "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==",
+      "version": "8.5.14",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.14.tgz",
+      "integrity": "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
        "@types/node": "*"
      }
@ -5583,9 +5585,10 @@
      }
    },
    "node_modules/pixi.js": {
-      "version": "8.6.6",
-      "resolved": "https://registry.npmjs.org/pixi.js/-/pixi.js-8.6.6.tgz",
-      "integrity": "sha512-o5pw7G2yuIrnBx0G4npBlmFp+XGNcapI/Ufs62rRj/4XKxc1Zo74YJr/BtEXcXTraTKd+pQvYOLvnfxRjxBMvQ==",
+      "version": "8.7.3",
+      "resolved": "https://registry.npmjs.org/pixi.js/-/pixi.js-8.7.3.tgz",
+      "integrity": "sha512-wfWlhJYnGx1s4f2yoouevQjaeacbJ12LTkJGa+n9AIYNIjOnmJylBtZ2mARX7iFk3mr2xv0wuo//XPe2hk5OBw==",
+      "license": "MIT",
      "dependencies": {
        "@pixi/colord": "^2.9.6",
        "@types/css-font-loading-module": "^0.0.12",
--- a/package.json
+++ b/package.json
@ -60,7 +60,7 @@
    "mdast-util-to-hast": "^13.2.0",
    "mdast-util-to-string": "^4.0.0",
    "micromorph": "^0.4.5",
-    "pixi.js": "^8.6.6",
+    "pixi.js": "^8.7.3",
    "preact": "^10.25.4",
    "preact-render-to-string": "^6.5.13",
    "pretty-bytes": "^6.1.1",
@ -102,10 +102,10 @@
    "@types/d3": "^7.4.3",
    "@types/hast": "^3.0.4",
    "@types/js-yaml": "^4.0.9",
-    "@types/node": "^22.10.6",
+    "@types/node": "^22.12.0",
    "@types/pretty-time": "^1.1.5",
    "@types/source-map-support": "^0.5.10",
-    "@types/ws": "^8.5.13",
+    "@types/ws": "^8.5.14",
    "@types/yargs": "^17.0.33",
    "esbuild": "^0.24.2",
    "prettier": "^3.4.2",
--- a/quartz/plugins/emitters/tagPage.tsx
+++ b/quartz/plugins/emitters/tagPage.tsx
@ -17,11 +17,17 @@ import { TagContent } from "../../components"
 import { write } from "./helpers"
 import { i18n } from "../../i18n"
 import DepGraph from "../../depgraph"
+import { Data } from "vfile"

 interface TagPageOptions extends FullPageLayout {
  sort?: (f1: QuartzPluginData, f2: QuartzPluginData) => number
 }

+const getTags = ({ frontmatter, tagLinks }: Data) => [
+  ...(frontmatter?.tags ?? []),
+  ...(tagLinks ?? []),
+]
+
 export const TagPage: QuartzEmitterPlugin<Partial<TagPageOptions>> = (userOpts) => {
  const opts: FullPageLayout = {
    ...sharedPageComponents,
@ -55,7 +61,7 @@ export const TagPage: QuartzEmitterPlugin<Partial<TagPageOptions>> = (userOpts)

      for (const [_tree, file] of content) {
        const sourcePath = file.data.filePath!
-        const tags = (file.data.frontmatter?.tags ?? []).flatMap(getAllSegmentPrefixes)
+        const tags = getTags(file.data).flatMap(getAllSegmentPrefixes)
        // if the file has at least one tag, it is used in the tag index page
        if (tags.length > 0) {
          tags.push("index")
@ -76,9 +82,7 @@ export const TagPage: QuartzEmitterPlugin<Partial<TagPageOptions>> = (userOpts)
      const allFiles = content.map((c) => c[1].data)
      const cfg = ctx.cfg.configuration

-      const tags: Set<string> = new Set(
-        allFiles.flatMap((data) => data.frontmatter?.tags ?? []).flatMap(getAllSegmentPrefixes),
-      )
+      const tags: Set<string> = new Set(allFiles.flatMap(getTags).flatMap(getAllSegmentPrefixes))

      // add base tag
      tags.add("index")
--- a/quartz/plugins/transformers/ofm.ts
+++ b/quartz/plugins/transformers/ofm.ts
@ -31,7 +31,7 @@ export interface Options {
  wikilinks: boolean
  callouts: boolean
  mermaid: boolean
-  parseTags: boolean
+  parseTags: boolean | "link-only"
  parseArrows: boolean
  parseBlockReferences: boolean
  enableInHtmlEmbed: boolean
@ -338,9 +338,13 @@ export const ObsidianFlavoredMarkdown: QuartzTransformerPlugin<Partial<Options>>
                }

                tag = slugTag(tag)
-                if (file.data.frontmatter) {
+                if (opts.parseTags != "link-only" && file.data.frontmatter) {
                  const noteTags = file.data.frontmatter.tags ?? []
                  file.data.frontmatter.tags = [...new Set([...noteTags, tag])]
+                } else {
+                  // We store the content tags so that the tagPage can be generated even
+                  // if there's no pages tagged with them through the frontmatter
+                  file.data.tagLinks = (file.data.tagLinks ?? new Set()).add(tag)
                }

                return {
@ -828,5 +832,6 @@ declare module "vfile" {
    blocks: Record<string, Element>
    htmlAst: HtmlRoot
    hasMermaidDiagram: boolean | undefined
+    tagLinks: Set<string>
  }
 }
Author	SHA1	Message	Date
Anton Bulakh	e3557718cf	Merge 1038d1bac70a8bac3b94763c5bc608b9e7c7f359 into 7be47742a6dc86f22d148ca9d304f7a9eea318cf	2025-01-31 06:46:47 -05:00
dependabot[bot]	7be47742a6	chore(deps): bump the production-dependencies group across 1 directory with 3 updates (#1744 ) Some checks failed Build and Test / build-and-test (macos-latest) (push) Has been cancelled Details Build and Test / build-and-test (ubuntu-latest) (push) Has been cancelled Details Build and Test / build-and-test (windows-latest) (push) Has been cancelled Details Build and Test / publish-tag (push) Has been cancelled Details Docker build & push image / build (push) Has been cancelled Details Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-01-31 06:46:45 -05:00
Anton Bulakh	1038d1bac7	feat(tags): Allow separating page tags from frontmatter tags I feel like tags in note content are just links to the tag page, and shouldn't mark the page with that tag. Also the way it was done - adding content tags to frontmatter - interferes with my WIP page properties component, I want to only show "explicitly put in the frontmatter" tags. Added an option to have those "outgoing" tags that don't tag the page, yet get a tag page generated (so that the popover is not 404 if there are no pages with this tag).	2025-01-18 06:20:06 +02:00