@quiteer/vite 0.1.10 → 0.1.11

package/dist/bin/qvite.mjs

@@ -2,11 +2,13 @@
 import { cac } from "cac";
 import { build, createServer, loadEnv, mergeConfig } from "vite";
 import UnoCSS from "@quiteer/unocss";
-import { PersistentStore, deepMerge } from "@quiteer/utils";
+import { PersistentStore, deepMerge, isPlainObject } from "@quiteer/utils";
 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 { VueRouterAutoImports } from "unplugin-vue-router";
 import { cwd } from "node:process";
+import VueRouter from "unplugin-vue-router/vite";
 import { isFunction } from "@quiteer/is";
 import { parserConfig } from "@quiteer/parser-config";
 import { pathExists } from "fs-extra";
@@ -14,7 +16,7 @@ import { setTimeout } from "node:timers/promises";
 import { getPortPromise } from "portfinder";
 
 //#region package.json
-var version = "0.1.10";
+var version = "0.1.11";
 
 //#endregion
 //#region src/store.ts
@@ -36,9 +38,21 @@ function getDefaultOptions(config) {
 	return {
 		minify,
 		localIconDir,
-		UnoCSS: false,
+		UnoCSS: true,
 		plugins: {
-			Vue: [{ customElement: true }],
+			VueRouter: [{
+				logs: true,
+				dts: "src/typings/pages.d.ts",
+				extensions: [
+					".page.vue",
+					".meta.vue",
+					".link.vue"
+				]
+			}],
+			Vue: [{
+				customElement: true,
+				include: [/\.vue$/, /\.md$/]
+			}],
 			VueDevTools: [{}],
 			VueJsx: [{}],
 			Progress: [{}],
@@ -52,17 +66,22 @@ function getDefaultOptions(config) {
 				defaultClass: "inline-block"
 			}],
 			SvgIcons: false,
-			AutoImport: [{ imports: [
-				"vue",
-				"vue-router",
-				{ "naive-ui": [
-					"useDialog",
-					"useMessage",
-					"useNotification",
-					"useLoadingBar"
-				] }
-			] }],
+			AutoImport: [{
+				dts: "src/typings/auto-imports.d.ts",
+				imports: [
+					"vue",
+					"vue-router",
+					VueRouterAutoImports,
+					{ "naive-ui": [
+						"useDialog",
+						"useMessage",
+						"useNotification",
+						"useLoadingBar"
+					] }
+				]
+			}],
 			Components: [{
+				dts: "src/typings/components.d.ts",
 				types: [{
 					from: "vue-router",
 					names: ["RouterLink", "RouterView"]
@@ -94,6 +113,7 @@ function getDefaultOptions(config) {
 //#endregion
 //#region src/plugins.ts
 var plugins_default = {
+	VueRouter,
 	FileChangeLogger: fileChangeLoggerPlugin,
 	MockRouter: mockRouterPlugin,
 	RemoveConsole: removeConsolePlugin,
@@ -141,10 +161,19 @@ function geVitePlugins(config) {
 	const { env, plugins } = config;
 	const html = withUnoInjection(config);
 	return [
-		...Object.keys(plugins).map((key) => {
+		...[...Object.keys(plugins)].sort((a, b) => {
+			const order = {
+				VueRouter: 1,
+				Vue: 2
+			};
+			return (order[a] || 99) - (order[b] || 99);
+		}).map((key) => {
 			const pluginOptions = plugins[key];
 			const pluginFn = plugins_default[key];
-			if (Array.isArray(pluginOptions)) return pluginFn(...pluginOptions);
+			if (Array.isArray(pluginOptions)) {
+				if (pluginOptions.every(isPlainObject)) return pluginFn(deepMerge({}, ...pluginOptions));
+				return pluginFn(...pluginOptions);
+			}
 			return null;
 		}).filter(Boolean),
 		virtualHtmlPlugin(html),

package/dist/index.d.mts

@@ -1,22 +1,24 @@
 import { UserConfig, defineConfig as defineConfig$1 } from "tsdown";
 import { UserConfig as UserConfig$1, defineConfig as defineConfig$2 } from "vite";
-import { AutoImport, Components, FileSystemIconLoader, Icons, IconsResolver, NaiveUiResolver, Progress, Vue, VueDevTools, VueJsx, createSvgIconsPlugin } from "@quiteer/vite-plugins/plugins";
+import { AutoImport, AutoImport as AutoImport$1, Components, Components as Components$1, FileSystemIconLoader, Icons, Icons as Icons$1, IconsResolver, NaiveUiResolver, Progress, Progress as Progress$1, Vue, Vue as Vue$1, VueDevTools, VueDevTools as VueDevTools$1, VueJsx, VueJsx as VueJsx$1, createSvgIconsPlugin } from "@quiteer/vite-plugins/plugins";
 import { EnvConfig, EnvConfigPluginOptions, VirtualHtmlOptions, fileChangeLoggerPlugin, mockRouterPlugin, removeConsolePlugin } from "@quiteer/vite-plugins";
+import VueRouter from "unplugin-vue-router/vite";
 
 //#region src/typings.d.ts
 type PluginOptions<T extends (...args: any) => any> = boolean | Parameters<T>;
 interface QvitePlugins {
-  Vue?: PluginOptions<typeof Vue>;
-  VueJsx?: PluginOptions<typeof VueJsx>;
-  Progress?: PluginOptions<typeof Progress>;
-  VueDevTools?: PluginOptions<typeof VueDevTools>;
+  VueRouter?: PluginOptions<typeof VueRouter>;
+  Vue?: PluginOptions<typeof Vue$1>;
+  VueJsx?: PluginOptions<typeof VueJsx$1>;
+  Progress?: PluginOptions<typeof Progress$1>;
+  VueDevTools?: PluginOptions<typeof VueDevTools$1>;
   RemoveConsole?: PluginOptions<typeof removeConsolePlugin>;
   MockRouter?: PluginOptions<typeof mockRouterPlugin>;
   FileChangeLogger?: PluginOptions<typeof fileChangeLoggerPlugin>;
-  Components?: PluginOptions<typeof Components>;
+  Components?: PluginOptions<typeof Components$1>;
   SvgIcons?: PluginOptions<typeof createSvgIconsPlugin>;
-  Icons?: PluginOptions<typeof Icons>;
-  AutoImport?: PluginOptions<typeof AutoImport>;
+  Icons?: PluginOptions<typeof Icons$1>;
+  AutoImport?: PluginOptions<typeof AutoImport$1>;
 }
 interface QviteConfig {
   minify?: boolean;
@@ -122,4 +124,4 @@ declare function defineViteConfig(config: Parameters<typeof defineConfig$2>[0]):
  */
 declare function defineTsdownConfig(config: Parameters<typeof defineConfig$1>[0]): ReturnType<typeof defineConfig$1>;
 //#endregion
-export { Command, ConfigEnv, type EnvConfig, FileSystemIconLoader, IconsResolver, Mode, NaiveUiResolver, PluginOptions, QviteConfig, QviteConfigExport, QviteConfigFn, QviteConfigFnObject, QviteConfigFnPromise, QvitePlugins, defineConfig, defineTsdownConfig, defineViteConfig };
+export { AutoImport, Command, Components, ConfigEnv, type EnvConfig, FileSystemIconLoader, Icons, IconsResolver, Mode, NaiveUiResolver, PluginOptions, Progress, QviteConfig, QviteConfigExport, QviteConfigFn, QviteConfigFnObject, QviteConfigFnPromise, QvitePlugins, Vue, VueDevTools, VueJsx, defineConfig, defineTsdownConfig, defineViteConfig };

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/plugins";
+import { AutoImport, Components, FileSystemIconLoader, Icons, IconsResolver, NaiveUiResolver, Progress, Vue, VueDevTools, VueJsx } from "@quiteer/vite-plugins/plugins";
 
 //#region index.ts
 function defineConfig(config) {
@@ -62,4 +62,4 @@ function defineTsdownConfig(config) {
 }
 
 //#endregion
-export { FileSystemIconLoader, IconsResolver, NaiveUiResolver, defineConfig, defineTsdownConfig, defineViteConfig };
+export { AutoImport, Components, FileSystemIconLoader, Icons, IconsResolver, NaiveUiResolver, Progress, Vue, VueDevTools, VueJsx, defineConfig, defineTsdownConfig, defineViteConfig };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@quiteer/vite",
   "type": "module",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "在 vite 的基础上增强的前端架构 cli",
   "author": "quiteer",
   "license": "MIT",
@@ -57,11 +57,12 @@
     "portfinder": "^1.0.38",
     "semver": "^7.6.3",
     "tsdown": "^0.16.1",
+    "unplugin-vue-router": "^0.19.2",
     "vite": "npm:rolldown-vite@7.2.2",
     "zx": "^8.8.5",
     "@quiteer/is": "0.0.2",
-    "@quiteer/unocss": "0.0.6",
     "@quiteer/utils": "0.0.4",
+    "@quiteer/unocss": "0.0.6",
     "@quiteer/vite-plugins": "^0.1.5"
   },
   "scripts": {