DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure plugin registrants are generated in build_web (#41906)

Browse Source
This commit is contained in:
Jonah Williams 2019-10-04 00:36:09 -07:00 committed by GitHub
parent ea305c5050
commit ae18f07324
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 78 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/flutter_tools/lib/src/build_system/targets/web.dart
View File

@ -55,12 +55,16 @@ class WebEntrypointTarget extends Target {
String contents;
if (hasPlugins) {
final String generatedPath = environment.projectDir
.childDirectory('lib')
.childFile('generated_plugin_registrant.dart')
.absolute.uri.toString();
contents = '''
import 'dart:ui' as ui;
import 'package:flutter_web_plugins/flutter_web_plugins.dart';
import 'generated_plugin_registrant.dart';
import '$generatedPath';
import "$import" as entrypoint;
Future<void> main() async {

3
packages/flutter_tools/lib/src/web/compile.dart
View File

@ -27,9 +27,10 @@ Future<void> buildWeb(FlutterProject flutterProject, String target, BuildInfo bu
}
final bool hasWebPlugins = findPlugins(flutterProject)
.any((Plugin p) => p.platforms.containsKey(WebPlugin.kConfigKey));
await injectPlugins(flutterProject, checkProjects: true);
final Status status = logger.startProgress('Compiling $target for the Web...', timeout: null);
final Stopwatch sw = Stopwatch()..start();
final BuildResult result = await const BuildSystem().build(const WebReleaseBundle(), Environment(
final BuildResult result = await buildSystem.build(const WebReleaseBundle(), Environment(
outputDir: fs.directory(getWebBuildDirectory()),
projectDir: fs.currentDirectory,
buildDir: flutterProject.directory

66
packages/flutter_tools/test/commands.shard/hermetic/build_web_test.dart
View File

@ -7,6 +7,7 @@ import 'package:flutter_tools/src/base/common.dart';
import 'package:flutter_tools/src/base/file_system.dart';
import 'package:flutter_tools/src/base/platform.dart';
import 'package:flutter_tools/src/build_info.dart';
import 'package:flutter_tools/src/build_system/build_system.dart';
import 'package:flutter_tools/src/cache.dart';
import 'package:flutter_tools/src/commands/build.dart';
import 'package:flutter_tools/src/commands/build_web.dart';
@ -86,6 +87,70 @@ void main() {
FeatureFlags: () => TestFeatureFlags(isWebEnabled: false),
}));
test('Builds a web bundle - end to end', () => testbed.run(() async {
final CommandRunner<void> runner = createTestCommandRunner(BuildCommand());
final List<String> dependencies = <String>[
fs.path.join('packages', 'flutter_tools', 'lib', 'src', 'build_system', 'targets', 'web.dart'),
fs.path.join('bin', 'cache', 'flutter_web_sdk'),
fs.path.join('bin', 'cache', 'dart-sdk', 'bin', 'snapshots', 'dart2js.dart.snapshot'),
fs.path.join('bin', 'cache', 'dart-sdk', 'bin', 'dart'),
fs.path.join('bin', 'cache', 'dart-sdk '),
];
for (String dependency in dependencies) {
fs.file(dependency).createSync(recursive: true);
}
// Project files.
fs.file('.packages')
..writeAsStringSync('''
foo:lib/
fizz:bar/lib/
''');
fs.file('pubspec.yaml')
..writeAsStringSync('''
name: foo
dependencies:
flutter:
sdk: flutter
fizz:
path:
bar/
''');
fs.file(fs.path.join('bar', 'pubspec.yaml'))
..createSync(recursive: true)
..writeAsStringSync('''
name: bar
flutter:
plugin:
platforms:
web:
pluginClass: UrlLauncherPlugin
fileName: url_launcher_web.dart
''');
fs.file(fs.path.join('bar', 'lib', 'url_launcher_web.dart'))
..createSync(recursive: true)
..writeAsStringSync('''
class UrlLauncherPlugin {}
''');
fs.file(fs.path.join('lib', 'main.dart'))
..writeAsStringSync('void main() { }');
// Process calls. We're not testing that these invocations are correct because
// that is covered in targets/web_test.dart.
when(buildSystem.build(any, any)).thenAnswer((Invocation invocation) async {
return BuildResult(success: true);
});
await runner.run(<String>['build', 'web']);
expect(fs.file(fs.path.join('lib', 'generated_plugin_registrant.dart')).existsSync(), true);
}, overrides: <Type, Generator>{
FeatureFlags: () => TestFeatureFlags(isWebEnabled: true),
BuildSystem: () => MockBuildSystem(),
}));
test('hidden if feature flag is not enabled', () => testbed.run(() async {
expect(BuildWebCommand().hidden, true);
}, overrides: <Type, Generator>{
@ -99,6 +164,7 @@ void main() {
}));
}
class MockBuildSystem extends Mock implements BuildSystem {}
class MockWebCompilationProxy extends Mock implements WebCompilationProxy {}
class MockPlatform extends Mock implements Platform {
@override

10
packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart
View File

@ -56,7 +56,7 @@ void main() {
final String generated = environment.buildDir.childFile('main.dart').readAsStringSync();
// Plugins
expect(generated, contains("import 'generated_plugin_registrant.dart';"));
expect(generated, contains("import 'file:///lib/generated_plugin_registrant.dart';"));
expect(generated, contains('registerPlugins(webPluginRegistry);'));
// Platform
@ -77,7 +77,7 @@ void main() {
final String generated = environment.buildDir.childFile('main.dart').readAsStringSync();
// Plugins
expect(generated, contains("import 'generated_plugin_registrant.dart';"));
expect(generated, contains("import 'file:///C:/lib/generated_plugin_registrant.dart';"));
expect(generated, contains('registerPlugins(webPluginRegistry);'));
// Platform
@ -100,7 +100,7 @@ void main() {
final String generated = environment.buildDir.childFile('main.dart').readAsStringSync();
// Plugins
expect(generated, isNot(contains("import 'generated_plugin_registrant.dart';")));
expect(generated, isNot(contains("import 'file:///lib/generated_plugin_registrant.dart';")));
expect(generated, isNot(contains('registerPlugins(webPluginRegistry);')));
// Platform
@ -118,7 +118,7 @@ void main() {
final String generated = environment.buildDir.childFile('main.dart').readAsStringSync();
// Plugins
expect(generated, contains("import 'generated_plugin_registrant.dart';"));
expect(generated, contains("import 'file:///lib/generated_plugin_registrant.dart';"));
expect(generated, contains('registerPlugins(webPluginRegistry);'));
// Platform
@ -136,7 +136,7 @@ void main() {
final String generated = environment.buildDir.childFile('main.dart').readAsStringSync();
// Plugins
expect(generated, isNot(contains("import 'generated_plugin_registrant.dart';")));
expect(generated, isNot(contains("import 'file:///lib/generated_plugin_registrant.dart';")));
expect(generated, isNot(contains('registerPlugins(webPluginRegistry);')));
// Platform