From 19f29cb5aa6e631125824d9ca65c681533a094b3 Mon Sep 17 00:00:00 2001
From: bholmesdev <hey@bholmes.dev>
Date: Mon, 21 Mar 2022 17:10:18 -0400
Subject: [PATCH] fix: use resolveConfig to preserve defaults

---
 packages/integrations/tailwind/src/index.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/integrations/tailwind/src/index.ts b/packages/integrations/tailwind/src/index.ts
index 833c2a0cb061..bb5a4ade3a3c 100644
--- a/packages/integrations/tailwind/src/index.ts
+++ b/packages/integrations/tailwind/src/index.ts
@@ -3,17 +3,18 @@ import { fileURLToPath } from 'url';
 import path from 'path';
 import tailwindPlugin from 'tailwindcss';
 import type { TailwindConfig } from 'tailwindcss/tailwind-config';
+import resolveConfig from 'tailwindcss/resolveConfig.js';
 import autoprefixerPlugin from 'autoprefixer';
 import load from '@proload/core';
 
 function getDefaultTailwindConfig(srcUrl: URL): TailwindConfig {
-	return {
+	return resolveConfig({
 		theme: {
 			extend: {},
 		},
 		plugins: [],
 		content: [path.join(fileURLToPath(srcUrl), `**`, `*.{astro,html,js,jsx,svelte,ts,tsx,vue}`)],
-	};
+	});
 }
 
 async function getUserConfig(projectRoot: URL, configPath?: string) {
@@ -64,7 +65,7 @@ export default function tailwindIntegration(options: TailwindOptions): AstroInte
 				if (applyAstroConfigPreset && userConfig?.value) {
 					// apply Astro config as a preset to user config
 					// this avoids merging or applying nested spread operators ourselves
-					tailwindConfig.presets = [...(tailwindConfig.presets || []), getDefaultTailwindConfig(config.src)];
+					tailwindConfig.presets = [getDefaultTailwindConfig(config.src), ...(tailwindConfig.presets || [])];
 				}
 
 				config.styleOptions.postcss.plugins.push(tailwindPlugin(tailwindConfig));