@vixt/uni 0.5.17 → 0.6.1

package/dist/client/entry.d.ts

@@ -0,0 +1,12 @@
+import "virtual:vixt:css";
+import "virtual:uno.css";
+import * as Pinia from "pinia";
+import * as vue0 from "vue";
+
+//#region src/client/entry.d.ts
+declare function createApp(): {
+  app: vue0.App<Element>;
+  Pinia: typeof Pinia;
+};
+//#endregion
+export { createApp as default };

package/dist/client/entry.js

@@ -0,0 +1,25 @@
+import "virtual:vixt:css";
+import "virtual:uno.css";
+import { applyPlugins, createVixtApp } from "@vixt/core/client";
+import * as Pinia from "pinia";
+import appConfig from "virtual:vixt:app-config";
+import plugins from "virtual:vixt:plugins";
+import { createSSRApp } from "vue";
+import RootComponent from "@/App.vue";
+
+//#region src/client/entry.ts
+function createApp() {
+	const app = createSSRApp(RootComponent);
+	applyPlugins(createVixtApp({
+		app,
+		appConfig
+	}), plugins);
+	return {
+		app,
+		Pinia
+	};
+}
+var entry_default = createApp;
+
+//#endregion
+export { entry_default as default };

package/dist/client/plugins/pinia.d.ts

@@ -0,0 +1,6 @@
+import * as _vixt_core_client0 from "@vixt/core/client";
+
+//#region src/client/plugins/pinia.d.ts
+declare const _default: _vixt_core_client0.VixtPlugin;
+//#endregion
+export { _default as default };

package/dist/client/plugins/pinia.js

@@ -0,0 +1,24 @@
+import { defineVixtPlugin } from "@vixt/core/client";
+import { createPinia } from "pinia";
+import { createPersistedState } from "pinia-plugin-persistedstate";
+
+//#region src/client/plugins/pinia.ts
+var pinia_default = defineVixtPlugin({
+	name: "vixt:pinia",
+	setup(vixt) {
+		const { app, appConfig } = vixt;
+		const pinia = createPinia();
+		pinia.use(createPersistedState({
+			storage: {
+				getItem: uni.getStorageSync,
+				setItem: uni.setStorageSync
+			},
+			...appConfig.piniaPersistedState
+		}));
+		app.use(pinia);
+		vixt.pinia = pinia;
+	}
+});
+
+//#endregion
+export { pinia_default as default };

package/dist/client/plugins/router.d.ts

@@ -0,0 +1,6 @@
+import * as _vixt_core_client0 from "@vixt/core/client";
+
+//#region src/client/plugins/router.d.ts
+declare const _default: _vixt_core_client0.VixtPlugin;
+//#endregion
+export { _default as default };

package/dist/client/plugins/router.js

@@ -0,0 +1,13 @@
+import { defineVixtPlugin } from "@vixt/core/client";
+import { pages } from "virtual:uni-pages";
+
+//#region src/client/plugins/router.ts
+var router_default = defineVixtPlugin({
+	name: "vixt:router",
+	setup(vixt) {
+		vixt.routes = pages;
+	}
+});
+
+//#endregion
+export { router_default as default };

package/dist/index.d.mts

@@ -1,107 +1,7 @@
-import * as vite from 'vite';
-import { ResolvedConfig } from 'vite';
-import * as _vixt_core from '@vixt/core';
-import { AppOptions, Vixt, PluginOptions as PluginOptions$1, VixtOptions } from '@vixt/core';
-import Pages, { PageMetaDatum } from '@uni-helper/vite-plugin-uni-pages';
-import { Pinia } from 'pinia';
-import { PluginOptions } from 'pinia-plugin-persistedstate';
-import { App } from 'vue';
-import Uni from '@dcloudio/vite-plugin-uni';
-import Components from '@uni-helper/vite-plugin-uni-components';
-import Layouts from '@uni-helper/vite-plugin-uni-layouts';
-import UnoCSS from 'unocss/vite';
-import AutoImport from 'unplugin-auto-import/vite';
-import { ImportsMap } from 'unplugin-auto-import/types';
+import * as _vixt_core0 from "@vixt/core";
+import * as vite0 from "vite";
 
-declare module '@vixt/core/client' {
-  interface VixtAppConfig {
-    /** https://github.com/prazdevs/pinia-plugin-persistedstate */
-    piniaPersistedState?: PluginOptions
-  }
-
-  interface VixtApp {
-    app: App
-    routes: PageMetaDatum[]
-    pinia: Pinia
-    appConfig: VixtAppConfig
-  }
-}
-
-declare const appUni: _vixt_core.VixtModule<AppOptions>;
-
-declare function generateMainTs(options: AppOptions, vixt: Vixt): string;
-
-declare module '@vixt/core' {
-    interface VixtOptions {
-        uni?: PluginOptions$1<typeof Uni>;
-        /** https://github.com/uni-helper/vite-plugin-uni-pages */
-        uniPages?: PluginOptions$1<typeof Pages>;
-        /** https://github.com/uni-helper/vite-plugin-uni-layouts */
-        uniLayouts?: PluginOptions$1<typeof Layouts>;
-        /** https://github.com/uni-helper/vite-plugin-uni-components */
-        uniComponents?: PluginOptions$1<typeof Components>;
-        /** https://github.com/antfu/unplugin-auto-import */
-        imports?: PluginOptions$1<typeof AutoImport>;
-        /** https://github.com/antfu/unocss */
-        unocss?: PluginOptions$1<typeof UnoCSS>;
-    }
-}
-declare module '@vixt/core/client' {
-    interface VixtAppConfig {
-        /** https://github.com/prazdevs/pinia-plugin-persistedstate */
-        piniaPersistedState?: PluginOptions;
-    }
-}
-declare const presetUni: _vixt_core.VixtModule<VixtOptions>;
-
-declare module '@vixt/core' {
-    interface VixtOptions {
-        uniModules?: ModuleOptions;
-    }
-}
-interface ModuleOptions {
-    include?: string[];
-    exclude?: string[];
-}
-declare const uniModules: _vixt_core.VixtModule<_vixt_core.ModuleOptions>;
-
-/** 增加小程序中vueuse的运行所需 */
-declare function transformMpRuntime(code: string, id: string): string;
-/**
- * 修复h5报错`Cannot assign to read only property '_' of object '#<Object>'`
- * @see https://ask.dcloud.net.cn/question/194973
- */
-declare function transformH5Runtime(code: string, id: string): string;
-/** 修复app运行白屏，原因是pinia调用了@vue/devtools-kit的setupDevToolsPlugin */
-declare function transformVueDevtools(code: string, id: string): string;
-/** 移除路径中的'../' */
-declare function patchNormalizeNodeModules(): void;
-/**
- * 兼容 unocss^66.1.0 小程序平台的css文件后缀名
- * @see https://github.com/dcloudio/uni-app/pull/5605/files
- */
-declare function patchAdjustCssExtname(config: ResolvedConfig): void;
-/**
- * fix unocss^66.1.0 hot reload fail `[unocss:global:build:scan] Could not load xxx/src/__uno.css`
- * @see https://github.com/unocss/unocss/issues/4616
- * @see https://github.com/unocss/unocss/pull/4737
- */
-declare function patchUnocssGlobalBuildScan(config: ResolvedConfig): void;
-/**
- * fix `@uni-helper/vite-plugin-uni-components` load slowly
- * @see https://github.com/uni-helper/vite-plugin-uni-components/blob/main/packages/core/src/index.ts#L27
- */
-declare function patchUniComponents(config: ResolvedConfig): void;
-/**
- * fix `@uni-helper/vite-plugin-uni-pages` client types
- * @see https://github.com/uni-helper/vite-plugin-uni-pages/blob/main/packages/core/client.d.ts#L4
- */
-declare function patchUniPagesTypes(): void;
-declare const uniPatch: (options?: any) => vite.PluginOption;
-
-declare function uniVueUseResolver(): ImportsMap;
-
-declare const _default: (options?: _vixt_core.VixtOptions | undefined) => vite.PluginOption;
-
-export { appUni, _default as default, generateMainTs, patchAdjustCssExtname, patchNormalizeNodeModules, patchUniComponents, patchUniPagesTypes, patchUnocssGlobalBuildScan, presetUni, transformH5Runtime, transformMpRuntime, transformVueDevtools, uniModules, uniPatch, uniVueUseResolver };
-export type { ModuleOptions };
+//#region src/index.d.ts
+declare const _default: (options?: _vixt_core0.VixtOptions | undefined) => vite0.PluginOption;
+//#endregion
+export { _default as default };

package/dist/index.mjs

@@ -1,344 +1,292 @@
-import { generateClient, generateCss, generateAppConfig, generatePlugins, defineVixtModule, generateIndexHtml, defineVitePlugin, resolveLayersDirs, isSamePath, createVixtPlugin } from '@vixt/core';
-import path from 'pathe';
-import { genarateAppComponent } from '@vixt/vue';
-import fs from 'fs-extra';
-import Uni from '@dcloudio/vite-plugin-uni';
-import Components from '@uni-helper/vite-plugin-uni-components';
-import Layouts from '@uni-helper/vite-plugin-uni-layouts';
-import Pages from '@uni-helper/vite-plugin-uni-pages';
-import defu from 'defu';
-import UnoCSS from 'unocss/vite';
-import AutoImport from 'unplugin-auto-import/vite';
-import { resolvePathSync } from 'mlly';
-import { normalizePath } from 'vite';
-import { readFileSync } from 'node:fs';
-import process from 'node:process';
-import { uniuseAutoImports } from '@uni-helper/uni-use';
-import { resolveModule } from 'local-pkg';
-
-function generateMainTs(options, vixt) {
-  const { buildDir, srcDir } = vixt.options;
-  const mainTsPath = path.resolve(srcDir, "main.ts");
-  if (!fs.existsSync(mainTsPath))
-    fs.outputFileSync(mainTsPath, `// Generated by Vixt
-// This file transform from '${path.basename(buildDir)}/main.ts'
-`);
-  generateClient(vixt);
-  const appComponentTemplate = genarateAppComponent(vixt);
-  const cssTemplate = generateCss(options);
-  const appConfigTemplate = generateAppConfig(vixt);
-  const pluginsTemplate = generatePlugins(vixt);
-  const code = `// Generated by Vixt
-// This file transform to '${srcDir}/main.ts'
-// @ts-nocheck
-${appComponentTemplate}
-${cssTemplate}
-${appConfigTemplate}
-${pluginsTemplate}
-
-import 'virtual:uno.css'
-import { createSSRApp } from 'vue'
-import * as Pinia from 'pinia'
-import { createPersistedState } from 'pinia-plugin-persistedstate'
-import { pages as routes } from 'virtual:uni-pages'
-
-export function createApp() {
-  const app = createSSRApp(App)
-  const pinia = Pinia.createPinia()
-  pinia.use(createPersistedState({
-    storage: {
-      getItem: uni.getStorageSync,
-      setItem: uni.setStorageSync,
-    },
-    ...appConfig.piniaPersistedState,
-  }))
-  app.use(pinia)
-  usePlugins({ app, routes, pinia, appConfig })
-  
-  return { app, Pinia }
-}
-`;
-  fs.outputFileSync(path.resolve(buildDir, "main.ts"), code);
-  return code;
-}
-
-const name$2 = "vixt:app-uni";
-const defaults$1 = {
-  rootId: "app",
-  rootTag: "div",
-  baseURL: "/",
-  entryFile: "main.ts",
-  css: [],
-  head: {
-    meta: [
-      { charset: "utf-8" },
-      { name: "viewport", content: "width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" }
-    ]
-  }
-};
-const appUni = defineVixtModule({
-  meta: { name: name$2, configKey: "app" },
-  defaults: defaults$1,
-  setup(options, vixt) {
-    let indexHtmlCode;
-    let mainTsCode;
-    const mainTsPath = path.resolve(vixt.options.srcDir, "main.ts");
-    return {
-      name: name$2,
-      configResolved() {
-        indexHtmlCode = generateIndexHtml(options, vixt);
-        mainTsCode = generateMainTs(options, vixt);
-      },
-      transformIndexHtml: {
-        order: "pre",
-        handler() {
-          return indexHtmlCode;
-        }
-      },
-      transform: {
-        order: "pre",
-        handler(_, id) {
-          if (id !== mainTsPath)
-            return;
-          return mainTsCode;
-        }
-      }
-    };
-  }
-});
+import { VixtClientAutoImports, createVixtPlugin, defineVitePlugin, defineVixtModule, isSamePath, resolveLayersDirs } from "@vixt/core";
+import fs from "fs-extra";
+import { resolvePathSync } from "mlly";
+import Uni from "@dcloudio/vite-plugin-uni";
+import Components from "@uni-helper/vite-plugin-uni-components";
+import Layouts from "@uni-helper/vite-plugin-uni-layouts";
+import Pages from "@uni-helper/vite-plugin-uni-pages";
+import defu from "defu";
+import UnoCSS from "unocss/vite";
+import AutoImport from "unplugin-auto-import/vite";
+import path from "pathe";
+import { normalizePath } from "vite";
+import { readFileSync } from "node:fs";
+import process from "node:process";
+import { uniuseAutoImports } from "@uni-helper/uni-use";
+import { resolveModule } from "local-pkg";
 
+//#region src/modules/uni-patch.ts
+/** 增加小程序中vueuse的运行所需 */
 function transformMpRuntime(code, id) {
-  if (!id.endsWith("@dcloudio/uni-mp-vue/dist/vue.runtime.esm.js"))
-    return code;
-  code += `
+	if (!id.endsWith("@dcloudio/uni-mp-vue/dist/vue.runtime.esm.js")) return code;
+	code += `
 export const render = () => {}
 export const TransitionGroup = {}
 `;
-  return code;
+	return code;
 }
+/**
+* 修复h5报错`Cannot assign to read only property '_' of object '#<Object>'`
+* @see https://ask.dcloud.net.cn/question/194973
+*/
 function transformH5Runtime(code, id) {
-  if (!id.endsWith("@dcloudio/uni-h5-vue/dist/vue.runtime.esm.js"))
-    return code;
-  code = code.replace(`def(children, "_", type);`, `def(children, "_", type, true);`);
-  return code;
+	if (!id.endsWith("@dcloudio/uni-h5-vue/dist/vue.runtime.esm.js")) return code;
+	code = code.replace(`def(children, "_", type);`, `def(children, "_", type, true);`);
+	return code;
 }
-function transformVueDevtools(code, id) {
-  if (!id.endsWith("@vue/devtools-kit/dist/index.js"))
-    return code;
-  code = code.replace(`function setupDevToolsPlugin(pluginDescriptor, setupFn) {
-  return hook.setupDevToolsPlugin(pluginDescriptor, setupFn);
-}`, `function setupDevToolsPlugin(pluginDescriptor, setupFn) {}`);
-  return code;
+/** 修复app运行白屏，原因是pinia调用了@vue/devtools-kit的setupDevToolsPlugin */
+function transformPinia(code, id) {
+	if (!id.endsWith("pinia/dist/pinia.mjs")) return code;
+	code = code.replace(`import { setupDevtoolsPlugin } from '@vue/devtools-api';`, `function setupDevtoolsPlugin() {};`);
+	return code;
 }
+/** 移除路径中的'../' */
 function patchNormalizeNodeModules() {
-  const matched = `str = normalizePath(str).replace(NODE_MODULES_REGEX, 'node-modules');`;
-  const replaced = `str = normalizePath(str).replace(NODE_MODULES_REGEX, 'node-modules').replace(/\\.\\.\\//g, '');`;
-  const codePath = resolvePathSync("@dcloudio/uni-cli-shared/dist/utils.js");
-  let code = fs.readFileSync(codePath, "utf8");
-  if (code.includes(matched)) {
-    code = code.replace(matched, replaced);
-    fs.writeFileSync(codePath, code);
-  }
+	const matched = `str = normalizePath(str).replace(NODE_MODULES_REGEX, 'node-modules');`;
+	const replaced = `str = normalizePath(str).replace(NODE_MODULES_REGEX, 'node-modules').replace(/\\.\\.\\//g, '');`;
+	const codePath = resolvePathSync("@dcloudio/uni-cli-shared/dist/utils.js");
+	let code = fs.readFileSync(codePath, "utf8");
+	if (code.includes(matched)) {
+		code = code.replace(matched, replaced);
+		fs.writeFileSync(codePath, code);
+	}
 }
+/**
+* 兼容 unocss^66.1.0 小程序平台的css文件后缀名
+* @see https://github.com/dcloudio/uni-app/pull/5605/files
+*/
 function patchAdjustCssExtname(config) {
-  const plugin = config.plugins.find((p) => p.name === "uni:adjust-css-extname");
-  if (plugin && typeof plugin.generateBundle === "function") {
-    const handler = plugin.generateBundle;
-    plugin.generateBundle = { order: "post", handler };
-  }
+	const plugin = config.plugins.find((p) => p.name === "uni:adjust-css-extname");
+	if (plugin && typeof plugin.generateBundle === "function") plugin.generateBundle = {
+		order: "post",
+		handler: plugin.generateBundle
+	};
 }
+/**
+* fix unocss^66.1.0 hot reload fail `[unocss:global:build:scan] Could not load xxx/src/__uno.css`
+* @see https://github.com/unocss/unocss/issues/4616
+* @see https://github.com/unocss/unocss/pull/4737
+*/
 function patchUnocssGlobalBuildScan(config) {
-  const plugin = config.plugins.find((p) => p.name === "unocss:global:build:scan");
-  if (plugin)
-    plugin.shouldTransformCachedModule = ({ id }) => id.endsWith("main.ts");
+	const plugin = config.plugins.find((p) => p.name === "unocss:global:build:scan");
+	if (plugin) plugin.shouldTransformCachedModule = ({ id }) => id.endsWith("main.ts");
 }
+/**
+* fix `@uni-helper/vite-plugin-uni-components` load slowly
+* @see https://github.com/uni-helper/vite-plugin-uni-components/blob/main/packages/core/src/index.ts#L27
+*/
 function patchUniComponents(config) {
-  if (JSON.stringify(config.build.watch) === "{}")
-    config.build.watch = null;
+	if (JSON.stringify(config.build.watch) === "{}") config.build.watch = null;
 }
+/**
+* fix `@uni-helper/vite-plugin-uni-pages` client types
+* @see https://github.com/uni-helper/vite-plugin-uni-pages/blob/main/packages/core/client.d.ts#L4
+*/
 function patchUniPagesTypes() {
-  const matched = `  import type { SubPackage } from './src/config/types/index'
-  import type { PageMetaDatum } from './src/types'`;
-  const replaced = `  import type { PageMetaDatum, SubPackage } from '@uni-helper/vite-plugin-uni-pages'`;
-  const codePath = path.resolve(resolvePathSync("@uni-helper/vite-plugin-uni-pages"), "../../client.d.ts");
-  let code = codePath && fs.readFileSync(codePath, "utf-8");
-  if (code.includes(matched)) {
-    code = code.replace(matched, replaced);
-    fs.outputFileSync(codePath, code);
-  }
+	const matched = `  import type { SubPackage } from './src/config/types/index'\n  import type { PageMetaDatum } from './src/types'`;
+	const replaced = `  import type { PageMetaDatum, SubPackage } from '@uni-helper/vite-plugin-uni-pages'`;
+	const codePath = path.resolve(resolvePathSync("@uni-helper/vite-plugin-uni-pages"), "../../client.d.ts");
+	let code = codePath && fs.readFileSync(codePath, "utf-8");
+	if (code.includes(matched)) {
+		code = code.replace(matched, replaced);
+		fs.outputFileSync(codePath, code);
+	}
 }
 const uniPatch = defineVitePlugin(() => {
-  patchNormalizeNodeModules();
-  patchUniPagesTypes();
-  return [
-    {
-      name: "vixt:uni-patch-runtime",
-      transform(code, id) {
-        id = normalizePath(id);
-        code = transformMpRuntime(code, id);
-        code = transformH5Runtime(code, id);
-        code = transformVueDevtools(code, id);
-        return code;
-      }
-    },
-    {
-      name: "vixt:uni-patch-uni-components",
-      configResolved(config) {
-        patchUniComponents(config);
-      }
-    },
-    {
-      name: "vixt:uni-patch-unocss-global-build-scan",
-      apply: "build",
-      enforce: "pre",
-      configResolved(config) {
-        patchUnocssGlobalBuildScan(config);
-      }
-    },
-    {
-      name: "vixt:uni-patch-adjust-css-extname",
-      enforce: "post",
-      configResolved(config) {
-        patchAdjustCssExtname(config);
-      }
-    }
-  ];
+	patchNormalizeNodeModules();
+	patchUniPagesTypes();
+	return [
+		{
+			name: "vixt:uni-patch-runtime",
+			transform(code, id) {
+				id = normalizePath(id);
+				code = transformMpRuntime(code, id);
+				code = transformH5Runtime(code, id);
+				code = transformPinia(code, id);
+				return code;
+			}
+		},
+		{
+			name: "vixt:uni-patch-uni-components",
+			configResolved(config) {
+				patchUniComponents(config);
+			}
+		},
+		{
+			name: "vixt:uni-patch-unocss-global-build-scan",
+			apply: "build",
+			enforce: "pre",
+			configResolved(config) {
+				patchUnocssGlobalBuildScan(config);
+			}
+		},
+		{
+			name: "vixt:uni-patch-adjust-css-extname",
+			enforce: "post",
+			configResolved(config) {
+				patchAdjustCssExtname(config);
+			}
+		}
+	];
 });
 
+//#endregion
+//#region src/modules/uni-use.ts
 let _cache;
 function uniVueUseResolver() {
-  const excluded = [
-    "toRefs",
-    "utils",
-    "toRef",
-    "toValue",
-    "tryOnScopeDispose",
-    "useNetwork",
-    "useOnline",
-    "usePreferredDark",
-    "useStorage",
-    "useStorageAsync"
-  ];
-  if (!_cache) {
-    let indexesJson;
-    try {
-      const corePath = resolveModule("@vueuse/core") || process.cwd();
-      const path = resolveModule("@vueuse/core/indexes.json") || resolveModule("@vueuse/metadata/index.json") || resolveModule("@vueuse/metadata/index.json", { paths: [corePath] });
-      indexesJson = JSON.parse(readFileSync(path, "utf-8"));
-    } catch (error) {
-      console.error(error);
-      throw new Error("[auto-import] failed to load @vueuse/core, have you installed it?");
-    }
-    if (indexesJson) {
-      _cache = {
-        "@vueuse/core": indexesJson.functions.filter((i) => ["core", "shared"].includes(i.package)).flatMap((i) => [i.name, ...i.alias || []]).filter((i) => i && i.length >= 4 && !excluded.includes(i)),
-        ...uniuseAutoImports()
-      };
-    }
-  }
-  return _cache || {};
+	const excluded = [
+		"toRefs",
+		"utils",
+		"toRef",
+		"toValue",
+		"tryOnScopeDispose",
+		"useNetwork",
+		"useOnline",
+		"usePreferredDark",
+		"useStorage",
+		"useStorageAsync"
+	];
+	if (!_cache) {
+		let indexesJson;
+		try {
+			const corePath = resolveModule("@vueuse/core") || process.cwd();
+			const path$1 = resolveModule("@vueuse/core/indexes.json") || resolveModule("@vueuse/metadata/index.json") || resolveModule("@vueuse/metadata/index.json", { paths: [corePath] });
+			indexesJson = JSON.parse(readFileSync(path$1, "utf-8"));
+		} catch (error) {
+			console.error(error);
+			throw new Error("[auto-import] failed to load @vueuse/core, have you installed it?");
+		}
+		if (indexesJson) _cache = {
+			"@vueuse/core": indexesJson.functions.filter((i) => ["core", "shared"].includes(i.package)).flatMap((i) => [i.name, ...i.alias || []]).filter((i) => i && i.length >= 4 && !excluded.includes(i)),
+			...uniuseAutoImports()
+		};
+	}
+	return _cache || {};
 }
 
+//#endregion
+//#region src/modules/preset-uni.ts
 const name$1 = "vixt:preset-uni";
-const presetUni = defineVixtModule({
-  meta: { name: name$1 },
-  setup(_, vixt) {
-    const { components = [], composables = [], constants = [], utils = [], stores = [] } = resolveLayersDirs([...vixt._layers].reverse());
-    const { buildTypesDir, buildImportsDir } = vixt.options;
-    const defaultOptions = {
-      uni: {},
-      uniPages: { dts: `${buildTypesDir}/uni-pages.d.ts` },
-      uniLayouts: {},
-      uniComponents: {
-        dts: `${buildTypesDir}/components.d.ts`,
-        dirs: [...components].reverse(),
-        directoryAsNamespace: true,
-        collapseSamePrefixes: true
-      },
-      imports: {
-        imports: ["vue", "uni-app", "pinia", uniVueUseResolver()],
-        dts: `${buildTypesDir}/auto-imports.d.ts`,
-        dirs: [composables, constants, stores, utils, buildImportsDir].flat(),
-        vueTemplate: true
-      },
-      unocss: {}
-    };
-    const options = vixt.options = defu(vixt.options, defaultOptions);
-    const modules = [
-      Pages(options.uniPages),
-      Layouts(options.uniLayouts),
-      Components(options.uniComponents),
-      AutoImport(options.imports),
-      UnoCSS(options.unocss),
-      uniPatch(),
-      // @ts-expect-error
-      Uni.default(options.uni)
-    ];
-    return modules;
-  }
+var preset_uni_default = defineVixtModule({
+	meta: { name: name$1 },
+	setup(_, vixt) {
+		const { components = [], composables = [], constants = [], utils = [], stores = [] } = resolveLayersDirs([...vixt._layers].reverse());
+		const { buildTypesDir } = vixt.options;
+		const defaultOptions = {
+			uni: {},
+			uniPages: { dts: `${buildTypesDir}/uni-pages.d.ts` },
+			uniLayouts: {},
+			uniComponents: {
+				dts: `${buildTypesDir}/components.d.ts`,
+				dirs: [...components].reverse(),
+				directoryAsNamespace: true,
+				collapseSamePrefixes: true
+			},
+			imports: {
+				imports: [
+					"vue",
+					"uni-app",
+					"pinia",
+					uniVueUseResolver(),
+					VixtClientAutoImports
+				],
+				dts: `${buildTypesDir}/auto-imports.d.ts`,
+				dirs: [
+					composables,
+					constants,
+					stores,
+					utils
+				].flat(),
+				vueTemplate: true
+			},
+			unocss: {}
+		};
+		const options = vixt.options = defu(vixt.options, defaultOptions);
+		return [
+			Pages(options.uniPages),
+			Layouts(options.uniLayouts),
+			Components(options.uniComponents),
+			AutoImport(options.imports),
+			UnoCSS(options.unocss),
+			uniPatch(),
+			(Uni?.default ?? Uni)(options.uni)
+		];
+	}
 });
 
+//#endregion
+//#region src/modules/uni-modules.ts
 function copyUniModules(options, vixt) {
-  const { srcDir } = vixt.options;
-  const { include, exclude } = options ?? {};
-  const { uni_modules = [] } = resolveLayersDirs(vixt._layers);
-  const srcUniModulesPath = path.join(srcDir, "uni_modules");
-  uni_modules.forEach((uniModulesPath) => {
-    fs.readdirSync(uniModulesPath).filter((dir) => {
-      if (include?.length)
-        return include.includes(dir);
-      if (exclude?.length)
-        return !exclude.includes(dir);
-      return true;
-    }).forEach((dir) => {
-      const srcPath = path.join(uniModulesPath, dir);
-      const destPath = path.join(srcUniModulesPath, dir);
-      if (srcPath !== destPath) {
-        try {
-          fs.emptyDirSync(destPath);
-          fs.copySync(srcPath, destPath);
-          fs.writeFileSync(path.join(destPath, ".gitignore"), "*", "utf-8");
-        } catch (e) {
-          console.error(`Error copying ${srcPath} to ${destPath}:
-`, e);
-        }
-      }
-    });
-  });
+	const { srcDir } = vixt.options;
+	const { include, exclude } = options ?? {};
+	const { uni_modules = [] } = resolveLayersDirs(vixt._layers);
+	const srcUniModulesPath = path.join(srcDir, "uni_modules");
+	uni_modules.forEach((uniModulesPath) => {
+		fs.readdirSync(uniModulesPath).filter((dir) => {
+			if (include?.length) return include.includes(dir);
+			if (exclude?.length) return !exclude.includes(dir);
+			return true;
+		}).forEach((dir) => {
+			const srcPath = path.join(uniModulesPath, dir);
+			const destPath = path.join(srcUniModulesPath, dir);
+			if (srcPath !== destPath) try {
+				fs.emptyDirSync(destPath);
+				fs.copySync(srcPath, destPath);
+				fs.writeFileSync(path.join(destPath, ".gitignore"), "*", "utf-8");
+			} catch (e) {
+				console.error(`Error copying ${srcPath} to ${destPath}:\n`, e);
+			}
+		});
+	});
 }
 const name = "vixt:uni-modules";
-const uniModules = defineVixtModule({
-  meta: { name, configKey: "uniModules" },
-  setup(options, vixt) {
-    copyUniModules(options, vixt);
-    return {
-      name,
-      configureServer(server) {
-        const { uni_modules = [] } = resolveLayersDirs(vixt._layers.filter((e) => !isSamePath(e.cwd, vixt.options.rootDir)));
-        server.watcher.add(uni_modules);
-        server.watcher.on("all", (_, file) => {
-          const match = uni_modules.some((e) => path.normalize(file).match(e));
-          if (match)
-            copyUniModules(options, vixt);
-        });
-      }
-    };
-  }
+var uni_modules_default = defineVixtModule({
+	meta: {
+		name,
+		configKey: "uniModules"
+	},
+	setup(options, vixt) {
+		copyUniModules(options, vixt);
+		return {
+			name,
+			configureServer(server) {
+				const { uni_modules = [] } = resolveLayersDirs(vixt._layers.filter((e) => !isSamePath(e.cwd, vixt.options.rootDir)));
+				server.watcher.add(uni_modules);
+				server.watcher.on("all", (_, file) => {
+					if (uni_modules.some((e) => path.normalize(file).match(e))) copyUniModules(options, vixt);
+				});
+			}
+		};
+	}
 });
 
-const defaults = {
-  modules: [uniModules, appUni, presetUni],
-  typescript: {
-    tsConfig: {
-      compilerOptions: {
-        types: ["@dcloudio/types", "@uni-helper/uni-app-types"]
-      },
-      vueCompilerOptions: {
-        plugins: ["@uni-helper/uni-app-types/volar-plugin"]
-      }
-    }
-  }
-};
-const index = createVixtPlugin({ defaults });
+//#endregion
+//#region src/index.ts
+var src_default = createVixtPlugin({ defaults: {
+	modules: [preset_uni_default, uni_modules_default],
+	plugins: ["@vixt/uni/client/plugins/pinia", "@vixt/uni/client/plugins/router"],
+	app: {
+		entryFile: "main.ts",
+		entryCode: fs.readFileSync(resolvePathSync("@vixt/uni/client/entry"), "utf-8"),
+		head: { meta: [{ charset: "utf-8" }, {
+			name: "viewport",
+			content: "width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"
+		}] }
+	},
+	typescript: { tsConfig: {
+		compilerOptions: { types: [
+			"@vixt/uni/types",
+			"@dcloudio/types",
+			"@uni-helper/uni-app-types"
+		] },
+		vueCompilerOptions: { plugins: ["@uni-helper/uni-app-types/volar-plugin"] }
+	} },
+	vite: { optimizeDeps: { exclude: [
+		"@vixt/uni/client/entry",
+		"@vixt/uni/client/plugins/pinia",
+		"@vixt/uni/client/plugins/router"
+	] } }
+} });
 
-export { appUni, index as default, generateMainTs, patchAdjustCssExtname, patchNormalizeNodeModules, patchUniComponents, patchUniPagesTypes, patchUnocssGlobalBuildScan, presetUni, transformH5Runtime, transformMpRuntime, transformVueDevtools, uniModules, uniPatch, uniVueUseResolver };
+//#endregion
+export { src_default as default };

package/dist/types/client.d.ts

@@ -0,0 +1,18 @@
+import type { PageMetaDatum } from '@uni-helper/vite-plugin-uni-pages'
+import type { Pinia } from 'pinia'
+import type { PluginOptions as PersistedStateOptions } from 'pinia-plugin-persistedstate'
+import type { App } from 'vue'
+
+declare module '@vixt/core/client' {
+  interface VixtAppConfig {
+    /** https://github.com/prazdevs/pinia-plugin-persistedstate */
+    piniaPersistedState?: PersistedStateOptions
+  }
+
+  interface VixtApp {
+    app: App
+    routes: PageMetaDatum[]
+    pinia: Pinia
+    appConfig: VixtAppConfig
+  }
+}

package/dist/types/index.d.ts

@@ -0,0 +1,2 @@
+import './client.d'
+import './node.d'

package/dist/types/node.d.ts

@@ -0,0 +1,23 @@
+import type Uni from '@dcloudio/vite-plugin-uni'
+import type Components from '@uni-helper/vite-plugin-uni-components'
+import type Layouts from '@uni-helper/vite-plugin-uni-layouts'
+import type Pages from '@uni-helper/vite-plugin-uni-pages'
+import type { ExtractPluginOptions } from '@vixt/core'
+import type UnoCSS from 'unocss/vite'
+import type AutoImport from 'unplugin-auto-import/vite'
+
+declare module '@vixt/core' {
+  interface VixtOptions {
+    uni?: ExtractPluginOptions<typeof Uni>
+    /** https://github.com/uni-helper/vite-plugin-uni-pages */
+    uniPages?: ExtractPluginOptions<typeof Pages>
+    /** https://github.com/uni-helper/vite-plugin-uni-layouts */
+    uniLayouts?: ExtractPluginOptions<typeof Layouts>
+    /** https://github.com/uni-helper/vite-plugin-uni-components */
+    uniComponents?: ExtractPluginOptions<typeof Components>
+    /** https://github.com/antfu/unplugin-auto-import */
+    imports?: ExtractPluginOptions<typeof AutoImport>
+    /** https://github.com/antfu/unocss */
+    unocss?: ExtractPluginOptions<typeof UnoCSS>
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/uni",
   "type": "module",
-  "version": "0.5.17",
+  "version": "0.6.1",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://soullyoko.github.io/vixt/",
@@ -14,13 +14,13 @@
     "uni-app"
   ],
   "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs"
-    }
+    ".": "./dist/index.mjs",
+    "./client/*": "./dist/client/*.js",
+    "./types": "./dist/types/index.d.ts",
+    "./package.json": "./package.json"
   },
-  "main": "dist/index.mjs",
-  "types": "dist/index.d.ts",
+  "main": "./dist/index.mjs",
+  "types": "./dist/types/index.d.ts",
   "files": [
     "dist"
   ],
@@ -33,11 +33,7 @@
     "@uni-helper/vite-plugin-uni-layouts": "^0.1.11",
     "@uni-helper/vite-plugin-uni-pages": "^0.3.22",
     "unocss-applet": "^0.12.2",
-    "@vixt/vue": "0.5.17",
-    "@vixt/core": "0.5.17"
-  },
-  "scripts": {
-    "build": "unbuild",
-    "dev": "unbuild --stub"
+    "@vixt/core": "0.6.1",
+    "@vixt/vue": "0.6.1"
   }
 }

package/dist/index.d.ts

@@ -1,107 +0,0 @@
-import * as vite from 'vite';
-import { ResolvedConfig } from 'vite';
-import * as _vixt_core from '@vixt/core';
-import { AppOptions, Vixt, PluginOptions as PluginOptions$1, VixtOptions } from '@vixt/core';
-import Pages, { PageMetaDatum } from '@uni-helper/vite-plugin-uni-pages';
-import { Pinia } from 'pinia';
-import { PluginOptions } from 'pinia-plugin-persistedstate';
-import { App } from 'vue';
-import Uni from '@dcloudio/vite-plugin-uni';
-import Components from '@uni-helper/vite-plugin-uni-components';
-import Layouts from '@uni-helper/vite-plugin-uni-layouts';
-import UnoCSS from 'unocss/vite';
-import AutoImport from 'unplugin-auto-import/vite';
-import { ImportsMap } from 'unplugin-auto-import/types';
-
-declare module '@vixt/core/client' {
-  interface VixtAppConfig {
-    /** https://github.com/prazdevs/pinia-plugin-persistedstate */
-    piniaPersistedState?: PluginOptions
-  }
-
-  interface VixtApp {
-    app: App
-    routes: PageMetaDatum[]
-    pinia: Pinia
-    appConfig: VixtAppConfig
-  }
-}
-
-declare const appUni: _vixt_core.VixtModule<AppOptions>;
-
-declare function generateMainTs(options: AppOptions, vixt: Vixt): string;
-
-declare module '@vixt/core' {
-    interface VixtOptions {
-        uni?: PluginOptions$1<typeof Uni>;
-        /** https://github.com/uni-helper/vite-plugin-uni-pages */
-        uniPages?: PluginOptions$1<typeof Pages>;
-        /** https://github.com/uni-helper/vite-plugin-uni-layouts */
-        uniLayouts?: PluginOptions$1<typeof Layouts>;
-        /** https://github.com/uni-helper/vite-plugin-uni-components */
-        uniComponents?: PluginOptions$1<typeof Components>;
-        /** https://github.com/antfu/unplugin-auto-import */
-        imports?: PluginOptions$1<typeof AutoImport>;
-        /** https://github.com/antfu/unocss */
-        unocss?: PluginOptions$1<typeof UnoCSS>;
-    }
-}
-declare module '@vixt/core/client' {
-    interface VixtAppConfig {
-        /** https://github.com/prazdevs/pinia-plugin-persistedstate */
-        piniaPersistedState?: PluginOptions;
-    }
-}
-declare const presetUni: _vixt_core.VixtModule<VixtOptions>;
-
-declare module '@vixt/core' {
-    interface VixtOptions {
-        uniModules?: ModuleOptions;
-    }
-}
-interface ModuleOptions {
-    include?: string[];
-    exclude?: string[];
-}
-declare const uniModules: _vixt_core.VixtModule<_vixt_core.ModuleOptions>;
-
-/** 增加小程序中vueuse的运行所需 */
-declare function transformMpRuntime(code: string, id: string): string;
-/**
- * 修复h5报错`Cannot assign to read only property '_' of object '#<Object>'`
- * @see https://ask.dcloud.net.cn/question/194973
- */
-declare function transformH5Runtime(code: string, id: string): string;
-/** 修复app运行白屏，原因是pinia调用了@vue/devtools-kit的setupDevToolsPlugin */
-declare function transformVueDevtools(code: string, id: string): string;
-/** 移除路径中的'../' */
-declare function patchNormalizeNodeModules(): void;
-/**
- * 兼容 unocss^66.1.0 小程序平台的css文件后缀名
- * @see https://github.com/dcloudio/uni-app/pull/5605/files
- */
-declare function patchAdjustCssExtname(config: ResolvedConfig): void;
-/**
- * fix unocss^66.1.0 hot reload fail `[unocss:global:build:scan] Could not load xxx/src/__uno.css`
- * @see https://github.com/unocss/unocss/issues/4616
- * @see https://github.com/unocss/unocss/pull/4737
- */
-declare function patchUnocssGlobalBuildScan(config: ResolvedConfig): void;
-/**
- * fix `@uni-helper/vite-plugin-uni-components` load slowly
- * @see https://github.com/uni-helper/vite-plugin-uni-components/blob/main/packages/core/src/index.ts#L27
- */
-declare function patchUniComponents(config: ResolvedConfig): void;
-/**
- * fix `@uni-helper/vite-plugin-uni-pages` client types
- * @see https://github.com/uni-helper/vite-plugin-uni-pages/blob/main/packages/core/client.d.ts#L4
- */
-declare function patchUniPagesTypes(): void;
-declare const uniPatch: (options?: any) => vite.PluginOption;
-
-declare function uniVueUseResolver(): ImportsMap;
-
-declare const _default: (options?: _vixt_core.VixtOptions | undefined) => vite.PluginOption;
-
-export { appUni, _default as default, generateMainTs, patchAdjustCssExtname, patchNormalizeNodeModules, patchUniComponents, patchUniPagesTypes, patchUnocssGlobalBuildScan, presetUni, transformH5Runtime, transformMpRuntime, transformVueDevtools, uniModules, uniPatch, uniVueUseResolver };
-export type { ModuleOptions };