diff options
author | 2022-04-13 15:05:00 +0000 | |
---|---|---|
committer | 2022-04-13 15:05:00 +0000 | |
commit | 254a8f37499863c5684fb0d5b0f59a8cee093d0b (patch) | |
tree | e674f09c45637be0ffb30efa3504f91f93b4f8b1 /packages/integrations/tailwind/src | |
parent | b23f6b159694d1fc269f0d4ba110a545195aea4e (diff) | |
download | astro-254a8f37499863c5684fb0d5b0f59a8cee093d0b.tar.gz astro-254a8f37499863c5684fb0d5b0f59a8cee093d0b.tar.zst astro-254a8f37499863c5684fb0d5b0f59a8cee093d0b.zip |
Fixing bug that could lose Tailwind's default presets (#3099)
* fixing bug that could lose Tailwind's default presets
* updating integration README
* chore: adding changeset
* test: fixing the tailwind tests
Diffstat (limited to 'packages/integrations/tailwind/src')
-rw-r--r-- | packages/integrations/tailwind/src/index.ts | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/packages/integrations/tailwind/src/index.ts b/packages/integrations/tailwind/src/index.ts index 3efd8fde8..9a0275f33 100644 --- a/packages/integrations/tailwind/src/index.ts +++ b/packages/integrations/tailwind/src/index.ts @@ -14,6 +14,7 @@ function getDefaultTailwindConfig(srcUrl: URL): TailwindConfig { }, plugins: [], content: [path.join(fileURLToPath(srcUrl), `**`, `*.{astro,html,js,jsx,svelte,ts,tsx,vue}`)], + presets: undefined // enable Tailwind's default preset }); } @@ -38,12 +39,6 @@ type TailwindOptions = */ path?: string; /** - * Apply Astro's default Tailwind config as a preset - * This is recommended to enable Tailwind across all components and Astro files - * @default true - */ - applyAstroPreset?: boolean; - /** * Apply Tailwind's base styles * Disabling this is useful when further customization of Tailwind styles * and directives is required. See {@link https://tailwindcss.com/docs/functions-and-directives#tailwind Tailwind's docs} @@ -56,7 +51,6 @@ type TailwindOptions = | undefined; export default function tailwindIntegration(options: TailwindOptions): AstroIntegration { - const applyAstroConfigPreset = options?.config?.applyAstroPreset ?? true; const applyBaseStyles = options?.config?.applyBaseStyles ?? true; const customConfigPath = options?.config?.path; return { @@ -76,14 +70,6 @@ export default function tailwindIntegration(options: TailwindOptions): AstroInte const tailwindConfig: TailwindConfig = (userConfig?.value as TailwindConfig) ?? getDefaultTailwindConfig(config.srcDir); - if (applyAstroConfigPreset && userConfig?.value) { - // apply Astro config as a preset to user config - // this avoids merging or applying nested spread operators ourselves - tailwindConfig.presets = [ - getDefaultTailwindConfig(config.srcDir), - ...(tailwindConfig.presets || []), - ]; - } config.style.postcss.plugins.push(tailwindPlugin(tailwindConfig)); config.style.postcss.plugins.push(autoprefixerPlugin); |