Avoid UNC paths for Windows

tailwindlabs · Aug 5, 2024 · 0ab64f9 · 0ab64f9
1 parent 5e65427
commit 0ab64f9
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/oxide/Cargo.toml b/crates/oxide/Cargo.toml
@@ -17,6 +17,7 @@ ignore = "0.4.20"
 lazy_static = "1.4.0"
 glob-match = "0.2.1"
 serial_test = "3.1.1"
+dunce = "1.0.5"
 
 [dev-dependencies]
 tempfile = "3.5.0"

diff --git a/crates/oxide/src/lib.rs b/crates/oxide/src/lib.rs
@@ -10,8 +10,6 @@ use ignore::WalkBuilder;
 use lazy_static::lazy_static;
 use rayon::prelude::*;
 use std::cmp::Ordering;
-use std::iter;
-use std::path;
 use std::path::Path;
 use std::path::PathBuf;
 use std::sync::Mutex;
@@ -80,7 +78,9 @@ pub fn scan_dir(opts: ScanOptions) -> ScanResult {
     // If we have additional content paths, then we have to resolve them as well.
     if !opts.content_paths.is_empty() {
         let resolved_files: Vec<_> = match fast_glob(&opts.content_paths) {
-            Ok(matches) => matches.filter_map(|x| path::absolute(x).ok()).collect(),
+            Ok(matches) => matches
+                .filter_map(|x| dunce::canonicalize(&x).ok())
+                .collect(),
             Err(err) => {
                 event!(tracing::Level::ERROR, "Failed to resolve glob: {:?}", err);
                 vec![]
@@ -92,27 +92,23 @@ pub fn scan_dir(opts: ScanOptions) -> ScanResult {
         let optimized_incoming_globs = get_fast_patterns(&opts.content_paths)
             .iter()
             .flat_map(|(root, globs)| {
-                let root = match path::absolute(root) {
-                    Ok(root) => root,
-                    Err(err) => {
-                        event!(
-                            tracing::Level::ERROR,
-                            "Failed to canonicalize base path: {:?}",
-                            err
-                        );
-
-                        return vec![];
-                    }
-                };
-
-                globs
-                    .iter()
-                    .map(|glob| {
-                        let base = root.clone().display().to_string();
-                        let glob = glob.to_string();
-                        GlobEntry { base, glob }
-                    })
-                    .collect()
+                globs.iter().filter_map(|glob| {
+                    let root = match dunce::canonicalize(root.clone()) {
+                        Ok(root) => root,
+                        Err(error) => {
+                            event!(
+                                tracing::Level::ERROR,
+                                "Failed to canonicalize base path {:?}",
+                                error
+                            );
+                            return None;
+                        }
+                    };
+
+                    let base = root.display().to_string();
+                    let glob = glob.to_string();
+                    Some(GlobEntry { base, glob })
+                })
             })
             .collect::<Vec<GlobEntry>>();
 

diff --git a/packages/@tailwindcss-vite/src/index.ts b/packages/@tailwindcss-vite/src/index.ts
@@ -87,6 +87,8 @@ export default function tailwindcss(): Plugin[] {
       },
     })
 
+    console.log({ inputBasePath })
+
     let result = scanDir({
       // TODO: This might not be necessary if we enable/disabled auto content
       // detection
@@ -118,6 +120,8 @@ export default function tailwindcss(): Plugin[] {
       // the glob.
       relative = normalizePath(relative)
 
+      console.log({ glob, relative, added: path.posix.join(relative, glob.glob) })
+
       addWatchFile(path.posix.join(relative, glob.glob))
     }