[dwds] Pass reloaded sources path in all hot restart calls in client (#2673)
While the result may be currently unused, we'll likely need it for
debugging soon both in the web-server and build daemon cases, so
always pass the path. Currently, a null assertion that assumes the
path is always passed when using the DDC library bundle format is
being triggered.
diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md
index 3a39d39..1a87732 100644
--- a/dwds/CHANGELOG.md
+++ b/dwds/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 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:
diff --git a/dwds/lib/src/injected/client.js b/dwds/lib/src/injected/client.js
index 6ca724c..cb3b4b4 100644
--- a/dwds/lib/src/injected/client.js
+++ b/dwds/lib/src/injected/client.js
@@ -10169,7 +10169,7 @@
rng[8] = rng[8] & 63 | 128;
runId = A.UuidParsing_unparse(rng);
$async$goto = 7;
- return A._asyncAwait(manager.hotRestart$1$runId(runId), $async$handleWebSocketHotRestartRequest);
+ return A._asyncAwait(manager.hotRestart$2$reloadedSourcesPath$runId(A._asStringQ(init.G.$reloadedSourcesPath), runId), $async$handleWebSocketHotRestartRequest);
case 7:
// returning from await.
A._sendResponse(clientSink, A.hot_restart_response_HotRestartResponse___new_tearOff$closure(), requestId, null, true, type$.HotRestartResponse);
@@ -28263,7 +28263,7 @@
case 8:
// then
$async$goto = 11;
- return A._asyncAwait($async$self.manager.hotRestart$0(), $async$call$1);
+ return A._asyncAwait($async$self.manager.hotRestart$1$reloadedSourcesPath(A._asStringQ(t1.$reloadedSourcesPath)), $async$call$1);
case 11:
// returning from await.
// goto join
@@ -28823,11 +28823,8 @@
});
return A._asyncStartSync($async$hotRestart$3$readyToRunMain$reloadedSourcesPath$runId, $async$completer);
},
- hotRestart$0() {
- return this.hotRestart$3$readyToRunMain$reloadedSourcesPath$runId(null, null, null);
- },
- hotRestart$1$runId(runId) {
- return this.hotRestart$3$readyToRunMain$reloadedSourcesPath$runId(null, null, runId);
+ hotRestart$1$reloadedSourcesPath(reloadedSourcesPath) {
+ return this.hotRestart$3$readyToRunMain$reloadedSourcesPath$runId(null, reloadedSourcesPath, null);
},
hotRestart$2$reloadedSourcesPath$runId(reloadedSourcesPath, runId) {
return this.hotRestart$3$readyToRunMain$reloadedSourcesPath$runId(null, reloadedSourcesPath, runId);
diff --git a/dwds/lib/src/version.dart b/dwds/lib/src/version.dart
index badf612..f4414db 100644
--- a/dwds/lib/src/version.dart
+++ b/dwds/lib/src/version.dart
@@ -1,2 +1,2 @@
// Generated code. Do not modify.
-const packageVersion = '25.0.2';
+const packageVersion = '25.0.3';
diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml
index 97184a1..bdaf630 100644
--- a/dwds/pubspec.yaml
+++ b/dwds/pubspec.yaml
@@ -1,6 +1,6 @@
name: dwds
# Every time this changes you need to run `dart run build_runner build`.
-version: 25.0.2
+version: 25.0.3
description: >-
A service that proxies between the Chrome debug protocol and the Dart VM
diff --git a/dwds/web/client.dart b/dwds/web/client.dart
index b75e6d7..f44fb3a 100644
--- a/dwds/web/client.dart
+++ b/dwds/web/client.dart
@@ -190,7 +190,9 @@
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 @@
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(
