@maz-ui/nuxt 5.0.0-beta.45 → 5.0.0-beta.47

package/dist/module.json

@@ -2,9 +2,9 @@
   "name": "maz-ui",
   "configKey": "mazUi",
   "compatibility": {
-    "nuxt": ">=3.0.0"
+    "nuxt": ">=3.4.0 <5.0.0"
   },
-  "version": "5.0.0-beta.45",
+  "version": "5.0.0-beta.47",
   "builder": {
     "@nuxt/module-builder": "1.0.3",
     "unbuild": "unknown"

package/dist/module.mjs

@@ -170,7 +170,7 @@ const module$1 = defineNuxtModule({
     name: "maz-ui",
     configKey: "mazUi",
     compatibility: {
-      nuxt: ">=3.0.0"
+      nuxt: ">=3.4.0 <5.0.0"
     }
   },
   defaults,

package/dist/runtime/plugins/theme.js

@@ -17,11 +17,11 @@ function getSavedResolvedColorMode() {
   return void 0;
 }
 function getInitialColorMode() {
-  const resolvedColorMode = getSavedResolvedColorMode();
-  if (resolvedColorMode) {
-    return resolvedColorMode;
-  }
   if (import.meta.server) {
+    const resolvedColorMode = getSavedResolvedColorMode();
+    if (resolvedColorMode) {
+      return resolvedColorMode;
+    }
     const headers = useRequestHeaders();
     if (headers["sec-ch-prefers-color-scheme"] === "dark") {
       return "dark";
@@ -30,13 +30,9 @@ function getInitialColorMode() {
     if (userAgent?.includes("dark")) {
       return "dark";
     }
-  } else {
-    const systemColorMode = getSystemColorMode();
-    if (systemColorMode === "dark") {
-      return "dark";
-    }
+    return "auto";
   }
-  return "auto";
+  return getSystemColorMode();
 }
 function getColorModeBlockingScript(config) {
   const darkClass = config.darkClass;
@@ -60,26 +56,40 @@ function injectThemeCSS(config) {
     }]
   });
 }
+function parseSavedPreset(raw) {
+  if (!raw) {
+    return null;
+  }
+  const separatorIndex = raw.indexOf(":");
+  if (separatorIndex === -1) {
+    return null;
+  }
+  const base = raw.slice(0, separatorIndex);
+  const active = raw.slice(separatorIndex + 1);
+  return base && active ? { base, active } : null;
+}
 async function resolvePreset(options, persistPreset) {
-  const presetCookie = useCookie("maz-preset");
-  const savedName = persistPreset ? presetCookie.value : void 0;
   const presetObject = options?.preset && typeof options.preset !== "string" ? options.preset : void 0;
-  if (savedName && presetObject && savedName === presetObject.name) {
-    return presetObject;
+  const basePreset = presetObject ?? await getPreset(options?.preset);
+  const baseName = basePreset.name;
+  if (!persistPreset) {
+    return { preset: basePreset, baseName };
   }
-  if (savedName) {
+  const presetCookie = useCookie("maz-preset");
+  const saved = parseSavedPreset(presetCookie.value);
+  if (saved && saved.base === baseName && saved.active !== baseName) {
     try {
-      return await getPreset(savedName);
+      return { preset: await getPreset(saved.active), baseName };
     } catch {
-      presetCookie.value = null;
     }
   }
-  return getPreset(options?.preset);
+  return { preset: basePreset, baseName };
 }
 export default defineNuxtPlugin(async ({ vueApp, $config }) => {
   const options = $config.public.mazUi.theme;
   const persistPreset = options?.persistPreset !== false;
-  let preset = await resolvePreset(options, persistPreset);
+  const resolved = await resolvePreset(options, persistPreset);
+  let preset = resolved.preset;
   if (options?.overrides) {
     preset = mergePresets(preset, options.overrides);
   }
@@ -89,8 +99,9 @@ export default defineNuxtPlugin(async ({ vueApp, $config }) => {
       sameSite: "lax",
       path: "/"
     });
-    if (presetCookie.value !== preset.name) {
-      presetCookie.value = preset.name;
+    const value = `${resolved.baseName}:${preset.name}`;
+    if (presetCookie.value !== value) {
+      presetCookie.value = value;
     }
   }
   const config = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maz-ui/nuxt",
   "type": "module",
-  "version": "5.0.0-beta.45",
+  "version": "5.0.0-beta.47",
   "description": "Nuxt module for Maz-UI",
   "author": "Louis Mazel <me@loicmazuel.com>",
   "license": "MIT",
@@ -48,20 +48,20 @@
     "nuxt": ">=3.4.0 <5.0.0"
   },
   "dependencies": {
-    "@maz-ui/themes": "5.0.0-beta.44",
-    "@maz-ui/translations": "5.0.0-beta.44",
-    "@maz-ui/utils": "5.0.0-beta.44",
-    "@nuxt/devtools-kit": "^4.0.0-beta.2",
+    "@maz-ui/themes": "5.0.0-beta.46",
+    "@maz-ui/translations": "5.0.0-beta.46",
+    "@maz-ui/utils": "5.0.0-beta.46",
+    "@nuxt/devtools-kit": "^3.2.3",
     "@nuxt/kit": "^4.5.2",
     "defu": "^6.1.7",
-    "maz-ui": "5.0.0-beta.44"
+    "maz-ui": "5.0.0-beta.47"
   },
   "devDependencies": {
-    "@maz-ui/eslint-config": "5.0.0-beta.44",
-    "@nuxt/devtools": "^4.0.0-beta.2",
+    "@maz-ui/eslint-config": "5.0.0-beta.47",
+    "@nuxt/devtools": "^3.2.3",
     "@nuxt/module-builder": "^1.0.3",
     "@nuxt/schema": "^4.5.2",
-    "@nuxt/test-utils": "^4.3.2",
+    "@nuxt/test-utils": "^4.3.3",
     "nuxt": "^4.5.2"
   },
   "lint-staged": {