webanvil 0.0.9 → 0.0.10

package/dist/_chunks/commands.mjs

@@ -1,9 +1,9 @@
-import { assertSyntaxTarget, loadConfig, resolveEffectiveBuildConfig, resolveRolldownPlugins, resolveVitePlugins, syntaxTargetSchema, withConfig } from "./config.mjs";
+import { assertSyntaxTarget, hasOxcConfig, hasStorybookConfig, hasToolConfig, loadConfig, resolveEffectiveBuildConfig, resolveRolldownPlugins, resolveVitePlugins, syntaxTargetSchema, withConfig } from "./config.mjs";
 import { Module, createRequire, isBuiltin } from "node:module";
 import { defineArgument, defineCommand, defineOption } from "cmdore";
 import { dirname, isAbsolute, join, relative, resolve } from "pathe";
 import { glob } from "tinyglobby";
-import { access, copyFile, lstat, mkdir, mkdtemp, readFile, readdir, realpath, rename, rm, rmdir, writeFile } from "node:fs/promises";
+import { access, copyFile, lstat, mkdir, mkdtemp, readFile, realpath, rename, rm, rmdir, writeFile } from "node:fs/promises";
 import { z } from "zod";
 import { dirname as dirname$1, isAbsolute as isAbsolute$1, join as join$1, relative as relative$1, resolve as resolve$1 } from "node:path";
 import { getTsconfig, readTsconfig } from "get-tsconfig";
@@ -31,30 +31,6 @@ const paths = defineArgument({
 	description: "Files or directories to check.",
 	variadic: true
 });
-const hasFile = async (path) => access(path).then(() => true).catch(() => false);
-const hasToolConfig = async (name, cwd = process.cwd()) => {
-	const files = await readdir(cwd).catch(() => []);
-	return [
-		"js",
-		"mjs",
-		"cjs",
-		"ts",
-		"mts",
-		"cts"
-	].some((extension) => files.includes(`${name}.config.${extension}`));
-};
-const hasOxcConfig = (name, cwd = process.cwd()) => hasFile(join(cwd, name === "oxfmt" ? ".oxfmtrc.json" : ".oxlintrc.json"));
-const hasStorybookConfig = async (configDir = ".storybook", cwd = process.cwd()) => {
-	const files = await readdir(resolve(cwd, configDir)).catch(() => []);
-	return [
-		"js",
-		"mjs",
-		"cjs",
-		"ts",
-		"mts",
-		"cts"
-	].some((extension) => files.includes(`main.${extension}`));
-};
 const path = (cwd) => resolve(cwd, ".webanvil", "buildinfo.json");
 const relativeOutput = (file, cwd) => {
 	const output = relative(cwd, resolve(cwd, file));

package/dist/_chunks/config.mjs

@@ -1,6 +1,32 @@
+import { join, resolve } from "pathe";
+import { access, readdir } from "node:fs/promises";
 import { loadConfig } from "c12";
 import { defu } from "defu";
 import { z } from "zod";
+const hasFile = async (path) => access(path).then(() => true).catch(() => false);
+const hasToolConfig = async (name, cwd = process.cwd()) => {
+	const files = await readdir(cwd).catch(() => []);
+	return [
+		"js",
+		"mjs",
+		"cjs",
+		"ts",
+		"mts",
+		"cts"
+	].some((extension) => files.includes(`${name}.config.${extension}`));
+};
+const hasOxcConfig = (name, cwd = process.cwd()) => hasFile(join(cwd, name === "oxfmt" ? ".oxfmtrc.json" : ".oxlintrc.json"));
+const hasStorybookConfig = async (configDir = ".storybook", cwd = process.cwd()) => {
+	const files = await readdir(resolve(cwd, configDir)).catch(() => []);
+	return [
+		"js",
+		"mjs",
+		"cjs",
+		"ts",
+		"mts",
+		"cts"
+	].some((extension) => files.includes(`main.${extension}`));
+};
 const NODE_PLUGIN_ERROR = "Node builds require plugins created with definePlugin()";
 const definePlugin = (plugin, options) => ({
 	rolldown: () => plugin.rolldown(options),
@@ -137,4 +163,4 @@ const withConfig = (select, run) => async (arguments_, resolvedConfig) => {
 		...defined(arguments_)
 	}, selectedConfig, config, arguments_);
 };
-export { assertSyntaxTarget, buildConfigSchema, copyMappingSchema, defaultConfig, defineConfig, definePlugin, effectiveUserConfigSchema, formatConfigSchema, isUnpluginAdapter, isWebAnvilPlugin, lintConfigSchema, loadConfig$1 as loadConfig, resolveEffectiveBuildConfig, resolveRolldownPlugins, resolveVitePlugins, rolldownConfigSchema, storybookConfigSchema, syntaxTargetSchema, testConfigSchema, userConfigSchema, viteConfigSchema, withConfig };
+export { assertSyntaxTarget, buildConfigSchema, copyMappingSchema, defaultConfig, defineConfig, definePlugin, effectiveUserConfigSchema, formatConfigSchema, hasOxcConfig, hasStorybookConfig, hasToolConfig, isUnpluginAdapter, isWebAnvilPlugin, lintConfigSchema, loadConfig$1 as loadConfig, resolveEffectiveBuildConfig, resolveRolldownPlugins, resolveVitePlugins, rolldownConfigSchema, storybookConfigSchema, syntaxTargetSchema, testConfigSchema, userConfigSchema, viteConfigSchema, withConfig };

package/dist/_chunks/project-vite.mjs

@@ -1,9 +1,11 @@
-import { loadConfig, resolveVitePlugins } from "./config.mjs";
-const withProjectVitePlugins = async (config) => {
+import { hasToolConfig, loadConfig, resolveVitePlugins } from "./config.mjs";
+import { resolve } from "node:path";
+const withProjectVitePlugins = async (config, storybookConfigDirectory = ".storybook") => {
 	const { config: webanvilConfig } = await loadConfig();
+	const plugins = [...resolveVitePlugins(webanvilConfig.plugins ?? []), ...await hasToolConfig("vite", resolve(storybookConfigDirectory, "..")) ? [] : webanvilConfig.vite?.plugins ?? []];
 	return {
 		...config,
-		plugins: [...resolveVitePlugins(webanvilConfig.plugins ?? []), ...config.plugins ?? []]
+		plugins: [...plugins, ...config.plugins ?? []]
 	};
 };
 export { withProjectVitePlugins };

package/dist/storybook/react/preset

@@ -4,5 +4,5 @@ import { fileURLToPath } from "node:url";
 import { viteFinal as viteFinal$1 } from "@storybook/react-vite/preset";
 export * from "@storybook/react-vite/preset";
 const addons = [resolve(fileURLToPath(new URL("..", import.meta.url)), "test")];
-const viteFinal = async (...arguments_) => viteFinal$1(await withProjectVitePlugins(arguments_[0]), arguments_[1]);
+const viteFinal = async (...arguments_) => viteFinal$1(await withProjectVitePlugins(arguments_[0], arguments_[1]?.configDir), arguments_[1]);
 export { addons, viteFinal };

package/dist/storybook/react/preset.mjs

@@ -4,5 +4,5 @@ import { fileURLToPath } from "node:url";
 import { viteFinal as viteFinal$1 } from "@storybook/react-vite/preset";
 export * from "@storybook/react-vite/preset";
 const addons = [resolve(fileURLToPath(new URL("..", import.meta.url)), "test")];
-const viteFinal = async (...arguments_) => viteFinal$1(await withProjectVitePlugins(arguments_[0]), arguments_[1]);
+const viteFinal = async (...arguments_) => viteFinal$1(await withProjectVitePlugins(arguments_[0], arguments_[1]?.configDir), arguments_[1]);
 export { addons, viteFinal };

package/dist/storybook/svelte/preset

@@ -4,5 +4,5 @@ import { fileURLToPath } from "node:url";
 import { viteFinal as viteFinal$1 } from "@storybook/svelte-vite/preset";
 export * from "@storybook/svelte-vite/preset";
 const addons = [resolve(fileURLToPath(new URL("..", import.meta.url)), "test")];
-const viteFinal = async (...arguments_) => viteFinal$1(await withProjectVitePlugins(arguments_[0]), arguments_[1]);
+const viteFinal = async (...arguments_) => withProjectVitePlugins(await viteFinal$1(arguments_[0], arguments_[1]), arguments_[1]?.configDir);
 export { addons, viteFinal };

package/dist/storybook/svelte/preset.mjs

@@ -4,5 +4,5 @@ import { fileURLToPath } from "node:url";
 import { viteFinal as viteFinal$1 } from "@storybook/svelte-vite/preset";
 export * from "@storybook/svelte-vite/preset";
 const addons = [resolve(fileURLToPath(new URL("..", import.meta.url)), "test")];
-const viteFinal = async (...arguments_) => viteFinal$1(await withProjectVitePlugins(arguments_[0]), arguments_[1]);
+const viteFinal = async (...arguments_) => withProjectVitePlugins(await viteFinal$1(arguments_[0], arguments_[1]), arguments_[1]?.configDir);
 export { addons, viteFinal };

package/dist/storybook/vue/preset

@@ -4,5 +4,5 @@ import { fileURLToPath } from "node:url";
 import { viteFinal as viteFinal$1 } from "@storybook/vue3-vite/preset";
 export * from "@storybook/vue3-vite/preset";
 const addons = [resolve(fileURLToPath(new URL("..", import.meta.url)), "test")];
-const viteFinal = async (...arguments_) => viteFinal$1(await withProjectVitePlugins(arguments_[0]), arguments_[1]);
+const viteFinal = async (...arguments_) => viteFinal$1(await withProjectVitePlugins(arguments_[0], arguments_[1]?.configDir), arguments_[1]);
 export { addons, viteFinal };

package/dist/storybook/vue/preset.mjs

@@ -4,5 +4,5 @@ import { fileURLToPath } from "node:url";
 import { viteFinal as viteFinal$1 } from "@storybook/vue3-vite/preset";
 export * from "@storybook/vue3-vite/preset";
 const addons = [resolve(fileURLToPath(new URL("..", import.meta.url)), "test")];
-const viteFinal = async (...arguments_) => viteFinal$1(await withProjectVitePlugins(arguments_[0]), arguments_[1]);
+const viteFinal = async (...arguments_) => viteFinal$1(await withProjectVitePlugins(arguments_[0], arguments_[1]?.configDir), arguments_[1]);
 export { addons, viteFinal };

package/dist/storybook/web-components/preset

@@ -3,5 +3,5 @@ import { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 export * from "@storybook/web-components-vite/preset";
 const addons = [resolve(fileURLToPath(new URL("..", import.meta.url)), "test")];
-const viteFinal = withProjectVitePlugins;
+const viteFinal = async (config, options) => withProjectVitePlugins(config, options.configDir);
 export { addons, viteFinal };

package/dist/storybook/web-components/preset.d.mts

@@ -1,4 +1,8 @@
+import { InlineConfig } from "vite";
 export * from "@storybook/web-components-vite/preset";
+declare const withProjectVitePlugins: (config: InlineConfig, storybookConfigDirectory?: string) => Promise<InlineConfig>;
 declare const addons: string[];
-declare const viteFinal: (config: import("vite").InlineConfig) => Promise<import("vite").InlineConfig>;
+declare const viteFinal: (config: Parameters<typeof withProjectVitePlugins>[0], options: {
+  configDir?: string;
+}) => Promise<import("vite").InlineConfig>;
 export { addons, viteFinal };

package/dist/storybook/web-components/preset.mjs

@@ -3,5 +3,5 @@ import { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 export * from "@storybook/web-components-vite/preset";
 const addons = [resolve(fileURLToPath(new URL("..", import.meta.url)), "test")];
-const viteFinal = withProjectVitePlugins;
+const viteFinal = async (config, options) => withProjectVitePlugins(config, options.configDir);
 export { addons, viteFinal };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "webanvil",
-    "version": "0.0.9",
+    "version": "0.0.10",
     "description": "A unified CLI for building, testing, linting, formatting, and type-checking JavaScript and TypeScript projects.",
     "keywords": [
         "build-tool",