From 3eaa79fc9f0bf94dd5c7926e8d1f785b8e20123f Mon Sep 17 00:00:00 2001
From: Istvan Soos <istvan.soos@gmail.com>
Date: Wed, 31 Mar 2021 09:33:44 +0200
Subject: [PATCH] Migrate from 'pub' to 'dart pub'.

---
 app/lib/dartdoc/dartdoc_runner.dart              |  2 +-
 app/lib/frontend/static_files.dart               |  2 +-
 pkg/code_coverage/build.sh                       |  4 ++--
 pkg/code_coverage/lib/test_runner.dart           |  6 ++++--
 pkg/pub_dartdoc/test/self_documenting_test.dart  |  3 ++-
 pkg/pub_integration/lib/src/pub_tool_client.dart | 14 +++++++-------
 pkg/web_css/build.sh                             |  2 +-
 7 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/lib/dartdoc/dartdoc_runner.dart b/app/lib/dartdoc/dartdoc_runner.dart
index 800b4dfba0..a20e1cf4d5 100644
--- a/app/lib/dartdoc/dartdoc_runner.dart
+++ b/app/lib/dartdoc/dartdoc_runner.dart
@@ -88,7 +88,7 @@ class _DartdocRunner implements DartdocRunner {
   Future<void> _initializeIfNeeded() async {
     if (_initialized) return;
     await runProc(
-      ['pub', 'get'],
+      ['dart', 'pub', 'get'],
       workingDirectory: resolvePubDartdocDirPath(),
     );
     _initialized = true;
diff --git a/app/lib/frontend/static_files.dart b/app/lib/frontend/static_files.dart
index f10a3780d4..0d9520bd22 100644
--- a/app/lib/frontend/static_files.dart
+++ b/app/lib/frontend/static_files.dart
@@ -255,7 +255,7 @@ Future<DateTime> _detectLastModified(Directory dir) async {
 
 Future _runPubGet(Directory dir) async {
   final pr = await runProc(
-    ['pub', 'get'],
+    ['dart', 'pub', 'get'],
     workingDirectory: dir.path,
     timeout: Duration(minutes: 2),
   );
diff --git a/pkg/code_coverage/build.sh b/pkg/code_coverage/build.sh
index b78d58eee0..36e0cddc64 100755
--- a/pkg/code_coverage/build.sh
+++ b/pkg/code_coverage/build.sh
@@ -38,7 +38,7 @@ APP_TEST_PID=$!
 sleep 15;
 
 cd "${CODE_COVERAGE_DIR}"
-pub run coverage:collect_coverage \
+dart pub run coverage:collect_coverage \
   --uri=http://localhost:20202 \
   -o "${OUTPUT_DIR}/raw/app_unit.json" \
   --wait-paused \
@@ -57,7 +57,7 @@ rm ${APP_ALL_TEST_PATH}
 
 echo "Exporting to LCOV"
 cd "${APP_DIR}"
-pub run coverage:format_coverage \
+dart pub run coverage:format_coverage \
   --packages "${APP_DIR}/.packages" \
   -i "${OUTPUT_DIR}/raw/app_unit.json" \
   --base-directory "${PROJECT_DIR}" \
diff --git a/pkg/code_coverage/lib/test_runner.dart b/pkg/code_coverage/lib/test_runner.dart
index 54e63e0bd2..f302626d0a 100644
--- a/pkg/code_coverage/lib/test_runner.dart
+++ b/pkg/code_coverage/lib/test_runner.dart
@@ -94,8 +94,9 @@ Future<Process> _startCollect(int port, String outputFile) async {
   await File(outputFile).parent.create(recursive: true);
   print('[collect-$port-$outputFile] starting...');
   final p = await Process.start(
-    'pub',
+    'dart',
     [
+      'pub',
       'run',
       'coverage:collect_coverage',
       '--uri=http://localhost:$port',
@@ -116,8 +117,9 @@ Future<void> _convertToLcov(
   if (await out.exists()) return;
   await out.parent.create(recursive: true);
   await Process.run(
-    'pub',
+    'dart',
     [
+      'pub',
       'run',
       'coverage:format_coverage',
       '--packages',
diff --git a/pkg/pub_dartdoc/test/self_documenting_test.dart b/pkg/pub_dartdoc/test/self_documenting_test.dart
index 536656302a..9a32d046fa 100644
--- a/pkg/pub_dartdoc/test/self_documenting_test.dart
+++ b/pkg/pub_dartdoc/test/self_documenting_test.dart
@@ -16,7 +16,8 @@ void main() {
   group('generate documentation on self', () {
     setUpAll(() async {
       tempDir = await Directory.systemTemp.createTemp();
-      final pr = await Process.run('pub', [
+      final pr = await Process.run('dart', [
+        'pub',
         'run',
         'pub_dartdoc',
         '--input',
diff --git a/pkg/pub_integration/lib/src/pub_tool_client.dart b/pkg/pub_integration/lib/src/pub_tool_client.dart
index a0d5371063..294159f707 100644
--- a/pkg/pub_integration/lib/src/pub_tool_client.dart
+++ b/pkg/pub_integration/lib/src/pub_tool_client.dart
@@ -70,13 +70,13 @@ class PubToolClient {
   }
 
   Future<ProcessResult> getDependencies(String pkgDir) async {
-    return await runProc('pub', ['get'], workingDirectory: pkgDir);
+    return await runProc('dart', ['pub', 'get'], workingDirectory: pkgDir);
   }
 
   Future<ProcessResult> publish(String pkgDir, {String? expectedError}) async {
     return await runProc(
-      'pub',
-      ['publish', '--force'],
+      'dart',
+      ['pub', 'publish', '--force'],
       workingDirectory: pkgDir,
       expectedError: expectedError,
     );
@@ -84,8 +84,8 @@ class PubToolClient {
 
   Future<ProcessResult> addUploader(String pkgDir, String email) async {
     return await runProc(
-      'pub',
-      ['uploader', 'add', email],
+      'dart',
+      ['pub', 'uploader', 'add', email],
       workingDirectory: pkgDir,
       expectedError: "We've sent an invitation email to $email.\n"
           "They'll be added as an uploader after they accept the invitation.",
@@ -94,8 +94,8 @@ class PubToolClient {
 
   Future<ProcessResult> removeUploader(String pkgDir, String email) async {
     return await runProc(
-      'pub',
-      ['uploader', 'remove', email],
+      'dart',
+      ['pub', 'uploader', 'remove', email],
       workingDirectory: pkgDir,
     );
   }
diff --git a/pkg/web_css/build.sh b/pkg/web_css/build.sh
index 828ede8349..7095af8a19 100755
--- a/pkg/web_css/build.sh
+++ b/pkg/web_css/build.sh
@@ -14,7 +14,7 @@ mkdir -p ${OUTPUT_DIR}
 # Change to web_css folder
 cd "${WEB_CSS_DIR}";
 
-pub run sass \
+dart pub run sass \
   --style=compressed \
   "${WEB_CSS_DIR}/lib/style.scss" \
   "${OUTPUT_DIR}/style.css"