diff --git a/pkgs/dart_services/lib/src/common.dart b/pkgs/dart_services/lib/src/common.dart index d2eda3bcd..df462e30c 100644 --- a/pkgs/dart_services/lib/src/common.dart +++ b/pkgs/dart_services/lib/src/common.dart @@ -21,30 +21,17 @@ import 'dart:ui_web' as ui_web; import 'package:flutter_web_plugins/flutter_web_plugins.dart'; -import 'generated_plugin_registrant.dart'; +import 'generated_plugin_registrant.dart' as pluginRegistrant; import 'main.dart' as entrypoint; Future main() async { - registerPlugins(webPluginRegistrar); await ui_web.bootstrapEngine( runApp: () { - return entrypoint.main(); + entrypoint.main(); + }, + registerPlugins: () { + pluginRegistrant.registerPlugins(); }, ); } '''; - -const kBootstrapFlutterCode_3_16 = r''' -import 'dart:ui' as ui; - -import 'package:flutter_web_plugins/flutter_web_plugins.dart'; - -import 'generated_plugin_registrant.dart'; -import 'main.dart' as entrypoint; - -Future main() async { - registerPlugins(webPluginRegistrar); - await ui.webOnlyInitializePlatform(); - entrypoint.main(); -} -'''; diff --git a/pkgs/dart_services/lib/src/compiling.dart b/pkgs/dart_services/lib/src/compiling.dart index a2494ba8c..cc5ae130c 100644 --- a/pkgs/dart_services/lib/src/compiling.dart +++ b/pkgs/dart_services/lib/src/compiling.dart @@ -121,14 +121,8 @@ class Compiler { Directory(path.join(temp.path, 'lib')).createSync(recursive: true); final bootstrapPath = path.join(temp.path, 'lib', kBootstrapDart); - String bootstrapContents; - if (usingFlutter) { - bootstrapContents = _sdk.usesNewBootstrapEngine - ? kBootstrapFlutterCode - : kBootstrapFlutterCode_3_16; - } else { - bootstrapContents = kBootstrapDartCode; - } + final bootstrapContents = + usingFlutter ? kBootstrapFlutterCode : kBootstrapDartCode; File(bootstrapPath).writeAsStringSync(bootstrapContents); File(path.join(temp.path, 'lib', kMainDart)).writeAsStringSync(source); diff --git a/pkgs/dart_services/lib/src/sdk.dart b/pkgs/dart_services/lib/src/sdk.dart index dc09c40ca..5236b6cf0 100644 --- a/pkgs/dart_services/lib/src/sdk.dart +++ b/pkgs/dart_services/lib/src/sdk.dart @@ -113,19 +113,6 @@ final class Sdk { String get flutterWebSdkPath => path.join(_flutterBinPath, 'cache', 'flutter_web_sdk', 'kernel'); - bool get usesNewBootstrapEngine { - final uiWebPackage = - path.join(_flutterBinPath, 'cache', 'flutter_web_sdk', 'lib', 'ui_web'); - final initializationLibrary = - path.join(uiWebPackage, 'ui_web', 'initialization.dart'); - - final file = File(initializationLibrary); - if (!file.existsSync()) return false; - - // Look for 'Future bootstrapEngine({ ... }) { ... }'. - return file.readAsStringSync().contains('bootstrapEngine('); - } - static Map _retrieveFlutterVersion( String flutterSdkPath, String flutterToolPath,