Commit 954cd3b
authored
fix(workspace): avoid holding workspace file handles across session (#335)
## Summary
- Refactor `FileWithPath` to pre-read file contents into memory and
close the OS handle immediately, rather than keeping a live
`std::fs::File` for the entire lifetime of `WorkspaceRoot`.
- Update `load_package_graph` to deserialize via
`serde_*::from_slice(content())` instead of `from_reader(file())`; drop
the now-unnecessary seek-back step in `find_workspace_root`.
- Add regression tests: a cross-platform rename-over-target test
modeling pnpm's atomic update flow while `WorkspaceRoot` is alive, a
Linux-only `/proc/self/fd` check, and basic correctness tests for the
new API.
## Why
On Windows, `vp run dev` keeps a `Session` (and its `WorkspaceRoot`)
alive for the full duration of the dev server. Holding an open handle to
`pnpm-workspace.yaml` in that `WorkspaceRoot` could prevent pnpm in a
second terminal from atomically replacing the file
(write-temp-then-rename), surfacing as `EPERM: operation not permitted`
when pnpm tried to add a catalog entry — see
voidzero-dev/vite-plus#1357. Even where current Rust's default
`FILE_SHARE_DELETE` makes the rename succeed, long-lived handles to
config files are fragile across OS/AV/filesystem edge cases. Reading
content once and closing the handle is strictly simpler.
## Test plan
- [x] `cargo test -p vite_workspace` — 78 passing (including 4 new
tests)
- [x] `cargo test -p vite_task -p vite_task_plan -p vite_task_graph` —
all pass
- [x] `cargo clippy -p vite_workspace --all-targets -- -D warnings` —
clean
- [x] Verified end-to-end against vite-plus via local `[patch]`: all
vite-plus own crate tests pass.
- [x] Windows CI rerun to exercise the new regression test on the target
platform.
## Follow-up
Once merged, bump the `vite-task` git rev in `voidzero-dev/vite-plus`
`Cargo.toml` (entries at lines 92, 197, 203–206) to pick up the fix.
Fixes voidzero-dev/vite-plus#13571 parent 26baabe commit 954cd3b
2 files changed
+108
-37
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
248 | 248 | | |
249 | 249 | | |
250 | 250 | | |
251 | | - | |
252 | | - | |
| 251 | + | |
| 252 | + | |
253 | 253 | | |
254 | 254 | | |
255 | 255 | | |
256 | 256 | | |
257 | 257 | | |
258 | 258 | | |
259 | | - | |
260 | | - | |
| 259 | + | |
| 260 | + | |
261 | 261 | | |
262 | 262 | | |
263 | 263 | | |
264 | 264 | | |
265 | 265 | | |
266 | 266 | | |
267 | 267 | | |
268 | | - | |
| 268 | + | |
269 | 269 | | |
270 | 270 | | |
271 | 271 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
| 1 | + | |
6 | 2 | | |
7 | 3 | | |
8 | 4 | | |
9 | 5 | | |
10 | 6 | | |
11 | | - | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
12 | 15 | | |
13 | 16 | | |
14 | | - | |
| 17 | + | |
15 | 18 | | |
16 | 19 | | |
17 | 20 | | |
18 | 21 | | |
19 | | - | |
| 22 | + | |
20 | 23 | | |
21 | 24 | | |
22 | | - | |
| 25 | + | |
23 | 26 | | |
24 | | - | |
25 | | - | |
| 27 | + | |
| 28 | + | |
26 | 29 | | |
27 | 30 | | |
28 | | - | |
| 31 | + | |
29 | 32 | | |
30 | 33 | | |
31 | | - | |
| 34 | + | |
32 | 35 | | |
33 | | - | |
34 | | - | |
| 36 | + | |
| 37 | + | |
35 | 38 | | |
36 | 39 | | |
37 | 40 | | |
38 | 41 | | |
39 | 42 | | |
40 | | - | |
| 43 | + | |
41 | 44 | | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
| 45 | + | |
| 46 | + | |
49 | 47 | | |
50 | 48 | | |
51 | 49 | | |
| |||
156 | 154 | | |
157 | 155 | | |
158 | 156 | | |
159 | | - | |
160 | | - | |
161 | | - | |
162 | | - | |
163 | | - | |
164 | | - | |
165 | | - | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
166 | 162 | | |
167 | 163 | | |
168 | | - | |
169 | | - | |
170 | 164 | | |
171 | 165 | | |
172 | 166 | | |
| |||
195 | 189 | | |
196 | 190 | | |
197 | 191 | | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
0 commit comments