@@ -12,7 +12,8 @@ import {
12
12
createResolver ,
13
13
resolvePath ,
14
14
addVitePlugin ,
15
- tryRequireModule
15
+ tryRequireModule ,
16
+ isNuxt3
16
17
} from '@nuxt/kit'
17
18
import { Config } from 'tailwindcss'
18
19
import { name , version } from '../package.json'
@@ -77,14 +78,14 @@ export default defineNuxtModule<ModuleOptions>({
77
78
*/
78
79
const addConfigPath = async ( path : string | string [ ] ) => {
79
80
if ( typeof path === 'string' ) {
80
- path = ( await resolvePath ( path ) ) . split ( '.' ) . slice ( 0 , - 1 ) . join ( '.' )
81
+ path = ( await resolvePath ( path , { extensions : [ '.js' , '.ts' ] } ) ) . split ( '.' ) . slice ( 0 , - 1 ) . join ( '.' )
81
82
configPaths . push ( path )
82
83
return
83
84
}
84
85
85
86
if ( Array . isArray ( path ) ) {
86
87
for ( let _path of path ) {
87
- _path = ( await resolvePath ( _path ) ) . split ( '.' ) . slice ( 0 , - 1 ) . join ( '.' )
88
+ _path = ( await resolvePath ( _path , { extensions : [ '.js' , '.ts' ] } ) ) . split ( '.' ) . slice ( 0 , - 1 ) . join ( '.' )
88
89
configPaths . push ( )
89
90
}
90
91
}
@@ -220,6 +221,7 @@ export default defineNuxtModule<ModuleOptions>({
220
221
*/
221
222
222
223
// Add _tailwind config viewer endpoint
224
+ // TODO: Fix `addServerHandler` on Nuxt 2 w/o Bridge
223
225
if ( nuxt . options . dev && moduleOptions . viewer ) {
224
226
const route = '/_tailwind'
225
227
const createServer = await import ( 'tailwind-config-viewer/server/index.js' ) . then ( r => r . default || r ) as any
@@ -232,7 +234,8 @@ export default defineNuxtModule<ModuleOptions>({
232
234
}
233
235
_viewerDevMiddleware ( req , res )
234
236
}
235
- addDevServerHandler ( { route, handler : viewerDevMiddleware } )
237
+ if ( isNuxt3 ( ) ) { addDevServerHandler ( { route, handler : viewerDevMiddleware } ) }
238
+ if ( isNuxt2 ( ) ) { nuxt . options . serverMiddleware . push ( { route, handler : viewerDevMiddleware } ) }
236
239
nuxt . hook ( 'listen' , ( _ , listener ) => {
237
240
const viewerUrl = `${ withoutTrailingSlash ( listener . url ) } ${ route } `
238
241
logger . info ( `Tailwind Viewer: ${ chalk . underline . yellow ( withTrailingSlash ( viewerUrl ) ) } ` )
0 commit comments