@vixt/uni 0.11.1 → 0.12.0

package/dist/client/entry.d.ts

@@ -1,9 +1,8 @@
-import * as _$vue from "vue";
 import * as Pinia from "pinia";
 
 //#region src/client/entry.d.ts
 declare function createApp(): {
-  app: _$vue.App<Element>;
+  app: import("vue").App<Element>;
   Pinia: typeof Pinia;
 };
 //#endregion

package/dist/client/index.d.ts

@@ -1,2 +1,2 @@
 import { UniVixtApp } from "./client.js";
-export { UniVixtApp };
+export type { UniVixtApp };

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

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

package/dist/node/index.d.mts

@@ -1,9 +1,7 @@
 import { UniVixtOptions } from "./node.mjs";
-import * as _$_vixt_core0 from "@vixt/core";
-import * as _$vite from "vite";
 
 //#region src/node/index.d.ts
 /** @hidden */
-declare const _default: (options?: _$_vixt_core0.VixtOptions | undefined) => _$vite.PluginOption;
+declare const _default: (options?: import("@vixt/core").VixtOptions | undefined) => import("vite").PluginOption;
 //#endregion
-export { UniVixtOptions, _default as default };
+export { type UniVixtOptions, _default as default };

package/dist/node/index.mjs

@@ -26,9 +26,9 @@ var node_default = createVixtPlugin({ defaults: {
 		compilerOptions: { types: [
 			"@vixt/uni/types",
 			"@dcloudio/types",
-			"@uni-helper/uni-app-types"
+			"@uni-helper/uni-types"
 		] },
-		vueCompilerOptions: { plugins: ["@uni-helper/uni-app-types/volar-plugin"] }
+		vueCompilerOptions: { plugins: ["@uni-helper/uni-types/volar-plugin"] }
 	} },
 	vite: { optimizeDeps: { exclude: plugins } }
 } });

package/dist/node/modules/preset-uni.d.mts

@@ -1,7 +1,6 @@
-import * as _$_vixt_core0 from "@vixt/core";
 import { VixtOptions } from "@vixt/core";
 
 //#region src/node/modules/preset-uni.d.ts
-declare const _default: _$_vixt_core0.VixtModule<VixtOptions>;
+declare const _default: import("@vixt/core").VixtModule<VixtOptions>;
 //#endregion
 export { _default as default };

package/dist/node/modules/preset-uni.mjs

@@ -27,7 +27,7 @@ var preset_uni_default = defineVixtModule({
 			uni_layouts_default(options.uniLayouts),
 			Components(options.uniComponents),
 			uni_patch_default(),
-			(Uni?.default ?? Uni)(options.uni)
+			Uni(options.uni)
 		];
 	}
 });

package/dist/node/modules/uni-layouts.d.mts

@@ -1,2 +1,2 @@
-import { n as _default, t as UniLayoutsOptions } from "../uni-layouts-B1hWgSc_.mjs";
+import { n as _default, t as UniLayoutsOptions } from "../uni-layouts-DiqR237-.mjs";
 export { UniLayoutsOptions, _default as default };

package/dist/node/modules/uni-modules.d.mts

@@ -1,15 +1,2 @@
-import * as _$_vixt_core0 from "@vixt/core";
-
-//#region src/node/modules/uni-modules.d.ts
-declare module '@vixt/core' {
-  interface VixtOptions {
-    uniModules?: ModuleOptions;
-  }
-}
-interface ModuleOptions {
-  include?: string[];
-  exclude?: string[];
-}
-declare const _default: _$_vixt_core0.VixtModule<_$_vixt_core0.ModuleOptions>;
-//#endregion
-export { ModuleOptions, _default as default };
+import { n as _default, t as UniModulesOptions } from "../uni-modules-DKxzU50K.mjs";
+export { UniModulesOptions, _default as default };

package/dist/node/modules/uni-patch.d.mts

@@ -1,7 +1,13 @@
-import * as _$vite from "vite";
 import { ResolvedConfig } from "vite";
 
 //#region src/node/modules/uni-patch.d.ts
+/** 移除路径中的'../' */
+declare function overrideNormalizeNodeModules(): void;
+/**
+ * fix `@uni-helper/vite-plugin-uni-pages` client types
+ * @see https://github.com/uni-helper/vite-plugin-uni-pages/blob/v0.3.24/packages/core/client.d.ts#L4
+ */
+declare function overrideUniPagesTypes(): void;
 /** 增加小程序中vueuse的运行所需 */
 declare function transformMpRuntime(code: string, id: string): string;
 /**
@@ -11,29 +17,22 @@ declare function transformMpRuntime(code: string, id: string): string;
 declare function transformH5Runtime(code: string, id: string): string;
 /** 修复app运行白屏，原因是pinia调用了@vue/devtools-kit的setupDevToolsPlugin */
 declare function transformPinia(code: string, id: string): string;
-/** 移除路径中的'../' */
-declare function patchNormalizeNodeModules(): void;
+/**
+ * fix `@uni-helper/vite-plugin-uni-components` load slowly
+ * @see https://github.com/uni-helper/vite-plugin-uni-components/blob/v0.2.6/packages/core/src/index.ts#L27
+ */
+declare function modifyUniComponentsConfig(config: ResolvedConfig): void;
 /**
  * 兼容 unocss^66.1.0 小程序平台的css文件后缀名
  * @see https://github.com/dcloudio/uni-app/pull/5605/files
+ * @fixed 官方已修复
  */
-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
+ * @fixed 官方已修复
  */
-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 _default: (options?: any) => _$vite.PluginOption;
+declare const _default: (options?: any) => import("vite").PluginOption;
 //#endregion
-export { _default as default, patchAdjustCssExtname, patchNormalizeNodeModules, patchUniComponents, patchUniPagesTypes, patchUnocssGlobalBuildScan, transformH5Runtime, transformMpRuntime, transformPinia };
+export { _default as default, modifyUniComponentsConfig, overrideNormalizeNodeModules, overrideUniPagesTypes, transformH5Runtime, transformMpRuntime, transformPinia };

package/dist/node/modules/uni-patch.mjs

@@ -4,6 +4,31 @@ import { resolvePathSync } from "mlly";
 import path from "pathe";
 import { normalizePath } from "vite";
 //#region src/node/modules/uni-patch.ts
+/** 移除路径中的'../' */
+function overrideNormalizeNodeModules() {
+	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, "utf-8");
+	if (code.includes(matched)) {
+		code = code.replace(matched, replaced);
+		fs.writeFileSync(codePath, code);
+	}
+}
+/**
+* fix `@uni-helper/vite-plugin-uni-pages` client types
+* @see https://github.com/uni-helper/vite-plugin-uni-pages/blob/v0.3.24/packages/core/client.d.ts#L4
+*/
+function overrideUniPagesTypes() {
+	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);
+	}
+}
 /** 增加小程序中vueuse的运行所需 */
 function transformMpRuntime(code, id) {
 	if (!id.endsWith("@dcloudio/uni-mp-vue/dist/vue.runtime.esm.js")) return code;
@@ -28,94 +53,40 @@ function transformPinia(code, id) {
 	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, "utf-8");
-	if (code.includes(matched)) {
-		code = code.replace(matched, replaced);
-		fs.writeFileSync(codePath, code);
-	}
+/**
+* fix `@uni-helper/vite-plugin-uni-components` load slowly
+* @see https://github.com/uni-helper/vite-plugin-uni-components/blob/v0.2.6/packages/core/src/index.ts#L27
+*/
+function modifyUniComponentsConfig(config) {
+	if (JSON.stringify(config.build.watch) === "{}") config.build.watch = null;
 }
 /**
 * 兼容 unocss^66.1.0 小程序平台的css文件后缀名
 * @see https://github.com/dcloudio/uni-app/pull/5605/files
+* @fixed 官方已修复
 */
-function patchAdjustCssExtname(config) {
-	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
+* @fixed 官方已修复
 */
-function patchUnocssGlobalBuildScan(config) {
-	const plugin = config.plugins.find((p) => p.name === "unocss:global:build:scan");
-	if (plugin) plugin.shouldTransformCachedModule = ({ code }) => code.includes("virtual:uno.css");
-}
-/**
-* 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;
-}
-/**
-* 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'\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);
-	}
-}
 var uni_patch_default = defineVitePlugin(() => {
-	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;
-			}
+	overrideNormalizeNodeModules();
+	overrideUniPagesTypes();
+	return {
+		name: "vixt:uni-patch",
+		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);
-			}
+		configResolved(config) {
+			modifyUniComponentsConfig(config);
 		}
-	];
+	};
 });
 //#endregion
-export { uni_patch_default as default, patchAdjustCssExtname, patchNormalizeNodeModules, patchUniComponents, patchUniPagesTypes, patchUnocssGlobalBuildScan, transformH5Runtime, transformMpRuntime, transformPinia };
+export { uni_patch_default as default, modifyUniComponentsConfig, overrideNormalizeNodeModules, overrideUniPagesTypes, transformH5Runtime, transformMpRuntime, transformPinia };

package/dist/node/node.d.mts

@@ -1,4 +1,5 @@
-import { t as UniLayoutsOptions } from "./uni-layouts-B1hWgSc_.mjs";
+import { t as UniLayoutsOptions } from "./uni-layouts-DiqR237-.mjs";
+import { t as UniModulesOptions } from "./uni-modules-DKxzU50K.mjs";
 import { ExtractPluginOptions } from "@vixt/core";
 import Uni from "@dcloudio/vite-plugin-uni";
 import Components from "@uni-helper/vite-plugin-uni-components";
@@ -13,6 +14,8 @@ interface UniVixtOptions {
   uniLayouts?: UniLayoutsOptions;
   /** https://github.com/uni-helper/vite-plugin-uni-components */
   uniComponents?: ExtractPluginOptions<typeof Components>;
+  /** Options for extends `uni-modules` */
+  uniModules?: UniModulesOptions;
 }
 declare module '@vixt/core' {
   interface VixtOptions extends UniVixtOptions {}

package/dist/node/{uni-layouts-B1hWgSc_.d.mts → uni-layouts-DiqR237-.d.mts}

@@ -1,5 +1,3 @@
-import * as _$vite from "vite";
-
 //#region src/node/modules/uni-layouts.d.ts
 interface UniLayoutsOptions {
   /**
@@ -17,6 +15,6 @@ interface UniLayoutsOptions {
    */
   defaultLayout?: string;
 }
-declare const _default: (options?: UniLayoutsOptions | undefined) => _$vite.PluginOption;
+declare const _default: (options?: UniLayoutsOptions | undefined) => import("vite").PluginOption;
 //#endregion
 export { _default as n, UniLayoutsOptions as t };

package/dist/node/uni-modules-DKxzU50K.d.mts

@@ -0,0 +1,13 @@
+//#region src/node/modules/uni-modules.d.ts
+declare module '@vixt/core' {
+  interface VixtOptions {
+    uniModules?: UniModulesOptions;
+  }
+}
+interface UniModulesOptions {
+  include?: string[];
+  exclude?: string[];
+}
+declare const _default: import("@vixt/core").VixtModule<import("@vixt/core").ModuleOptions>;
+//#endregion
+export { _default as n, UniModulesOptions as t };

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@vixt/uni",
   "type": "module",
-  "version": "0.11.1",
+  "version": "0.12.0",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://soullyoko.github.io/vixt/",
-  "repository": "https://github.com/SoulLyoko/vixt.git",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/SoulLyoko/vixt.git"
+  },
   "keywords": [
     "vixt",
     "vite",
@@ -24,16 +27,27 @@
   "files": [
     "dist"
   ],
+  "peerDependencies": {
+    "@dcloudio/vite-plugin-uni": "*",
+    "pinia": "*"
+  },
   "dependencies": {
     "@dcloudio/types": "^3.4.28",
-    "@uni-helper/uni-app-types": "^1.0.0",
-    "@uni-helper/uni-use": "^0.19.17",
-    "@uni-helper/unocss-preset-uni": "^0.2.11",
+    "@uni-helper/uni-types": "^1.1.0",
     "@uni-helper/vite-plugin-uni-components": "0.2.6",
     "@uni-helper/vite-plugin-uni-layouts": "^0.1.11",
     "@uni-helper/vite-plugin-uni-pages": "^0.3.24",
-    "unocss-applet": "^0.12.2",
-    "@vixt/core": "0.11.1",
-    "@vixt/vue": "0.11.1"
+    "defu": "^6.1.7",
+    "fast-glob": "^3.3.3",
+    "fs-extra": "^11.3.6",
+    "mlly": "^1.8.2",
+    "pathe": "^2.0.3",
+    "vite": "^7.3.6",
+    "vue": "^3.5.39",
+    "@vixt/core": "0.12.0"
+  },
+  "devDependencies": {
+    "@dcloudio/vite-plugin-uni": "3.0.0-5000720260410001",
+    "pinia": "^3.0.4"
   }
 }