@unocss/nuxt 0.60.3 → 0.61.0

package/dist/index.d.mts

@@ -34,6 +34,12 @@ interface UnocssNuxtOptions extends UserConfig {
      * @default true
      */
     disableNuxtInlineStyle?: boolean;
+    /**
+     * Automatically merge UnoCSS configs from Nuxt layers.
+     *
+     * @default false
+     */
+    nuxtLayers?: boolean;
     /**
      * Adjust the position of the `uno.css` injection. (Depends on `mode`)
      *

package/dist/index.d.ts

@@ -34,6 +34,12 @@ interface UnocssNuxtOptions extends UserConfig {
      * @default true
      */
     disableNuxtInlineStyle?: boolean;
+    /**
+     * Automatically merge UnoCSS configs from Nuxt layers.
+     *
+     * @default false
+     */
+    nuxtLayers?: boolean;
     /**
      * Adjust the position of the `uno.css` injection. (Depends on `mode`)
      *

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import process from 'node:process';
-import { defineNuxtModule, addPluginTemplate, isNuxt2, addComponentsDir, isNuxt3, extendWebpackConfig } from '@nuxt/kit';
+import { defineNuxtModule, addPluginTemplate, isNuxt2, addComponentsDir, addTemplate, findPath, extendWebpackConfig, isNuxt3 } from '@nuxt/kit';
 import WebpackPlugin from '@unocss/webpack';
 import VitePlugin from '@unocss/vite';
 import { loadConfig } from '@unocss/config';
@@ -56,6 +56,7 @@ const index = defineNuxtModule({
     preflight: false,
     components: true,
     disableNuxtInlineStyle: true,
+    nuxtLayers: false,
     // presets
     uno: true,
     attributify: false,
@@ -94,22 +95,44 @@ const index = defineNuxtModule({
         watch: false
       });
     }
-    const { config: unoConfig } = await loadConfig(process.cwd(), {
-      configFile: options.configFile
-    }, [], options);
-    await nuxt.callHook("unocss:config", unoConfig);
-    if (isNuxt3() && nuxt.options.builder === "@nuxt/vite-builder" && nuxt.options.postcss.plugins.cssnano && unoConfig.transformers?.some((t) => t.name === "@unocss/transformer-directives" && t.enforce !== "pre")) {
-      const preset = nuxt.options.postcss.plugins.cssnano.preset;
-      nuxt.options.postcss.plugins.cssnano = {
-        preset: [preset?.[0] || "default", Object.assign(
-          { mergeRules: false, normalizeWhitespace: false, discardComments: false },
-          preset?.[1]
-        )]
-      };
+    if (options.nuxtLayers) {
+      addTemplate({
+        filename: "uno.config.mjs",
+        async getContents() {
+          const configPaths = (await Promise.all(nuxt.options._layers.map(
+            (layer) => findPath(options.configFile || ["uno.config", "unocss.config"], { cwd: layer.config.srcDir })
+          ))).filter(Boolean).reverse();
+          return `import { mergeConfigs } from '@unocss/core'
+${configPaths.map((path, index) => `import cfg${index} from '${path}'`.trimStart()).join("\n").trimEnd()}
+
+export default mergeConfigs([${configPaths.map((_, index) => `cfg${index}`).join(", ")}])
+`;
+        },
+        write: true
+      });
+    }
+    async function loadUnoConfig() {
+      const { config: unoConfig } = await loadConfig(process.cwd(), {
+        configFile: options.nuxtLayers ? resolve(nuxt.options.buildDir, "uno.config.mjs") : options.configFile
+      }, [], options);
+      await nuxt.callHook("unocss:config", unoConfig);
+      if (isNuxt3() && nuxt.options.builder === "@nuxt/vite-builder" && nuxt.options.postcss.plugins.cssnano && unoConfig.transformers?.some((t) => t.name === "@unocss/transformer-directives" && t.enforce !== "pre")) {
+        const preset = nuxt.options.postcss.plugins.cssnano.preset;
+        nuxt.options.postcss.plugins.cssnano = {
+          preset: [preset?.[0] || "default", Object.assign(
+            { mergeRules: false, normalizeWhitespace: false, discardComments: false },
+            preset?.[1]
+          )]
+        };
+      }
+      return unoConfig;
     }
-    nuxt.hook("vite:extend", ({ config }) => {
+    nuxt.hook("vite:extend", async ({ config }) => {
+      const unoConfig = await loadUnoConfig();
       config.plugins = config.plugins || [];
-      config.plugins.unshift(...VitePlugin({ mode: options.mode }, unoConfig));
+      config.plugins.unshift(...VitePlugin({
+        mode: options.mode
+      }, unoConfig));
     });
     if (nuxt.options.dev) {
       nuxt.hook("devtools:customTabs", (tabs) => {
@@ -133,7 +156,8 @@ const index = defineNuxtModule({
           config.plugins = [plugin];
       });
     }
-    extendWebpackConfig((config) => {
+    extendWebpackConfig(async (config) => {
+      const unoConfig = await loadUnoConfig();
       config.plugins = config.plugins || [];
       config.plugins.unshift(WebpackPlugin({}, unoConfig));
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/nuxt",
   "type": "module",
-  "version": "0.60.3",
+  "version": "0.61.0",
   "description": "Nuxt module for UnoCSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -38,23 +38,23 @@
     "runtime"
   ],
   "dependencies": {
-    "@nuxt/kit": "^3.11.2",
-    "@unocss/config": "0.60.3",
-    "@unocss/core": "0.60.3",
-    "@unocss/preset-attributify": "0.60.3",
-    "@unocss/preset-tagify": "0.60.3",
-    "@unocss/preset-icons": "0.60.3",
-    "@unocss/preset-typography": "0.60.3",
-    "@unocss/preset-uno": "0.60.3",
-    "@unocss/preset-web-fonts": "0.60.3",
-    "@unocss/preset-wind": "0.60.3",
-    "@unocss/reset": "0.60.3",
-    "@unocss/vite": "0.60.3",
-    "@unocss/webpack": "0.60.3",
-    "unocss": "0.60.3"
+    "@nuxt/kit": "^3.12.1",
+    "@unocss/config": "0.61.0",
+    "@unocss/core": "0.61.0",
+    "@unocss/preset-icons": "0.61.0",
+    "@unocss/preset-attributify": "0.61.0",
+    "@unocss/preset-tagify": "0.61.0",
+    "@unocss/preset-typography": "0.61.0",
+    "@unocss/preset-uno": "0.61.0",
+    "@unocss/preset-web-fonts": "0.61.0",
+    "@unocss/preset-wind": "0.61.0",
+    "@unocss/reset": "0.61.0",
+    "@unocss/vite": "0.61.0",
+    "@unocss/webpack": "0.61.0",
+    "unocss": "0.61.0"
   },
   "devDependencies": {
-    "@nuxt/schema": "^3.11.2"
+    "@nuxt/schema": "^3.12.1"
   },
   "scripts": {
     "build": "unbuild",