@quiteer/vite 0.1.8 → 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, FileSystemIconLoader, 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.8";
+var version = "0.1.9";
 
 //#endregion
 //#region src/store.ts
@@ -68,7 +69,7 @@ function getDefaultOptions(config) {
 				}],
 				resolvers: [NaiveUiResolver(), IconsResolver({
 					customCollections: "local",
-					componentPrefix: "icon-loacl"
+					componentPrefix: "icon-local"
 				})]
 			}]
 		},
@@ -153,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

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>;

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.8",
+  "version": "0.1.9",
   "description": "在 vite 的基础上增强的前端架构 cli",
   "author": "quiteer",
   "license": "MIT",
@@ -59,10 +59,10 @@
     "tsdown": "^0.16.1",
     "vite": "npm:rolldown-vite@7.2.2",
     "zx": "^8.8.5",
-    "@quiteer/unocss": "0.0.5",
     "@quiteer/is": "0.0.2",
-    "@quiteer/vite-plugins": "^0.1.2",
-    "@quiteer/utils": "0.0.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,13 +1,17 @@
+import type { VitePluginConfig } from '@unocss/vite'
 import { defineConfig, NaiveUIPreset, QuiteerPreset } from '@quiteer/unocss'
 
-export default defineConfig({
-  content: {
-    pipeline: {
-      exclude: ['node_modules', 'dist']
-    }
-  },
-  presets: [
-    QuiteerPreset(),
-    NaiveUIPreset()
-  ]
-})
+export default (userConfig: VitePluginConfig) => {
+  return defineConfig({
+    content: {
+      pipeline: {
+        exclude: ['node_modules', 'dist']
+      }
+    },
+    presets: [
+      QuiteerPreset(),
+      NaiveUIPreset()
+    ],
+    ...userConfig
+  })
+}