chore(module): call hook before resolving config (#655)

* chore(module): call hook before resolving config

* chore(module): lint

* chore(github): update ci to use pnpm

Author: benjamincanac

.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

src/module.ts

@@ -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())