do11y 0.2.4 → 0.2.5

package/dist/docs/plugins/highlight/highlight-css.d.ts

@@ -0,0 +1,7 @@
+import type { Plugin } from "vite";
+/**
+ * Adds the necessary styles for using
+ * dual themes with the `highlighter`.
+ */
+declare const _default: () => Plugin;
+export default _default;

package/dist/docs/plugins/highlight/highlight-css.js

@@ -0,0 +1,33 @@
+import { do11yOptions } from "../../options.js";
+/**
+ * Adds the necessary styles for using
+ * dual themes with the `highlighter`.
+ */
+export default () => ({
+    name: "do11y:highlight-css",
+    async resolveId(id) {
+        if (id === "do11y:css") {
+            return "\0dolly:css.css";
+        }
+    },
+    load: {
+        order: "post",
+        handler(id) {
+            if (id === "\0dolly:css.css") {
+                const generateThemeCss = (theme) => `
+        [data-theme="${theme}"] .shiki {
+          background-color: var(--shiki-${theme}-bg) !important;
+        }
+
+        [data-theme="${theme}"] .shiki span {
+          color: var(--shiki-${theme}) !important;
+        }
+      `;
+                return Object.keys(do11yOptions.highlighter.themesInput)
+                    .filter((theme) => do11yOptions.highlighter.defaultTheme !== theme)
+                    .map((theme) => generateThemeCss(theme))
+                    .join("\n");
+            }
+        },
+    },
+});

package/dist/docs/plugins/{highlight.js → highlight/highlight.js}

@@ -3,7 +3,7 @@ import { parse as parseVue } from "vue/compiler-sfc";
 import { format } from "oxfmt";
 import { createHighlighter, bundledLanguages, bundledThemes } from "shiki";
 import { JSDOM } from "jsdom";
-import { do11yOptions } from "../options.js";
+import { do11yOptions } from "../../options.js";
 import { transformerNotationDiff, transformerNotationErrorLevel, transformerNotationHighlight, } from "@shikijs/transformers";
 const shiki = await createHighlighter({
     langs: Object.keys(bundledLanguages),
@@ -41,32 +41,12 @@ export const highlightAndFormatCode = async (path, code) => {
 export default () => {
     let viteDevServer;
     return {
-        name: "do11y:shiki",
+        name: "do11y:highlight",
         configureServer(server) {
             viteDevServer = server;
         },
-        async resolveId(id) {
-            if (id === "do11y:css") {
-                return "\0dolly:css.css";
-            }
-        },
         async load(id) {
-            if (id === "\0dolly:css.css") {
-                const generateThemeCss = (theme) => `
-          [data-theme="${theme}"] .shiki {
-            background-color: var(--shiki-${theme}-bg) !important;
-          }
-
-          [data-theme="${theme}"] .shiki span {
-            color: var(--shiki-${theme}) !important;
-          }
-        `;
-                return Object.keys(do11yOptions.highlighter.themesInput)
-                    .filter((theme) => do11yOptions.highlighter.defaultTheme !== theme)
-                    .map((theme) => generateThemeCss(theme))
-                    .join("\n");
-            }
-            else if (id.endsWith(".vue?highlight") || id.endsWith(".vue?highlight&lang=css")) {
+            if (id.endsWith(".vue?highlight") || id.endsWith(".vue?highlight&lang=css")) {
                 const path = id.replace("?highlight", "").replace("&lang=css", "");
                 const source = readFileSync(path, "utf-8");
                 /**
@@ -77,7 +57,7 @@ export default () => {
                  * to compile the style tags to CSS.
                  */
                 if (viteDevServer?.config.command === "serve" || !id.endsWith("lang=css")) {
-                    return `export default ${JSON.stringify(await highlightAndFormatCode(path, source))};`;
+                    return `export default \`${await highlightAndFormatCode(path, source)}\`;`;
                 }
                 const loadCss = async (index, lang) => {
                     const { code } = await this.load({
@@ -96,7 +76,7 @@ export default () => {
                     .filter((stylesheet) => !!stylesheet)
                     .map((stylesheet) => `<style>${stylesheet}</style>`)
                     .join("\n");
-                return `export default ${JSON.stringify(await highlightAndFormatCode(path, sourceWithoutStyles + css))};`;
+                return `export default \`${await highlightAndFormatCode(path, sourceWithoutStyles + css)}\`;`;
             }
         },
     };

package/dist/docs/plugins/markdown.js

@@ -3,7 +3,7 @@ import { sfcPlugin } from "@mdit-vue/plugin-sfc";
 import { frontmatterPlugin } from "@mdit-vue/plugin-frontmatter";
 import attrsPlugin from "markdown-it-attrs";
 import markdown from "markdown-it";
-import { highlightCode } from "./highlight.js";
+import { highlightCode } from "./highlight/highlight.js";
 /**
  * Processes blocks with the lang set to `md` into HTML,
  * and turns `.md` files into single file vue components

package/dist/docs/plugins/plugins.js

@@ -1,6 +1,7 @@
 import ui from "./ui.js";
 import sandbox from "./sandbox.js";
-import highlight from "./highlight.js";
+import highlightCss from "./highlight/highlight-css.js";
+import highlight from "./highlight/highlight.js";
 import meta from "./meta/meta.js";
 import markdown from "./markdown.js";
 import block from "v-custom-block";
@@ -10,6 +11,7 @@ import { do11yOptions } from "../options.js";
 export const plugins = () => [
     ui(),
     sandbox(),
+    highlightCss(),
     highlight(),
     meta(),
     markdown(do11yOptions),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "do11y",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "A bare-bones tool to document Vue components.",
   "keywords": [
     "docs-generator",