commit f370f828368cf1a63dac89c10764329a06cc1aa9
author Brett Morgan <brett.morgan@gmail.com> Sat Sep 05 11:17:39 2020 +1000
committer GitHub <noreply@github.com> Sat Sep 05 11:17:39 2020 +1000
tree e08f7b720d177be7c3271f27ac06323473d9f712
parent a0ccc318467cc4f702ebde5277f4aa71cadb7e33

Simplify flutter web startup (#595)

benchmark/bench.dart

diff --git a/benchmark/bench.dart b/benchmark/bench.dart
index f7ed1c1..ab6bd13 100644
--- a/benchmark/bench.dart
+++ b/benchmark/bench.dart
@@ -21,7 +21,7 @@
   final harness = BenchmarkHarness(asJson: json);
 
   final flutterWebManager = FlutterWebManager(SdkManager.flutterSdk);
-  await flutterWebManager.initFlutterWeb();
+  await flutterWebManager.warmup();
 
   final compiler =
       Compiler(SdkManager.sdk, SdkManager.flutterSdk, flutterWebManager);

lib/src/common_server_impl.dart

diff --git a/lib/src/common_server_impl.dart b/lib/src/common_server_impl.dart
index af2e5de..f00f91b 100644
--- a/lib/src/common_server_impl.dart
+++ b/lib/src/common_server_impl.dart
@@ -42,12 +42,9 @@
   Compiler compiler;
   AnalysisServersWrapper analysisServers;
 
+  // Restarting and health status of the two Analysis Servers
   bool get analysisServersRunning => analysisServers.running;
-
   bool get isRestarting => analysisServers.isRestarting;
-
-  // If the server has been trying and failing to restart for more than a half
-  // hour, something is seriously wrong.
   bool get isHealthy => analysisServers.isHealthy;
 
   CommonServerImpl(
@@ -62,7 +59,6 @@
     log.info('Beginning CommonServer init().');
     flutterWebManager = FlutterWebManager(SdkManager.flutterSdk);
     analysisServers = AnalysisServersWrapper(flutterWebManager);
-
     compiler =
         Compiler(SdkManager.sdk, SdkManager.flutterSdk, flutterWebManager);
 
@@ -403,15 +399,6 @@
       throw BadRequest(
           'Unsupported input: ${flutterWebManager.getUnsupportedImport(imports)}');
     }
-
-    if (flutterWebManager.usesFlutterWeb(imports)) {
-      try {
-        await flutterWebManager.initFlutterWeb();
-      } catch (e) {
-        log.warning('unable to init package:flutter: $e');
-        return;
-      }
-    }
   }
 }
 

lib/src/flutter_web.dart

diff --git a/lib/src/flutter_web.dart b/lib/src/flutter_web.dart
index 1330f82..8458400 100644
--- a/lib/src/flutter_web.dart
+++ b/lib/src/flutter_web.dart
@@ -49,27 +49,23 @@
 
   Future<void> warmup() async {
     try {
-      await initFlutterWeb();
+      if (_initedFlutterWeb) {
+        return;
+      }
+
+      _logger.info('creating flutter web pubspec');
+      final pubspec = createPubspec(true);
+      await File(path.join(_projectDirectory.path, 'pubspec.yaml'))
+          .writeAsString(pubspec);
+
+      await _runPubGet();
+
+      _initedFlutterWeb = true;
     } catch (e, s) {
       _logger.warning('Error initializing flutter web', e, s);
     }
   }
 
-  Future<void> initFlutterWeb() async {
-    if (_initedFlutterWeb) {
-      return;
-    }
-
-    _logger.info('creating flutter web pubspec');
-    final pubspec = createPubspec(true);
-    await File(path.join(_projectDirectory.path, 'pubspec.yaml'))
-        .writeAsString(pubspec);
-
-    await _runPubGet();
-
-    _initedFlutterWeb = true;
-  }
-
   String get summaryFilePath {
     return path.join('artifacts', 'flutter_web.dill');
   }

test/compiler_test.dart

diff --git a/test/compiler_test.dart b/test/compiler_test.dart
index 9375ad1..2f39158 100644
--- a/test/compiler_test.dart
+++ b/test/compiler_test.dart
@@ -22,7 +22,7 @@
       await SdkManager.flutterSdk.init();
 
       flutterWebManager = FlutterWebManager(SdkManager.flutterSdk);
-      await flutterWebManager.initFlutterWeb();
+      await flutterWebManager.warmup();
 
       compiler =
           Compiler(SdkManager.sdk, SdkManager.flutterSdk, flutterWebManager);

test/flutter_web_test.dart

diff --git a/test/flutter_web_test.dart b/test/flutter_web_test.dart
index 9349dc2..c5f3c45 100644
--- a/test/flutter_web_test.dart
+++ b/test/flutter_web_test.dart
@@ -58,7 +58,7 @@
       await SdkManager.sdk.init();
       await SdkManager.flutterSdk.init();
       flutterWebManager = FlutterWebManager(SdkManager.flutterSdk);
-      await flutterWebManager.initFlutterWeb();
+      await flutterWebManager.warmup();
     });
 
     tearDownAll(() {