Skip to content

Commit 279d4e6

Browse files
committed
Attempt to bump version of dwds; format after sdk bump
1 parent 07b57ed commit 279d4e6

40 files changed

+323
-353
lines changed

dwds/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 26.0.0-dev
2+
- Bumped minimim required sdk to 3.10.0-149.0.dev
3+
- Added 'scriptUri' parameter to compileExpressionToJs
4+
15
## 25.1.0
26

37
- Added `DartDevelopmentServiceConfiguration` to allow for configuring DDS behavior.

dwds/lib/dart_web_debug_service.dart

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,18 @@ class Dwds {
8383
Future<String>? extensionUri;
8484
ExtensionBackend? extensionBackend;
8585
if (debugSettings.enableDebugExtension) {
86-
final handler =
87-
debugSettings.useSseForDebugBackend
88-
? SseSocketHandler(
89-
SseHandler(
90-
Uri.parse('/\$debug'),
91-
// Proxy servers may actively kill long standing connections.
92-
// Allow for clients to reconnect in a short window. Making the
93-
// window too long may cause issues if the user closes a debug
94-
// session and initiates a new one during the keepAlive window.
95-
keepAlive: const Duration(seconds: 5),
96-
),
97-
)
98-
: WebSocketSocketHandler();
86+
final handler = debugSettings.useSseForDebugBackend
87+
? SseSocketHandler(
88+
SseHandler(
89+
Uri.parse('/\$debug'),
90+
// Proxy servers may actively kill long standing connections.
91+
// Allow for clients to reconnect in a short window. Making the
92+
// window too long may cause issues if the user closes a debug
93+
// session and initiates a new one during the keepAlive window.
94+
keepAlive: const Duration(seconds: 5),
95+
),
96+
)
97+
: WebSocketSocketHandler();
9998

10099
extensionBackend = await ExtensionBackend.start(
101100
handler,

dwds/lib/data/build_result.g.dart

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dwds/lib/data/debug_event.g.dart

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dwds/lib/data/extension_request.g.dart

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dwds/lib/data/hot_reload_request.g.dart

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dwds/lib/data/hot_restart_request.g.dart

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dwds/lib/data/service_extension_request.dart

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ abstract class ServiceExtensionRequest
1515
get argsJson; // Store args as JSON string for built_value compatibility
1616

1717
// Helper method to get args as Map<String, dynamic>
18-
Map<String, dynamic> get args =>
19-
argsJson.isEmpty
20-
? <String, dynamic>{}
21-
: json.decode(argsJson) as Map<String, dynamic>;
18+
Map<String, dynamic> get args => argsJson.isEmpty
19+
? <String, dynamic>{}
20+
: json.decode(argsJson) as Map<String, dynamic>;
2221

2322
ServiceExtensionRequest._();
2423
factory ServiceExtensionRequest([
@@ -31,11 +30,10 @@ abstract class ServiceExtensionRequest
3130
required String method,
3231
required Map<String, dynamic> args,
3332
}) => ServiceExtensionRequest(
34-
(b) =>
35-
b
36-
..id = id
37-
..method = method
38-
..argsJson = json.encode(args),
33+
(b) => b
34+
..id = id
35+
..method = method
36+
..argsJson = json.encode(args),
3937
);
4038

4139
static Serializer<ServiceExtensionRequest> get serializer =>

dwds/lib/data/service_extension_response.dart

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ abstract class ServiceExtensionResponse
1818
String? get errorMessage;
1919

2020
// Helper method to get result as Map<String, dynamic>
21-
Map<String, dynamic>? get result =>
22-
resultJson == null || resultJson!.isEmpty
23-
? null
24-
: json.decode(resultJson!) as Map<String, dynamic>;
21+
Map<String, dynamic>? get result => resultJson == null || resultJson!.isEmpty
22+
? null
23+
: json.decode(resultJson!) as Map<String, dynamic>;
2524

2625
ServiceExtensionResponse._();
2726
factory ServiceExtensionResponse([
@@ -36,13 +35,12 @@ abstract class ServiceExtensionResponse
3635
int? errorCode,
3736
String? errorMessage,
3837
}) => ServiceExtensionResponse(
39-
(b) =>
40-
b
41-
..id = id
42-
..success = success
43-
..resultJson = result != null ? json.encode(result) : null
44-
..errorCode = errorCode
45-
..errorMessage = errorMessage,
38+
(b) => b
39+
..id = id
40+
..success = success
41+
..resultJson = result != null ? json.encode(result) : null
42+
..errorCode = errorCode
43+
..errorMessage = errorMessage,
4644
);
4745

4846
static Serializer<ServiceExtensionResponse> get serializer =>

dwds/lib/src/connections/debug_connection.dart

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,14 @@ class DebugConnection {
4444
/// A client of the Dart VM Service with DWDS specific extensions.
4545
VmService get vmService => _appDebugServices.dwdsVmClient.client;
4646

47-
Future<void> close() =>
48-
_closed ??= () async {
49-
final proxyService = _appDebugServices.proxyService;
50-
if (proxyService is ChromeProxyService) {
51-
await proxyService.remoteDebugger.close();
52-
}
53-
await _appDebugServices.close();
54-
_onDoneCompleter.complete();
55-
}();
47+
Future<void> close() => _closed ??= () async {
48+
final proxyService = _appDebugServices.proxyService;
49+
if (proxyService is ChromeProxyService) {
50+
await proxyService.remoteDebugger.close();
51+
}
52+
await _appDebugServices.close();
53+
_onDoneCompleter.complete();
54+
}();
5655

5756
Future<void> get onDone => _onDoneCompleter.future;
5857
}

0 commit comments

Comments
 (0)