From 9f49e49233574093113f845b9da0040272e6e093 Mon Sep 17 00:00:00 2001
From: Matan Lurey <matan@lurey.org>
Date: Mon, 1 Jul 2024 16:13:33 -0700
Subject: [PATCH] ++

---
 pubspec.yaml             | 25 ++++++++++---------------
 tools/pub_get_offline.py |  3 +--
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 0c4d8f50788a6..8b306fdc97bfe 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -49,7 +49,7 @@
 # (3) MIGRATING A NON-WORKSPACE PACKAGE TO USING THE WORKSPACE
 # ------------------------------------------------------------------------------
 # Many packages in this repo are still using a pre-workspace style pubspec.yaml,
-# either with manuallu declared `dependency_overrides` (much of ./tools) or by
+# either with manually declared `dependency_overrides` (much of ./tools) or by
 # using pub (./web_sdk, ./lib/web_ui). To migrate a package to the workspace:
 #
 # A. Add the `resolution: workspace` field to the pubspec.yaml.
@@ -96,30 +96,17 @@ workspace:
 #    package is not important, as it is managed by the `DEPS` file. In other
 #    words, "if the test pass, ship it".
 #
-# 3. The `path` field is used to indicate the location of the package in the
-#    local repository itself. This is to *only* be used for local packages that
-#    are part of the workspace. Third party dependencies are managed by the
-#    `DEPS` file: they get a "any" version constraint and are overridden in the
-#    `dependency_overrides` section below.
-#
 # While not enforced by tooling, try to keep this list in alphabetical order.
+# TODO(matanlurey): https://dart.dev/tools/linter-rules/sort_pub_dependencies.
 dependencies:
   args: any
   async_helper: any
-  engine_build_configs:
-    path: ./tools/pkg/engine_build_configs
-  engine_repo_tools:
-    path: ./tools/pkg/engine_repo_tools
   expect: any
   file: any
-  litetest:
-    path: ./testing/litetest
   logging: any
   meta: any
   path: any
   platform: any
-  process_fakes:
-    path: ./tools/pkg/process_fakes
   process_runner: any
   smith: any
 
@@ -152,10 +139,16 @@ dependency_overrides:
     path: ./third_party/dart/pkg/async_helper
   collection:
     path: ./third_party/dart/third_party/pkg/collection
+  engine_build_configs:
+    path: ./tools/pkg/engine_build_configs
+  engine_repo_tools:
+    path: ./tools/pkg/engine_repo_tools
   expect:
     path: ./third_party/dart/pkg/expect
   file:
     path: ./third_party/dart/third_party/pkg/file/packages/file
+  litetest:
+    path: ./testing/litetest
   logging:
     path: ./third_party/dart/third_party/pkg/logging
   meta:
@@ -166,6 +159,8 @@ dependency_overrides:
     path: ./third_party/pkg/platform
   process:
     path: ./third_party/pkg/process
+  process_fakes:
+    path: ./tools/pkg/process_fakes
   process_runner:
     path: ./third_party/pkg/process_runner
   smith:
diff --git a/tools/pub_get_offline.py b/tools/pub_get_offline.py
index b17050d8d2097..b4382c23fce00 100644
--- a/tools/pub_get_offline.py
+++ b/tools/pub_get_offline.py
@@ -18,6 +18,7 @@
 ENGINE_DIR = os.path.join(SRC_ROOT, 'flutter')
 
 ALL_PACKAGES = [
+    os.path.join(ENGINE_DIR),
     os.path.join(ENGINE_DIR, 'ci'),
     os.path.join(ENGINE_DIR, 'flutter_frontend_server'),
     os.path.join(ENGINE_DIR, 'impeller', 'tessellator', 'dart'),
@@ -87,8 +88,6 @@ def check_package(package):
 
 
 EXCLUDED_DIRS = [
-    # FIXME: Do not submit this change, it's for PR testing only.
-    os.path.join(ENGINE_DIR),
     os.path.join(ENGINE_DIR, 'lib'),
     os.path.join(ENGINE_DIR, 'prebuilts'),
     os.path.join(ENGINE_DIR, 'shell', 'platform', 'fuchsia'),