@vixt/uni 0.5.15 → 0.5.17

package/dist/index.d.mts

@@ -92,13 +92,16 @@ declare function patchUnocssGlobalBuildScan(config: ResolvedConfig): void;
  * @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 function genarateVirtualUniPagesTypes(vixt: Vixt): void;
-
 declare const _default: (options?: _vixt_core.VixtOptions | undefined) => vite.PluginOption;
 
-export { appUni, _default as default, genarateVirtualUniPagesTypes, generateMainTs, patchAdjustCssExtname, patchNormalizeNodeModules, patchUniComponents, patchUnocssGlobalBuildScan, presetUni, transformH5Runtime, transformMpRuntime, transformVueDevtools, uniModules, uniPatch, uniVueUseResolver };
+export { appUni, _default as default, generateMainTs, patchAdjustCssExtname, patchNormalizeNodeModules, patchUniComponents, patchUniPagesTypes, patchUnocssGlobalBuildScan, presetUni, transformH5Runtime, transformMpRuntime, transformVueDevtools, uniModules, uniPatch, uniVueUseResolver };
 export type { ModuleOptions };

package/dist/index.d.ts

@@ -92,13 +92,16 @@ declare function patchUnocssGlobalBuildScan(config: ResolvedConfig): void;
  * @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 function genarateVirtualUniPagesTypes(vixt: Vixt): void;
-
 declare const _default: (options?: _vixt_core.VixtOptions | undefined) => vite.PluginOption;
 
-export { appUni, _default as default, genarateVirtualUniPagesTypes, generateMainTs, patchAdjustCssExtname, patchNormalizeNodeModules, patchUniComponents, patchUnocssGlobalBuildScan, presetUni, transformH5Runtime, transformMpRuntime, transformVueDevtools, uniModules, uniPatch, uniVueUseResolver };
+export { appUni, _default as default, generateMainTs, patchAdjustCssExtname, patchNormalizeNodeModules, patchUniComponents, patchUniPagesTypes, patchUnocssGlobalBuildScan, presetUni, transformH5Runtime, transformMpRuntime, transformVueDevtools, uniModules, uniPatch, uniVueUseResolver };
 export type { ModuleOptions };

package/dist/index.mjs

@@ -156,8 +156,20 @@ function patchUniComponents(config) {
   if (JSON.stringify(config.build.watch) === "{}")
     config.build.watch = null;
 }
+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 uniPatch = defineVitePlugin(() => {
   patchNormalizeNodeModules();
+  patchUniPagesTypes();
   return [
     {
       name: "vixt:uni-patch-runtime",
@@ -227,19 +239,6 @@ function uniVueUseResolver() {
   return _cache || {};
 }
 
-function genarateVirtualUniPagesTypes(vixt) {
-  const { buildTypesDir } = vixt.options;
-  const codePath = path.resolve(buildTypesDir, "virtual-uni-pages.d.ts");
-  const code = `declare module 'virtual:uni-pages' {
-  import type { PageMetaDatum, SubPackage } from '@uni-helper/vite-plugin-uni-pages'
-
-  export const pages: PageMetaDatum[]
-  export const subPackages: SubPackage[]
-}
-`;
-  fs.outputFileSync(codePath, code);
-}
-
 const name$1 = "vixt:preset-uni";
 const presetUni = defineVixtModule({
   meta: { name: name$1 },
@@ -265,7 +264,6 @@ const presetUni = defineVixtModule({
       unocss: {}
     };
     const options = vixt.options = defu(vixt.options, defaultOptions);
-    genarateVirtualUniPagesTypes(vixt);
     const modules = [
       Pages(options.uniPages),
       Layouts(options.uniLayouts),
@@ -333,7 +331,7 @@ const defaults = {
   typescript: {
     tsConfig: {
       compilerOptions: {
-        types: ["@dcloudio/types", "@uni-helper/uni-app-types", "@uni-helper/vite-plugin-uni-pages/client"]
+        types: ["@dcloudio/types", "@uni-helper/uni-app-types"]
       },
       vueCompilerOptions: {
         plugins: ["@uni-helper/uni-app-types/volar-plugin"]
@@ -343,4 +341,4 @@ const defaults = {
 };
 const index = createVixtPlugin({ defaults });
 
-export { appUni, index as default, genarateVirtualUniPagesTypes, generateMainTs, patchAdjustCssExtname, patchNormalizeNodeModules, patchUniComponents, patchUnocssGlobalBuildScan, presetUni, transformH5Runtime, transformMpRuntime, transformVueDevtools, uniModules, uniPatch, uniVueUseResolver };
+export { appUni, index as default, generateMainTs, patchAdjustCssExtname, patchNormalizeNodeModules, patchUniComponents, patchUniPagesTypes, patchUnocssGlobalBuildScan, presetUni, transformH5Runtime, transformMpRuntime, transformVueDevtools, uniModules, uniPatch, uniVueUseResolver };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/uni",
   "type": "module",
-  "version": "0.5.15",
+  "version": "0.5.17",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://soullyoko.github.io/vixt/",
@@ -33,8 +33,8 @@
     "@uni-helper/vite-plugin-uni-layouts": "^0.1.11",
     "@uni-helper/vite-plugin-uni-pages": "^0.3.22",
     "unocss-applet": "^0.12.2",
-    "@vixt/core": "0.5.15",
-    "@vixt/vue": "0.5.15"
+    "@vixt/vue": "0.5.17",
+    "@vixt/core": "0.5.17"
   },
   "scripts": {
     "build": "unbuild",