do11y 0.0.0 → 0.1.0

package/dist/docs/cli.js

@@ -1,12 +1,11 @@
 import { createServer, build, preview, mergeConfig } from "vite";
-import { getUserViteConfig, getUserVuePlugin, viteConfig } from "./vite-config.js";
+import { getUserViteConfig, viteConfig } from "./vite-config.js";
 const [_, __, command = "dev"] = process.argv;
 if (command !== "dev" && command !== "build" && command !== "preview") {
     throw new Error();
 }
 const userViteConfig = await getUserViteConfig(command);
-const vuePlugin = await getUserVuePlugin(userViteConfig);
-const mergedViteConfig = mergeConfig({ plugins: [vuePlugin] }, viteConfig);
+const mergedViteConfig = mergeConfig(userViteConfig, viteConfig);
 if (command === "dev") {
     const server = await createServer(mergedViteConfig);
     await server.listen();

package/dist/docs/vite-config.d.ts

@@ -1,7 +1,10 @@
-import { type Plugin, type UserConfig } from "vite";
-import type { Api } from "@vitejs/plugin-vue";
-export declare const getUserViteConfig: (command: "dev" | "build" | "preview") => Promise<UserConfig>;
-export declare const getUserVuePlugin: (userViteConfig: UserConfig) => Promise<Plugin<Api>>;
+import { type Plugin } from "vite";
+export declare const getUserViteConfig: (command: "dev" | "build" | "preview") => Promise<{
+    plugins: Plugin<any>[];
+    resolve: (import("vite").ResolveOptions & {
+        alias?: import("vite").AliasOptions;
+    }) | undefined;
+}>;
 export declare const viteConfig: {
     root: string;
     plugins: Plugin<any>[];

package/dist/docs/vite-config.js

@@ -7,7 +7,11 @@ export const getUserViteConfig = async (command) => {
         command: command === "dev" ? "serve" : "build",
         mode: command === "dev" ? "dev" : "build",
     });
-    return userConfigFile?.config ?? {};
+    const config = userConfigFile?.config ?? {};
+    return {
+        plugins: await getUserPlugins(config),
+        resolve: config.resolve,
+    };
 };
 const getPlugin = async (plugin) => {
     if (!plugin) {
@@ -26,16 +30,19 @@ const getPlugin = async (plugin) => {
         return (await getPlugin(await plugin)).flat();
     }
 };
-export const getUserVuePlugin = async (userViteConfig) => {
+const getUserPlugins = async (userViteConfig) => {
     const userPlugins = userViteConfig.plugins?.map(async (p) => await getPlugin(p)) ?? [];
     const resolvedUserPlugins = (await Promise.all(userPlugins)).flat();
     const vuePluginApi = resolvedUserPlugins.find((p) => p.name === "vite:vue").api;
     const VuePlugin = (await import("@vitejs/plugin-vue")).default;
-    return VuePlugin({
-        ...vuePluginApi.options,
-        include: [/\.vue$/, /\.md$/],
-        exclude: [/\.vue\?meta$/],
-    });
+    return [
+        VuePlugin({
+            ...vuePluginApi.options,
+            include: [/\.vue$/, /\.md$/],
+            exclude: [/\.vue\?meta$/],
+        }),
+        ...resolvedUserPlugins.filter((i) => i.name !== "vite:vue"),
+    ];
 };
 export const viteConfig = {
     root: docs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "do11y",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "description": "A bare-bones tool to document Vue components.",
   "license": "MIT",
   "repository": "github:sq11y/do11y",