Merge branch 'master' into 2.54.1-hotfix

Author: elliette

packages/devtools_app/lib/devtools.dart

@@ -10,4 +10,4 @@
 /// Note: a regexp in the `dt update-version' command logic matches the constant
 /// declaration `const version =`. If you change the declaration you must also
 /// modify the regex in the `dt update-version' command logic.
-const version = '2.54.1';
+const version = '2.55.0-dev.0';

packages/devtools_app/pubspec.yaml

@@ -7,7 +7,7 @@ publish_to: none
 
 # Note: this version should only be updated by running the 'dt update-version'
 # command that updates the version here and in 'devtools.dart'.
-version: 2.54.1
+version: 2.55.0-dev.0
 
 repository: https://github.com/flutter/devtools/tree/master/packages/devtools_app
 

packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md

@@ -3,26 +3,23 @@ Copyright 2025 The Flutter Authors
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 -->
-This is draft for future release notes, that are going to land on
+This is a draft for future release notes that are going to land on
 [the Flutter website](https://docs.flutter.dev/tools/devtools/release-notes).
 
-# DevTools 2.54.0 release notes
+# DevTools 2.55.0 release notes
 
-The 2.54.0 release of the Dart and Flutter DevTools
+The 2.55.0 release of the Dart and Flutter DevTools
 includes the following changes among other general improvements.
 To learn more about DevTools, check out the
-[DevTools overview](/tools/devtools/overview).
+[DevTools overview](/tools/devtools).
 
 ## General updates
 
-- Dropped connections to DTD will now automatically be retried to improve the
-  experience when your machine is resumed from sleep.
-  [#9587](https://github.com/flutter/devtools/pull/9587)
+TODO: Remove this section if there are not any updates.
 
 ## Inspector updates
 
-- Added a warning banner that the legacy inspector will be removed in a future
-  release. - [#9572](https://github.com/flutter/devtools/pull/9572)
+TODO: Remove this section if there are not any updates.
 
 ## Performance updates
 
@@ -34,8 +31,7 @@ TODO: Remove this section if there are not any updates.
 
 ## Memory updates
 
-- Fixed error preventing users from changing the zoom duration. -
-  [#9573](https://github.com/flutter/devtools/pull/9573)
+TODO: Remove this section if there are not any updates.
 
 ## Debugger updates
 
@@ -55,17 +51,13 @@ TODO: Remove this section if there are not any updates.
 
 ## Deep links tool updates
 
-- Added more informative dialog if Deep Links tool is unable to find build
-  options for the iOS or Android app. -
-  [#9571](https://github.com/flutter/devtools/pull/9571)
-- Fixed null error when parsing universal link settings -
-  [#9581](https://github.com/flutter/devtools/pull/9581)
+TODO: Remove this section if there are not any updates.
 
-## VS Code Sidebar updates
+## VS Code sidebar updates
 
 TODO: Remove this section if there are not any updates.
 
-## DevTools Extension updates
+## DevTools extension updates
 
 TODO: Remove this section if there are not any updates.
 
@@ -76,4 +68,4 @@ TODO: Remove this section if there are not any updates.
 ## Full commit history
 
 To find a complete list of changes in this release, check out the
-[DevTools git log](https://github.com/flutter/devtools/tree/v2.54.0).
+[DevTools git log](https://github.com/flutter/devtools/tree/v2.55.0).

packages/devtools_app/release_notes/README.md

@@ -8,20 +8,21 @@ found in the LICENSE file or at https://developers.google.com/open-source/licens
 When you add a user-facing change to DevTools,
 please add a release note entry to document this improvement.
 
-This entry should be phrased in the past tense (e.g. "Added XYZ" instead of "Add XYZ").
+This entry should be phrased in the past tense.
+For example, "Added XYZ" instead of "Add XYZ".
 
 ### Release note entry
 
 Use this format for the entry:
 
 ```markdown
 * Created the best feature ever. -
-[#10000000001](https://github.com/flutter/devtools/pull/10000000001),
-[#10000000002](https://github.com/flutter/devtools/pull/10000000002),
-[#10000000003](https://github.com/flutter/devtools/pull/10000000003)
+  [#10000000001](https://github.com/flutter/devtools/pull/10000000001),
+  [#10000000002](https://github.com/flutter/devtools/pull/10000000002),
+  [#10000000003](https://github.com/flutter/devtools/pull/10000000003)
 ```
 
-Find other examples in [previous notes](https://github.com/flutter/website/tree/main/src/tools/devtools/release-notes).
+Find other examples in [previous notes](https://github.com/flutter/website/tree/main/src/content/tools/devtools/release-notes).
 
 ### Adding images to a release note entry
 
@@ -37,10 +38,12 @@ Consider adding an image to the release note entry:
     ```
 
 #### Image style
-Please use DevTools in **dark mode** when taking screenshots for release
-notes. We use a dark theme since this is the default theme for DevTools.
+
+Please use DevTools in **dark mode** when taking screenshots for release notes.
+We use a dark theme since this is the default theme for DevTools.
 
 #### Image size
+
 When adding images, be cognizant that the images will be rendered in a
 relatively small window in DevTools, and they should be sized accordingly.
 A wide aspect ratio is preferred so that the space of the release notes
@@ -58,7 +61,9 @@ Before continuing, ensure you have your local environment set up for
 
 ### Creating the release notes PR
 
-Draft release notes on a local `flutter/website` branch using the following command:
+Draft release notes on a local `flutter/website` branch by running
+the following command with the path to your local `flutter/website` repo:
+
 ```console
 dt release-notes -w /Users/me/absolute/path/to/flutter/website
 ```

packages/devtools_app/release_notes/helpers/release_notes_template.md

@@ -3,15 +3,15 @@ Copyright 2025 The Flutter Authors
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file or at https://developers.google.com/open-source/licenses/bsd.
 -->
-This is draft for future release notes, that are going to land on
+This is a draft for future release notes that are going to land on
 [the Flutter website](https://docs.flutter.dev/tools/devtools/release-notes).
 
 # DevTools <number> release notes
 
 The <number> release of the Dart and Flutter DevTools
 includes the following changes among other general improvements.
 To learn more about DevTools, check out the
-[DevTools overview](/tools/devtools/overview).
+[DevTools overview](/tools/devtools).
 
 ## General updates
 
@@ -53,11 +53,11 @@ TODO: Remove this section if there are not any updates.
 
 TODO: Remove this section if there are not any updates.
 
-## VS Code Sidebar updates
+## VS Code sidebar updates
 
 TODO: Remove this section if there are not any updates.
 
-## DevTools Extension updates
+## DevTools extension updates
 
 TODO: Remove this section if there are not any updates.
 

tool/lib/commands/release_notes_helper.dart

@@ -68,7 +68,6 @@ class ReleaseNotesCommand extends Command {
             CliCommand.git(['stash']),
             CliCommand.git(['checkout', 'main']),
             CliCommand.git(['pull']),
-            CliCommand.git(['submodule', 'update', '--init', '--recursive']),
             CliCommand.git([
               'checkout',
               '-b',
@@ -114,7 +113,7 @@ class ReleaseNotesCommand extends Command {
       ),
     )..createSync();
 
-    final srcLines = devToolsReleaseNotes.srcLines;
+    final srcLines = devToolsReleaseNotes.sourceLines;
 
     // Copy release notes images and fix image reference paths.
     if (devToolsReleaseNotes.imageLineIndices.isNotEmpty) {
@@ -142,19 +141,19 @@ class ReleaseNotesCommand extends Command {
       }
     }
 
-    final metadataHeader = '''---
+    releaseNotesMd.writeAsStringSync('''---
 title: DevTools $releaseNotesVersion release notes
 shortTitle: $releaseNotesVersion release notes
 breadcrumb: $releaseNotesVersion
 showToc: false
 ---
 
-''';
+''');
 
-    // Write the 'release-notes-<x.y.z>.md' file, including any updates for
-    // image paths.
+    // Write the contents of the 'release-notes-<x.y.z>.md' file,
+    // including any updates for image paths.
     releaseNotesMd.writeAsStringSync(
-      metadataHeader + srcLines.joinWithNewLine(),
+      srcLines.joinWithNewLine().trimLeft(),
       flush: true,
     );
 
@@ -178,7 +177,7 @@ class _DevToolsReleaseNotes {
   _DevToolsReleaseNotes._({
     required this.file,
     required this.version,
-    required this.srcLines,
+    required this.sourceLines,
     required this.imageLineIndices,
   });
 
@@ -192,8 +191,8 @@ class _DevToolsReleaseNotes {
 
     final rawLines = file.readAsLinesSync();
 
-    late String version;
-    late int titleLineIndex;
+    String? version;
+    int? sourceStartIndex;
     final versionRegExp = RegExp(r"\d+\.\d+\.\d+");
     for (int i = 0; i < rawLines.length; i++) {
       final line = rawLines[i];
@@ -202,17 +201,34 @@ class _DevToolsReleaseNotes {
       // This match should be from the line "# DevTools <x.y.z> release notes".
       version = matches.first.group(0)!;
       // This is the markdown title where the release notes src begins.
-      titleLineIndex = i;
+      sourceStartIndex = i + 1;
       break;
     }
 
+    if (version == null || sourceStartIndex == null) {
+      throw Exception(
+        'Could not find the title line ("# DevTools x.y.z release notes") '
+        'in the NEXT_RELEASE_NOTES.md file.',
+      );
+    }
+
+    if (sourceStartIndex >= rawLines.length) {
+      throw Exception(
+        'No content found after the title line ("# DevTools x.y.z release notes") '
+        'in the NEXT_RELEASE_NOTES.md file.',
+      );
+    }
+
+    // Don't include the copyright, draft notice, or h1 header in
+    // the output release notes.
+    final sourceLines = rawLines.sublist(sourceStartIndex);
+
     // TODO(kenz): one nice polish task could be to remove sections that are
     // empty (i.e. sections that have the line
     // "TODO: Remove this section if there are not any updates.").
-    final srcLines = rawLines.sublist(titleLineIndex);
     final imageLineIndices = <int>{};
-    for (int i = 0; i < srcLines.length; i++) {
-      final line = srcLines[i];
+    for (int i = 0; i < sourceLines.length; i++) {
+      final line = sourceLines[i];
       if (line.contains(_imagePathMarker)) {
         imageLineIndices.add(i);
       }
@@ -221,14 +237,14 @@ class _DevToolsReleaseNotes {
     return _DevToolsReleaseNotes._(
       file: file,
       version: version,
-      srcLines: srcLines,
+      sourceLines: sourceLines,
       imageLineIndices: imageLineIndices,
     );
   }
 
   final File file;
   final String version;
-  final List<String> srcLines;
+  final List<String> sourceLines;
   final Set<int> imageLineIndices;
 
   static final _imagePathMarker = RegExp(r'images\/.*\.png');

tool/lib/commands/serve.dart

@@ -154,7 +154,8 @@ class ServeCommand extends Command {
         results[SharedCommandArgs.updatePerfetto.flagName] as bool;
     final useWasm = results[SharedCommandArgs.wasm.flagName] as bool;
     final noStripWasm = results[SharedCommandArgs.noStripWasm.flagName] as bool;
-    final noMinifyWasm = results[SharedCommandArgs.noMinifyWasm.flagName] as bool;
+    final noMinifyWasm =
+        results[SharedCommandArgs.noMinifyWasm.flagName] as bool;
     final runPubGet = results[SharedCommandArgs.pubGet.flagName] as bool;
     final devToolsAppBuildMode =
         results[SharedCommandArgs.buildMode.flagName] as String;
@@ -241,10 +242,10 @@ class ServeCommand extends Command {
       logStatus('completed building DevTools: $devToolsBuildLocation');
     }
 
-    logStatus('running pub get for DDS in the local dart sdk');
+    logStatus('running gclient sync in the local dart sdk');
     await processManager.runProcess(
-      CliCommand.dart(['pub', 'get']),
-      workingDirectory: path.join(localDartSdkLocation, 'pkg', 'dds'),
+      CliCommand.gclient(['sync']),
+      workingDirectory: localDartSdkLocation,
     );
 
     logStatus('serving DevTools with a local devtools server...');

tool/lib/utils.dart

@@ -81,6 +81,14 @@ class CliCommand {
     return CliCommand('git', args, throwOnException: throwOnException);
   }
 
+  /// CliCommand helper for running gclient commands.
+  factory CliCommand.gclient(
+    List<String> args, {
+    bool throwOnException = true,
+  }) {
+    return CliCommand('gclient', args, throwOnException: throwOnException);
+  }
+
   factory CliCommand.tool(List<String> args, {bool throwOnException = true}) {
     var toolPath = Platform.script.toFilePath();
     if (!File(toolPath).existsSync()) {