.github/workflows/ci.yml

@@ -25,24 +25,38 @@ jobs:
       - name: checkout
         uses: actions/checkout@master
 
-      - name: cache node_modules
-        uses: actions/cache@v3
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        id: pnpm-install
         with:
-          path: node_modules
-          key: ${{ matrix.os }}-node-v${{ matrix.node }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/yarn.lock')) }}
+          version: 7
+          run_install: false
+
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
+        with:
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
 
       - name: Install dependencies
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: yarn
+        run: pnpm install
 
       - name: Prepare
-        run: yarn dev:prepare
+        run: pnpm run dev:prepare
 
       - name: Lint
-        run: yarn lint
+        run: pnpm run lint
 
       - name: Test
-        run: yarn test
+        run: pnpm run test
 
       # - name: Coverage
       #   run: yarn codecov

CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## v6.6.6
+
+[compare changes](https://undefined/undefined/compare/v6.6.5...v6.6.6)
+
+
+### 🩹 Fixes
+
+  - Viewer on Nuxt 2 (#658)
+
+### 🏡 Chore
+
+  - **module:** Call hook before resolving config (#655)
+  - Add back viewer in playground (9f7e991)
+
+### ❤️  Contributors
+
+- Sébastien Chopin ([@Atinux](http://github.com/Atinux))
+- Benjamin Canac ([@benjamincanac](http://github.com/benjamincanac))
+- Asc0910
+
 ## v6.6.5
 
 [compare changes](https://undefined/undefined/compare/v6.6.4...v6.6.5)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxtjs/tailwindcss",
-  "version": "6.6.5",
+  "version": "6.6.6",
   "description": "TailwindCSS module for Nuxt",
   "repository": "nuxt-modules/tailwindcss",
   "license": "MIT",

playground/nuxt.config.ts

@@ -6,7 +6,7 @@ export default defineNuxtConfig({
     '@nuxt/devtools'
   ],
   tailwindcss: {
-    viewer: false,
+    // viewer: false,
     exposeConfig: true,
     injectPosition: 'last'
   },

src/module.ts

@@ -19,7 +19,7 @@ import {
 import type { Config } from 'tailwindcss'
 // @ts-expect-error
 import defaultTailwindConfig from 'tailwindcss/stubs/config.simple.js'
-import { eventHandler, sendRedirect } from 'h3'
+import { eventHandler, sendRedirect, H3Event } from 'h3'
 import { name, version } from '../package.json'
 import vitePlugin from './hmr'
 import { createTemplates, InjectPosition, resolveInjectPosition } from './utils'
@@ -154,6 +154,9 @@ export default defineNuxtModule<ModuleOptions>({
       }
     }
 
+    // Allow extending tailwindcss config by other modules
+    await nuxt.callHook('tailwindcss:config', tailwindConfig)
+
     // Write cjs version of config to support vscode extension
     const resolveConfig = await import('tailwindcss/resolveConfig.js').then(r => r.default || r)
     const resolvedConfig = resolveConfig(tailwindConfig) as Config
@@ -174,9 +177,6 @@ export default defineNuxtModule<ModuleOptions>({
       createTemplates(resolvedConfig, moduleOptions.exposeLevel, nuxt)
     }
 
-    // Allow extending tailwindcss config by other modules
-    await nuxt.callHook('tailwindcss:config', tailwindConfig)
-
     // Compute tailwindConfig hash
     tailwindConfig._hash = String(Date.now())
 
@@ -270,7 +270,7 @@ export default defineNuxtModule<ModuleOptions>({
       })
       if (isNuxt3()) { addDevServerHandler({ route, handler: viewerDevMiddleware }) }
       // @ts-ignore
-      if (isNuxt2()) { nuxt.options.serverMiddleware.push({ route, handler: viewerDevMiddleware }) }
+      if (isNuxt2()) { nuxt.options.serverMiddleware.push({ route, handler: (req, res, next) => viewerDevMiddleware(new H3Event(req, res)) }) }
       nuxt.hook('listen', (_, listener) => {
         const viewerUrl = `${withoutTrailingSlash(listener.url)}${route}`
         logger.info(`Tailwind Viewer: ${underline(yellow(withTrailingSlash(viewerUrl)))}`)