create-eziwiki 0.1.1 → 0.3.0

package/template/lib/markdown/render.ts

@@ -1,4 +1,6 @@
 import { unified, type Processor } from 'unified';
+import { VFile } from 'vfile';
+import type { Root, RootContent } from 'mdast';
 import remarkParse from 'remark-parse';
 import remarkGfm from 'remark-gfm';
 import remarkMath from 'remark-math';
@@ -12,17 +14,24 @@ import {
   rehypeBasePath,
   rehypeCodeShell,
   rehypeCollectHeadings,
+  rehypeHeadingAnchors,
   rehypeImages,
   rehypeInternalLinks,
   type Heading,
 } from './rehype-plugins';
-import { remarkWikiLinks, type WikiLinkTarget } from './remark-wikilink';
+import { remarkWikiLinks, type WikiLinkTarget, type TranscludeTarget } from './remark-wikilink';
+import { remarkCallouts } from './remark-callout';
+import { rehypeMermaid } from './rehype-mermaid';
 import { getUsedLanguages } from './languages';
 import { cached } from '../cache';
 import { BASE_PATH } from '../basePath';
 import { getUrlMap } from '../navigation/urlMap';
 import { getDoc } from '../content/registry';
 import { resolveTarget } from '../content/resolver';
+import { resolveAsset } from '../content/assets';
+import { getExcerpt } from '../content/excerpt';
+import GithubSlugger from 'github-slugger';
+import { toString as mdastToString } from 'mdast-util-to-string';
 import { docPathToUrl } from '../navigation/url';
 
 /**
@@ -77,18 +86,107 @@ function resolveWikiLink(target: string): WikiLinkTarget | null {
   if (!doc) return null;
 
   const url = docPathToUrl(getUrlMap(), doc.path);
-  return url ? { url: `/${url}/`, title: doc.title } : null;
+  if (!url) return null;
+
+  return {
+    url: `/${url}/`,
+    title: doc.title,
+    excerpt: getExcerpt(doc.path),
+  };
+}
+
+/**
+ * Resolves an embed target to a file under `public/`.
+ *
+ * @param target - Raw target text from inside the brackets
+ * @returns The file's URL, or null when nothing matches
+ */
+function resolveWikiEmbed(target: string): { url: string } | null {
+  const asset = resolveAsset(target);
+  return asset ? { url: asset.url } : null;
+}
+
+/** Parser for included documents; no rendering plugins, so it stays cheap. */
+const transclusionParser = unified().use(remarkParse).use(remarkGfm).use(remarkMath);
+
+/**
+ * Narrows a document's nodes to the section a heading names.
+ *
+ * The section runs from the matching heading to the next one at the same level
+ * or above, which is what a reader means by "that part of the page". The
+ * heading itself is kept: dropping it would leave the included text with no
+ * indication of what it is.
+ *
+ * @param nodes - The whole document's nodes
+ * @param anchor - Heading slug from after the `#`
+ * @returns The section's nodes, or null when no heading matches
+ */
+function sliceSection(nodes: RootContent[], anchor: string): RootContent[] | null {
+  const slugger = new GithubSlugger();
+  const wanted = anchor.toLowerCase();
+
+  let start = -1;
+  let depth = 0;
+
+  for (let i = 0; i < nodes.length; i++) {
+    const node = nodes[i];
+    if (node.type !== 'heading') continue;
+
+    // Slugs are assigned in document order, and repeats are numbered, so every
+    // heading has to pass through the slugger even before the match is found.
+    const slug = slugger.slug(mdastToString(node));
+
+    if (start === -1) {
+      if (slug !== wanted) continue;
+      start = i;
+      depth = node.depth;
+      continue;
+    }
+
+    if (node.depth <= depth) return nodes.slice(start, i);
+  }
+
+  return start === -1 ? null : nodes.slice(start);
+}
+
+/**
+ * Resolves an embed target to the document content it names.
+ *
+ * @param target - Raw target text from inside the brackets
+ * @param anchor - Heading slug, when the embed named a section
+ * @returns The document's nodes and identity, or null when it does not resolve
+ */
+function resolveWikiTransclusion(target: string, anchor?: string): TranscludeTarget | null {
+  const { doc } = resolveTarget(target);
+  if (!doc) return null;
+
+  const url = docPathToUrl(getUrlMap(), doc.path);
+  if (!url) return null;
+
+  const tree = transclusionParser.parse(doc.content) as Root;
+  const nodes = anchor ? sliceSection(tree.children, anchor) : tree.children;
+  if (!nodes || nodes.length === 0) return null;
+
+  return { path: doc.path, url: `/${url}/`, title: doc.title, nodes };
 }
 
 /**
  * Builds the shared unified processor.
  *
  * Plugin order is load-bearing:
+ * - `remarkCallouts` must run before the wiki-link pass, so that a link written
+ *   inside a callout is resolved like any other rather than being left in the
+ *   text the marker was read from.
  * - `remarkWikiLinks` must run while the tree is still Markdown, so the links
  *   it produces are processed like any other link downstream.
  * - `rehype-raw` must follow `remark-rehype` with `allowDangerousHtml`, so that
  *   inline HTML in Markdown is parsed rather than escaped.
- * - `rehype-slug` must precede heading collection, which reads the ids it adds.
+ * - `rehype-slug` must precede heading collection and the heading anchors,
+ *   both of which read the ids it adds.
+ * - `rehypeHeadingAnchors` must follow heading collection, or the anchor's own
+ *   text would be gathered into the contents rail.
+ * - `rehypeMermaid` must precede both, so a diagram fence never becomes a code
+ *   block, and one it cannot draw still does.
  * - `rehypeCodeShell` must precede the highlighter, since it reads the
  *   `language-*` class that highlighting replaces.
  * - `rehypeBasePath` runs last among the link plugins, so it prefixes the
@@ -99,14 +197,21 @@ function createProcessor(): Processor {
     .use(remarkParse)
     .use(remarkGfm)
     .use(remarkMath)
-    .use(remarkWikiLinks, resolveWikiLink)
+    .use(remarkCallouts)
+    .use(remarkWikiLinks, {
+      link: resolveWikiLink,
+      embed: resolveWikiEmbed,
+      transclude: resolveWikiTransclusion,
+    })
     .use(remarkRehype, { allowDangerousHtml: true })
     .use(rehypeRaw)
     .use(rehypeSlug)
     .use(rehypeCollectHeadings)
+    .use(rehypeHeadingAnchors)
     .use(rehypeKatex)
     .use(rehypeInternalLinks, getUrlMap())
     .use(rehypeImages)
+    .use(rehypeMermaid)
     .use(rehypeCodeShell)
     .use(rehypeShiki, {
       themes: SHIKI_THEMES,
@@ -150,6 +255,9 @@ function getProcessor(): Processor {
  * Compiles a Markdown string to HTML and extracts its headings.
  *
  * @param markdown - Markdown source, with frontmatter already stripped
+ * @param docPath - Path of the document being rendered, when it has one; a
+ *   transclusion naming it is refused rather than nesting a copy of the page
+ *   inside itself
  * @returns The rendered HTML and the headings found in it
  *
  * @example
@@ -158,12 +266,20 @@ function getProcessor(): Processor {
  * headings; // [{ id: 'setup', text: 'Setup', depth: 2 }]
  * ```
  */
-export async function renderMarkdown(markdown: string): Promise<RenderedMarkdown> {
-  const file = await getProcessor().process(markdown);
+export async function renderMarkdown(
+  markdown: string,
+  docPath?: string,
+): Promise<RenderedMarkdown> {
+  const file = new VFile(markdown);
+  // Seeds the transclusion stack, so a document that includes itself is caught
+  // at the first step rather than after rendering one copy of itself.
+  if (docPath) file.data.docPath = docPath;
+
+  const processed = await getProcessor().process(file);
 
   return {
-    html: String(file),
-    headings: (file.data.headings as Heading[] | undefined) ?? [],
+    html: String(processed),
+    headings: (processed.data.headings as Heading[] | undefined) ?? [],
   };
 }
 
@@ -186,7 +302,7 @@ export async function renderDoc(docPath: string): Promise<RenderedMarkdown | nul
   const doc = getDoc(docPath);
   if (!doc) return null;
 
-  const rendered = await renderMarkdown(doc.content);
+  const rendered = await renderMarkdown(doc.content, doc.path);
   cache.set(docPath, rendered);
 
   return rendered;

package/template/lib/markdown/wikilink.test.ts

@@ -89,3 +89,33 @@ describe('findWikiLinks', () => {
     expect(findWikiLinks('x [[a|B]] y')[0].raw).toBe('[[a|B]]');
   });
 });
+
+describe('embeds', () => {
+  it('marks a leading ! as an embed', () => {
+    const [link] = findWikiLinks('![[diagram.png]]');
+
+    expect(link.embed).toBe(true);
+    expect(link.target).toBe('diagram.png');
+    expect(link.raw).toBe('![[diagram.png]]');
+  });
+
+  it('leaves a plain link unmarked', () => {
+    const [link] = findWikiLinks('[[diagram.png]]');
+
+    expect(link.embed).toBe(false);
+  });
+
+  // The `!` has to be part of the match. Matching only the brackets would
+  // leave it behind as literal text in front of the rendered node.
+  it('consumes the ! rather than leaving it in the text', () => {
+    const [link] = findWikiLinks('before ![[a]] after');
+
+    expect(link.raw.startsWith('!')).toBe(true);
+  });
+
+  it('accepts a label on an embed', () => {
+    const [link] = findWikiLinks('![[diagram.png|Architecture]]');
+
+    expect(link).toMatchObject({ target: 'diagram.png', label: 'Architecture', embed: true });
+  });
+});

package/template/lib/markdown/wikilink.ts

@@ -8,10 +8,13 @@
 /**
  * Matches a wiki link and captures its contents.
  *
+ * The leading `!` is part of the match so that `![[diagram.png]]` is recognised
+ * as an embed rather than leaving a stray `!` in the text ahead of a link.
+ *
  * Deliberately refuses `]` and newlines inside the brackets: an unterminated
  * `[[` should stay literal text rather than swallowing the rest of a paragraph.
  */
-export const WIKILINK_PATTERN = /\[\[([^\]\n]+)\]\]/g;
+export const WIKILINK_PATTERN = /(!?)\[\[([^\]\n]+)\]\]/g;
 
 /** The parts of a wiki link. */
 export interface WikiLink {
@@ -21,6 +24,8 @@ export interface WikiLink {
   anchor?: string;
   /** Display text, when the author supplied one after '|' */
   label?: string;
+  /** Written as `![[…]]`, asking for the target to be shown rather than linked */
+  embed: boolean;
   /** The full matched source, e.g. '[[guide#setup|Setup]]' */
   raw: string;
 }
@@ -33,21 +38,23 @@ export interface WikiLink {
  * - `[[target|label]]`
  * - `[[target#anchor]]`
  * - `[[target#anchor|label]]`
+ * - any of the above prefixed with `!`, to embed rather than link
  *
  * The label is split off first, so a `|` inside it is preserved and a `#` in
  * the label is not mistaken for an anchor.
  *
  * @param inner - Text between the brackets
  * @param raw - The full matched source, stored on the result
+ * @param embed - Whether the source carried a leading `!`
  * @returns The parsed link, or null when the target is empty
  *
  * @example
  * ```typescript
  * parseWikiLink('guides/setup#step-1|Step one', '[[guides/setup#step-1|Step one]]');
- * // { target: 'guides/setup', anchor: 'step-1', label: 'Step one', raw: '...' }
+ * // { target: 'guides/setup', anchor: 'step-1', label: 'Step one', embed: false, raw: '...' }
  * ```
  */
-export function parseWikiLink(inner: string, raw: string): WikiLink | null {
+export function parseWikiLink(inner: string, raw: string, embed = false): WikiLink | null {
   const pipe = inner.indexOf('|');
   const label = pipe === -1 ? undefined : inner.slice(pipe + 1).trim();
   const locator = (pipe === -1 ? inner : inner.slice(0, pipe)).trim();
@@ -63,6 +70,7 @@ export function parseWikiLink(inner: string, raw: string): WikiLink | null {
     target,
     anchor,
     label: label || undefined,
+    embed,
     raw,
   };
 }
@@ -77,7 +85,7 @@ export function findWikiLinks(text: string): WikiLink[] {
   const links: WikiLink[] = [];
 
   for (const match of text.matchAll(WIKILINK_PATTERN)) {
-    const parsed = parseWikiLink(match[1], match[0]);
+    const parsed = parseWikiLink(match[2], match[0], match[1] === '!');
     if (parsed) links.push(parsed);
   }
 

package/template/lib/navigation/sequence.test.ts

@@ -0,0 +1,73 @@
+import { describe, it, expect } from 'vitest';
+import { getAdjacentPages } from './sequence';
+import { getSite } from '../site';
+import { extractAllPaths, filterHiddenItems } from './builder';
+
+/** The reading order, as the sidebar presents it. */
+function order(): string[] {
+  return extractAllPaths(filterHiddenItems(getSite().navigation));
+}
+
+describe('getAdjacentPages', () => {
+  // Written against however many pages there are: a scaffolded project starts
+  // with two, and indexing past them would fail there rather than here.
+  it('follows the order the sidebar shows', () => {
+    const sequence = order();
+
+    for (let i = 0; i < sequence.length; i++) {
+      const { previous, next } = getAdjacentPages(sequence[i]);
+
+      if (i > 0) expect(previous?.url).toContain(sequence[i - 1]);
+      if (i < sequence.length - 1) expect(next?.url).toContain(sequence[i + 1]);
+    }
+  });
+
+  it('gives the first page no predecessor', () => {
+    expect(getAdjacentPages(order()[0]).previous).toBeNull();
+  });
+
+  it('gives the last page no successor', () => {
+    const sequence = order();
+
+    expect(getAdjacentPages(sequence[sequence.length - 1]).next).toBeNull();
+  });
+
+  it('titles each neighbour', () => {
+    const sequence = order();
+    // Skipped rather than failed on a one-page wiki, which has no neighbours
+    // to title.
+    if (sequence.length < 2) return;
+
+    const { next } = getAdjacentPages(sequence[0]);
+
+    expect(next?.title).toBeTruthy();
+    expect(next?.title).not.toBe(next?.url);
+  });
+
+  // Stepping through a guide should not land on a page deliberately kept out
+  // of the sidebar.
+  it('leaves hidden pages out of the sequence', () => {
+    const { hiddenPaths } = getSite();
+    const sequence = order();
+
+    for (const hidden of hiddenPaths) {
+      expect(sequence).not.toContain(hidden);
+    }
+  });
+
+  it('offers nothing for a page outside the sequence', () => {
+    expect(getAdjacentPages('no/such/page')).toEqual({ previous: null, next: null });
+  });
+
+  // Every URL it produces is the trailing-slash form the export serves, or the
+  // links here would redirect like the ones fixed elsewhere.
+  it('emits URLs in the form the export serves', () => {
+    for (const path of order()) {
+      const { previous, next } = getAdjacentPages(path);
+
+      for (const page of [previous, next]) {
+        if (page) expect(page.url).toMatch(/^\/.*\/$/);
+      }
+    }
+  });
+});

package/template/lib/navigation/sequence.ts

@@ -0,0 +1,100 @@
+import { getSite } from '../site';
+import { extractAllPaths, filterHiddenItems } from './builder';
+import { docPathToUrl } from './url';
+import { getDoc } from '../content/registry';
+import { cached } from '../cache';
+
+/**
+ * The order pages are meant to be read in.
+ *
+ * The sidebar already answers this: sections come from the content tree, order
+ * from `_meta.json` and frontmatter, and reading it top to bottom is how a
+ * reader works through a guide. Flattening that same tree gives the sequence,
+ * so the two can never disagree — a separate ordering would be one more thing
+ * to keep in step.
+ *
+ * Server-only.
+ */
+
+/** A page next to another in reading order. */
+export interface AdjacentPage {
+  /** Display title */
+  title: string;
+  /** Href, in the site's configured URL form */
+  url: string;
+}
+
+/** What comes before and after a page. */
+export interface Adjacent {
+  previous: AdjacentPage | null;
+  next: AdjacentPage | null;
+}
+
+let memo: string[] | null = null;
+
+/**
+ * Every page in reading order, hidden ones excluded.
+ *
+ * Hidden pages are reachable by direct link but are not part of the sequence:
+ * stepping through a guide should not land on something deliberately unlisted.
+ *
+ * @returns Content paths, in the order the sidebar shows them
+ *
+ * @example
+ * ```typescript
+ * getReadingOrder()[0]; // the page a reader starts at
+ * ```
+ */
+export function getReadingOrder(): string[] {
+  const hit = cached(memo);
+  if (hit) return hit;
+
+  const { navigation } = getSite();
+
+  // Sections that only group pages carry no path of their own and drop out
+  // here, leaving just the readable pages.
+  memo = extractAllPaths(filterHiddenItems(navigation));
+  return memo;
+}
+
+/**
+ * Finds the pages either side of one in reading order.
+ *
+ * @param path - Content path of the current page
+ * @returns The neighbours, each null at the ends of the sequence
+ *
+ * @example
+ * ```typescript
+ * const { previous, next } = getAdjacentPages('getting-started/installation');
+ * next?.title; // 'Your First Wiki'
+ * ```
+ */
+export function getAdjacentPages(path: string): Adjacent {
+  const sequence = getReadingOrder();
+  const index = sequence.indexOf(path);
+
+  // A hidden page, or one reached by a URL that navigation does not cover, has
+  // no place in the sequence and so no neighbours to offer.
+  if (index === -1) return { previous: null, next: null };
+
+  return {
+    previous: toAdjacent(sequence[index - 1]),
+    next: toAdjacent(sequence[index + 1]),
+  };
+}
+
+/**
+ * Resolves a content path to the title and href a link needs.
+ *
+ * @param path - Content path, or undefined at either end of the sequence
+ * @returns The page, or null when there is none
+ */
+function toAdjacent(path: string | undefined): AdjacentPage | null {
+  if (!path) return null;
+
+  const { urlMap } = getSite();
+  const url = docPathToUrl(urlMap, path);
+  if (!url) return null;
+
+  return { title: getDoc(path)?.title ?? path, url: `/${url}/` };
+}

package/template/lib/payload/schema.ts

@@ -14,6 +14,7 @@ export const payloadSchema = {
         description: { type: 'string', minLength: 1 },
         favicon: { type: 'string' },
         baseUrl: { type: 'string', format: 'uri' },
+        repoUrl: { type: 'string', format: 'uri' },
         urlStrategy: { type: 'string', enum: ['path', 'hash'] },
         autoNavigation: { type: 'boolean' },
         seo: {

package/template/lib/payload/types.ts

@@ -30,6 +30,13 @@ export interface GlobalConfig {
   favicon?: string;
   /** Base URL for the site */
   baseUrl?: string;
+  /**
+   * Source repository for this site.
+   *
+   * Shown as a link in the sidebar when set, and omitted entirely when not, so
+   * a private or unpublished wiki does not advertise one.
+   */
+  repoUrl?: string;
   /**
    * How content paths are expressed in URLs.
    *

package/template/package-lock.json

@@ -7,14 +7,18 @@
     "": {
       "name": "my-wiki",
       "version": "0.1.0",
+      "license": "MIT",
       "dependencies": {
         "@shikijs/rehype": "^4.3.1",
         "ajv": "^8.12.0",
         "ajv-formats": "^3.0.1",
+        "beautiful-mermaid": "^1.1.3",
+        "github-slugger": "^2.0.0",
         "gray-matter": "^4.0.3",
         "hast-util-to-string": "^3.0.1",
         "katex": "^0.16.47",
         "lucide-react": "^0.554.0",
+        "mdast-util-to-string": "^4.0.0",
         "minisearch": "^7.2.0",
         "next": "^14.2.0",
         "react": "^18.3.0",
@@ -1047,15 +1051,6 @@
         "url": "https://opencollective.com/pkgr"
       }
     },
-    "node_modules/@polka/url": {
-      "version": "1.0.0-next.29",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
-      "integrity": "sha512-wwQAWhWSuHaag8c4q/KN/vCoeOJYshAIvMQwD4GpSb3OiZklFfvAgmj0VCBBImRpuF/aFgIRzllXlVX93Jevww==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/@rollup/rollup-android-arm-eabi": {
       "version": "4.53.2",
       "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.53.2.tgz",
@@ -2222,30 +2217,6 @@
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vitest/ui": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@vitest/ui/-/ui-4.0.9.tgz",
-      "integrity": "sha512-6HV2HHl9aRJ09TlYj/WAQxaa797Ezb5u0LpgabthlASAUAWKgw/W1DSPX7t848mMZmIUvzZgnUHGIylAoYHP0w==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@vitest/utils": "4.0.9",
-        "fflate": "^0.8.2",
-        "flatted": "^3.3.3",
-        "pathe": "^2.0.3",
-        "sirv": "^3.0.2",
-        "tinyglobby": "^0.2.15",
-        "tinyrainbow": "^3.0.3"
-      },
-      "funding": {
-        "url": "https://opencollective.com/vitest"
-      },
-      "peerDependencies": {
-        "vitest": "4.0.9"
-      }
-    },
     "node_modules/@vitest/utils": {
       "version": "4.0.9",
       "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.0.9.tgz",
@@ -2685,6 +2656,28 @@
         "baseline-browser-mapping": "dist/cli.js"
       }
     },
+    "node_modules/beautiful-mermaid": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/beautiful-mermaid/-/beautiful-mermaid-1.1.3.tgz",
+      "integrity": "sha512-TItrtrAyHp1vwFfFVYauWGrquouk/6SS21Aq3RsxindSYZODcN4xYrPZD6BiZRU+o5mKJzDPz9MUSMvELdylyg==",
+      "license": "MIT",
+      "dependencies": {
+        "elkjs": "^0.11.0",
+        "entities": "^7.0.1"
+      }
+    },
+    "node_modules/beautiful-mermaid/node_modules/entities": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
+      "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
     "node_modules/binary-extensions": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
@@ -3274,6 +3267,12 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/elkjs": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/elkjs/-/elkjs-0.11.1.tgz",
+      "integrity": "sha512-zxxR9k+rx5ktMwT/FwyLdPCrq7xN6e4VGGHH8hA01vVYKjTFik7nHOxBnAYtrgYUB1RpAiLvA1/U2YraWxyKKg==",
+      "license": "EPL-2.0"
+    },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
@@ -4288,15 +4287,6 @@
         "reusify": "^1.0.4"
       }
     },
-    "node_modules/fflate": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz",
-      "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -6793,18 +6783,6 @@
       "integrity": "sha512-dqT2XBYUOZOiC5t2HRnwADjhNS2cecp9u+TJRiJ1Qp/f5qjkeT5APcGPjHw+bz89Ms8Jp+cG4AlE+QZ/QnDglg==",
       "license": "MIT"
     },
-    "node_modules/mrmime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz",
-      "integrity": "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -8349,23 +8327,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/sirv": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-3.0.2.tgz",
-      "integrity": "sha512-2wcC/oGxHis/BoHkkPwldgiPSYcpZK3JU28WoMVv55yHJgcZ8rlXvuG9iZggz+sU1d4bRgIGASwyWqjxu3FM0g==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@polka/url": "^1.0.0-next.24",
-        "mrmime": "^2.0.0",
-        "totalist": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -8955,18 +8916,6 @@
         "node": ">=8.0"
       }
     },
-    "node_modules/totalist": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
-      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/trim-lines": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",