Merge DWDS 27.0.3 release fixes into main branch

dwds/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 27.0.3
+
+- Fix `dartExecutable` not being correctly passed to the DebugService.
+
+## 27.0.2
+
+- Add `dartExecutable` to `DartDevelopmentServiceConfiguration`.
+
 ## 27.0.1
 - Replace `package:uuid` dependency with internal `Uuid` class for generating version 4 UUIDs.
 - Add DDC Library Bundle tests in `dwds/test/integration/instances`.
@@ -15,6 +23,7 @@
 - Fix issue where `DebugConnection` did not complete `onDone` if `WebkitDebugger` fails to reconnect to the debugger after the connection closes.
 - Fix `FormatException` in `ExtensionDebugger` by making `ExtensionEvent.fromJson` robust to missing headers and Map-typed params.
 - Fix `StateError` in `DwdsInjector` during AOT execution by bundling `client.js` as a statically compiled asset.
+- Report errors when an empty reloaded_sources.json is seen in the DDC Library Bundle module system.
 
 ## 27.0.0
 - Remove `package:built_value`, `package:built_value_generator`, and `package:built_collection` dependencies.

dwds/lib/dart_web_debug_service.dart

@@ -156,6 +156,7 @@ class Dwds {
             launchedDevToolsUri ??
             debugSettings.ddsConfiguration.devToolsServerAddress,
         serveDevTools: debugSettings.ddsConfiguration.serveDevTools,
+        dartExecutable: debugSettings.ddsConfiguration.dartExecutable,
       ),
       debugSettings.launchDevToolsInNewWindow,
       useWebSocketConnection: useDwdsWebSocketConnection,

dwds/lib/src/config/tool_configuration.dart

@@ -57,12 +57,14 @@ class DartDevelopmentServiceConfiguration {
     this.port,
     this.serveDevTools = true,
     this.devToolsServerAddress,
+    this.dartExecutable,
   });
 
   final bool enable;
   final int? port;
   final bool serveDevTools;
   final Uri? devToolsServerAddress;
+  final String? dartExecutable;
 }
 
 /// Debug settings for the connected app.

dwds/lib/src/services/debug_service.dart

@@ -135,6 +135,7 @@ abstract class DebugService<T extends ProxyService> {
       ),
       devToolsServerAddress: ddsConfig.devToolsServerAddress,
       serveDevTools: ddsConfig.serveDevTools,
+      dartExecutable: ddsConfig.dartExecutable,
     );
     return _dds!;
   }

dwds/pubspec.yaml

@@ -1,6 +1,6 @@
 name: dwds
 # Every time this changes you need to run `dart run build_runner build`.
-version: 27.0.1
+version: 27.0.3
 
 description: >-
   A service that proxies between the Chrome debug protocol and the Dart VM

dwds/web/reloader/ddc_library_bundle_restarter.dart

@@ -81,12 +81,18 @@ class DdcLibraryBundleRestarter implements Restarter {
   Future<List<Map>> _getSrcModuleLibraries(String reloadedSourcesPath) async {
     final completer = Completer<String>();
     final xhr = _XMLHttpRequest();
-    xhr.withCredentials = true;
     xhr.onreadystatechange = () {
-      // If the request has completed and OK, or the response has not
-      // changed.
-      if (xhr.readyState == 4 && xhr.status == 200 || xhr.status == 304) {
-        completer.complete(xhr.responseText);
+      // If the request has completed and is OK or unchanged, send the response
+      // text. Otherwise, we should report an error reading the reloaded
+      // sources file.
+      if (xhr.readyState == 4) {
+        if (xhr.status == 200 || xhr.status == 304) {
+          completer.complete(xhr.responseText);
+        } else {
+          completer.completeError(
+            'Failed to fetch reloaded sources at $reloadedSourcesPath.',
+          );
+        }
       }
     }.toJS;
     xhr.get(reloadedSourcesPath, true);
@@ -97,7 +103,7 @@ class DdcLibraryBundleRestarter implements Restarter {
   }
 
   @override
-  Future<(bool, JSArray<JSObject>?)> restart({
+  Future<(bool, JSArray<JSObject>)> restart({
     String? runId,
     Future? readyToRunMain,
     String? reloadedSourcesPath,