Merge remote-tracking branch 'oxc' into merge/oxc

JounQin · JounQin · commit ed82ebdba6ce · 2025-04-22T20:49:21.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### <!-- 1 -->Bug Fixes
+
+- properly handle DOS device paths in strip_windows_prefix ([#455](https://github.com/oxc-project/oxc-resolver/pull/455))
+
 ## [1.6.3](https://github.com/unrs/unrs-resolver/compare/v1.6.2...v1.6.3) - 2025-04-21
 
 ### <!-- 1 -->Bug Fixes
diff --git a/fixtures/pnpm-workspace/packages/lib/package.json b/fixtures/pnpm-workspace/packages/lib/package.json
@@ -4,6 +4,6 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "react": "^19.0.0"
+    "react": "^19.1.0"
   }
 }
diff --git a/npm/package.json b/npm/package.json
@@ -48,6 +48,6 @@
     "postinstall": "napi-postinstall unrs-resolver check"
   },
   "dependencies": {
-    "napi-postinstall": "^0.1.1"
+    "napi-postinstall": "^0.1.5"
   }
 }
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "@types/node": "^22.14.1",
     "emnapi": "^1.4.3",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.1"
+    "vitest": "^3.1.2"
   },
   "packageManager": "pnpm@10.8.1"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -3,5 +3,9 @@ packages:
   - napi
   - fixtures/pnpm
   - fixtures/pnpm-workspace/**
+
 ignoredBuiltDependencies:
   - esbuild
+
+# For `windows_symlinked_longfilename` in tests/resolve_test.rs
+virtualStoreDirMaxLength: 1024
diff --git a/src/error.rs b/src/error.rs
@@ -41,6 +41,10 @@ pub enum ResolveError {
     #[error("{0}")]
     IOError(IOError),
 
+    /// For example, Windows UNC path with Volume GUID is not supported.
+    #[error("Path {0:?} contains unsupported construct.")]
+    PathNotSupported(PathBuf),
+
     /// Node.js builtin module when `Options::builtin_modules` is enabled.
     ///
     /// `is_runtime_module` can be used to determine whether the request
diff --git a/src/file_system.rs b/src/file_system.rs
@@ -189,29 +189,17 @@ impl FileSystemOs {
     pub fn read_link(path: &Path) -> io::Result<PathBuf> {
         let path = fs::read_link(path)?;
         cfg_if! {
-            if #[cfg(windows)] {
-                Ok(Self::strip_windows_prefix(path))
+            if #[cfg(target_os = "windows")] {
+                match crate::windows::try_strip_windows_prefix(path) {
+                    // We won't follow the link if we cannot represent its target properly.
+                    Ok(p) | Err(crate::ResolveError::PathNotSupported(p)) => Ok(p),
+                    _ => unreachable!(),
+                }
             } else {
                 Ok(path)
             }
         }
     }
-
-    pub fn strip_windows_prefix<P: AsRef<Path>>(path: P) -> PathBuf {
-        const UNC_PATH_PREFIX: &[u8] = b"\\\\?\\UNC\\";
-        const LONG_PATH_PREFIX: &[u8] = b"\\\\?\\";
-        let path_bytes = path.as_ref().as_os_str().as_encoded_bytes();
-        path_bytes
-            .strip_prefix(UNC_PATH_PREFIX)
-            .or_else(|| path_bytes.strip_prefix(LONG_PATH_PREFIX))
-            .map_or_else(
-                || path.as_ref().to_path_buf(),
-                |p| {
-                    // SAFETY: `as_encoded_bytes` ensures `p` is valid path bytes
-                    unsafe { PathBuf::from(std::ffi::OsStr::from_encoded_bytes_unchecked(p)) }
-                },
-            )
-    }
 }
 
 fn buffer_to_string(bytes: Vec<u8>) -> io::Result<String> {
diff --git a/src/fs_cache.rs b/src/fs_cache.rs
@@ -79,11 +79,12 @@ impl<Fs: FileSystem> Cache for FsCache<Fs> {
         let cached_path = self.canonicalize_impl(path)?;
         let path = cached_path.to_path_buf();
         cfg_if! {
-            if #[cfg(windows)] {
-                let path = crate::FileSystemOs::strip_windows_prefix(path);
+            if #[cfg(target_os = "windows")] {
+                crate::windows::try_strip_windows_prefix(path)
+            } else {
+                Ok(path)
             }
         }
-        Ok(path)
     }
 
     fn is_file(&self, path: &Self::Cp, ctx: &mut Ctx) -> bool {
diff --git a/src/lib.rs b/src/lib.rs
@@ -65,6 +65,8 @@ mod specifier;
 mod tsconfig;
 #[cfg(feature = "fs_cache")]
 mod tsconfig_serde;
+#[cfg(target_os = "windows")]
+mod windows;
 
 #[cfg(test)]
 mod tests;
diff --git a/src/windows.rs b/src/windows.rs
diff --git a/tests/resolve_test.rs b/tests/resolve_test.rs
