Switch flutter_tools to use frontend_server for web compilation (#50365)

dev/automated_tests/pubspec.yaml

@@ -20,7 +20,7 @@ dependencies:
   charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -73,4 +73,4 @@ flutter:
   assets:
   - icon/
 
-# PUBSPEC CHECKSUM: 43e1
+# PUBSPEC CHECKSUM: 7ae2

dev/benchmarks/complex_layout/pubspec.yaml

@@ -50,7 +50,7 @@ dev_dependencies:
   _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.14.0+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -92,4 +92,4 @@ flutter:
     - packages/flutter_gallery_assets/people/square/ali.png
     - packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png
 
-# PUBSPEC CHECKSUM: 6a4f
+# PUBSPEC CHECKSUM: a450

dev/benchmarks/macrobenchmarks/pubspec.yaml

@@ -50,7 +50,7 @@ dev_dependencies:
   _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.14.0+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -93,4 +93,4 @@ flutter:
   - packages/flutter_gallery_assets/food/cherry_pie.png
   - assets/999x1000.png
 
-# PUBSPEC CHECKSUM: 6a4f
+# PUBSPEC CHECKSUM: a450

dev/benchmarks/microbenchmarks/pubspec.yaml

@@ -24,7 +24,7 @@ dependencies:
   charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   dart_style: 1.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -78,4 +78,4 @@ dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 053c
+# PUBSPEC CHECKSUM: c23d

dev/benchmarks/test_apps/stocks/pubspec.yaml

@@ -53,7 +53,7 @@ dev_dependencies:
 
   archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http_multi_server: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   image: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -87,4 +87,4 @@ dev_dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 5272
+# PUBSPEC CHECKSUM: bc73

dev/bots/pubspec.yaml

@@ -26,7 +26,7 @@ dependencies:
   charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -69,4 +69,4 @@ dev_dependencies:
   mockito: 4.1.1
   test_api: 0.2.11
 
-# PUBSPEC CHECKSUM: 26ab
+# PUBSPEC CHECKSUM: abac

dev/devicelab/pubspec.yaml

@@ -44,7 +44,7 @@ dev_dependencies:
   _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.14.0+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -76,4 +76,4 @@ dev_dependencies:
   watcher: 0.9.7+13 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   yaml: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
-# PUBSPEC CHECKSUM: d160
+# PUBSPEC CHECKSUM: 8b61

dev/integration_tests/android_semantics_testing/pubspec.yaml

@@ -17,7 +17,7 @@ dependencies:
   charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -70,4 +70,4 @@ dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 7669
+# PUBSPEC CHECKSUM: 086a

dev/integration_tests/android_splash_screens/splash_screen_kitchen_sink/pubspec.yaml

@@ -50,7 +50,7 @@ dev_dependencies:
   boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -139,4 +139,4 @@ flutter:
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/custom-fonts/#from-packages
 
-# PUBSPEC CHECKSUM: c1f5
+# PUBSPEC CHECKSUM: e9f6

dev/integration_tests/android_splash_screens/splash_screen_trans_rotate/pubspec.yaml

@@ -50,7 +50,7 @@ dev_dependencies:
   boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -139,4 +139,4 @@ flutter:
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/custom-fonts/#from-packages
 
-# PUBSPEC CHECKSUM: c1f5
+# PUBSPEC CHECKSUM: e9f6

dev/integration_tests/android_views/pubspec.yaml

@@ -48,7 +48,7 @@ dev_dependencies:
   _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.14.0+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -87,4 +87,4 @@ dev_dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: a1cf
+# PUBSPEC CHECKSUM: e3d0

dev/integration_tests/channels/pubspec.yaml

@@ -21,7 +21,7 @@ dependencies:
   charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -74,4 +74,4 @@ dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 7669
+# PUBSPEC CHECKSUM: 086a

dev/integration_tests/codegen/pubspec.yaml

@@ -42,7 +42,7 @@ dev_dependencies:
   _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.14.0+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -81,4 +81,4 @@ builders:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 7669
+# PUBSPEC CHECKSUM: 086a

dev/integration_tests/external_ui/pubspec.yaml

@@ -21,7 +21,7 @@ dependencies:
   charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -74,4 +74,4 @@ dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 7669
+# PUBSPEC CHECKSUM: 086a

dev/integration_tests/flavors/pubspec.yaml

@@ -21,7 +21,7 @@ dependencies:
   charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -74,4 +74,4 @@ dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 7669
+# PUBSPEC CHECKSUM: 086a

dev/integration_tests/flutter_driver_screenshot_test/pubspec.yaml

@@ -43,7 +43,7 @@ dev_dependencies:
   _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.14.0+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -80,4 +80,4 @@ flutter:
   assets:
     - assets/
 
-# PUBSPEC CHECKSUM: ec3a
+# PUBSPEC CHECKSUM: d23b

dev/integration_tests/image_loading/pubspec.yaml

@@ -15,7 +15,7 @@ dependencies:
   charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -62,4 +62,4 @@ dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: f8e0
+# PUBSPEC CHECKSUM: e1e1

dev/integration_tests/platform_interaction/pubspec.yaml

@@ -21,7 +21,7 @@ dependencies:
   charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -74,4 +74,4 @@ dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 7669
+# PUBSPEC CHECKSUM: 086a

dev/integration_tests/release_smoke_test/pubspec.yaml

@@ -17,7 +17,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
 
-  e2e: 0.2.3
+  e2e: 0.2.3+1
 
   archive: 2.0.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   args: 1.5.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -40,4 +40,4 @@ dev_dependencies:
   test_api: 0.2.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   xml: 3.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
-# PUBSPEC CHECKSUM: b7d2
+# PUBSPEC CHECKSUM: bb2f

dev/integration_tests/ui/pubspec.yaml

@@ -22,7 +22,7 @@ dependencies:
   charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -83,4 +83,4 @@ dev_dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 4450
+# PUBSPEC CHECKSUM: 4051

dev/snippets/pubspec.yaml

@@ -46,7 +46,7 @@ dev_dependencies:
   test: 1.9.4
 
   boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http: 0.12.0+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http_multi_server: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -100,4 +100,4 @@ executables:
   vm_service_client: 0.2.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   web_socket_channel: 1.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
-# PUBSPEC CHECKSUM: 59ea
+# PUBSPEC CHECKSUM: 42eb

dev/tools/pubspec.yaml

@@ -36,7 +36,7 @@ dev_dependencies:
   _fe_analyzer_shared: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   analyzer: 0.39.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.14.0+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -68,4 +68,4 @@ dev_dependencies:
   web_socket_channel: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   yaml: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
-# PUBSPEC CHECKSUM: fbaa
+# PUBSPEC CHECKSUM: 2bab

examples/catalog/pubspec.yaml

@@ -30,7 +30,7 @@ dev_dependencies:
   boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -83,4 +83,4 @@ dev_dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 4450
+# PUBSPEC CHECKSUM: 4051

examples/flutter_gallery/pubspec.yaml

@@ -52,7 +52,7 @@ dev_dependencies:
   async: 2.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -271,4 +271,4 @@ flutter:
       - asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Regular.ttf
       - asset: packages/flutter_gallery_assets/fonts/merriweather/Merriweather-Light.ttf
 
-# PUBSPEC CHECKSUM: 5f11
+# PUBSPEC CHECKSUM: 3212

examples/platform_channel/pubspec.yaml

@@ -28,7 +28,7 @@ dev_dependencies:
   boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -82,4 +82,4 @@ dev_dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 4450
+# PUBSPEC CHECKSUM: 4051

examples/platform_channel_swift/pubspec.yaml

@@ -28,7 +28,7 @@ dev_dependencies:
   boolean_selector: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  coverage: 0.13.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  coverage: 0.13.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.16.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -82,4 +82,4 @@ dev_dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 4450
+# PUBSPEC CHECKSUM: 4051

packages/flutter_tools/lib/src/codegen.dart

@@ -192,6 +192,9 @@ class CodeGeneratingResidentCompiler implements ResidentCompiler {
   Future<void> shutdown() {
     return _residentCompiler.shutdown();
   }
+
+  @override
+  void addFileSystemRoot(String root) { }
 }
 
 /// The current status of a codegen build.

packages/flutter_tools/lib/src/commands/update_packages.dart

@@ -25,7 +25,7 @@ const Map<String, String> _kManuallyPinnedDependencies = <String, String>{
   'flutter_gallery_assets': '0.1.9+2', // See //examples/flutter_gallery/pubspec.yaml
   'mockito': '^4.1.0',  // Prevent mockito from downgrading to 4.0.0
   'vm_service_client': '0.2.6+2', // Final version before being marked deprecated.
-  'dwds': '0.8.5', // Requires updates to web_fs due to breaking changes.
+  'video_player': '0.10.6', // 0.10.7 fails a gallery smoke test for toString.
 };
 
 class UpdatePackagesCommand extends FlutterCommand {

packages/flutter_tools/lib/src/compile.dart

@@ -197,7 +197,8 @@ class StdoutHandler {
 class PackageUriMapper {
   PackageUriMapper(String scriptPath, String packagesPath, String fileSystemScheme, List<String> fileSystemRoots) {
     final Map<String, Uri> packageMap = PackageMap(globals.fs.path.absolute(packagesPath)).map;
-    final String scriptUri = Uri.file(scriptPath, windows: globals.platform.isWindows).toString();
+    final bool isWindowsPath = globals.platform.isWindows && !scriptPath.startsWith('org-dartlang-app');
+    final String scriptUri = Uri.file(scriptPath, windows: isWindowsPath).toString();
     for (final String packageName in packageMap.keys) {
       final String prefix = packageMap[packageName].toString();
       // Only perform a multi-root mapping if there are multiple roots.
@@ -463,6 +464,11 @@ abstract class ResidentCompiler {
     List<String> dartDefines,
   }) = DefaultResidentCompiler;
 
+  // TODO(jonahwilliams): find a better way to configure additional file system
+  // roots from the runner.
+  // See: https://github.com/flutter/flutter/issues/50494
+  void addFileSystemRoot(String root);
+
 
   /// If invoked for the first time, it compiles Dart script identified by
   /// [mainPath], [invalidatedFiles] list is ignored.
@@ -538,6 +544,11 @@ class DefaultResidentCompiler implements ResidentCompiler {
   final List<String> experimentalFlags;
   final List<String> dartDefines;
 
+  @override
+  void addFileSystemRoot(String root) {
+    fileSystemRoots.add(root);
+  }
+
   /// The path to the root of the Dart SDK used to compile.
   ///
   /// This is used to resolve the [platformDill].

packages/flutter_tools/lib/src/features.dart

@@ -37,9 +37,6 @@ class FeatureFlags {
   /// Whether the Android embedding V2 is enabled.
   bool get isAndroidEmbeddingV2Enabled => isEnabled(flutterAndroidEmbeddingV2Feature);
 
-  /// Whether the web incremental compiler is enabled.
-  bool get isWebIncrementalCompilerEnabled => isEnabled(flutterWebIncrementalCompiler);
-
   /// Whether a particular feature is enabled for the current channel.
   ///
   /// Prefer using one of the specific getters above instead of this API.
@@ -72,7 +69,6 @@ const List<Feature> allFeatures = <Feature>[
   flutterMacOSDesktopFeature,
   flutterWindowsDesktopFeature,
   flutterAndroidEmbeddingV2Feature,
-  flutterWebIncrementalCompiler,
 ];
 
 /// The [Feature] for flutter web.
@@ -154,21 +150,6 @@ const Feature flutterAndroidEmbeddingV2Feature = Feature(
   ),
 );
 
-/// The [Feature] for using the incremental compiler instead of build runner.
-const Feature flutterWebIncrementalCompiler = Feature(
-  name: 'Enable the incremental compiler for web builds',
-  configSetting: 'enable-web-incremental-compiler',
-  environmentOverride: 'WEB_INCREMENTAL_COMPILER',
-  master: FeatureChannelSetting(
-    available: true,
-    enabledByDefault: false,
-  ),
-  dev: FeatureChannelSetting(
-    available: true,
-    enabledByDefault: false,
-  ),
-);
-
 /// A [Feature] is a process for conditionally enabling tool features.
 ///
 /// All settings are optional, and if not provided will generally default to

packages/flutter_tools/lib/src/resident_runner.dart

@@ -52,7 +52,7 @@ class FlutterDevice {
          ),
          buildMode: buildMode,
          trackWidgetCreation: trackWidgetCreation,
-         fileSystemRoots: fileSystemRoots,
+         fileSystemRoots: fileSystemRoots ?? <String>[],
          fileSystemScheme: fileSystemScheme,
          targetModel: targetModel,
          experimentalFlags: experimentalFlags,
@@ -79,14 +79,15 @@ class FlutterDevice {
     if (device.platformType == PlatformType.fuchsia) {
       targetModel = TargetModel.flutterRunner;
     }
-    if (featureFlags.isWebIncrementalCompilerEnabled &&
-        targetPlatform == TargetPlatform.web_javascript) {
+    if (targetPlatform == TargetPlatform.web_javascript) {
       generator = ResidentCompiler(
         globals.artifacts.getArtifactPath(Artifact.flutterWebSdk, mode: buildMode),
         buildMode: buildMode,
         trackWidgetCreation: trackWidgetCreation,
-        fileSystemRoots: fileSystemRoots,
-        fileSystemScheme: fileSystemScheme,
+        fileSystemRoots: fileSystemRoots ?? <String>[],
+        // Override the filesystem scheme so that the frontend_server can find
+        // the generated entrypoint code.
+        fileSystemScheme: 'org-dartlang-app',
         targetModel: TargetModel.dartdevc,
         experimentalFlags: experimentalFlags,
         platformDill: globals.fs.file(globals.artifacts

packages/flutter_tools/lib/src/test/coverage_collector.dart

@@ -54,7 +54,7 @@ class CoverageCollector extends TestWatcher {
     assert(data != null);
 
     print('($observatoryUri): collected coverage data; merging...');
-    _addHitmap(coverage.createHitmap(data['coverage'] as List<dynamic>));
+    _addHitmap(coverage.createHitmap(data['coverage'] as List<Map<String, dynamic>>));
     print('($observatoryUri): done merging coverage data into global coverage map.');
   }
 
@@ -86,7 +86,7 @@ class CoverageCollector extends TestWatcher {
     assert(data != null);
 
     globals.printTrace('pid $pid ($observatoryUri): collected coverage data; merging...');
-    _addHitmap(coverage.createHitmap(data['coverage'] as List<dynamic>));
+    _addHitmap(coverage.createHitmap(data['coverage'] as List<Map<String, dynamic>>));
     globals.printTrace('pid $pid ($observatoryUri): done merging coverage data into global coverage map.');
   }
 

packages/flutter_tools/lib/src/web/bootstrap.dart

@@ -4,6 +4,39 @@
 
 import 'package:meta/meta.dart';
 
+// This logic is taken directly from https://github.com/dart-lang/build/blob/master/build_web_compilers/lib/src/dev_compiler_bootstrap.dart#L272
+// It should be fairly stable, but is otherwise required to interact with the client.js script
+// vendored with DWDS.
+const String _currentDirectoryScript = r'''
+var _currentDirectory = (function () {
+  var _url;
+  var lines = new Error().stack.split('\n');
+  function lookupUrl() {
+    if (lines.length > 2) {
+      var match = lines[1].match(/^\s+at (.+):\d+:\d+$/);
+      // Chrome.
+      if (match) return match[1];
+      // Chrome nested eval case.
+      match = lines[1].match(/^\s+at eval [(](.+):\d+:\d+[)]$/);
+      if (match) return match[1];
+      // Edge.
+      match = lines[1].match(/^\s+at.+\((.+):\d+:\d+\)$/);
+      if (match) return match[1];
+      // Firefox.
+      match = lines[0].match(/[<][@](.+):\d+:\d+$/)
+      if (match) return match[1];
+    }
+    // Safari.
+    return lines[0].match(/(.+):\d+:\d+$/)[1];
+  }
+  _url = lookupUrl();
+  var lastSlash = _url.lastIndexOf('/');
+  if (lastSlash == -1) return _url;
+  var currentDirectory = _url.substring(0, lastSlash + 1);
+  return currentDirectory;
+})();
+''';
+
 /// The JavaScript bootstrap script to support in-browser hot restart.
 ///
 /// The [requireUrl] loads our cached RequireJS script file. The [mapperUrl]
@@ -34,7 +67,7 @@ requireEl.defer = true;
 requireEl.async = false;
 requireEl.src = "$requireUrl";
 // This attribute tells require JS what to load as main (defined below).
-requireEl.setAttribute("data-main", "main_module");
+requireEl.setAttribute("data-main", "main_module.bootstrap");
 document.head.appendChild(requireEl);
 
 // Invoked by connected chrome debugger for hot reload/restart support.
@@ -55,8 +88,8 @@ window.\$hotReloadHook = function(modules) {
         // once we've reloaded every module, trigger the hot reload.
         if (reloadCount == modules.length) {
           require(["$entrypoint", "dart_sdk"], function(app, dart_sdk) {
-            // See L81 below for an explanation.
-            window.\$mainEntrypoint = app[Object.keys(app)[0]].main;
+            // See the doc comment under in generateMainModule.
+            window.\$dartRunMain = app[Object.keys(app)[0]].main;
             window.\$hotReload(resolve);
           });
         }
@@ -69,33 +102,108 @@ window.\$hotReloadHook = function(modules) {
 
 /// Generate a synthetic main module which captures the application's main
 /// method.
+///
+/// RE: Object.keys usage in app.main:
+/// This attaches the main entrypoint and hot reload functionality to the window.
+/// The app module will have a single property which contains the actual application
+/// code. The property name is based off of the entrypoint that is generated, for example
+/// the file `foo/bar/baz.dart` will generate a property named approximately
+/// `foo__bar__baz`. Rather than attempt to guess, we assume the first property of
+/// this object is the module.
 String generateMainModule({@required String entrypoint}) {
-  return '''
+  return '''/* ENTRYPOINT_EXTENTION_MARKER */
+// baseUrlScript
+var baseUrl = (function () {
+  // Attempt to detect --precompiled mode for tests, and set the base url
+  // appropriately, otherwise set it to '/'.
+  var pathParts = location.pathname.split("/");
+  if (pathParts[0] == "") {
+    pathParts.shift();
+  }
+  if (pathParts.length > 1 && pathParts[1] == "test") {
+    return "/" + pathParts.slice(0, 2).join("/") + "/";
+  }
+  // Attempt to detect base url using <base href> html tag
+  // base href should start and end with "/"
+  if (typeof document !== 'undefined') {
+    var el = document.getElementsByTagName('base');
+    if (el && el[0] && el[0].getAttribute("href") && el[0].getAttribute
+    ("href").startsWith("/") && el[0].getAttribute("href").endsWith("/")){
+      return el[0].getAttribute("href");
+    }
+  }
+  // return default value
+  return "/";
+}());
+$_currentDirectoryScript
+// dart loader
+if(!window.\$dartLoader) {
+   window.\$dartLoader = {
+     appDigests: _currentDirectory + 'basic.digests',
+     moduleIdToUrl: new Map(),
+     urlToModuleId: new Map(),
+     rootDirectories: new Array(),
+     // Used in package:build_runner/src/server/build_updates_client/hot_reload_client.dart
+     moduleParentsGraph: new Map(),
+     moduleLoadingErrorCallbacks: new Map(),
+     forceLoadModule: function (moduleName, callback, onError) {
+       if (typeof onError != 'undefined') {
+         var errorCallbacks = \$dartLoader.moduleLoadingErrorCallbacks;
+         if (!errorCallbacks.has(moduleName)) {
+           errorCallbacks.set(moduleName, new Set());
+         }
+         errorCallbacks.get(moduleName).add(onError);
+       }
+       requirejs.undef(moduleName);
+       requirejs([moduleName], function() {
+         if (typeof onError != 'undefined') {
+           errorCallbacks.get(moduleName).delete(onError);
+         }
+         if (typeof callback != 'undefined') {
+           callback();
+         }
+       });
+     },
+     getModuleLibraries: null, // set up by _initializeTools
+   };
+}
+let modulePaths = {};
+let customModulePaths = {};
+window.\$dartLoader.rootDirectories.push(window.location.origin + baseUrl);
+for (let moduleName of Object.getOwnPropertyNames(modulePaths)) {
+  let modulePath = modulePaths[moduleName];
+  if (modulePath != moduleName) {
+    customModulePaths[moduleName] = modulePath;
+  }
+  var src = window.location.origin + '/' + modulePath + '.js';
+  if (window.\$dartLoader.moduleIdToUrl.has(moduleName)) {
+    continue;
+  }
+  \$dartLoader.moduleIdToUrl.set(moduleName, src);
+  \$dartLoader.urlToModuleId.set(src, moduleName);
+}
 // Create the main module loaded below.
-define("main_module", ["$entrypoint", "dart_sdk"], function(app, dart_sdk) {
+define("main_module.bootstrap", ["$entrypoint", "dart_sdk"], function(app, dart_sdk) {
   dart_sdk.dart.setStartAsyncSynchronously(true);
   dart_sdk._isolate_helper.startRootIsolate(() => {}, []);
   dart_sdk._debugger.registerDevtoolsFormatter();
   let voidToNull = () => (voidToNull = dart_sdk.dart.constFn(dart_sdk.dart.fnType(dart_sdk.core.Null, [dart_sdk.dart.void])))();
 
-  // Attach the main entrypoint and hot reload functionality to the window.
-  // The app module will have a single property which contains the actual application
-  // code. The property name is based off of the entrypoint that is generated, for example
-  // the file `foo/bar/baz.dart` will generate a property named approximately
-  // `foo__bar__baz`. Rather than attempt to guess, we assume the first property of
-  // this object is the module.
-  window.\$mainEntrypoint = app[Object.keys(app)[0]].main;
+  // See the generateMainModule doc comment.
+  var child = {};
+  child.main = app[Object.keys(app)[0]].main;
   if (window.\$hotReload == null) {
     window.\$hotReload = function(cb) {
       dart_sdk.developer.invokeExtension("ext.flutter.disassemble", "{}").then((_) => {
         dart_sdk.dart.hotRestart();
-        window.\$mainEntrypoint();
+        window.\$dartRunMain();
         window.requestAnimationFrame(cb);
       });
     }
   }
 
-  window.\$mainEntrypoint();
+  /* MAIN_EXTENSION_MARKER */
+  child.main();
 });
 
 // Require JS configuration.

packages/flutter_tools/pubspec.yaml

@@ -11,9 +11,9 @@ dependencies:
   # To update these, use "flutter update-packages --force-upgrade".
   archive: 2.0.11
   args: 1.5.2
-  dwds: 0.8.5
+  dwds: 1.0.1
   completion: 0.2.1+1
-  coverage: 0.13.5
+  coverage: 0.13.6
   crypto: 2.1.3
   file: 5.1.0
   http: 0.12.0+4
@@ -94,6 +94,7 @@ dependencies:
   pubspec_parse: 0.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   scratch_space: 0.0.4+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   shelf: 0.7.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  shelf_packages_handler: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   shelf_proxy: 0.1.0+7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   shelf_static: 0.2.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   shelf_web_socket: 0.2.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -122,10 +123,9 @@ dev_dependencies:
 
   multi_server_socket: 1.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   node_preamble: 1.4.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  shelf_packages_handler: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
 dartdoc:
   # Exclude this package from the hosted API docs.
   nodoc: true
 
-# PUBSPEC CHECKSUM: 557d
+# PUBSPEC CHECKSUM: c273

packages/flutter_tools/test/general.shard/build_runner/multiroot_asset_reader_test.dart

-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:convert';
-import 'dart:io';
-
-import 'package:build/build.dart';
-import 'package:build_runner_core/build_runner_core.dart';
-import 'package:flutter_tools/src/build_runner/web_compilation_delegate.dart';
-import 'package:flutter_tools/src/globals.dart' as globals;
-import 'package:glob/glob.dart';
-
-import '../../src/common.dart';
-import '../../src/io.dart';
-import '../../src/testbed.dart';
-
-void main() {
-  group('MultirootFileBasedAssetReader', () {
-    Testbed testbed;
-    FakePackageGraph packageGraph;
-
-    setUp(() {
-      testbed = Testbed(setup: () {
-        final PackageNode root = PackageNode('foobar', globals.fs.currentDirectory.path, DependencyType.path);
-        packageGraph = FakePackageGraph(root, <String, PackageNode>{'foobar': root});
-        globals.fs.file(globals.fs.path.join('lib', 'main.dart'))
-          ..createSync(recursive: true)
-          ..writeAsStringSync('main');
-        globals.fs.file(globals.fs.path.join('.dart_tool', 'build', 'generated', 'foobar', 'lib', 'bar.dart'))
-          ..createSync(recursive: true)
-          ..writeAsStringSync('bar');
-        globals.fs.file('pubspec.yaml')
-          ..createSync()
-          ..writeAsStringSync('name: foobar');
-      });
-    });
-
-    test('Can find assets from the generated directory', () => testbed.run(() async {
-      await IOOverrides.runWithIOOverrides(() async {
-        final MultirootFileBasedAssetReader reader = MultirootFileBasedAssetReader(
-          packageGraph,
-          globals.fs.directory(globals.fs.path.join('.dart_tool', 'build', 'generated')),
-        );
-        expect(await reader.canRead(AssetId('foobar', 'lib/bar.dart')), true);
-        expect(await reader.canRead(AssetId('foobar', 'lib/main.dart')), true);
-
-        expect(await reader.readAsString(AssetId('foobar', 'lib/bar.dart')), 'bar');
-        expect(await reader.readAsString(AssetId('foobar', 'lib/main.dart')), 'main');
-
-        expect(await reader.readAsBytes(AssetId('foobar', 'lib/bar.dart')), utf8.encode('bar'));
-        expect(await reader.readAsBytes(AssetId('foobar', 'lib/main.dart')), utf8.encode('main'));
-
-        expect(await reader.findAssets(Glob('**')).toList(), unorderedEquals(<AssetId>[
-          AssetId('foobar', 'pubspec.yaml'),
-          AssetId('foobar', 'lib/bar.dart'),
-          AssetId('foobar', 'lib/main.dart'),
-        ]));
-      }, FlutterIOOverrides(fileSystem: globals.fs));
-     // Some component of either dart:io or build_runner normalizes file uris
-     // into file paths for windows. This doesn't seem to work with IOOverrides
-     // leaving all filepaths on windows with forward slashes.
-    }), skip: Platform.isWindows);
-  });
-}
-
-class FakePackageGraph implements PackageGraph {
-  FakePackageGraph(this.root, this.allPackages);
-
-  @override
-  final Map<String, PackageNode> allPackages;
-
-  @override
-  final PackageNode root;
-
-  @override
-  PackageNode operator [](String packageName) => allPackages[packageName];
-}

packages/flutter_tools/test/general.shard/resident_runner_test.dart

@@ -15,7 +15,6 @@ import 'package:flutter_tools/src/build_info.dart';
 import 'package:flutter_tools/src/compile.dart';
 import 'package:flutter_tools/src/devfs.dart';
 import 'package:flutter_tools/src/device.dart';
-import 'package:flutter_tools/src/features.dart';
 import 'package:flutter_tools/src/globals.dart' as globals;
 import 'package:flutter_tools/src/project.dart';
 import 'package:flutter_tools/src/reporting/reporting.dart';
@@ -701,8 +700,6 @@ void main() {
       globals.fs.file(globals.artifacts.getArtifactPath(Artifact.webPlatformKernelDill, mode: BuildMode.debug))
         .absolute.uri.toString(),
     );
-  }, overrides: <Type, Generator>{
-    FeatureFlags: () => TestFeatureFlags(isWebIncrementalCompilerEnabled: true),
   }));
 
   test('connect sets up log reader', () => testbed.run(() async {

packages/flutter_tools/test/general.shard/resident_web_runner_cold_test.dart

@@ -8,17 +8,16 @@ import 'package:dwds/dwds.dart';
 import 'package:flutter_tools/src/base/common.dart';
 import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/terminal.dart';
-import 'package:flutter_tools/src/base/net.dart';
 import 'package:flutter_tools/src/build_info.dart';
+import 'package:flutter_tools/src/build_system/build_system.dart';
 import 'package:flutter_tools/src/device.dart';
 import 'package:flutter_tools/src/globals.dart' as globals;
 import 'package:flutter_tools/src/project.dart';
 import 'package:flutter_tools/src/resident_runner.dart';
 import 'package:flutter_tools/src/build_runner/resident_web_runner.dart';
-import 'package:flutter_tools/src/build_runner/web_fs.dart';
 import 'package:flutter_tools/src/web/chrome.dart';
+import 'package:flutter_tools/src/web/devfs_web.dart';
 import 'package:flutter_tools/src/web/web_device.dart';
-import 'package:meta/meta.dart';
 import 'package:mockito/mockito.dart';
 import 'package:platform/platform.dart';
 import 'package:vm_service/vm_service.dart';
@@ -29,15 +28,22 @@ import '../src/testbed.dart';
 
 void main() {
   Testbed testbed;
-  MockFlutterWebFs mockWebFs;
   ResidentWebRunner residentWebRunner;
   MockFlutterDevice mockFlutterDevice;
+  MockWebDevFS mockWebDevFS;
+  MockBuildSystem mockBuildSystem;
 
   setUp(() {
-    mockWebFs = MockFlutterWebFs();
+    mockWebDevFS = MockWebDevFS();
+    mockBuildSystem = MockBuildSystem();
     final MockWebDevice mockWebDevice = MockWebDevice();
     mockFlutterDevice = MockFlutterDevice();
     when(mockFlutterDevice.device).thenReturn(mockWebDevice);
+    when(mockFlutterDevice.devFS).thenReturn(mockWebDevFS);
+    when(mockWebDevFS.sources).thenReturn(<Uri>[]);
+    when(mockBuildSystem.build(any, any)).thenAnswer((Invocation invocation) async {
+      return BuildResult(success: true);
+    });
     testbed = Testbed(
       setup: () {
         residentWebRunner = residentWebRunner = DwdsWebRunnerFactory().createWebRunner(
@@ -50,29 +56,14 @@ void main() {
           urlTunneller: null,
         ) as ResidentWebRunner;
       },
-      overrides: <Type, Generator>{
-        WebFsFactory: () => ({
-          @required String target,
-          @required FlutterProject flutterProject,
-          @required BuildInfo buildInfo,
-          @required bool skipDwds,
-          @required bool initializePlatform,
-          @required String hostname,
-          @required String port,
-          @required UrlTunneller urlTunneller,
-          @required List<String> dartDefines,
-        }) async {
-          return mockWebFs;
-        },
-      },
     );
   });
 
   void _setupMocks() {
+    globals.fs.file('.packages').writeAsStringSync('\n');
     globals.fs.file('pubspec.yaml').createSync();
     globals.fs.file(globals.fs.path.join('lib', 'main.dart')).createSync(recursive: true);
     globals.fs.file(globals.fs.path.join('web', 'index.html')).createSync(recursive: true);
-    when(mockWebFs.connect(any)).thenThrow(StateError('debugging not supported'));
   }
 
   test('Can successfully run and connect without vmservice', () => testbed.run(() async {
@@ -89,6 +80,7 @@ void main() {
     expect(debugConnectionInfo.wsUri, null);
     verify(mockStatus.stop()).called(1);
   }, overrides: <Type, Generator>{
+    BuildSystem: () => mockBuildSystem,
     Logger: () => DelegateLogger(BufferLogger(
       terminal: AnsiTerminal(
         stdio: null,
@@ -105,12 +97,11 @@ void main() {
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
-    when(mockWebFs.recompile()).thenAnswer((Invocation _) async {
-      return true;
-    });
     final OperationResult result = await residentWebRunner.restart(fullRestart: true);
 
     expect(result.code, 0);
+  }, overrides: <Type, Generator>{
+    BuildSystem: () => mockBuildSystem,
   }));
 
   test('Fails on compilation errors in hot restart', () => testbed.run(() async {
@@ -120,13 +111,15 @@ void main() {
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
-    when(mockWebFs.recompile()).thenAnswer((Invocation _) async {
-      return false;
+    when(mockBuildSystem.build(any, any)).thenAnswer((Invocation invocation) async {
+      return BuildResult(success: false);
     });
     final OperationResult result = await residentWebRunner.restart(fullRestart: true);
 
     expect(result.code, 1);
     expect(result.message, contains('Failed to recompile application.'));
+  }, overrides: <Type, Generator>{
+    BuildSystem: () => mockBuildSystem,
   }));
 
   test('Correctly performs a full refresh on attached chrome device.', () => testbed.run(() async {
@@ -150,22 +143,20 @@ void main() {
       connectionInfoCompleter: connectionInfoCompleter,
     ));
     await connectionInfoCompleter.future;
-    when(mockWebFs.recompile()).thenAnswer((Invocation _) async {
-      return true;
-    });
     final OperationResult result = await residentWebRunner.restart(fullRestart: true);
 
     expect(result.code, 0);
     verify(mockWipConnection.sendCommand('Page.reload', <String, Object>{
       'ignoreCache': true,
     })).called(1);
+  }, overrides: <Type, Generator>{
+    BuildSystem: () => mockBuildSystem,
   }));
 
 }
 
+class MockWebDevFS extends Mock implements WebDevFS {}
 class MockWebDevice extends Mock implements Device {}
-class MockBuildDaemonCreator extends Mock implements BuildDaemonCreator {}
-class MockFlutterWebFs extends Mock implements WebFs {}
 class MockDebugConnection extends Mock implements DebugConnection {}
 class MockVmService extends Mock implements VmService {}
 class MockStatus extends Mock implements Status {}
@@ -175,3 +166,4 @@ class MockChrome extends Mock implements Chrome {}
 class MockChromeConnection extends Mock implements ChromeConnection {}
 class MockChromeTab extends Mock implements ChromeTab {}
 class MockWipConnection extends Mock implements WipConnection {}
+class MockBuildSystem extends Mock implements BuildSystem {}

packages/flutter_tools/test/general.shard/web/bootstrap_test.dart

@@ -18,7 +18,7 @@ void main() {
     // stack trace mapper source is interpolated correctly.
     expect(result, contains('mapperEl.src = "mapper.js";'));
     // data-main is set to correct bootstrap module.
-    expect(result, contains('requireEl.setAttribute("data-main", "main_module");'));
+    expect(result, contains('requireEl.setAttribute("data-main", "main_module.bootstrap");'));
     // bootstrap main module has correct imports.
     expect(result, contains('require(["foo/bar/main.js", "dart_sdk"],'
       ' function(app, dart_sdk) {'));
@@ -29,7 +29,7 @@ void main() {
       entrypoint: 'foo/bar/main.js',
     );
     // bootstrap main module has correct defined module.
-    expect(result, contains('define("main_module", ["foo/bar/main.js", "dart_sdk"], '
+    expect(result, contains('define("main_module.bootstrap", ["foo/bar/main.js", "dart_sdk"], '
       'function(app, dart_sdk) {'));
   });
 }

packages/flutter_tools/test/general.shard/web/asset_server_test.dart → packages/flutter_tools/test/general.shard/web/web_asset_server_test.dart

@@ -2,12 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:flutter_tools/src/artifacts.dart';
-import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/io.dart';
-import 'package:flutter_tools/src/build_runner/web_fs.dart';
 import 'package:flutter_tools/src/globals.dart' as globals;
-import 'package:flutter_tools/src/project.dart';
+import 'package:flutter_tools/src/web/devfs_web.dart';
 import 'package:shelf/shelf.dart';
 
 import '../../src/common.dart';
@@ -23,7 +20,6 @@ const List<int> kTransparentImage = <int>[
 
 void main() {
   Testbed testbed;
-  AssetServer assetServer;
 
   setUp(() {
     testbed = Testbed(
@@ -39,80 +35,12 @@ void main() {
         globals.fs.file(globals.fs.path.join('build', 'flutter_assets', 'bar'))
           ..createSync(recursive: true)
           ..writeAsBytesSync(<int>[1, 2, 3]);
-        assetServer = DebugAssetServer(FlutterProject.current(), globals.fs.path.join('main'));
       }
     );
   });
 
-  test('can serve an html file from the web directory', () => testbed.run(() async {
-    final Response response = await assetServer
-      .handle(Request('GET', Uri.parse('http://localhost:8080/index.html')));
-
-    expect(response.headers, <String, String>{
-      'Content-Type': 'text/html',
-      'content-length': '5',
-    });
-    expect(await response.readAsString(), 'hello');
-  }));
-
-  test('can serve a sourcemap from dart:ui', () => testbed.run(() async {
-    final String flutterWebSdkPath = globals.artifacts.getArtifactPath(Artifact.flutterWebSdk);
-    final File windowSourceFile = globals.fs.file(globals.fs.path.join(flutterWebSdkPath, 'lib', 'ui', 'src', 'ui', 'window.dart'))
-      ..createSync(recursive: true)
-      ..writeAsStringSync('test');
-    final Response response = await assetServer
-      .handle(Request('GET', Uri.parse('http://localhost:8080/packages/build_web_compilers/lib/ui/src/ui/window.dart')));
-
-    expect(response.headers, <String, String>{
-      'content-length': windowSourceFile.lengthSync().toString(),
-    });
-    expect(await response.readAsString(), 'test');
-  }));
-
-  test('can serve a sourcemap from the dart:sdk', () => testbed.run(() async {
-    final String dartSdkPath = globals.artifacts.getArtifactPath(Artifact.engineDartSdkPath);
-    final File listSourceFile = globals.fs.file(globals.fs.path.join(dartSdkPath, 'lib', 'core', 'list.dart'))
-      ..createSync(recursive: true)
-      ..writeAsStringSync('test');
-
-    final Response response = await assetServer
-      .handle(Request('GET', Uri.parse('http://localhost:8080/packages/dart-sdk/lib/core/list.dart')));
-
-    expect(response.headers, <String, String>{
-      'content-length': listSourceFile.lengthSync().toString(),
-    });
-    expect(await response.readAsString(), 'test');
-  }));
-
-  test('can serve an asset with a png content type', () => testbed.run(() async {
-    final Response response = await assetServer
-      .handle(Request('GET', Uri.parse('http://localhost:8080/assets/foo.png')));
-
-    expect(response.headers, <String, String>{
-      'Content-Type': 'image/png',
-      'content-length': '64',
-    });
-  }));
-
-  test('can fallback to application/octet-stream', () => testbed.run(() async {
-    final Response response = await assetServer
-      .handle(Request('GET', Uri.parse('http://localhost:8080/assets/bar')));
-
-    expect(response.headers, <String, String>{
-      'Content-Type': 'application/octet-stream',
-      'content-length': '3',
-    });
-  }));
-
-  test('handles a missing html file from the web directory', () => testbed.run(() async {
-    final Response response = await assetServer
-        .handle(Request('GET', Uri.parse('http://localhost:8080/foobar.html')));
-
-    expect(response.statusCode, 404);
-  }));
-
   test('release asset server serves correct mime type and content length for png', () => testbed.run(() async {
-    assetServer = ReleaseAssetServer();
+    final ReleaseAssetServer assetServer = ReleaseAssetServer();
     globals.fs.file(globals.fs.path.join('build', 'web', 'assets', 'foo.png'))
       ..createSync(recursive: true)
       ..writeAsBytesSync(kTransparentImage);
@@ -126,7 +54,7 @@ void main() {
   }));
 
   test('release asset server serves correct mime type and content length for JavaScript', () => testbed.run(() async {
-    assetServer = ReleaseAssetServer();
+    final ReleaseAssetServer assetServer = ReleaseAssetServer();
     globals.fs.file(globals.fs.path.join('build', 'web', 'assets', 'foo.js'))
       ..createSync(recursive: true)
       ..writeAsStringSync('function main() {}');
@@ -140,7 +68,7 @@ void main() {
   }));
 
   test('release asset server serves correct mime type and content length for html', () => testbed.run(() async {
-    assetServer = ReleaseAssetServer();
+    final ReleaseAssetServer assetServer = ReleaseAssetServer();
     globals.fs.file(globals.fs.path.join('build', 'web', 'assets', 'foo.html'))
       ..createSync(recursive: true)
       ..writeAsStringSync('<!doctype html><html></html>');
@@ -154,7 +82,7 @@ void main() {
   }));
 
   test('release asset server serves content from flutter root', () => testbed.run(() async {
-    assetServer = ReleaseAssetServer();
+    final ReleaseAssetServer assetServer = ReleaseAssetServer();
     globals.fs.file(globals.fs.path.join('flutter', 'bar.dart'))
       ..createSync(recursive: true)
       ..writeAsStringSync('void main() { }');
@@ -165,7 +93,7 @@ void main() {
   }));
 
   test('release asset server serves content from project directory', () => testbed.run(() async {
-    assetServer = ReleaseAssetServer();
+    final ReleaseAssetServer assetServer = ReleaseAssetServer();
     globals.fs.file(globals.fs.path.join('lib', 'bar.dart'))
       ..createSync(recursive: true)
       ..writeAsStringSync('void main() { }');

packages/flutter_tools/test/general.shard/web/web_fs_test.dart

-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:build_daemon/client.dart';
-import 'package:build_daemon/data/build_status.dart';
-import 'package:built_collection/built_collection.dart';
-import 'package:dwds/asset_handler.dart';
-import 'package:dwds/dwds.dart';
-import 'package:flutter_tools/src/base/os.dart';
-import 'package:flutter_tools/src/build_info.dart';
-import 'package:flutter_tools/src/dart/pub.dart';
-import 'package:flutter_tools/src/project.dart';
-import 'package:flutter_tools/src/web/chrome.dart';
-import 'package:flutter_tools/src/build_runner/web_fs.dart';
-import 'package:flutter_tools/src/globals.dart' as globals;
-import 'package:http_multi_server/http_multi_server.dart';
-import 'package:meta/meta.dart';
-import 'package:mockito/mockito.dart';
-import 'package:process/process.dart';
-
-import '../../src/common.dart';
-import '../../src/mocks.dart';
-import '../../src/testbed.dart';
-
-void main() {
-  Testbed testbed;
-  MockBuildDaemonCreator mockBuildDaemonCreator;
-  MockDwds mockDwds;
-  MockChromeLauncher mockChromeLauncher;
-  MockHttpMultiServer mockHttpMultiServer;
-  MockBuildDaemonClient mockBuildDaemonClient;
-  MockOperatingSystemUtils mockOperatingSystemUtils;
-  MockProcessManager mockProcessManager;
-  bool lastInitializePlatform;
-  int lastPort;
-
-  setUp(() {
-    lastPort = null;
-    lastInitializePlatform = null;
-    mockBuildDaemonCreator =  MockBuildDaemonCreator();
-    mockChromeLauncher = MockChromeLauncher();
-    mockHttpMultiServer = MockHttpMultiServer();
-    mockBuildDaemonClient = MockBuildDaemonClient();
-    mockOperatingSystemUtils = MockOperatingSystemUtils();
-    mockDwds = MockDwds();
-    mockProcessManager = MockProcessManager();
-    when(mockBuildDaemonCreator.startBuildDaemon(any, release: anyNamed('release'), initializePlatform: anyNamed('initializePlatform')))
-      .thenAnswer((Invocation invocation) async {
-        lastInitializePlatform = invocation.namedArguments[#initializePlatform] as bool;
-        return mockBuildDaemonClient;
-      });
-    when(mockOperatingSystemUtils.findFreePort()).thenAnswer((Invocation _) async {
-      return 1234;
-    });
-    when(mockProcessManager.start(
-      any,
-      workingDirectory: anyNamed('workingDirectory'),
-      environment: anyNamed('environment'),
-    )).thenAnswer((Invocation invocation) async {
-      final String workingDirectory = invocation.namedArguments[#workingDirectory] as String;
-      globals.fs.file(globals.fs.path.join(workingDirectory, '.packages')).createSync(recursive: true);
-      return FakeProcess();
-    });
-    when(mockBuildDaemonClient.buildResults).thenAnswer((Invocation _) {
-      return Stream<BuildResults>.fromFuture(Future<BuildResults>.value(
-        BuildResults((BuildResultsBuilder builder) {
-          builder.results = ListBuilder<BuildResult>(
-            <BuildResult>[
-              DefaultBuildResult((DefaultBuildResultBuilder builder) {
-                builder.target = 'web';
-                builder.status = BuildStatus.succeeded;
-              }),
-            ],
-          );
-        })
-      ));
-    });
-    when(mockBuildDaemonCreator.assetServerPort(any)).thenReturn(4321);
-    testbed = Testbed(
-      setup: () {
-        globals.fs.file(globals.fs.path.join('packages', 'flutter_tools', 'pubspec.yaml'))
-          ..createSync(recursive: true)
-          ..setLastModifiedSync(DateTime(1991, 08, 23));
-        // Create an empty .packages file so we can read it when we check for
-        // plugins on Webglobals.fs.start()
-        globals.fs.file('.packages').createSync();
-      },
-      overrides: <Type, Generator>{
-        Pub: () => MockPub(),
-        OperatingSystemUtils: () => mockOperatingSystemUtils,
-        BuildDaemonCreator: () => mockBuildDaemonCreator,
-        ChromeLauncher: () => mockChromeLauncher,
-        ProcessManager: () => mockProcessManager,
-        HttpMultiServerFactory: () => (dynamic address, int port) async {
-          lastPort = port;
-          return mockHttpMultiServer;
-        },
-        DwdsFactory: () => ({
-          @required AssetHandler assetHandler,
-          @required Stream<BuildResult> buildResults,
-          @required ConnectionProvider chromeConnection,
-          String hostname,
-          ReloadConfiguration reloadConfiguration,
-          bool serveDevTools,
-          LogWriter logWriter,
-          bool verbose,
-          bool enableDebugExtension,
-          UrlEncoder urlEncoder,
-        }) async {
-          return mockDwds;
-        },
-      },
-    );
-  });
-
-  test('Can create webFs from mocked interfaces', () => testbed.run(() async {
-    final FlutterProject flutterProject = FlutterProject.current();
-    await WebFs.start(
-      skipDwds: false,
-      target: globals.fs.path.join('lib', 'main.dart'),
-      buildInfo: BuildInfo.debug,
-      flutterProject: flutterProject,
-      initializePlatform: true,
-      hostname: null,
-      port: null,
-      urlTunneller: null,
-      dartDefines: const <String>[],
-    );
-    // Since the .packages file is missing in the memory filesystem, this should
-    // be called.
-    verify(pub.get(
-      context: PubContext.pubGet,
-      directory: anyNamed('directory'),
-      offline: true,
-      skipPubspecYamlCheck: true,
-      checkLastModified: false,
-    )).called(1);
-
-    // The build daemon is told to build once.
-    verify(mockBuildDaemonClient.startBuild()).called(1);
-
-    // .dart_tool directory is created.
-    expect(flutterProject.dartTool.existsSync(), true);
-    expect(lastInitializePlatform, true);
-  }));
-
-  test('Can create webFs from mocked interfaces with initializePlatform', () => testbed.run(() async {
-    final FlutterProject flutterProject = FlutterProject.current();
-    await WebFs.start(
-      skipDwds: false,
-      target: globals.fs.path.join('lib', 'main.dart'),
-      buildInfo: BuildInfo.debug,
-      flutterProject: flutterProject,
-      initializePlatform: false,
-      hostname: null,
-      port: null,
-      urlTunneller: null,
-      dartDefines: const <String>[],
-    );
-
-    // The build daemon is told to build once.
-    verify(mockBuildDaemonClient.startBuild()).called(1);
-
-    // .dart_tool directory is created.
-    expect(flutterProject.dartTool.existsSync(), true);
-    expect(lastInitializePlatform, false);
-  }));
-
-  test('Uses provided port number and hostname.', () => testbed.run(() async {
-    final FlutterProject flutterProject = FlutterProject.current();
-    final WebFs webFs = await WebFs.start(
-      skipDwds: false,
-      target: globals.fs.path.join('lib', 'main.dart'),
-      buildInfo: BuildInfo.debug,
-      flutterProject: flutterProject,
-      initializePlatform: false,
-      hostname: 'localhost',
-      port: '1234',
-      urlTunneller: null,
-      dartDefines: const <String>[],
-    );
-
-    expect(webFs.uri.toString(), contains('localhost'));
-    expect(lastPort, 1234);
-  }));
-
-  test('Throws exception if build fails', () => testbed.run(() async {
-    when(mockBuildDaemonClient.buildResults).thenAnswer((Invocation _) {
-      return Stream<BuildResults>.fromFuture(Future<BuildResults>.value(
-        BuildResults((BuildResultsBuilder builder) {
-          builder.results = ListBuilder<BuildResult>(
-            <BuildResult>[
-              DefaultBuildResult((DefaultBuildResultBuilder builder) {
-                builder.target = 'web';
-                builder.status = BuildStatus.failed;
-              }),
-            ],
-          );
-        })
-      ));
-    });
-    final FlutterProject flutterProject = FlutterProject.current();
-
-    expect(WebFs.start(
-      skipDwds: false,
-      target: globals.fs.path.join('lib', 'main.dart'),
-      buildInfo: BuildInfo.debug,
-      flutterProject: flutterProject,
-      initializePlatform: false,
-      hostname: 'foo',
-      port: '1234',
-      urlTunneller: null,
-      dartDefines: const <String>[],
-    ), throwsException);
-  }));
-}
-
-class MockBuildDaemonCreator extends Mock implements BuildDaemonCreator {}
-class MockBuildDaemonClient extends Mock implements BuildDaemonClient {}
-class MockDwds extends Mock implements Dwds {}
-class MockHttpMultiServer extends Mock implements HttpMultiServer {}
-class MockChromeLauncher extends Mock implements ChromeLauncher {}
-class MockOperatingSystemUtils extends Mock implements OperatingSystemUtils {}
-class MockPub extends Mock implements Pub {}
-class MockProcessManager extends Mock implements ProcessManager {}

packages/flutter_tools/test/src/mocks.dart

@@ -710,6 +710,9 @@ class MockResidentCompiler extends BasicMock implements ResidentCompiler {
     globals.fs.file(outputPath).writeAsStringSync('compiled_kernel_output');
     return CompilerOutput(outputPath, 0, <Uri>[]);
   }
+
+  @override
+  void addFileSystemRoot(String root) { }
 }
 
 /// A fake implementation of [ProcessResult].

packages/flutter_tools/test/src/testbed.dart

@@ -722,7 +722,6 @@ class TestFeatureFlags implements FeatureFlags {
     this.isWebEnabled = false,
     this.isWindowsEnabled = false,
     this.isAndroidEmbeddingV2Enabled = false,
-    this.isWebIncrementalCompilerEnabled = false,
 });
 
   @override
@@ -740,9 +739,6 @@ class TestFeatureFlags implements FeatureFlags {
   @override
   final bool isAndroidEmbeddingV2Enabled;
 
-  @override
-  final bool isWebIncrementalCompilerEnabled;
-
   @override
   bool isEnabled(Feature feature) {
     switch (feature) {
@@ -756,8 +752,6 @@ class TestFeatureFlags implements FeatureFlags {
         return isWindowsEnabled;
       case flutterAndroidEmbeddingV2Feature:
         return isAndroidEmbeddingV2Enabled;
-      case flutterWebIncrementalCompiler:
-        return isWebIncrementalCompilerEnabled;
     }
     return false;
   }