Rebase and reformat

Author: bkonyi

_analysis_config/pubspec.yaml

@@ -4,7 +4,7 @@ description: The shared analysis configuration for the webdev packages.
 publish_to: none
 
 environment:
-  sdk: ^3.8.0
+  sdk: ^3.10.0-0.0.dev
 
 dependencies:
   lints: ^5.0.0

dwds/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 25.1.1-wip
+
+- Bump SDK constraint to ^3.10.0
+
 ## 25.1.0
 
 - Added `DartDevelopmentServiceConfiguration` to allow for configuring DDS behavior.

dwds/debug_extension/pubspec.yaml

@@ -5,7 +5,7 @@ description: >-
   A Chrome extension for Dart debugging.
 
 environment:
-  sdk: ^3.8.0
+  sdk: ^3.10.0-0.0.dev
 
 dependencies:
   built_value: ^8.9.0
@@ -22,7 +22,7 @@ dev_dependencies:
   dwds: ^24.1.0
   path: ^1.9.0
   sse: ^4.1.4
-  web_socket_channel: '>=2.2.0 <4.0.0'
+  web_socket_channel: ">=2.2.0 <4.0.0"
 
 dependency_overrides:
   dwds:

dwds/debug_extension/tool/copy_builder.dart

@@ -10,12 +10,12 @@ Builder copyBuilder(_) => _CopyBuilder();
 class _CopyBuilder extends Builder {
   @override
   Map<String, List<String>> get buildExtensions => {
-    'web/{{}}.dart.js': ['compiled/{{}}.dart.js'],
-    'web/static_assets/{{}}.png': ['compiled/static_assets/{{}}.png'],
-    'web/static_assets/{{}}.html': ['compiled/static_assets/{{}}.html'],
-    'web/static_assets/{{}}.css': ['compiled/static_assets/{{}}.css'],
-    'web/manifest.json': ['compiled/manifest.json'],
-  };
+        'web/{{}}.dart.js': ['compiled/{{}}.dart.js'],
+        'web/static_assets/{{}}.png': ['compiled/static_assets/{{}}.png'],
+        'web/static_assets/{{}}.html': ['compiled/static_assets/{{}}.html'],
+        'web/static_assets/{{}}.css': ['compiled/static_assets/{{}}.css'],
+        'web/manifest.json': ['compiled/manifest.json'],
+      };
 
   @override
   Future<void> build(BuildStep buildStep) async {

dwds/debug_extension/web/background.dart

@@ -279,9 +279,8 @@ void _setWarningIcon(int tabId) {
 }
 
 void _setDefaultIcon(int tabId) {
-  final iconPath = isDevMode
-      ? 'static_assets/dart_dev.png'
-      : 'static_assets/dart_grey.png';
+  final iconPath =
+      isDevMode ? 'static_assets/dart_dev.png' : 'static_assets/dart_grey.png';
   setExtensionIcon(IconInfo(path: iconPath));
   setExtensionPopup(PopupDetails(popup: '', tabId: tabId));
 }

dwds/debug_extension/web/cider_connection.dart

@@ -170,8 +170,7 @@ Future<void> _sendInspectorUrl({String? appId}) async {
   if (!alreadyDebugging) {
     sendErrorMessageToCider(
       errorType: CiderErrorType.invalidRequest,
-      errorDetails:
-          'Cannot send the inspector URL before '
+      errorDetails: 'Cannot send the inspector URL before '
           'the debugger has been attached.',
     );
     return;

dwds/debug_extension/web/copier.dart

@@ -49,8 +49,8 @@ void _copyAppId(String appId) {
 }
 
 Future<bool> _notifyCopiedSuccess(String appId) => sendRuntimeMessage(
-  type: MessageType.appId,
-  body: appId,
-  sender: Script.copier,
-  recipient: Script.background,
-);
+      type: MessageType.appId,
+      body: appId,
+      sender: Script.copier,
+      recipient: Script.background,
+    );

dwds/debug_extension/web/cross_extension_communication.dart

@@ -126,17 +126,19 @@ ExternalExtensionMessage _debugEventMessage({
   required String method,
   required dynamic params,
   required int tabId,
-}) => ExternalExtensionMessage(
-  name: 'chrome.debugger.event',
-  tabId: tabId,
-  options: DebugEvent(method: method, params: params),
-);
+}) =>
+    ExternalExtensionMessage(
+      name: 'chrome.debugger.event',
+      tabId: tabId,
+      options: DebugEvent(method: method, params: params),
+    );
 
 ExternalExtensionMessage _dwdsEventMessage({
   required String method,
   required dynamic params,
   required int tabId,
-}) => ExternalExtensionMessage(name: method, tabId: tabId, options: params);
+}) =>
+    ExternalExtensionMessage(name: method, tabId: tabId, options: params);
 
 // This message is used for cross-extension communication between this extension
 // and the AngularDart DevTools extension.