From c8b01ffd2a34c109c5b21402a5e58c8e70bba275 Mon Sep 17 00:00:00 2001 From: Kristaps Fabians Geikins Date: Tue, 13 May 2025 16:18:46 +0300 Subject: [PATCH] fix(tailwind-theme): remove default exports to fix comp w/ dui3 (#4730) --- packages/dui3/tailwind.config.mjs | 2 +- packages/tailwind-theme/README.md | 2 +- packages/tailwind-theme/src/index.ts | 2 -- packages/tailwind-theme/src/plugin.ts | 3 +-- packages/tailwind-theme/src/preset.ts | 2 +- packages/ui-components/tailwind.config.cjs | 4 ++-- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/packages/dui3/tailwind.config.mjs b/packages/dui3/tailwind.config.mjs index b952f6bfb..a74d51214 100644 --- a/packages/dui3/tailwind.config.mjs +++ b/packages/dui3/tailwind.config.mjs @@ -1,4 +1,4 @@ -import speckleTheme from '@speckle/tailwind-theme' +import { plugin as speckleTheme } from '@speckle/tailwind-theme' import { tailwindContentEntries as themeEntries } from '@speckle/tailwind-theme/tailwind-configure' import { tailwindContentEntries as uiLibEntries } from '@speckle/ui-components/tailwind-configure' import formsPlugin from '@tailwindcss/forms' diff --git a/packages/tailwind-theme/README.md b/packages/tailwind-theme/README.md index 095ead69e..e54022f43 100644 --- a/packages/tailwind-theme/README.md +++ b/packages/tailwind-theme/README.md @@ -5,7 +5,7 @@ Tailwind theme used in frontend 2 and other apps. ## Setup 1. Install the package -1. In your tailwind config import `@speckle/tailwind-theme` and `@tailwindcss/forms` and add them to your `plugins` array +1. In your tailwind config import `plugin` from `@speckle/tailwind-theme` and `@tailwindcss/forms` and add them to your `plugins` array 1. Import `tailwindContentEntries` from `@speckle/tailwind-theme/tailwind-configure` and invoke it in the `contents` field in your Tailwind config to ensure PurgeCSS is configured correctly. It requires the CJS `require` object as its only parameter. If it isn't available (in an ESM environment), you can use node's `createRequire()`. ## Development diff --git a/packages/tailwind-theme/src/index.ts b/packages/tailwind-theme/src/index.ts index a1320a510..559e74f29 100644 --- a/packages/tailwind-theme/src/index.ts +++ b/packages/tailwind-theme/src/index.ts @@ -1,4 +1,2 @@ import { darkThemeVariables, lightThemeVariables, plugin } from './plugin.js' - -export default plugin export { darkThemeVariables, lightThemeVariables, plugin } diff --git a/packages/tailwind-theme/src/plugin.ts b/packages/tailwind-theme/src/plugin.ts index 38b0874e9..154d5d8b8 100644 --- a/packages/tailwind-theme/src/plugin.ts +++ b/packages/tailwind-theme/src/plugin.ts @@ -1,5 +1,5 @@ import buildPlugin from 'tailwindcss/plugin.js' -import preset from './preset.js' +import { config as preset } from './preset.js' export const lightThemeVariables = { /* used only as the page background */ @@ -385,5 +385,4 @@ const plugin = buildPlugin(({ addComponents, addBase }) => { }) }, preset) -export default plugin export { plugin } diff --git a/packages/tailwind-theme/src/preset.ts b/packages/tailwind-theme/src/preset.ts index 54468f304..51689c319 100644 --- a/packages/tailwind-theme/src/preset.ts +++ b/packages/tailwind-theme/src/preset.ts @@ -97,4 +97,4 @@ const config: Config = { plugins: [FormsPlugin] } -export default config +export { config } diff --git a/packages/ui-components/tailwind.config.cjs b/packages/ui-components/tailwind.config.cjs index 4c000fd57..1f0db61c9 100644 --- a/packages/ui-components/tailwind.config.cjs +++ b/packages/ui-components/tailwind.config.cjs @@ -1,4 +1,4 @@ -const speckleTheme = require('@speckle/tailwind-theme') +const { plugin: speckleTheme } = require('@speckle/tailwind-theme') const { tailwindContentEntries } = require('@speckle/tailwind-theme/tailwind-configure') const formsPlugin = require('@tailwindcss/forms') @@ -10,5 +10,5 @@ module.exports = { './src/**/*.{js,ts,jsx,tsx,vue}', ...tailwindContentEntries() ], - plugins: [speckleTheme.default, formsPlugin] + plugins: [speckleTheme, formsPlugin] }