The lock order of bundler and clients were inconsistent. This potentially causes deadlocks (e.g. when one thread locks bundler and another thread locks clients).

• bundler -> clients

  • rolldown/crates/rolldown_dev/src/bundling_task.rs

    Lines 128 to 138 in 11424ab

    	let mut bundler = self.bundler.lock().await;
    	let changed_files = self
    	.input
    	.changed_files()
    	.iter()
    	.map(|(p, event)| (p.to_string_lossy().to_string(), *event))
    	.collect::<FxIndexMap<_, _>>();
    	// Build ClientHmrInput for each client
    	// Store client sessions to keep data alive during HMR computation
    	let client_sessions: Vec<_> = self.dev_context.clients.iter().collect();

• clients -> bundler

  • rolldown/crates/rolldown_dev/src/dev_engine.rs

    Lines 269 to 270 in 11424ab

    	for client in self.clients.iter() {
    	let mut bundler = self.bundler.lock().await;

  • rolldown/crates/rolldown_dev/src/dev_engine.rs

    Lines 310 to 317 in 11424ab

    	// Get executed modules for this client
    	let executed_modules =
    	self.clients.get(&client_id).map(|c| c.executed_modules.clone()).unwrap_or_default();
    	// Mark the proxy module as fetched BEFORE compilation.
    	// This changes the content returned by the lazy compilation plugin's load hook
    	// from a stub (fetches via /lazy endpoint) to actual code that imports the real module.
    	let mut bundler = self.bundler.lock().await;

This PR changes all to bundler -> clients.