@vixt/uni 0.0.7 → 0.0.9

package/dist/index.d.mts

@@ -3,9 +3,11 @@ import * as _vixt_core from '@vixt/core';
 import { AppOptions, PluginOptions, VixtOptions } from '@vixt/core';
 import Uni from '@dcloudio/vite-plugin-uni';
 import Pages from '@uni-helper/vite-plugin-uni-pages';
+import Layouts from '@uni-helper/vite-plugin-uni-layouts';
 import Components from '@uni-helper/vite-plugin-uni-components';
 import AutoImport from 'unplugin-auto-import/vite';
 import UnoCSS from 'unocss/vite';
+import { ImportsMap } from 'unplugin-auto-import/types';
 
 declare const entryUni: _vixt_core.VixtModule<AppOptions>;
 
@@ -15,7 +17,7 @@ declare module '@vixt/core' {
         /** https://github.com/uni-helper/vite-plugin-uni-pages */
         pages?: PluginOptions<typeof Pages>;
         /** https://github.com/uni-helper/vite-plugin-uni-layouts */
-        layouts?: any;
+        uniLayouts?: PluginOptions<typeof Layouts>;
         /** https://github.com/uni-helper/vite-plugin-uni-components */
         components?: PluginOptions<typeof Components>;
         /** https://github.com/antfu/unplugin-auto-import */
@@ -32,6 +34,8 @@ declare function vueusePolyfill(code: string, id: string): string;
 declare function patchNormalizeNodeModules(): void;
 declare const uniPatch: (options?: any) => vite.PluginOption;
 
+declare const useImports: () => ImportsMap;
+
 declare const _default: (options?: _vixt_core.VixtOptions | undefined) => vite.PluginOption;
 
-export { _default as default, entryUni, patchNormalizeNodeModules, presetUni, uniPatch, vueusePolyfill };
+export { _default as default, entryUni, patchNormalizeNodeModules, presetUni, uniPatch, useImports, vueusePolyfill };

package/dist/index.d.ts

@@ -3,9 +3,11 @@ import * as _vixt_core from '@vixt/core';
 import { AppOptions, PluginOptions, VixtOptions } from '@vixt/core';
 import Uni from '@dcloudio/vite-plugin-uni';
 import Pages from '@uni-helper/vite-plugin-uni-pages';
+import Layouts from '@uni-helper/vite-plugin-uni-layouts';
 import Components from '@uni-helper/vite-plugin-uni-components';
 import AutoImport from 'unplugin-auto-import/vite';
 import UnoCSS from 'unocss/vite';
+import { ImportsMap } from 'unplugin-auto-import/types';
 
 declare const entryUni: _vixt_core.VixtModule<AppOptions>;
 
@@ -15,7 +17,7 @@ declare module '@vixt/core' {
         /** https://github.com/uni-helper/vite-plugin-uni-pages */
         pages?: PluginOptions<typeof Pages>;
         /** https://github.com/uni-helper/vite-plugin-uni-layouts */
-        layouts?: any;
+        uniLayouts?: PluginOptions<typeof Layouts>;
         /** https://github.com/uni-helper/vite-plugin-uni-components */
         components?: PluginOptions<typeof Components>;
         /** https://github.com/antfu/unplugin-auto-import */
@@ -32,6 +34,8 @@ declare function vueusePolyfill(code: string, id: string): string;
 declare function patchNormalizeNodeModules(): void;
 declare const uniPatch: (options?: any) => vite.PluginOption;
 
+declare const useImports: () => ImportsMap;
+
 declare const _default: (options?: _vixt_core.VixtOptions | undefined) => vite.PluginOption;
 
-export { _default as default, entryUni, patchNormalizeNodeModules, presetUni, uniPatch, vueusePolyfill };
+export { _default as default, entryUni, patchNormalizeNodeModules, presetUni, uniPatch, useImports, vueusePolyfill };

package/dist/index.mjs

@@ -9,6 +9,10 @@ import Components from '@uni-helper/vite-plugin-uni-components';
 import AutoImport from 'unplugin-auto-import/vite';
 import UnoCSS from 'unocss/vite';
 import { resolvePathSync } from 'mlly';
+import { readFileSync } from 'node:fs';
+import process from 'node:process';
+import { resolveModule } from 'local-pkg';
+import { uniuseAutoImports } from '@uni-helper/uni-use';
 
 function resolveLayersPlugins(layers, from) {
   const { plugins = [] } = resolveLayersDirs(layers);
@@ -79,7 +83,7 @@ const presetUni = defineVixtModule({
     const defaultOptions = {
       uni: {},
       pages: { dts: `${typesDir}/uni-pages.d.ts` },
-      layouts: {},
+      uniLayouts: {},
       components: {
         dts: `${typesDir}/components.d.ts`,
         dirs: components,
@@ -88,7 +92,7 @@ const presetUni = defineVixtModule({
         allowOverrides: true
       },
       imports: {
-        imports: ["vue", "@vueuse/core", "uni-app", "pinia"],
+        imports: ["vue", "uni-app", "pinia", useImports()],
         dts: `${typesDir}/auto-imports.d.ts`,
         dirs: [...composables, ...constants, ...stores, ...utils],
         vueTemplate: true
@@ -98,7 +102,7 @@ const presetUni = defineVixtModule({
     const options = defu(vixt.options, defaultOptions);
     const modules = [
       Pages(options.pages),
-      Layouts(options.layouts),
+      Layouts(options.uniLayouts),
       Components(options.components),
       AutoImport(options.imports),
       UnoCSS(options.unocss),
@@ -140,6 +144,40 @@ const uniPatch = defineVitePlugin(() => {
   };
 });
 
+let _cache;
+const useImports = () => {
+  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 defaults = {
   modules: [entryUni, presetUni],
   app: {
@@ -149,11 +187,18 @@ const defaults = {
     main: "src/main.ts"
   },
   typescript: {
-    references: ["types/uni-pages.d.ts", "types/components.d.ts", "types/auto-imports.d.ts", "types/vite-env.d.ts"],
-    tsConfig: { compilerOptions: { types: ["@dcloudio/types", "@uni-helper/vite-plugin-uni-pages/client"] } },
+    // references: ['types/uni-pages.d.ts', 'types/components.d.ts', 'types/auto-imports.d.ts'],
+    tsConfig: {
+      compilerOptions: {
+        types: ["@dcloudio/types", "@uni-helper/uni-app-types", "@uni-helper/vite-plugin-uni-pages/client"]
+      },
+      vueCompilerOptions: {
+        plugins: ["@uni-helper/uni-app-types/volar-plugin"]
+      }
+    },
     typeCheck: { vueTsc: true }
   }
 };
 const index = createVixtPlugin({ defaults });
 
-export { index as default, entryUni, patchNormalizeNodeModules, presetUni, uniPatch, vueusePolyfill };
+export { index as default, entryUni, patchNormalizeNodeModules, presetUni, uniPatch, useImports, vueusePolyfill };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/uni",
   "type": "module",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://github.com/SoulLyoko/vixt#readme",
@@ -21,6 +21,7 @@
     "@dcloudio/types": "^3.4.8",
     "@uni-helper/eslint-config": "^0.0.6",
     "@uni-helper/uni-app-types": "^0.5.13",
+    "@uni-helper/uni-use": "^0.19.12",
     "@uni-helper/unocss-preset-uni": "^0.2.9",
     "@uni-helper/vite-plugin-uni-components": "^0.0.9",
     "@uni-helper/vite-plugin-uni-layouts": "^0.1.10",
@@ -31,7 +32,7 @@
     "unocss": "^0.61.0",
     "unplugin-auto-import": "^0.17.6",
     "vue": "^3.4.31",
-    "@vixt/core": "0.0.7"
+    "@vixt/core": "0.0.9"
   },
   "scripts": {
     "build": "unbuild"