Merge ab0b73693f860f354b82a5c326253b92c32eb088 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 06:24:22 +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
4 changed files with 31 additions and 15 deletions
--- 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/components/scripts/graph.inline.ts
+++ b/quartz/components/scripts/graph.inline.ts
@ -99,6 +99,13 @@ async function renderGraph(container: string, fullSlug: FullSlug) {
  const tags: SimpleSlug[] = []
  const validLinks = new Set(data.keys())

+  const aliases = new Map<SimpleSlug, SimpleSlug>()
+  for (const [slug, details] of data.entries()) {
+    for (const alias of details.aliases) {
+      aliases.set(simplifySlug(alias), slug)
+    }
+  }
+
  const tweens = new Map<string, TweenNode>()
  for (const [source, details] of data.entries()) {
    const outgoing = details.links ?? []
@ -107,6 +114,10 @@ async function renderGraph(container: string, fullSlug: FullSlug) {
      if (validLinks.has(dest)) {
        links.push({ source: source, target: dest })
      }
+      const aliased = aliases.get(dest)
+      if (aliased) {
+        links.push({ source: source, target: aliased })
+      }
    }

    if (showTags) {
--- a/quartz/plugins/emitters/contentIndex.ts
+++ b/quartz/plugins/emitters/contentIndex.ts
@ -14,6 +14,7 @@ export type ContentDetails = {
  title: string
  links: SimpleSlug[]
  tags: string[]
+  aliases: FullSlug[]
  content: string
  richContent?: string
  date?: Date
@ -125,6 +126,7 @@ export const ContentIndex: QuartzEmitterPlugin<Partial<Options>> = (opts) => {
            title: file.data.frontmatter?.title!,
            links: file.data.links ?? [],
            tags: file.data.frontmatter?.tags ?? [],
+            aliases: file.data.aliases ?? [],
            content: file.data.text ?? "",
            richContent: opts?.rssFullHtml
              ? escapeHTML(toHtml(tree as Root, { allowDangerousHtml: true }))
Author	SHA1	Message	Date
Anton Bulakh	ba6a833af8	Merge ab0b73693f860f354b82a5c326253b92c32eb088 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	ab0b73693f	fix(aliases): Make sure the graph shows aliased pages Given pages A and B, where B has an alias Z, if page A had a link [[Z]] you'd expect the graph to show an edge from A to B and B to have A as a backlink. That didn't happen, here's a fix	2025-01-18 06:20:06 +02:00