Revert "Fix Astro by adding the componentns folder instead of falling to full fs scanning"

This reverts commit daacc5e.

Author: philipp-spiess

integrations/vite/astro.test.ts

@@ -92,10 +92,9 @@ test(
         // https://astro.build/config
         export default defineConfig({ vite: { plugins: [tailwindcss()] }, integrations: [react()] })
       `,
-      // prettier-ignore
       'src/pages/index.astro': html`
         ---
-        import ClientOnly from '../components/client-only';
+        import ClientOnly from './client-only';
         ---
 
         <div class="underline">Hello, world!</div>
@@ -106,7 +105,7 @@ test(
           @import 'tailwindcss';
         </style>
       `,
-      'src/components/client-only.jsx': js`
+      'src/pages/client-only.jsx': js`
         export default function ClientOnly() {
           return <div className="overline">Hello, world!</div>
         }

packages/@tailwindcss-vite/src/index.ts

@@ -13,11 +13,11 @@ const INLINE_STYLE_ID_RE = /[?&]index\=\d+\.css$/
 
 const IGNORED_DEPENDENCIES = ['tailwind-merge']
 
-type ScannerMode = 'module-graph' | 'file-system'
+type ScannerMode = 'automatic' | 'module-graph' | 'file-system'
 
 export default function tailwindcss(
-  { scanner: scannerMode = 'module-graph' }: { scanner: ScannerMode } = {
-    scanner: 'module-graph',
+  { scanner: scannerMode = 'automatic' }: { scanner: ScannerMode } = {
+    scanner: 'automatic',
   },
 ): Plugin[] {
   let servers: ViteDevServer[] = []
@@ -26,8 +26,6 @@ export default function tailwindcss(
   let isSSR = false
   let minify = false
 
-  let additionalFileSystemSources: string[] = []
-
   // The Vite extension has two types of sources for candidates:
   //
   // 1. The module graph: These are all modules that vite transforms and we want
@@ -69,7 +67,6 @@ export default function tailwindcss(
       () => moduleGraphCandidates,
       scannerMode,
       config!.root,
-      additionalFileSystemSources,
       customCssResolver,
       customJsResolver,
     )
@@ -212,8 +209,13 @@ export default function tailwindcss(
         minify = config.build.cssMinify !== false
         isSSR = config.build.ssr !== false && config.build.ssr !== undefined
 
-        if (isAstro(config)) {
-          additionalFileSystemSources.push(path.join(config.root, 'src', 'components'))
+        if (scannerMode === 'automatic') {
+          if (shouldDisableModuleGraph(config)) {
+            console.warn('Detected an Astro.js build and opted-out of using the Vite module graph.')
+            scannerMode = 'file-system'
+            return
+          }
+          scannerMode = 'module-graph'
         }
       },
 
@@ -436,7 +438,6 @@ class Root {
     private getSharedCandidates: () => Map<string, Set<string>>,
     private scannerMode: ScannerMode,
     private base: string,
-    private additionalFileSystemSources: string[],
 
     private customCssResolver: (id: string, base: string) => Promise<string | false | undefined>,
     private customJsResolver: (id: string, base: string) => Promise<string | false | undefined>,
@@ -491,15 +492,6 @@ class Root {
         return [this.compiler.root]
       })().concat(this.compiler.globs)
 
-      if (this.additionalFileSystemSources) {
-        sources = sources.concat(
-          this.additionalFileSystemSources.map((source) => ({
-            base: source,
-            pattern: '**/*',
-          })),
-        )
-      }
-
       this.scanner = new Scanner({ sources })
     }
 
@@ -616,6 +608,6 @@ class Root {
   }
 }
 
-function isAstro(config: ResolvedConfig) {
+function shouldDisableModuleGraph(config: ResolvedConfig) {
   return config.plugins.some((p) => p.name === 'astro:scripts:page-ssr')
 }