Merge remote-tracking branch 'upstream/master' into network_screen_of…

…fline_support # Conflicts: # packages/devtools_app/lib/src/screens/network/network_screen.dart # packages/devtools_app/test/screens/network/offline_data_test.dart # packages/devtools_app/test/screens/network/sample_network_offline_data.json
flutter · Dec 27, 2024 · a97135a · a97135a
2 parents ab8c519 + 2ffc52c
commit a97135a
Show file tree

Hide file tree

Showing 574 changed files with 4,990 additions and 3,542 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -65,7 +65,7 @@ jobs:
           wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg
           echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list
           sudo apt-get update
-          sudo apt-get install dcm=1.22.0-1 # To avoid errors add `-1` (build number) to the version
+          sudo apt-get install dcm=1.24.2-1 # To avoid errors add `-1` (build number) to the version
           sudo chmod +x /usr/bin/dcm
           echo "$(dcm --version)"
       - name: Setup Dart SDK
@@ -173,7 +173,7 @@ jobs:
         run: ./tool/ci/bots.sh
 
       - name: Upload Golden Failure Artifacts
-        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: golden_image_failures.${{ matrix.bot }}
@@ -244,7 +244,7 @@ jobs:
         run: ./tool/ci/bots.sh
 
       - name: Upload Golden Failure Artifacts
-        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: golden_image_failures.${{ matrix.bot }}
@@ -277,7 +277,7 @@ jobs:
   benchmark-performance:
     name: benchmark-performance
     needs: flutter-prep
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     strategy:
       fail-fast: false
     steps:

diff --git a/.github/workflows/daily-dev-bump.yaml b/.github/workflows/daily-dev-bump.yaml
@@ -41,7 +41,6 @@ jobs:
         with:
           ref: master
 
-      - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672
       - name: Load Cached Flutter SDK
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
@@ -59,6 +58,10 @@ jobs:
         id: version-bump
         run: |
           set -ex
+
+          # Ensure we are using the Dart executable from the Flutter SDK
+          export PATH=`pwd`/tool/flutter-sdk/bin/cache/dart-sdk/bin:`pwd`/tool/flutter-sdk/bin:`pwd`/bin:$PATH
+
           pushd tool/
           dart pub get
           popd

diff --git a/packages/.vscode/extensions.json → .vscode/extensions.json b/packages/.vscode/extensions.json → .vscode/extensions.json
diff --git a/packages/.vscode/launch.json → .vscode/launch.json b/packages/.vscode/launch.json → .vscode/launch.json
@@ -6,21 +6,21 @@
     "configurations": [
         {
             "name": "opened test or devtools",
-            "cwd": "devtools_app",
+            "cwd": "packages/devtools_app",
             "request": "launch",
             "type": "dart",
         },
         {
             "name": "devtools",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_app/lib/main.dart",
+            "program": "packages/devtools_app/lib/main.dart",
         },
         {
             "name": "devtools + experiments",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_app/lib/main.dart",
+            "program": "packages/devtools_app/lib/main.dart",
             "args": [
                 "--dart-define",
                 "memory_disconnect_experience=true",
@@ -32,21 +32,21 @@
             "name": "devtools + profile",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_app/lib/main.dart",
+            "program": "packages/devtools_app/lib/main.dart",
             "flutterMode": "profile",
         },
         {
             "name": "devtools + release",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_app/lib/main.dart",
+            "program": "packages/devtools_app/lib/main.dart",
             "flutterMode": "release",
         },
         {
             "name": "devtools + profile + experiments",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_app/lib/main.dart",
+            "program": "packages/devtools_app/lib/main.dart",
             "flutterMode": "profile",
             "args": [
                 "--dart-define=enable_experiments=true"
@@ -56,57 +56,74 @@
             "name": "devtools + release",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_app/lib/main.dart",
+            "program": "packages/devtools_app/lib/main.dart",
             "flutterMode": "release",
         },
         {
             "name": "memory/default",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_app/test/test_infra/scenes/memory/default.stager_app.g.dart",
+            "program": "packages/devtools_app/test/test_infra/scenes/memory/default.stager_app.g.dart",
         },
         {
             "name": "memory/diff_snapshot",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_app/test/test_infra/scenes/memory/diff_snapshot.stager_app.g.dart",
+            "program": "packages/devtools_app/test/test_infra/scenes/memory/diff_snapshot.stager_app.g.dart",
         },
         {
             "name": "performance/default",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_app/test/test_infra/scenes/performance/default.stager_app.g.dart",
+            "program": "packages/devtools_app/test/test_infra/scenes/performance/default.stager_app.g.dart",
         },
         {
             "name": "profiler/default",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_app/test/test_infra/scenes/cpu_profiler/default.stager_app.g.dart",
+            "program": "packages/devtools_app/test/test_infra/scenes/cpu_profiler/default.stager_app.g.dart",
         },
         {
             "name": "fixtures/flutter_app",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_app/test/test_infra/fixtures/flutter_app/lib/main.dart",
+            "program": "packages/devtools_app/test/test_infra/fixtures/flutter_app/lib/main.dart",
         },
         {
             "name": "fixtures/memory_app",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_app/test/test_infra/fixtures/memory_app/lib/main.dart",
+            "program": "packages/devtools_app/test/test_infra/fixtures/memory_app/lib/main.dart",
         },
         {
             "name": "standalone_ui/editor_sidebar",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_app/test/test_infra/scenes/standalone_ui/editor_sidebar.stager_app.g.dart",
+            "program": "packages/devtools_app/test/test_infra/scenes/standalone_ui/editor_sidebar.stager_app.g.dart",
+            "preLaunchTask": "Start DTD on Port 8500",
+        },
+        {
+            "name": "standalone_ui/editor_sidebar + experiments",
+            "request": "launch",
+            "type": "dart",
+            "program": "packages/devtools_app/test/test_infra/scenes/standalone_ui/editor_sidebar.stager_app.g.dart",
+            "preLaunchTask": "Start DTD on Port 8500",
+            "args": [
+                "--dart-define=enable_experiments=true"
+            ],
+        },
+        {
+            "name": "standalone_ui/property_editor_sidebar",
+            "request": "launch",
+            "type": "dart",
+            "program": "packages/devtools_app/test/test_infra/scenes/standalone_ui/property_editor_sidebar.stager_app.g.dart",
             "preLaunchTask": "Start DTD on Port 8500",
         },
         {
             "name": "devtools_extensions: foo + sim",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/main.dart",
+            "program": "packages/devtools_extensions/example/packages_with_extensions/foo/packages/foo_devtools_extension/lib/main.dart",
             "args": [
                 "--dart-define=use_simulated_environment=true"
             ],
@@ -115,7 +132,7 @@
             "name": "devtools_extensions: dart_foo + sim",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_extensions/example/packages_with_extensions/dart_foo/packages/dart_foo_devtools_extension/lib/main.dart",
+            "program": "packages/devtools_extensions/example/packages_with_extensions/dart_foo/packages/dart_foo_devtools_extension/lib/main.dart",
             "args": [
                 "--dart-define=use_simulated_environment=true"
             ],
@@ -124,13 +141,13 @@
             "name": "devtools_extensions: app_that_uses_foo",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_extensions/example/app_that_uses_foo/lib/main.dart",
+            "program": "packages/devtools_extensions/example/app_that_uses_foo/lib/main.dart",
         },
         {
             "name": "devtools_extensions: app_that_uses_foo - bin",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_extensions/example/app_that_uses_foo/bin/script.dart",
+            "program": "packages/devtools_extensions/example/app_that_uses_foo/bin/script.dart",
         },
         {
             "name": "attach",
@@ -141,7 +158,7 @@
             "name": "foo_devtools_extension example + simulated environment",
             "request": "launch",
             "type": "dart",
-            "program": "devtools_extensions/example/foo/packages/foo_devtools_extension/lib/main.dart",
+            "program": "packages/devtools_extensions/example/foo/packages/foo_devtools_extension/lib/main.dart",
             "args": [
                 "--dart-define=use_simulated_environment=true"
             ],

diff --git a/packages/.vscode/settings.json → .vscode/settings.json b/packages/.vscode/settings.json → .vscode/settings.json
@@ -1,5 +1,5 @@
 {
     // Set current working directory to devtools_app.
-    "terminal.integrated.cwd": "devtools_app",
+    "terminal.integrated.cwd": "packages/devtools_app",
     "dart.showTodos": false,
 }
diff --git a/packages/.vscode/tasks.json → .vscode/tasks.json b/packages/.vscode/tasks.json → .vscode/tasks.json
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -169,10 +169,20 @@ dependency_overrides:
     path: relative/path/to/devtools/packages/devtools_shared
 ```
 
-Then you can run DevTools with the server by running the following from the top-level `devtools` directory:
-```
-dt serve
-```
+Then you can run DevTools with the server by running the following from anywhere under the `devtools/` directory:
+1. To run DevTools in release mode, served with the DevTools server (this emulates the production environment):
+	```
+	dt serve
+	```
+2. To run DevTools in debug mode with full debugging support and a connection to a live DevTools server:
+	```sh
+	dt run
+	```
+
+Option 2 is useful for a quicker development cycle. The DevTools build time will be faster, and you will be
+able to connect the DevTools web app to an IDE or DevTools for debugging purposes.
+
+To see the full list of arguments available for either command, please pass the `-h` flag.
 
 ### DevTools + VS Code integration (IDE-embedded DevTools experience)
 
@@ -191,7 +201,10 @@ command palette (`F1`)) and add the following to your settings:
 		"LOCAL_DART_SDK": "/path/to/sdk"
 		// Path to the version that Flutter DevTools is pinned to.
 		"FLUTTER_ROOT": "/path/to/devtools/tool/flutter-sdk"
-	}
+	},
+	"args": [
+		// Arguments that will be passed along to the `dt serve` command.
+    ],
 },
 ```
 

diff --git a/TRIAGE.md b/TRIAGE.md
@@ -2,29 +2,41 @@
 
 ## The Process
 
-DevTools issues are triaged as time allows throughout the week, and during a dedicated triage meeting that occurs weekly.
-During the triage meeting, new and existing issues are categorized, prioritized, and / or commented on to provide updates
-or gather clarification.
+DevTools issues are triaged weekly as time allows or at a dedicated time set aside by the triager.
+The triager is assigned by an automatic rotation of DevTools team members. 
 
-The DevTools discord [channel](https://discord.com/channels/608014603317936148/958862085297672282) is also scrubbed for
-any recent user questions / concerns that require a response.
+## Quick links
+- [Untriaged issues](https://github.com/flutter/devtools/issues?q=is%3Aopen+is%3Aissue+-label%3AP0%2CP1%2CP2%2CP3)
+- [Reproduce to verify issues](https://github.com/flutter/devtools/labels/reproduce%20to%20verify)
+(issues that need to be manually reproduced in order to verify validity)
+- [flutter/flutter issues related to DevTools](https://github.com/flutter/flutter/labels/d%3A%20devtools)
 
-## DevTools Issues
+## Triager responsibilities
 
-Queue: https://github.com/flutter/devtools/issues?q=is%3Aopen+is%3Aissue+-label%3AP0%2CP1%2CP2%2CP3
+The triager should spend about ~1 hour per week on maintaining the health of the DevTools repository.
 
-For each issue, perform all of these tasks that apply:
+1. Triage any [new flutter/devtools issues](https://github.com/flutter/devtools/issues?q=is%3Aopen+is%3Aissue+-label%3AP0%2CP1%2CP2%2CP3)
+by applying [proper labels](#label-the-issue) and [assigning priority](#prioritize-the-issue).
+2. Triage any new [flutter/flutter issues related to DevTools](https://github.com/flutter/flutter/labels/d%3A%20devtools).
+Transfer any issues to the `flutter/devtools` repo that should be tracked on our own issue tracker, and close issues you
+find that are obsolete.
+3. Try to reproduce any issues with the [reproduce to verify](https://github.com/flutter/devtools/labels/reproduce%20to%20verify) label.
+4. Spend at least 20 minutes [cleaning up the issue backlog](#clean-up-the-issue-backlog).
+5. Look through the DevTools discord [channel](https://discord.com/channels/608014603317936148/958862085297672282) for any recent user
+questions or concerns that require a response.
 
-### Label/project the issue:
-* Add labels for its proper category or categories ( “Inspector page”, “debugger page”, “bug”, etc.)
+### Label the issue
+
+* Add labels for its proper category or categories ( “screen: inspector", “screen: network", “bug”, etc.)
+* Add cost labels ("cost: low", "cost: medium", etc.) if you have a good idea of how much work it will
+take to resolve this issue. Leave the cost label off if you do not know.
 * Add label “waiting for customer response” if you requested more details from reporter
 * Add label “fix it friday” if the issue should be fixed and looks easy to fix
 * Add label "good first issue" if the issue looks like an easy starter bug for a new contributor
 
-### Prioritize the issue. 
+### Prioritize the issue
 
 Follow the prioritization rubric [here](https://github.com/flutter/flutter/blob/master/docs/contributing/issue_hygiene/README.md#priorities).
-
 If the issue requires specific expertise, tag a product area owner (see below) in a comment and ask them to take a look. 
 If the issue is actively being worked on or if it needs immediate / almost-immediate attention (P0, P1), assign the issue
 to a product area owner.
@@ -45,9 +57,14 @@ Here are some suggested owners by product area:
 For anything else that requires immediate attention but does not fit into one of
 the above areas, please tag @kenzieschmoll or @elliette.
 
-## Related Flutter Issues
+**Ping the [hackers-devtools](https://discord.com/channels/608014603317936148/1106667330093723668) discord channel
+about issues marked “severe: …” or “P0”.**
 
-flutter/flutter issues relating to DevTools:
-https://github.com/flutter/flutter/issues?q=is%3Aopen+label%3A%22d%3A+devtools%22+++no%3Amilestone+ 
+### Clean up the issue backlog
 
-Ping the [hackers-devtools](https://discord.com/channels/608014603317936148/1106667330093723668) discord channel about issues marked “severe: …” or “P0”. 
+This step is to ensure the health of the [DevTools issue backlog](https://github.com/flutter/devtools/issues) over time.
+There are a couple of things to do as part of the backlog clean up work:
+- Close any obsolete issues. Recommendation: start with the oldest issues first since these are the most likely to be stale.
+- Add good candidates for product excellence / quality work to the 
+[DevTools Product Excellence project](https://github.com/orgs/flutter/projects/157). This project feeds monthly milestone
+planning for ongoing P.E. work.
diff --git a/packages/analysis_options.yaml → analysis_options.yaml b/packages/analysis_options.yaml → analysis_options.yaml
@@ -12,9 +12,9 @@ analyzer:
     # treat missing required parameters as a warning (not a hint)
     missing_required_param: warning
   exclude:
-    - build/**
+    - '**/build/**'
     - '**.freezed.dart'
-    - flutter-sdk/
+    - tool/flutter-sdk/
 
 linter:
   rules:
@@ -85,7 +85,6 @@ linter:
     # - one_member_abstracts # too many false positives
     # - only_throw_errors # https://github.com/flutter/flutter/issues/5792
     - overridden_fields
-    - package_api_docs
     - package_names
     - package_prefixed_library_names
     # - parameter_assignments # we do this commonly

diff --git a/case_study/code_size/optimized/code_size_images/lib/animals.dart b/case_study/code_size/optimized/code_size_images/lib/animals.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 
 class Animals extends StatelessWidget {
+  const Animals({super.key});
+
   @override
   Widget build(BuildContext context) {
     return ListView(