vuetify-nuxt-module 0.7.2 → 0.8.0

package/dist/module.d.mts

@@ -241,7 +241,7 @@ interface MOptions {
      * @see https://github.com/vuetifyjs/vuetify-loader/tree/master/packages/vite-plugin
      * @see https://github.com/userquin/vuetify-nuxt-module/issues/78 and https://github.com/userquin/vuetify-nuxt-module/issues/74
      */
-    styles?: true | 'none' | 'expose' | 'sass' | {
+    styles?: true | 'none' | 'sass' | {
         configFile: string;
     };
     /**

package/dist/module.d.ts

@@ -241,7 +241,7 @@ interface MOptions {
      * @see https://github.com/vuetifyjs/vuetify-loader/tree/master/packages/vite-plugin
      * @see https://github.com/userquin/vuetify-nuxt-module/issues/78 and https://github.com/userquin/vuetify-nuxt-module/issues/74
      */
-    styles?: true | 'none' | 'expose' | 'sass' | {
+    styles?: true | 'none' | 'sass' | {
         configFile: string;
     };
     /**

package/dist/module.json

@@ -5,5 +5,5 @@
     "nuxt": "^3.6.5",
     "bridge": false
   },
-  "version": "0.7.2"
+  "version": "0.8.0"
 }

package/dist/module.mjs

@@ -6,16 +6,15 @@ import { existsSync, statSync } from 'node:fs';
 import { resolve, dirname, extname } from 'node:path';
 import process from 'node:process';
 import { createConfigLoader } from 'unconfig';
-import { readFile, utimes } from 'node:fs/promises';
-import { resolveVuetifyBase, normalizePath, writeStyles, cacheDir, generateImports } from '@vuetify/loader-shared';
+import { readFile } from 'node:fs/promises';
+import { resolveVuetifyBase, normalizePath, generateImports } from '@vuetify/loader-shared';
 import { isAbsolute, join, relative } from 'pathe';
-import { normalizePath as normalizePath$1 } from 'vite';
 import { pathToFileURL } from 'node:url';
 import { parseQuery, parseURL } from 'ufo';
 import destr from 'destr';
 import { transformAssetUrls } from 'vite-plugin-vuetify';
 
-const version = "0.7.2";
+const version = "0.8.0";
 
 const VIRTUAL_VUETIFY_CONFIGURATION = "virtual:vuetify-configuration";
 const RESOLVED_VIRTUAL_VUETIFY_CONFIGURATION = `/@nuxt-vuetify-configuration/${VIRTUAL_VUETIFY_CONFIGURATION.slice("virtual:".length)}`;
@@ -499,103 +498,13 @@ function isSubdir(root, test) {
   const relative$1 = relative(root, test);
   return relative$1 && !relative$1.startsWith("..") && !isAbsolute(relative$1);
 }
-const styleImportRegexp = /(@use |meta\.load-css\()['"](vuetify(?:\/lib)?(?:\/styles(?:\/main(?:\.sass)?)?)?)['"]/;
 function vuetifyStylesPlugin(options, logger) {
   const vuetifyBase = resolveVuetifyBase();
-  const files = /* @__PURE__ */ new Set();
-  let server;
-  let context;
-  let resolve;
-  let promise;
-  let needsTouch = false;
-  const blockingModules = /* @__PURE__ */ new Set();
-  let pendingModules;
-  async function getPendingModules() {
-    if (!server) {
-      await new Promise((resolve2) => setTimeout(resolve2, 0));
-      const modules = Array.from(context.getModuleIds()).filter((id) => {
-        return !blockingModules.has(id) && !/\w\.(s[ac]|c)ss/.test(id);
-      }).map((id) => context.getModuleInfo(id)).filter((module) => module.code == null);
-      pendingModules = modules.map((module) => module.id);
-      if (!pendingModules.length)
-        return 0;
-      const promises = modules.map((module) => context.load(module));
-      await Promise.race(promises);
-      return promises.length;
-    } else {
-      const modules = Array.from(server.moduleGraph.urlToModuleMap.entries()).filter(([k, v]) => v.transformResult == null && !k.startsWith("/@id/") && !/\w\.(s[ac]|c)ss/.test(k) && !blockingModules.has(v.id) && !/\/node_modules\/\.vite\/deps\/(?!vuetify[._])/.test(k));
-      pendingModules = modules.map(([, v]) => v.id);
-      if (!pendingModules.length)
-        return 0;
-      const promises = modules.map(([k, v]) => server.transformRequest(k).then(() => v));
-      await Promise.race(promises);
-      return promises.length;
-    }
-  }
-  let timeout;
-  async function awaitBlocking() {
-    let pending;
-    do {
-      clearTimeout(timeout);
-      timeout = setTimeout(() => {
-        console.error("vuetify:styles fallback timeout hit", {
-          blockingModules: Array.from(blockingModules.values()),
-          pendingModules,
-          // @ts-expect-error not exported?
-          pendingRequests: server?._pendingRequests.keys()
-        });
-        resolve(false);
-      }, options.stylesTimeout);
-      pending = await Promise.any([
-        promise,
-        getPendingModules()
-      ]);
-      logger.info(pending, "pending modules", pendingModules);
-    } while (pending);
-    resolve(false);
-  }
-  async function awaitResolve(id) {
-    if (id)
-      blockingModules.add(id);
-    if (!promise) {
-      promise = new Promise((_resolve) => resolve = _resolve);
-      awaitBlocking();
-      await promise;
-      clearTimeout(timeout);
-      blockingModules.clear();
-      logger.info("writing styles");
-      await writeStyles(files);
-      if (server && needsTouch) {
-        const cacheFile = normalizePath$1(cacheDir("styles.scss"));
-        logger.log("cacheFile", cacheFile);
-        server.moduleGraph.getModulesByFile(cacheFile)?.forEach((module) => {
-          module.importers.forEach((module2) => {
-            if (module2.file) {
-              const now = /* @__PURE__ */ new Date();
-              logger.info(`touching ${module2.file}`);
-              utimes(module2.file, now, now);
-            }
-          });
-        });
-        needsTouch = false;
-      }
-      promise = null;
-    }
-    return promise;
-  }
   let configFile;
   const tempFiles = /* @__PURE__ */ new Map();
   return {
     name: "vuetify:styles:nuxt",
     enforce: "pre",
-    configureServer(_server) {
-      server = _server;
-    },
-    buildStart() {
-      if (!server) {
-        context = this;
-      }
-    },
     configResolved(config) {
       if (config.plugins.findIndex((plugin) => plugin.name === "vuetify:styles") > -1)
         throw new Error("Remove vite-plugin-vuetify from your Nuxt config file, this module registers a modified version.");
@@ -613,20 +522,6 @@ function vuetifyStylesPlugin(options, logger) {
         } else if (options.styles === "sass") {
           const target = source.replace(/\.css$/, ".sass");
           return this.resolve(target, importer, { skipSelf: true, custom });
-        } else if (options.styles === "expose") {
-          awaitResolve();
-          const resolution = await this.resolve(
-            source.replace(/\.css$/, ".sass"),
-            importer,
-            { skipSelf: true, custom }
-          );
-          if (resolution) {
-            if (!files.has(resolution.id)) {
-              needsTouch = true;
-              files.add(resolution.id);
-            }
-            return "/@plugin-vuetify/lib/__void__";
-          }
         } else if (typeof options.styles === "object") {
           const resolution = await this.resolve(source, importer, { skipSelf: true, custom });
           if (!resolution)
@@ -640,17 +535,6 @@ function vuetifyStylesPlugin(options, logger) {
         }
       }
     },
-    async transform(code, id) {
-      if (options.styles === "expose" && [".scss", ".sass"].some((v) => id.endsWith(v)) && styleImportRegexp.test(code)) {
-        logger.info(`awaiting ${id}`);
-        await awaitResolve(id);
-        logger.info(`returning ${id}`);
-        return {
-          code: code.replace(styleImportRegexp, '$1".cache/vuetify/styles.scss"'),
-          map: null
-        };
-      }
-    },
     load(id) {
       if (/^\/@plugin-vuetify\/lib\/__void__(\?.*)?$/.test(id))
         return "";
@@ -1158,8 +1042,7 @@ export function dateConfiguration() {
 `;
         }
         const { adapter: _adapter, ...newDateOptions } = ctx.vuetifyOptions.date ?? {};
-        const imports = ctx.dateAdapter === "vuetify" ? ctx.vuetify3_4 === true ? "" : "import { VuetifyDateAdapter } from 'vuetify/labs/date/adapters/vuetify'" : ctx.dateAdapter === "custom" ? "" : `import Adapter from '@date-io/${ctx.dateAdapter}'`;
-        return `${imports}
+        return `${buildImports()}
 export const enabled = true
 export const isDev = ${ctx.isDev}
 export const i18n = ${ctx.i18n}
@@ -1178,8 +1061,21 @@ export function dateConfiguration() {
       return "";
     if (ctx.dateAdapter === "vuetify")
       return "options.adapter = VuetifyDateAdapter";
+    const locale = ctx.vuetifyOptions.locale?.locale ?? "en";
+    if (ctx.dateAdapter === "date-fns")
+      return `options.adapter = new Adapter({ locale: ${locale} })`;
     return "options.adapter = Adapter";
   }
+  function buildImports() {
+    if (ctx.dateAdapter === "custom" || ctx.dateAdapter === "vuetify" && ctx.vuetify3_4 === true)
+      return "";
+    if (ctx.dateAdapter === "vuetify")
+      return "import { VuetifyDateAdapter } from 'vuetify/labs/date/adapters/vuetify'";
+    const imports = [`import Adapter from '@date-io/${ctx.dateAdapter}'`];
+    if (ctx.dateAdapter === "date-fns")
+      imports.push(`import { ${ctx.vuetifyOptions.locale?.locale ?? "en"} } from 'date-fns/locale'`);
+    return imports.join("\n");
+  }
 }
 
 function vuetifySSRClientHintsPlugin(ctx) {
@@ -1220,7 +1116,7 @@ function parseId(id) {
     path: pathname ?? id
   };
 }
-function vuetifyImportPlugin() {
+function vuetifyImportPlugin(options) {
   return {
     name: "vuetify:import:nuxt",
     configResolved(config) {
@@ -1230,7 +1126,7 @@ function vuetifyImportPlugin() {
     async transform(code, id) {
       const { query, path } = parseId(id);
       if ((!query || !("vue" in query)) && extname(path) === ".vue" && !/^import { render as _sfc_render } from ".*"$/m.test(code) || query && "vue" in query && (query.type === "template" || query.type === "script" && query.setup === "true")) {
-        const { code: imports, source } = generateImports(code);
+        const { code: imports, source } = generateImports(code, options);
         return {
           code: source + imports,
           map: null
@@ -1254,7 +1150,7 @@ function configureVite(configKey, nuxt, ctx) {
         configKey
       ];
     }
-    viteInlineConfig.plugins.push(vuetifyImportPlugin());
+    viteInlineConfig.plugins.push(vuetifyImportPlugin({}));
     viteInlineConfig.plugins.push(vuetifyStylesPlugin({ styles: ctx.moduleOptions.styles }, ctx.logger));
     viteInlineConfig.plugins.push(vuetifyConfigurationPlugin(ctx));
     viteInlineConfig.plugins.push(vuetifyIconsPlugin(ctx));

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "vuetify-nuxt-module",
   "type": "module",
-  "version": "0.7.2",
-  "packageManager": "pnpm@8.11.0",
+  "version": "0.8.0",
+  "packageManager": "pnpm@8.13.1",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
   "license": "MIT",
@@ -52,6 +52,8 @@
     "dev:build:multiple-json": "MULTIPLE_LANG_FILES=true nuxi build playground",
     "dev:generate:multiple-json": "MULTIPLE_LANG_FILES=true nuxi generate playground",
     "dev:preview": "nuxi preview playground",
+    "dev:prepare:date-io": "nuxt-module-build build --stub && nuxt-module-build prepare && pnpm nuxt prepare date-io-playground",
+    "dev:date-io": "nuxi dev date-io-playground",
     "docs:dev": "pnpm -C docs run dev",
     "docs:build": "nuxt-module-build prepare && pnpm -C docs run build",
     "docs:serve": "pnpm -C docs run serve",
@@ -63,16 +65,16 @@
     "release": "bumpp && npm publish"
   },
   "dependencies": {
-    "@nuxt/kit": "^3.8.2",
+    "@nuxt/kit": "^3.9.0",
     "defu": "^6.1.3",
     "destr": "^2.0.2",
     "local-pkg": "^0.5.0",
     "pathe": "^1.1.1",
     "perfect-debounce": "^1.0.0",
-    "ufo": "^1.3.1",
+    "ufo": "^1.3.2",
     "unconfig": "^0.3.11",
-    "vite-plugin-vuetify": "^1.0.2",
-    "vuetify": "^3.4.3"
+    "vite-plugin-vuetify": "^2.0.1",
+    "vuetify": "^3.4.8"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^0.43.1",
@@ -84,14 +86,14 @@
     "@iconify-json/carbon": "^1.1.21",
     "@iconify-json/mdi": "^1.1.55",
     "@mdi/js": "^7.3.67",
-    "@nuxt/devtools": "^0.8.5",
+    "@nuxt/devtools": "^1.0.6",
     "@nuxt/module-builder": "^0.5.4",
-    "@nuxt/schema": "^3.8.2",
-    "@nuxt/test-utils": "^3.8.1",
-    "@nuxtjs/i18n": "npm:@nuxtjs/i18n-edge",
+    "@nuxt/schema": "^3.9.0",
+    "@nuxt/test-utils": "^3.9.0",
+    "@nuxtjs/i18n": "^8.0.0",
     "@parcel/watcher": "^2.3.0",
     "@types/node": "^18",
-    "@unocss/nuxt": "^0.57.7",
+    "@unocss/nuxt": "^0.58.0",
     "bumpp": "^9.2.0",
     "eslint": "^8.54.0",
     "luxon": "^3.4.3",
@@ -99,10 +101,10 @@
     "publint": "^0.2.5",
     "rimraf": "^5.0.5",
     "sass": "^1.63.6",
-    "typescript": "^5.3.2",
-    "vite": "^4.5.0",
-    "vitest": "^0.34.6",
-    "vue-tsc": "^1.8.22"
+    "typescript": "^5.3.3",
+    "vite": "^5.0.10",
+    "vitest": "^1.1.0",
+    "vue-tsc": "^1.8.27"
   },
   "build": {
     "externals": [