Merge branch 'main' of https://github.com/nuxt-modules/tailwindcss

Author: ineshbose

.github/workflows/ci.yml

@@ -18,8 +18,7 @@ jobs:
         with:
           node-version: 20
           cache: "pnpm"
-      - run: pnpm install
-      - run: pnpm dev:prepare
+      - run: pnpm install && pnpm dev:prepare
       # - run: pnpm lint
       - run: pnpm test
       - run: pnpm build

.github/workflows/nightly.yml

@@ -14,16 +14,16 @@ jobs:
       id-token: write
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - run: corepack enable
       - uses: actions/setup-node@v4
         with:
           node-version: 20
           registry-url: "https://registry.npmjs.org/"
           cache: "pnpm"
 
-      - run: pnpm install && pnpm dev:prepare
-      - run: pnpm build
-
+      - run: pnpm install && pnpm dev:prepare && pnpm build
       - run: pnpm changelogen --bump --canary --publish --publishTag nightly --from $(git log -n 1 --pretty=format:%H -- CHANGELOG.md)
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

package.json

@@ -22,14 +22,15 @@
     "dist"
   ],
   "scripts": {
-    "dev": "nuxi dev playground",
     "play": "pnpm dev",
-    "prepare": "nuxt-module-build prepare && nuxt-module-build build --stub",
+    "prepare": "nuxt-module-build prepare",
+    "dev": "nuxi dev playground",
     "dev:build": "nuxi build playground",
     "dev:generate": "nuxi generate playground",
     "dev:nuxt2": "nuxi dev nuxt2-playground",
-    "dev:prepare": "pnpm prepare",
+    "dev:prepare": "pnpm prepare && pnpm build:stub",
     "build": "nuxt-module-build build",
+    "build:stub": "pnpm build --stub",
     "prepack": "pnpm build",
     "release": "pnpm lint && pnpm test && pnpm prepack && pnpm changelogen --release --push && pnpm publish",
     "docs:build": "nuxi generate docs",
@@ -79,5 +80,8 @@
   "packageManager": "pnpm@8.14.1",
   "resolutions": {
     "@nuxtjs/tailwindcss": "link:."
+  },
+  "stackblitz": {
+    "startCommand": "pnpm dev:prepare && pnpm dev"
   }
 }

playground/nuxt.config.ts

@@ -1,8 +1,11 @@
+import { existsSync } from 'node:fs'
+import { resolve } from 'pathe'
+
 export default defineNuxtConfig({
   extends: ['./theme'],
   modules: [
     '@nuxt/content',
-    '@nuxtjs/tailwindcss',
+    existsSync(resolve(__dirname, '../dist/module.mjs')) ? '@nuxtjs/tailwindcss' : '../src/module',
     '@nuxt/devtools'
   ],
   tailwindcss: {

src/module.ts

@@ -166,6 +166,7 @@ export default defineNuxtModule<ModuleOptions>({
         addTemplate({
           filename: 'tailwind.config.cjs',
           getContents: () => `module.exports = ${JSON.stringify(resolvedConfig, null, 2)}`,
+          write: true,
           ...(typeof editorSupportConfig.generateConfig === 'object' ? editorSupportConfig.generateConfig : {})
         })
       }

src/resolvers.ts

@@ -28,8 +28,7 @@ export const resolveContentPaths = (srcDir: string, nuxt = useNuxt()) => {
   const extensionFormat = (s: string[]) => s.length > 1 ? `.{${s.join(',')}}` : `.${s.join('') || 'vue'}`
 
   const defaultExtensions = extensionFormat(['js', 'ts', 'mjs'])
-  const extensions = Array.from(new Set(['vue', ...nuxt.options.extensions]))
-  const sfcExtensions = extensionFormat(extensions.map(e => e.replace(/^\.*/, '')))
+  const sfcExtensions = extensionFormat(Array.from(new Set(['.vue', ...nuxt.options.extensions])).map(e => e.replace(/^\.*/, '')))
 
   const importDirs = [...(nuxt.options.imports?.dirs || [])].map(r)
   const [composablesDir, utilsDir] = [resolve(srcDir, 'composables'), resolve(srcDir, 'utils')]

src/types.ts

@@ -79,6 +79,8 @@ export type EditorSupportConfig = {
    * 
    * Read https://tailwindcss.nuxtjs.org/tailwind/editor-support#load-config-file.
    * 
+   * Note: this is experimental and may change in future.
+   * 
    * @default false // if true, { filename: 'tailwind.config.cjs', write: true }
    */
   generateConfig: BoolObj<Omit<import('nuxt/schema').NuxtTemplate, 'getContents'>>;