From 8b08edeee76e88dba0a1c01541626760e63bcbbe Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Mon, 5 Feb 2024 12:16:58 +0100 Subject: [PATCH] chore(module): pass `resolve` and `runtimeDir` to `installTailwind` --- src/module.ts | 2 +- src/tailwind.ts | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/module.ts b/src/module.ts index 1d17c62c..aa98369d 100644 --- a/src/module.ts +++ b/src/module.ts @@ -94,7 +94,7 @@ export default defineNuxtModule({ await installModule('nuxt-icon') await installModule('@nuxtjs/color-mode', { classSuffix: '' }) - await installTailwind(options, nuxt) + await installTailwind(options, nuxt, { resolve, runtimeDir }) // Plugins diff --git a/src/tailwind.ts b/src/tailwind.ts index 18867c4d..5a2ffd69 100644 --- a/src/tailwind.ts +++ b/src/tailwind.ts @@ -1,17 +1,10 @@ import { join } from 'pathe' -import { addTemplate, createResolver, installModule, useNuxt } from '@nuxt/kit' +import { addTemplate, installModule, useNuxt } from '@nuxt/kit' import defaultColors from 'tailwindcss/colors.js' - import { excludeColors, generateSafelist } from './runtime/utils/colors' import type { ModuleOptions } from './module' -export default async function installTailwind ( - moduleOptions: ModuleOptions, - nuxt = useNuxt() -) { - const { resolve } = createResolver(import.meta.url) - const runtimeDir = resolve('./runtime') - +export default async function installTailwind (moduleOptions: ModuleOptions, nuxt = useNuxt(), { resolve, runtimeDir }) { // 1. register hook // @ts-ignore nuxt.hook('tailwindcss:config', function (tailwindConfig) {