Unverified Commit f050ee67 authored by Devon Carew's avatar Devon Carew Committed by GitHub

prettify the flutter web bootstrap file (#55125)

parent 8e5b5751
...@@ -584,18 +584,23 @@ class _ResidentWebRunner extends ResidentWebRunner { ...@@ -584,18 +584,23 @@ class _ResidentWebRunner extends ResidentWebRunner {
} }
final String entrypoint = <String>[ final String entrypoint = <String>[
'import "$importedEntrypoint" as entrypoint;', '// Flutter web bootstrap script for $importedEntrypoint.',
'import "dart:ui" as ui;', '',
"import 'dart:ui' as ui;",
'',
"import '$importedEntrypoint' as entrypoint;",
if (hasWebPlugins) if (hasWebPlugins)
'import "package:flutter_web_plugins/flutter_web_plugins.dart";', "import 'package:flutter_web_plugins/flutter_web_plugins.dart';",
if (hasWebPlugins) if (hasWebPlugins)
'import "$generatedImport";', "import '$generatedImport';",
'',
'Future<void> main() async {', 'Future<void> main() async {',
if (hasWebPlugins) if (hasWebPlugins)
' registerPlugins(webPluginRegistry);', ' registerPlugins(webPluginRegistry);',
' await ui.webOnlyInitializePlatform();', ' await ui.webOnlyInitializePlatform();',
' entrypoint.main();', ' entrypoint.main();',
'}', '}',
'',
].join('\n'); ].join('\n');
result.writeAsStringSync(entrypoint); result.writeAsStringSync(entrypoint);
} }
......
...@@ -11,6 +11,7 @@ import 'package:flutter_tools/src/base/io.dart'; ...@@ -11,6 +11,7 @@ import 'package:flutter_tools/src/base/io.dart';
import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/logger.dart';
import 'package:flutter_tools/src/base/terminal.dart'; import 'package:flutter_tools/src/base/terminal.dart';
import 'package:flutter_tools/src/build_info.dart'; import 'package:flutter_tools/src/build_info.dart';
import 'package:flutter_tools/src/build_runner/devfs_web.dart';
import 'package:flutter_tools/src/build_runner/resident_web_runner.dart'; import 'package:flutter_tools/src/build_runner/resident_web_runner.dart';
import 'package:flutter_tools/src/compile.dart'; import 'package:flutter_tools/src/compile.dart';
import 'package:flutter_tools/src/dart/pub.dart'; import 'package:flutter_tools/src/dart/pub.dart';
...@@ -21,7 +22,6 @@ import 'package:flutter_tools/src/project.dart'; ...@@ -21,7 +22,6 @@ import 'package:flutter_tools/src/project.dart';
import 'package:flutter_tools/src/reporting/reporting.dart'; import 'package:flutter_tools/src/reporting/reporting.dart';
import 'package:flutter_tools/src/resident_runner.dart'; import 'package:flutter_tools/src/resident_runner.dart';
import 'package:flutter_tools/src/web/chrome.dart'; import 'package:flutter_tools/src/web/chrome.dart';
import 'package:flutter_tools/src/build_runner/devfs_web.dart';
import 'package:flutter_tools/src/web/web_device.dart'; import 'package:flutter_tools/src/web/web_device.dart';
import 'package:mockito/mockito.dart'; import 'package:mockito/mockito.dart';
import 'package:platform/platform.dart'; import 'package:platform/platform.dart';
...@@ -390,9 +390,10 @@ void main() { ...@@ -390,9 +390,10 @@ void main() {
// Ensure that generated entrypoint is generated correctly. // Ensure that generated entrypoint is generated correctly.
expect(entrypointFileName, isNotNull); expect(entrypointFileName, isNotNull);
expect(globals.fs.file(entrypointFileName).readAsStringSync(), contains( final String entrypointContents = globals.fs.file(entrypointFileName).readAsStringSync();
'await ui.webOnlyInitializePlatform();' expect(entrypointContents, contains('// Flutter web bootstrap script'));
)); expect(entrypointContents, contains("import 'dart:ui' as ui;"));
expect(entrypointContents, contains('await ui.webOnlyInitializePlatform();'));
expect(testLogger.statusText, contains('Restarted application in')); expect(testLogger.statusText, contains('Restarted application in'));
expect(result.code, 0); expect(result.code, 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment