From 03dbff74eeaa998a65cba783a3b242ea9cf06508 Mon Sep 17 00:00:00 2001
From: Jackson Gardner <jacksongardner@google.com>
Date: Thu, 10 Nov 2022 16:07:54 -0800
Subject: [PATCH 1/2] Run pub get before building host.dart.

---
 lib/web_ui/dev/steps/compile_tests_step.dart | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/web_ui/dev/steps/compile_tests_step.dart b/lib/web_ui/dev/steps/compile_tests_step.dart
index cfef289f20792..b1d221af092c9 100644
--- a/lib/web_ui/dev/steps/compile_tests_step.dart
+++ b/lib/web_ui/dev/steps/compile_tests_step.dart
@@ -441,7 +441,23 @@ Future<void> buildHostPage() async {
     print('Building ${hostDartFile.path}.');
   }
 
-  final int exitCode = await runProcess(
+  int exitCode = await runProcess(
+    environment.dartExecutable,
+    <String>[
+      'pub',
+      'get',
+    ],
+    workingDirectory: environment.webEngineTesterRootDir.path
+  );
+
+  if (exitCode != 0) {
+    throw ToolExit(
+      'Failed to run pub get for web_engine_tester, exit code $exitCode',
+      exitCode: exitCode,
+    );
+  }
+
+  exitCode = await runProcess(
     environment.dartExecutable,
     <String>[
       'compile',

From 0aa3e31beb97f8e63ec21d04905cbe115c20ace2 Mon Sep 17 00:00:00 2001
From: Jackson Gardner <jacksongardner@google.com>
Date: Fri, 11 Nov 2022 10:07:14 -0800
Subject: [PATCH 2/2] We should call `pub get` for `web_ui` in the launcher
 script because felt itself needs it. However, we should let felt invoke `pub
 get` on `web_engine_tester` only as needed, not in the launcher script.

---
 lib/web_ui/dev/felt     | 4 +---
 lib/web_ui/dev/felt.bat | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/web_ui/dev/felt b/lib/web_ui/dev/felt
index 98ab19d647b38..f09214ee5ca71 100755
--- a/lib/web_ui/dev/felt
+++ b/lib/web_ui/dev/felt
@@ -87,11 +87,9 @@ then
 fi
 
 install_deps() {
+  # We need to run pub get here before we actually invoke felt.
   echo "Running \`dart pub get\` in 'engine/src/flutter/lib/web_ui'"
   (cd "$WEB_UI_DIR"; $DART_PATH pub get)
-
-  echo "Running \`dart pub get\` in 'engine/src/flutter/web_sdk/web_engine_tester'"
-  (cd "$FLUTTER_DIR/web_sdk/web_engine_tester"; $DART_PATH pub get)
 }
 
 if [[ $KERNEL_NAME == *"Darwin"* ]]
diff --git a/lib/web_ui/dev/felt.bat b/lib/web_ui/dev/felt.bat
index bfa2102e2dcd7..7ebfbb36c4807 100644
--- a/lib/web_ui/dev/felt.bat
+++ b/lib/web_ui/dev/felt.bat
@@ -37,13 +37,15 @@ SET DART_BIN=%DART_SDK_DIR%\bin\dart
 
 cd %WEB_UI_DIR%
 
+:: We need to invoke pub get here before we actually invoke felt.
+CALL %DART_BIN% pub get
+
 IF FELT_USE_SNAPSHOT=="0" (
   ECHO Invoking felt.dart without snapshot
   SET FELT_TARGET=%FELT_PATH%
 ) ELSE (
   IF NOT EXIST "%SNAPSHOT_PATH%" (
     ECHO Precompiling felt snapshot
-    CALL %DART_BIN% pub get
     %DART_BIN% --snapshot="%SNAPSHOT_PATH%" --packages="%WEB_UI_DIR%\.dart_tool\package_config.json" %FELT_PATH%
   )
   SET FELT_TARGET=%SNAPSHOT_PATH%