vuetify-nuxt-module 1.0.0-beta.3 → 1.0.0-beta.4

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.15.0"
   },
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -1,5 +1,5 @@
-import { pathToFileURL, fileURLToPath } from 'node:url';
-import { addPluginTemplate, resolvePath, addTemplate, extendWebpackConfig, isNuxtMajorVersion, addImports, addPlugin, addVitePlugin, useLogger, defineNuxtModule, getNuxtVersion, createResolver, hasNuxtModule } from '@nuxt/kit';
+import { addPluginTemplate, resolvePath, addTemplate, extendWebpackConfig, isNuxtMajorVersion, addImports, addPlugin, addVitePlugin, useLogger, defineNuxtModule, getNuxtVersion, hasNuxtModule, createResolver } from '@nuxt/kit';
+import { isPackageExists, getPackageInfo } from 'local-pkg';
 import semver from 'semver';
 import { createFilter, version as version$1 } from 'vite';
 import defu from 'defu';
@@ -7,6 +7,7 @@ import { transformAssetUrls } from 'vite-plugin-vuetify';
 import { createHash } from 'node:crypto';
 import fs, { existsSync, readdirSync, rmSync, statSync, readFileSync, mkdirSync, writeFileSync } from 'node:fs';
 import { isAbsolute, resolve, join, relative, dirname } from 'pathe';
+import { pathToFileURL } from 'node:url';
 import { generateImports, isObject, resolveVuetifyBase, normalizePath } from '@vuetify/loader-shared';
 import destr from 'destr';
 import { parseQuery, parseURL } from 'ufo';
@@ -16,7 +17,7 @@ import { debounce } from 'perfect-debounce';
 import process from 'node:process';
 import { createConfigLoader } from 'unconfig';
 
-const version = "1.0.0-beta.3";
+const version = "1.0.0-beta.4";
 
 const VIRTUAL_VUETIFY_CONFIGURATION = "virtual:vuetify-configuration";
 const RESOLVED_VIRTUAL_VUETIFY_CONFIGURATION = `\0${VIRTUAL_VUETIFY_CONFIGURATION}`;
@@ -1066,25 +1067,7 @@ function isSubdir(root, test) {
   return relative$1 && !relative$1.startsWith("..") && !isAbsolute(relative$1);
 }
 
-async function loadPackageJSON(name, parentURL = import.meta.url) {
-  try {
-    const packageJsonUrl = import.meta.resolve(`${name}/package.json`, parentURL);
-    const packageJsonPath = fileURLToPath(packageJsonUrl);
-    return JSON.parse(await readFile(packageJsonPath, "utf8"));
-  } catch {
-    return null;
-  }
-}
-function isPackageExists(name, parentURL = import.meta.url) {
-  try {
-    import.meta.resolve(name, parentURL);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-function detectDate(packageResolveFrom) {
+function detectDate() {
   const result = [];
   for (const adapter of [
     "date-fns",
@@ -1096,7 +1079,7 @@ function detectDate(packageResolveFrom) {
     "jalaali",
     "hijri"
   ]) {
-    if (isPackageExists(`@date-io/${adapter}`, packageResolveFrom)) {
+    if (isPackageExists(`@date-io/${adapter}`)) {
       result.push(adapter);
     }
   }
@@ -1149,7 +1132,7 @@ function configureVite(configKey, nuxt, ctx) {
     if (!ctx.moduleOptions.disableModernSassCompiler) {
       const enableModernSassCompiler = semver.gte(ctx.viteVersion, "5.4.0") && semver.lt(ctx.viteVersion, "7.0.0-0");
       if (enableModernSassCompiler) {
-        const sassEmbedded = isPackageExists("sass-embedded", ctx.packageResolveFrom);
+        const sassEmbedded = isPackageExists("sass-embedded");
         if (sassEmbedded) {
           viteInlineConfig.css ??= {};
           viteInlineConfig.css.preprocessorOptions ??= {};
@@ -1233,7 +1216,7 @@ const disabledResolvedIcons = Object.freeze({
   local: [],
   svg: {}
 });
-function prepareIcons(unocssPresent, logger, vuetifyOptions, packageResolveFrom) {
+function prepareIcons(unocssPresent, logger, vuetifyOptions) {
   if (vuetifyOptions.icons === false) {
     return disabledResolvedIcons;
   }
@@ -1277,7 +1260,7 @@ function prepareIcons(unocssPresent, logger, vuetifyOptions, packageResolveFrom)
       }
       resolvedIcons.imports.push(`import {${name === defaultSet ? "aliases," : ""}${name}} from 'vuetify/iconsets/${name}'`);
       resolvedIcons.sets.push(name);
-      if (isPackageExists(iconsPackageNames[name].name, packageResolveFrom)) {
+      if (isPackageExists(iconsPackageNames[name].name)) {
         resolvedIcons.local.push(iconsPackageNames[name].css);
       } else {
         resolvedIcons.cdn.push([name, cdn ?? iconsCDN[name]]);
@@ -1296,21 +1279,18 @@ function prepareIcons(unocssPresent, logger, vuetifyOptions, packageResolveFrom)
     if (!faSvg) {
       faSvg = {};
     }
-    let faSvgExists = isPackageExists("@fortawesome/fontawesome-svg-core", packageResolveFrom);
+    let faSvgExists = isPackageExists("@fortawesome/fontawesome-svg-core");
     if (!faSvgExists) {
       logger.warn("Missing @fortawesome/fontawesome-svg-core dependency, install it!");
     }
-    faSvgExists = isPackageExists("@fortawesome/vue-fontawesome", packageResolveFrom);
+    faSvgExists = isPackageExists("@fortawesome/vue-fontawesome");
     if (faSvgExists) {
       if (!faSvg.libraries?.length) {
         faSvg.libraries = [[false, "fas", "@fortawesome/free-solid-svg-icons"]];
       }
-      for (const libraryEntry of faSvg.libraries) {
-        if (!libraryEntry) {
-          continue;
-        }
-        const library = libraryEntry[2];
-        if (!isPackageExists(library, packageResolveFrom)) {
+      for (const p in faSvg.libraries) {
+        const [_defaultExport, _name, library] = faSvg.libraries[p];
+        if (!isPackageExists(library)) {
           faSvgExists = false;
           logger.warn(`Missing library ${library} dependency, install it!`);
         }
@@ -1322,11 +1302,7 @@ function prepareIcons(unocssPresent, logger, vuetifyOptions, packageResolveFrom)
       resolvedIcons.aliasesImportPresent ||= defaultSet === "fa-svg";
       resolvedIcons.imports.push(`import {${defaultSet === "fa-svg" ? "aliases," : ""}fa} from 'vuetify/iconsets/fa-svg'`, "import { library } from '@fortawesome/fontawesome-svg-core'", "import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'", "import { useNuxtApp } from '#imports'");
       resolvedIcons.svg.fa = ["useNuxtApp().vueApp.component('font-awesome-icon', FontAwesomeIcon)"];
-      for (const libraryEntry of faSvg.libraries ?? []) {
-        if (!libraryEntry) {
-          continue;
-        }
-        const [defaultExport, name, library] = libraryEntry;
+      for (const [defaultExport, name, library] of faSvg.libraries) {
         resolvedIcons.imports.push(`import ${defaultExport ? name : `{${name}}`} from '${library}'`);
         resolvedIcons.svg.fa.push(`library.add(${name})`);
       }
@@ -1341,7 +1317,7 @@ function prepareIcons(unocssPresent, logger, vuetifyOptions, packageResolveFrom)
     if (!mdiSvg) {
       mdiSvg = {};
     }
-    const mdiSvgExists = isPackageExists("@mdi/js", packageResolveFrom);
+    const mdiSvgExists = isPackageExists("@mdi/js");
     if (mdiSvgExists) {
       resolvedIcons.svg.mdi = true;
       resolvedIcons.aliasesImportPresent ||= defaultSet === "mdi-svg";
@@ -1701,7 +1677,7 @@ async function load(options, nuxt, ctx) {
   const dateOptions = vuetifyOptions.date;
   if (dateOptions) {
     const adapter = dateOptions.adapter;
-    const date = detectDate(ctx.packageResolveFrom);
+    const date = detectDate();
     if (!adapter && date.length > 1) {
       throw new Error(`Multiple date adapters found: ${date.map((d) => `@date-io/${d[0]}`).join(", ")}, please specify the adapter to use in the "vuetifyOptions.date.adapter" option.`);
     }
@@ -1730,7 +1706,7 @@ async function load(options, nuxt, ctx) {
   ctx.enableRules = ctx.moduleOptions.enableRules;
   ctx.rulesConfiguration = ctx.moduleOptions.rulesConfiguration;
   ctx.vuetifyFilesToWatch = Array.from(vuetifyConfigurationFilesToWatch);
-  ctx.icons = prepareIcons(ctx.unocss, ctx.logger, vuetifyAppOptions, ctx.packageResolveFrom);
+  ctx.icons = prepareIcons(ctx.unocss, ctx.logger, vuetifyAppOptions);
   ctx.ssrClientHints = prepareSSRClientHints(nuxt.options.app.baseURL ?? "/", ctx);
   if (ctx.icons.enabled) {
     if (ctx.icons.local) {
@@ -1831,16 +1807,13 @@ const module$1 = defineNuxtModule({
     if (isNuxtMajorVersion(2, nuxt)) {
       logger.error(`Cannot support nuxt version: ${getNuxtVersion(nuxt)}`);
     }
-    const resolver = createResolver(import.meta.url);
-    const packageResolveFrom = pathToFileURL(resolver.resolve(nuxt.options.rootDir, "package.json")).href;
-    const vuetifyPkg = await loadPackageJSON("vuetify", packageResolveFrom);
+    const vuetifyPkg = await getPackageInfo("vuetify");
     const currentVersion = vuetifyPkg?.version;
     const vuetifyGte = (version2) => !!currentVersion && semver.gte(currentVersion, version2);
     const viteVersion = version$1;
     const ctx = {
       logger,
-      resolver,
-      packageResolveFrom,
+      resolver: createResolver(import.meta.url),
       moduleOptions: void 0,
       vuetifyOptions: void 0,
       vuetifyFilesToWatch: [],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vuetify-nuxt-module",
   "type": "module",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
   "license": "MIT",
@@ -54,6 +54,7 @@
     "@nuxt/kit": "^4.3.1",
     "defu": "^6.1.4",
     "destr": "^2.0.5",
+    "local-pkg": "^1.1.2",
     "pathe": "^2.0.3",
     "perfect-debounce": "^2.1.0",
     "semver": "^7.7.4",
@@ -102,6 +103,7 @@
       "consola",
       "destr",
       "esbuild",
+      "local-pkg",
       "pathe",
       "perfect-debounce",
       "rollup",