Merge branch 'main' of github.com:dart-lang/webdev into format_webdev

Author: bkonyi

.github/workflows/changelog_reminder.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Check changed files
         run: |
           git fetch origin main

.github/workflows/daily_stable_testing.yml

@@ -29,7 +29,7 @@ jobs:
           echo "VERSION_TAG=$(webdev --version)" >> $GITHUB_OUTPUT
       - name: Checkout Webdev at version tag
         id: checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
         with:
           ref: webdev-v${{ steps.version.outputs.VERSION_TAG }}
       - name: Upgrade deps

.github/workflows/daily_testing.yml

@@ -17,7 +17,7 @@ jobs:
           sdk: main
       - id: checkout
         name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - id: dwds_pub_upgrade
         name: dwds; dart pub upgrade
         run: dart pub upgrade

.github/workflows/dart.yml

@@ -27,7 +27,7 @@ jobs:
           sdk: dev
       - id: checkout
         name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
         with:
           ref: "${{ github.event.pull_request.head.sha }}"
       - id: dwds_pub_upgrade

.github/workflows/dcm.yml

@@ -18,7 +18,7 @@ jobs:
           sdk: dev
       - id: checkout
         name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Run proper release test
         run: dart test test/proper_release_test.dart
         working-directory: test_common

.github/workflows/release_reminder.yml

@@ -1,8 +1,55 @@
-## 24.4.2-wip
+## 25.1.0
 
-- Bump minimum SDK version to 3.8.0
+- Added `DartDevelopmentServiceConfiguration` to allow for configuring DDS behavior.
+- Added support for serving DevTools via DDS. This will become the sole method of serving
+  DevTools from DWDS in a future major release.
+- Deprecated `spawnDds`, `ddsPort`, and `devToolsLauncher` properties in `DebugSettings`.
+- Added `ddsConfiguration` to `DebugSettings`.
+
+## 25.0.4
+
+### Bug Fixes:
+
+- Fix issue where `DebugService: Error serving requestsError: Unsupported operation: Cannot send Null`
+  would be spammed on the console.
+
+## 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:
+
+- Fix issue where DDS would fail to initialize if DWDS already had existing
+  clients.
+
+## 25.0.1
+
+### Bug Fixes:
+
+- Fix issue in hot restart where a hot restart with no changes followed by one
+  with changes, a `Future` was completed again, resulting in a crash.
+
+## 25.0.0
+
+- Implemented hot restart over websockets with multi window support.
+- Fix refresh race condition bug by adding an isolate destruction grace period.
 - Update a call to the `package:shelf_web_socket` `webSocketHandler()` function.
 
+**Breaking changes**
+
+- Remove deprecated parameter `injectDebuggingSupportCode` from `Dwds.start()`.
+- Remove all deprecated fields, getters, and parameters
+  related to the null safety compilation mode. Dart 3 only
+  supports [sound null safety](https://dart.dev/null-safety).
+- Rename `FrontendServerDdcLibraryBundleStrategy.hotReloadSourcesUri` to
+  `reloadedSourcesUri`. The file that the `Uri` points to should now be updated
+  for both a hot restart and a hot reload.
+
 ## 24.4.1
 
 - Implemented a WebSocket-based communication protocol that provides essential developer tooling (hot reload, service extensions) when Chrome debugger access is unavailable. - [#2605](https://github.com/dart-lang/webdev/issues/2605)
@@ -55,6 +102,7 @@
   libraries instead of assuming it exists in the global `window`.
 
 ## 24.3.5
+
 - Allow clients to specify the `packageConfigPath` in `LoadStrategy` class and associated providers.
 
 ## 24.3.4
@@ -139,7 +187,7 @@
 
 ## 23.1.1
 
-- Loosen `package:vm_service` constraints to allow `>=13.0.0 <15.0.0`.  - [#2329](https://github.com/dart-lang/webdev/pull/2329)
+- Loosen `package:vm_service` constraints to allow `>=13.0.0 <15.0.0`. - [#2329](https://github.com/dart-lang/webdev/pull/2329)
 
 ## 23.1.0
 

dwds/CHANGELOG.md

@@ -74,11 +74,6 @@ class Dwds {
     required Stream<BuildResult> buildResults,
     required ConnectionProvider chromeConnection,
     required ToolConfiguration toolConfiguration,
-    // ignore: avoid-unused-parameters
-    @Deprecated(
-      'This parameter is ignored and will be removed in a future version.',
-    )
-    bool injectDebuggingSupportCode = true,
     bool useDwdsWebSocketConnection = false,
   }) async {
     globalToolConfiguration = toolConfiguration;
@@ -119,15 +114,20 @@ class Dwds {
       }
     }
 
+    // TODO(bkonyi): only allow for serving DevTools via DDS.
+    // ignore: deprecated_member_use_from_same_package
     final devToolsLauncher = debugSettings.devToolsLauncher;
-    if (devToolsLauncher != null) {
+    Uri? launchedDevToolsUri;
+    if (devToolsLauncher != null &&
+        // If DDS is configured to serve DevTools, use its instance.
+        !debugSettings.ddsConfiguration.serveDevTools) {
       devTools = await devToolsLauncher(appMetadata.hostname);
-      final uri = Uri(
+      launchedDevToolsUri = Uri(
         scheme: 'http',
         host: devTools.hostname,
         port: devTools.port,
       );
-      _logger.info('Serving DevTools at $uri\n');
+      _logger.info('Serving DevTools at $launchedDevToolsUri\n');
     }
 
     final injected = DwdsInjector(extensionUri: extensionUri);
@@ -144,8 +144,18 @@ class Dwds {
       debugSettings.useSseForInjectedClient,
       debugSettings.expressionCompiler,
       injected,
-      debugSettings.spawnDds,
-      debugSettings.ddsPort,
+      DartDevelopmentServiceConfiguration(
+        // This technically isn't correct, but DartDevelopmentServiceConfiguration.enable
+        // is true by default, so this won't break unmigrated tools.
+        // ignore: deprecated_member_use_from_same_package
+        enable: debugSettings.spawnDds && debugSettings.ddsConfiguration.enable,
+        // ignore: deprecated_member_use_from_same_package
+        port: debugSettings.ddsPort ?? debugSettings.ddsConfiguration.port,
+        devToolsServerAddress:
+            launchedDevToolsUri ??
+            debugSettings.ddsConfiguration.devToolsServerAddress,
+        serveDevTools: debugSettings.ddsConfiguration.serveDevTools,
+      ),
       debugSettings.launchDevToolsInNewWindow,
       useWebSocketConnection: useDwdsWebSocketConnection,
     );