diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index d6d929ee7..3104b18fa 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -1,6 +1,13 @@ ## 27.1.0 - Add `appName` to `DartDevelopmentServiceConfiguration`. + +## 27.0.3 + +- Fix `dartExecutable` not being correctly passed to the DebugService. + +## 27.0.2 + - Add `dartExecutable` to `DartDevelopmentServiceConfiguration`. ## 27.0.1 diff --git a/dwds/lib/dart_web_debug_service.dart b/dwds/lib/dart_web_debug_service.dart index 7f8077870..a3698b71b 100644 --- a/dwds/lib/dart_web_debug_service.dart +++ b/dwds/lib/dart_web_debug_service.dart @@ -157,6 +157,7 @@ class Dwds { debugSettings.ddsConfiguration.devToolsServerAddress, serveDevTools: debugSettings.ddsConfiguration.serveDevTools, appName: debugSettings.ddsConfiguration.appName, + dartExecutable: debugSettings.ddsConfiguration.dartExecutable, ), debugSettings.launchDevToolsInNewWindow, useWebSocketConnection: useDwdsWebSocketConnection, diff --git a/dwds/lib/src/handlers/injected_client_js.dart b/dwds/lib/src/handlers/injected_client_js.dart index adb8bc1f9..8b2a68254 100644 --- a/dwds/lib/src/handlers/injected_client_js.dart +++ b/dwds/lib/src/handlers/injected_client_js.dart @@ -21315,7 +21315,7 @@ const injectedClientJs = "// Generated by dart2js (, csp, intern-composite-value " },\n" " restart\$3\$readyToRunMain\$reloadedSourcesPath\$runId(readyToRunMain, reloadedSourcesPath, runId) {\n" " var \$async\$goto = 0,\n" -" \$async\$completer = A._makeAsyncAwaitCompleter(type\$.Record_2_bool_and_nullable_JSArray_nullable_Object),\n" +" \$async\$completer = A._makeAsyncAwaitCompleter(type\$.Record_2_bool_and_JSArray_nullable_Object),\n" " \$async\$returnValue, \$async\$self = this, mainHandler, srcModuleLibraries, t1;\n" " var \$async\$restart\$3\$readyToRunMain\$reloadedSourcesPath\$runId = A._wrapJsFunctionForAsync(function(\$async\$errorCode, \$async\$result) {\n" " if (\$async\$errorCode === 1)\n" @@ -21341,7 +21341,7 @@ const injectedClientJs = "// Generated by dart2js (, csp, intern-composite-value " return A._asyncAwait(A.promiseToFuture(A._asJSObject(A._asJSObject(t1.dartDevEmbedder).hotRestart()), type\$.nullable_Object), \$async\$restart\$3\$readyToRunMain\$reloadedSourcesPath\$runId);\n" " case 5:\n" " // returning from await.\n" -" \$async\$returnValue = new A._Record_2(true, type\$.nullable_JSArray_nullable_Object._as(A.jsify(srcModuleLibraries)));\n" +" \$async\$returnValue = new A._Record_2(true, type\$.JSArray_nullable_Object._as(A.jsify(srcModuleLibraries)));\n" " // goto return\n" " \$async\$goto = 1;\n" " break;\n" @@ -22432,6 +22432,7 @@ const injectedClientJs = "// Generated by dart2js (, csp, intern-composite-value " QueueList_Result_DebugEvent: findType(\"QueueList>\"),\n" " Record: findType(\"Record\"),\n" " Record_0: findType(\"+()\"),\n" +" Record_2_bool_and_JSArray_nullable_Object: findType(\"+(bool,JSArray)\"),\n" " Record_2_bool_and_nullable_JSArray_nullable_Object: findType(\"+(bool,JSArray?)\"),\n" " RegExpMatch: findType(\"RegExpMatch\"),\n" " RequireRestarter: findType(\"RequireRestarter\"),\n"