@quiteer/vite 0.1.7 → 0.1.9

package/dist/bin/qvite.mjs

@@ -3,8 +3,9 @@ import { cac } from "cac";
 import { build, createServer, loadEnv, mergeConfig } from "vite";
 import UnoCSS from "@quiteer/unocss";
 import { PersistentStore, deepMerge } from "@quiteer/utils";
-import { AutoImport, Components, Icons, IconsResolver, NaiveUiResolver, Progress, Vue, VueDevTools, VueJsx, bootstrapEnv, createSvgIconsPlugin, envConfigPlugin, fileChangeLoggerPlugin, mockRouterPlugin, removeConsolePlugin, virtualHtmlPlugin } from "@quiteer/vite-plugins";
+import { bootstrapEnv, envConfigPlugin, fileChangeLoggerPlugin, mockRouterPlugin, removeConsolePlugin, virtualHtmlPlugin } from "@quiteer/vite-plugins";
 import path, { join, resolve } from "node:path";
+import { AutoImport, Components, FileSystemIconLoader, Icons, IconsResolver, NaiveUiResolver, Progress, Vue, VueDevTools, VueJsx, createSvgIconsPlugin } from "@quiteer/vite-plugins/plugins";
 import { cwd } from "node:process";
 import { isFunction } from "@quiteer/is";
 import { parserConfig } from "@quiteer/parser-config";
@@ -13,7 +14,7 @@ import { setTimeout } from "node:timers/promises";
 import { getPortPromise } from "portfinder";
 
 //#region package.json
-var version = "0.1.7";
+var version = "0.1.9";
 
 //#endregion
 //#region src/store.ts
@@ -25,13 +26,16 @@ store.set("mode", "development");
 store.set("env", {});
 store.set("minify", false);
 store.set("port", 8080);
-store.set("prefixes", ["QVITE_", "VITE_"]);
 
 //#endregion
 //#region src/defaults.ts
-function getDefaultOptions() {
+function getDefaultOptions(config) {
 	const root$1 = store.get("root");
+	const minify = store.get("minify");
+	const localIconDir = config.localIconDir || "src/assets/icons";
 	return {
+		minify,
+		localIconDir,
 		UnoCSS: false,
 		plugins: {
 			Vue: [{ customElement: true }],
@@ -41,7 +45,12 @@ function getDefaultOptions() {
 			FileChangeLogger: false,
 			RemoveConsole: false,
 			MockRouter: false,
-			Icons: false,
+			Icons: [{
+				compiler: "vue3",
+				customCollections: { local: FileSystemIconLoader(resolve(root$1, localIconDir), (svg) => svg.replace(/^<svg\s/, "<svg width=\"1em\" height=\"1em\" ")) },
+				scale: 1,
+				defaultClass: "inline-block"
+			}],
 			SvgIcons: false,
 			AutoImport: [{ imports: [
 				"vue",
@@ -60,7 +69,7 @@ function getDefaultOptions() {
 				}],
 				resolvers: [NaiveUiResolver(), IconsResolver({
 					customCollections: "local",
-					componentPrefix: "icon-loacl"
+					componentPrefix: "icon-local"
 				})]
 			}]
 		},
@@ -72,11 +81,12 @@ function getDefaultOptions() {
 		vite: {
 			server: {
 				port: 3e3,
+				host: "0.0.0.0",
 				open: false,
 				strictPort: false
 			},
 			resolve: { alias: { "@": resolve(root$1, "src") } },
-			build: { minify: false }
+			build: { minify }
 		}
 	};
 }
@@ -125,7 +135,7 @@ function withUnoInjection(config) {
 	return next;
 }
 async function normalizeConfig(raw) {
-	return deepMerge(getDefaultOptions(), raw);
+	return deepMerge(getDefaultOptions(raw), raw);
 }
 function geVitePlugins(config) {
 	const { env, plugins } = config;
@@ -144,12 +154,18 @@ function geVitePlugins(config) {
 }
 async function toViteInlineConfig(config) {
 	const mode = store.get("mode");
+	const root$1 = store.get("root");
+	const plugins = geVitePlugins(config);
+	const userViteConfig = { ...config.vite };
+	const userPlugins = userViteConfig.plugins || [];
+	const userPluginsArray = Array.isArray(userPlugins) ? userPlugins : [userPlugins];
+	delete userViteConfig.plugins;
 	return mergeConfig({
 		configFile: false,
-		root: store.get("root"),
+		root: root$1,
 		mode,
-		plugins: geVitePlugins(config)
-	}, { ...config.vite });
+		plugins: [...userPluginsArray, ...plugins]
+	}, userViteConfig);
 }
 
 //#endregion
@@ -208,12 +224,13 @@ async function getConfig(filePath) {
 	const path$1 = await configPath(filePath);
 	const command = store.get("command");
 	const mode = store.get("mode");
+	const includePrefixes = ["QVITE_", "VITE_"];
 	await bootstrapEnv({
 		mode,
-		includePrefixes: ["VITE_"]
+		includePrefixes
 	});
-	const modeEnv = loadEnv(mode, root, store.get("prefixes"));
-	const env = deepMerge({}, loadEnv("", root, store.get("prefixes")), modeEnv);
+	const modeEnv = loadEnv(mode, root, includePrefixes);
+	const env = deepMerge({}, loadEnv("", root, includePrefixes), modeEnv);
 	try {
 		const option = await parserConfig(path$1, "qvite.config");
 		if (isFunction(option)) return option({
@@ -258,7 +275,8 @@ async function getConfig(filePath) {
 */
 async function watch(options) {
 	const normalized = await normalizeConfig(options);
-	const p = await getPortPromise({ port: normalized.vite?.server?.port || store.get("port") });
+	const port = normalized.vite?.server?.port;
+	const p = await getPortPromise({ port });
 	store.set("port", p);
 	const inline = await toViteInlineConfig(normalized);
 	const viteDevServer = await createServer({

package/dist/index.d.mts

@@ -1,6 +1,7 @@
 import { UserConfig, defineConfig as defineConfig$1 } from "tsdown";
 import { UserConfig as UserConfig$1, defineConfig as defineConfig$2 } from "vite";
-import { AutoImport, Components, EnvConfig, EnvConfigPluginOptions, FileSystemIconLoader, Icons, IconsResolver, NaiveUiResolver, Progress, VirtualHtmlOptions, Vue, VueDevTools, VueJsx, createSvgIconsPlugin, fileChangeLoggerPlugin, mockRouterPlugin, removeConsolePlugin } from "@quiteer/vite-plugins";
+import { AutoImport, Components, FileSystemIconLoader, Icons, IconsResolver, NaiveUiResolver, Progress, Vue, VueDevTools, VueJsx, createSvgIconsPlugin } from "@quiteer/vite-plugins/plugins";
+import { EnvConfig, EnvConfigPluginOptions, VirtualHtmlOptions, fileChangeLoggerPlugin, mockRouterPlugin, removeConsolePlugin } from "@quiteer/vite-plugins";
 
 //#region src/typings.d.ts
 type PluginOptions<T extends (...args: any) => any> = boolean | Parameters<T>;
@@ -18,6 +19,8 @@ interface QvitePlugins {
   AutoImport?: PluginOptions<typeof AutoImport>;
 }
 interface QviteConfig {
+  minify?: boolean;
+  localIconDir?: string;
   UnoCSS?: boolean;
   vite?: UserConfig$1;
   tsdown?: UserConfig | UserConfig[];

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { defineConfig as defineConfig$1 } from "tsdown";
 import { defineConfig as defineConfig$2 } from "vite";
-import { FileSystemIconLoader, IconsResolver, NaiveUiResolver } from "@quiteer/vite-plugins";
+import { FileSystemIconLoader, IconsResolver, NaiveUiResolver } from "@quiteer/vite-plugins/plugins";
 
 //#region index.ts
 function defineConfig(config) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@quiteer/vite",
   "type": "module",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "在 vite 的基础上增强的前端架构 cli",
   "author": "quiteer",
   "license": "MIT",
@@ -60,9 +60,9 @@
     "vite": "npm:rolldown-vite@7.2.2",
     "zx": "^8.8.5",
     "@quiteer/is": "0.0.2",
-    "@quiteer/utils": "0.0.2",
-    "@quiteer/unocss": "0.0.4",
-    "@quiteer/vite-plugins": "^0.1.2"
+    "@quiteer/unocss": "0.0.6",
+    "@quiteer/utils": "0.0.4",
+    "@quiteer/vite-plugins": "^0.1.4"
   },
   "scripts": {
     "dev": "tsdown -w",

package/uno.config.ts

@@ -1 +1,17 @@
-export { defineConfig, unoConfig } from '@quiteer/unocss/uno.config.ts'
+import type { VitePluginConfig } from '@unocss/vite'
+import { defineConfig, NaiveUIPreset, QuiteerPreset } from '@quiteer/unocss'
+
+export default (userConfig: VitePluginConfig) => {
+  return defineConfig({
+    content: {
+      pipeline: {
+        exclude: ['node_modules', 'dist']
+      }
+    },
+    presets: [
+      QuiteerPreset(),
+      NaiveUIPreset()
+    ],
+    ...userConfig
+  })
+}