Merge remote-tracking branch 'upstream/main' into fixwindowstests

Author: srujzs

dwds/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## 25.1.0-wip
 
+## 25.0.3
+
+### Bug Fixes:
+
+- Fix issue in hot restart with the web socket where we didn't pass the reloaded
+  sources path, resulting in a null assertion.
+
 ## 25.0.2
 
 ### Bug Fixes:

dwds/lib/src/injected/client.js

@@ -190,7 +190,9 @@ Future<void>? main() {
               manager.reloadPage();
             } else if (reloadConfiguration ==
                 'ReloadConfiguration.hotRestart') {
-              await manager.hotRestart();
+              await manager.hotRestart(
+                reloadedSourcesPath: hotRestartReloadedSourcesPath,
+              );
             } else if (reloadConfiguration == 'ReloadConfiguration.hotReload') {
               await manager.hotReloadStart(hotReloadReloadedSourcesPath);
               await manager.hotReloadEnd();
@@ -493,7 +495,10 @@ Future<void> handleWebSocketHotRestartRequest(
   final requestId = event.id;
   try {
     final runId = const Uuid().v4().toString();
-    await manager.hotRestart(runId: runId);
+    await manager.hotRestart(
+      runId: runId,
+      reloadedSourcesPath: hotRestartReloadedSourcesPath,
+    );
     _sendHotRestartResponse(clientSink, requestId, success: true);
   } catch (e) {
     _sendHotRestartResponse(