@vixt/uni 0.4.1 → 0.4.2

package/dist/index.d.mts

@@ -70,9 +70,9 @@ declare function vueusePolyfill(code: string, id: string): string;
 declare function patchNormalizeNodeModules(): void;
 declare const uniPatch: (options?: any) => vite.PluginOption;
 
-declare function useImports(): ImportsMap;
+declare function uniVueUseResolver(): ImportsMap;
 
 declare const _default: (options?: _vixt_core.VixtOptions | undefined) => vite.PluginOption;
 
-export { appUni, _default as default, generateMainTs, patchNormalizeNodeModules, presetUni, uniModules, uniPatch, useImports, vueusePolyfill };
+export { appUni, _default as default, generateMainTs, patchNormalizeNodeModules, presetUni, uniModules, uniPatch, uniVueUseResolver, vueusePolyfill };
 export type { ModuleOptions };

package/dist/index.d.ts

@@ -70,9 +70,9 @@ declare function vueusePolyfill(code: string, id: string): string;
 declare function patchNormalizeNodeModules(): void;
 declare const uniPatch: (options?: any) => vite.PluginOption;
 
-declare function useImports(): ImportsMap;
+declare function uniVueUseResolver(): ImportsMap;
 
 declare const _default: (options?: _vixt_core.VixtOptions | undefined) => vite.PluginOption;
 
-export { appUni, _default as default, generateMainTs, patchNormalizeNodeModules, presetUni, uniModules, uniPatch, useImports, vueusePolyfill };
+export { appUni, _default as default, generateMainTs, patchNormalizeNodeModules, presetUni, uniModules, uniPatch, uniVueUseResolver, vueusePolyfill };
 export type { ModuleOptions };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { generateClient, generateCss, generateAppConfig, generatePlugins, defineVixtModule, generateIndexHtml, resolveLayersDirs, defineVitePlugin, createVixtPlugin } from '@vixt/core';
+import { generateClient, generateCss, generateAppConfig, generatePlugins, defineVixtModule, generateIndexHtml, defineVitePlugin, resolveLayersDirs, createVixtPlugin } from '@vixt/core';
 import path from 'pathe';
 import { genarateAppComponent } from '@vixt/vue';
 import fs from 'fs-extra';
@@ -106,11 +106,75 @@ const appUni = defineVixtModule({
   }
 });
 
+function vueusePolyfill(code, id) {
+  if (!id.endsWith("@dcloudio/uni-mp-vue/dist/vue.runtime.esm.js"))
+    return code;
+  code += `
+export const render = () => {}
+export const TransitionGroup = {}
+`;
+  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 uniPatch = defineVitePlugin(() => {
+  patchNormalizeNodeModules();
+  return {
+    name: "vixt:uni-patch",
+    transform(code, id) {
+      code = vueusePolyfill(code, id);
+      return code;
+    }
+  };
+});
+
+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 name$1 = "vixt:preset-uni";
 const presetUni = defineVixtModule({
   meta: { name: name$1 },
   setup(_, vixt) {
-    const { components, composables = [], constants = [], utils = [], stores = [] } = resolveLayersDirs(vixt._layers);
+    const { components = [], composables = [], constants = [], utils = [], stores = [] } = resolveLayersDirs([...vixt._layers].reverse());
     const { buildTypesDir, buildImportsDir } = vixt.options;
     const defaultOptions = {
       uni: {},
@@ -118,14 +182,14 @@ const presetUni = defineVixtModule({
       uniLayouts: {},
       uniComponents: {
         dts: `${buildTypesDir}/components.d.ts`,
-        dirs: components,
+        dirs: [...components].reverse(),
         directoryAsNamespace: true,
         collapseSamePrefixes: true
       },
       imports: {
-        imports: ["vue", "uni-app", "pinia", useImports()],
+        imports: ["vue", "uni-app", "pinia", uniVueUseResolver()],
         dts: `${buildTypesDir}/auto-imports.d.ts`,
-        dirs: [...composables, ...constants, ...stores, ...utils, buildImportsDir],
+        dirs: [composables, constants, stores, utils, buildImportsDir].flat(),
         vueTemplate: true
       },
       unocss: {}
@@ -192,70 +256,6 @@ const uniModules = defineVixtModule({
   }
 });
 
-function vueusePolyfill(code, id) {
-  if (!id.endsWith("@dcloudio/uni-mp-vue/dist/vue.runtime.esm.js"))
-    return code;
-  code += `
-export const render = () => {}
-export const TransitionGroup = {}
-`;
-  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 uniPatch = defineVitePlugin(() => {
-  patchNormalizeNodeModules();
-  return {
-    name: "vixt:uni-patch",
-    transform(code, id) {
-      code = vueusePolyfill(code, id);
-      return code;
-    }
-  };
-});
-
-let _cache;
-function 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: [uniModules, appUni, presetUni],
   typescript: {
@@ -271,4 +271,4 @@ const defaults = {
 };
 const index = createVixtPlugin({ defaults });
 
-export { appUni, index as default, generateMainTs, patchNormalizeNodeModules, presetUni, uniModules, uniPatch, useImports, vueusePolyfill };
+export { appUni, index as default, generateMainTs, patchNormalizeNodeModules, presetUni, uniModules, uniPatch, uniVueUseResolver, vueusePolyfill };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vixt/uni",
   "type": "module",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "author": "SoulLyoko<https://github.com/SoulLyoko>",
   "license": "MIT",
   "homepage": "https://github.com/SoulLyoko/vixt#readme",
@@ -26,8 +26,8 @@
     "@uni-helper/vite-plugin-uni-layouts": "^0.1.10",
     "@uni-helper/vite-plugin-uni-pages": "^0.2.28",
     "unocss-applet": "^0.10.0",
-    "@vixt/core": "0.4.1",
-    "@vixt/vue": "0.4.1"
+    "@vixt/core": "0.4.2",
+    "@vixt/vue": "0.4.2"
   },
   "scripts": {
     "build": "unbuild",