From bb40c3103174a039f65b31c65fcc5d40cb29ce6b Mon Sep 17 00:00:00 2001 From: Benjamin Canac Date: Wed, 7 Feb 2024 12:43:56 +0100 Subject: [PATCH] fix(module): prevent tailwind warn with `bun` Fixes #809 --- src/module.ts | 12 ------------ src/tailwind.ts | 11 ++++++++++- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/module.ts b/src/module.ts index aebe378ad4..caf6bb7ae2 100644 --- a/src/module.ts +++ b/src/module.ts @@ -1,5 +1,4 @@ import { defineNuxtModule, installModule, addComponentsDir, addImportsDir, createResolver, addPlugin } from '@nuxt/kit' -import defaultColors from 'tailwindcss/colors.js' import type { CollectionNames, IconsPluginOptions } from '@egoist/tailwindcss-icons' import { name, version } from '../package.json' import createTemplates from './templates' @@ -7,17 +6,6 @@ import * as config from './runtime/ui.config' import type { DeepPartial, Strategy } from './runtime/types/utils' import installTailwind from './tailwind' -// @ts-ignore -delete defaultColors.lightBlue -// @ts-ignore -delete defaultColors.warmGray -// @ts-ignore -delete defaultColors.trueGray -// @ts-ignore -delete defaultColors.coolGray -// @ts-ignore -delete defaultColors.blueGray - type UI = { primary?: string gray?: string diff --git a/src/tailwind.ts b/src/tailwind.ts index 21396f3bfc..542f2178cc 100644 --- a/src/tailwind.ts +++ b/src/tailwind.ts @@ -1,9 +1,18 @@ +import { createRequire } from 'node:module' import { join } from 'pathe' 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' +const _require = createRequire(import.meta.url) +const defaultColors = _require('tailwindcss/colors.js') + +delete defaultColors.lightBlue +delete defaultColors.warmGray +delete defaultColors.trueGray +delete defaultColors.coolGray +delete defaultColors.blueGray + export default async function installTailwind (moduleOptions: ModuleOptions, nuxt = useNuxt(), { resolve, runtimeDir }) { // 1. register hook // @ts-ignore