vuetify-nuxt-module 0.5.0 → 0.5.2

package/dist/module.json

@@ -4,5 +4,5 @@
   "compatibility": {
     "nuxt": "^3.0.0"
   },
-  "version": "0.5.0"
+  "version": "0.5.2"
 }

package/dist/module.mjs

@@ -10,7 +10,7 @@ import { resolveVuetifyBase, normalizePath, writeStyles, cacheDir } from '@vueti
 import { isAbsolute, join, relative } from 'pathe';
 import { normalizePath as normalizePath$1 } from 'vite';
 
-const version = "0.5.0";
+const version = "0.5.2";
 
 const VIRTUAL_VUETIFY_CONFIGURATION = "virtual:vuetify-configuration";
 const RESOLVED_VIRTUAL_VUETIFY_CONFIGURATION = `/@nuxt-vuetify-configuration/${VIRTUAL_VUETIFY_CONFIGURATION.slice("virtual:".length)}`;
@@ -79,18 +79,16 @@ async function mergeVuetifyModules(options, nuxt) {
   if (nuxt.options._layers.length > 1) {
     for (let i = 1; i < nuxt.options._layers.length; i++) {
       const layer = nuxt.options._layers[i];
-      if (layer.config.vuetify) {
-        const resolvedOptions2 = await loadVuetifyConfiguration(
-          layer.config.rootDir,
-          layer.config.vuetify.vuetifyOptions
-        );
-        if (resolvedOptions2.sources.length)
-          resolvedOptions2.sources.forEach((s) => vuetifyConfigurationFilesToWatch.add(s.replace(/\\/g, "/")));
-        moduleOptions.push({
-          moduleOptions: layer.config.vuetify.moduleOptions,
-          vuetifyOptions: resolvedOptions2.config
-        });
-      }
+      const resolvedOptions2 = await loadVuetifyConfiguration(
+        layer.config.rootDir,
+        layer.config.vuetify?.vuetifyOptions
+      );
+      if (resolvedOptions2.sources.length)
+        resolvedOptions2.sources.forEach((s) => vuetifyConfigurationFilesToWatch.add(s.replace(/\\/g, "/")));
+      moduleOptions.push({
+        moduleOptions: layer.config.vuetify?.moduleOptions,
+        vuetifyOptions: resolvedOptions2.config
+      });
     }
   }
   const resolvedOptions = await loadVuetifyConfiguration(
@@ -612,6 +610,7 @@ function vuetifyConfigurationPlugin(ctx) {
           icons: _icons,
           localeMessages: _localeMessages,
           components: _components,
+          labComponents: _labComponents,
           ssr,
           aliases: _aliases,
           ...newVuetifyOptions

package/dist/runtime/plugins/i18n.mjs

@@ -1,12 +1,4 @@
-import {
-  getCurrentInstance as _getCurrentInstance,
-  computed,
-  effectScope,
-  onScopeDispose,
-  ref,
-  toRaw,
-  watch
-} from "vue";
+import { ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 import { useNuxtApp } from "#app";
 export function createAdapter(vuetifyOptions) {
@@ -16,120 +8,55 @@ export function createAdapter(vuetifyOptions) {
   const current = i18n.locale;
   const fallback = i18n.fallbackLocale;
   const messages = i18n.messages;
+  const currentLocale = ref(current.value);
   vuetifyOptions.locale.rtl = i18n.locales.value.reduce((acc, locale) => {
     acc[locale.code] = locale.dir === "rtl";
     return acc;
   }, {});
+  watch(currentLocale, (val, oldVal) => {
+    if (oldVal)
+      i18n.setLocale(val);
+  }, { immediate: true, flush: "post" });
+  if (process.client) {
+    nuxtApp.hook("i18n:localeSwitched", ({ newLocale }) => {
+      currentLocale.value = newLocale;
+    });
+  }
   vuetifyOptions.locale.adapter = {
     name: "nuxt-vue-i18n",
-    current,
+    current: currentLocale,
     fallback,
     messages,
     t: (key, ...params) => i18n.t(key, params),
     n: i18n.n,
-    provide: createProvideFunction({ current, fallback, messages })
+    provide: createProvideFunction({ current: currentLocale, fallback, messages })
   };
 }
-function getCurrentInstance(name, message) {
-  const vm = _getCurrentInstance();
-  if (!vm)
-    throw new Error(`[Vuetify] ${name} ${message || "must be called from inside a setup function"}`);
-  return vm;
-}
-function useToggleScope(source, fn) {
-  let scope;
-  function start() {
-    scope = effectScope();
-    scope.run(
-      () => fn.length ? fn(() => {
-        scope?.stop();
-        start();
-      }) : fn()
-    );
-  }
-  watch(source, (active) => {
-    if (active && !scope) {
-      start();
-    } else if (!active) {
-      scope?.stop();
-      scope = void 0;
-    }
-  }, { immediate: true });
-  onScopeDispose(() => {
-    scope?.stop();
-  });
-}
-function toKebabCase(str = "") {
-  return str.replace(/[^a-z]/gi, "-").replace(/\B([A-Z])/g, "-$1").toLowerCase();
-}
-function useProxiedModel(props, prop, defaultValue, transformIn = (v) => v, transformOut = (v) => v) {
-  const vm = getCurrentInstance("useProxiedModel");
-  const internal = ref(props[prop] !== void 0 ? props[prop] : defaultValue);
-  const kebabProp = toKebabCase(prop);
-  const checkKebab = kebabProp !== prop;
-  const isControlled = checkKebab ? computed(() => {
-    void props[prop];
-    return !!((vm.vnode.props?.hasOwnProperty(prop) || vm.vnode.props?.hasOwnProperty(kebabProp)) && (vm.vnode.props?.hasOwnProperty(`onUpdate:${prop}`) || vm.vnode.props?.hasOwnProperty(`onUpdate:${kebabProp}`)));
-  }) : computed(() => {
-    void props[prop];
-    return !!(vm.vnode.props?.hasOwnProperty(prop) && vm.vnode.props?.hasOwnProperty(`onUpdate:${prop}`));
-  });
-  useToggleScope(() => !isControlled.value, () => {
-    watch(() => props[prop], (val) => {
-      internal.value = val;
-    });
-  });
-  const model = computed({
-    get() {
-      const externalValue = props[prop];
-      return transformIn(isControlled.value ? externalValue : internal.value);
-    },
-    set(internalValue) {
-      const newValue = transformOut(internalValue);
-      const value = toRaw(isControlled.value ? props[prop] : internal.value);
-      if (value === newValue || transformIn(value) === internalValue)
-        return;
-      internal.value = newValue;
-      vm?.emit(`update:${prop}`, newValue);
-    }
-  });
-  Object.defineProperty(model, "externalValue", {
-    get: () => isControlled.value ? props[prop] : internal.value
-  });
-  return model;
-}
-function useProvided(props, prop, provided) {
-  const internal = useProxiedModel(props, prop);
-  internal.value = props[prop] ?? provided.value;
-  watch(provided, (v) => {
-    if (props[prop] == null)
-      internal.value = v;
-  });
-  return internal;
-}
 function createProvideFunction(data) {
   return (props) => {
-    const current = useProvided(props, "locale", data.current);
-    const fallback = useProvided(props, "fallback", data.fallback);
-    const messages = useProvided(props, "messages", data.messages);
+    const currentLocale = ref(props.locale ?? data.current.value);
     const i18n = useI18n({
-      locale: current.value,
-      fallbackLocale: fallback.value,
-      messages: messages.value,
+      locale: currentLocale.value,
+      fallbackLocale: data.fallback.value,
+      messages: data.messages.value,
       useScope: "local",
       legacy: false,
       inheritLocale: false
     });
+    watch(currentLocale, (val, oldVal) => {
+      if (oldVal)
+        i18n.setLocale(val);
+    }, { immediate: true, flush: "post" });
     return {
       name: "nuxt-vue-i18n",
-      current,
-      fallback,
-      messages,
+      current: currentLocale,
+      fallback: data.fallback,
+      messages: data.messages,
       // todo: fix this, we should check the options
       // @ts-expect-error Type instantiation is excessively deep and possibly infinite.ts(2589)
       t: (key, ...params) => i18n.t(key, params),
       n: i18n.n,
-      provide: createProvideFunction({ current, fallback, messages })
+      provide: createProvideFunction({ current: currentLocale, fallback: data.fallback, messages: data.messages })
     };
   };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vuetify-nuxt-module",
   "type": "module",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "packageManager": "pnpm@8.6.9",
   "description": "Zero-Config Nuxt Module for Vuetify",
   "author": "userquin <userquin@gmail.com>",
@@ -138,4 +138,4 @@
     "installDependencies": false,
     "startCommand": "node .stackblitz.js && pnpm install && pnpm run dev"
   }
-}
+}