@vixt/uni 0.0.7 → 0.0.8

package/dist/index.d.mts

@@ -3,6 +3,7 @@ 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';
@@ -15,7 +16,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 */

package/dist/index.d.ts

@@ -3,6 +3,7 @@ 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';
@@ -15,7 +16,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 */

package/dist/index.mjs

@@ -6,6 +6,7 @@ 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 { uniuseAutoImports } from '@uni-helper/uni-use';
 import AutoImport from 'unplugin-auto-import/vite';
 import UnoCSS from 'unocss/vite';
 import { resolvePathSync } from 'mlly';
@@ -79,16 +80,33 @@ const presetUni = defineVixtModule({
     const defaultOptions = {
       uni: {},
       pages: { dts: `${typesDir}/uni-pages.d.ts` },
-      layouts: {},
+      uniLayouts: {},
       components: {
         dts: `${typesDir}/components.d.ts`,
         dirs: components,
         directoryAsNamespace: true,
         collapseSamePrefixes: true,
-        allowOverrides: true
+        allowOverrides: true,
+        version: 2.7
       },
       imports: {
-        imports: ["vue", "@vueuse/core", "uni-app", "pinia"],
+        imports: [
+          "vue",
+          "uni-app",
+          "pinia",
+          {
+            "@vueuse/core": [
+              // already imported by uni-use
+              ["tryOnScopeDispose", ""],
+              ["useNetwork", ""],
+              ["useOnline", ""],
+              ["usePreferredDark", ""],
+              ["useStorage", ""],
+              ["useStorageAsync", ""]
+            ]
+          },
+          uniuseAutoImports()
+        ],
         dts: `${typesDir}/auto-imports.d.ts`,
         dirs: [...composables, ...constants, ...stores, ...utils],
         vueTemplate: true
@@ -98,7 +116,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),
@@ -149,8 +167,15 @@ 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 }
   }
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/uni",
   "type": "module",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "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.8"
   },
   "scripts": {
     "build": "unbuild"