Skip to content

Commit 6d50e5b

Browse files
committed
[flutter_tools] Invalidate WebEntrypointTarget when plugin set changes
Add `.dart_tool/package_config.json`, `pubspec.yaml`, and `.flutter-plugins-dependencies` (optional) to `WebEntrypointTarget.inputs`, and `{BUILD_DIR}/web_plugin_registrant.dart` to `WebEntrypointTarget.outputs`. Previously, `WebEntrypointTarget` only declared `{BUILD_DIR}/main.dart` in `outputs` and its own source file in `inputs`. When plugins were added or removed between consecutive `flutter build web` invocations, `FlutterBuildSystem` evaluated `WebEntrypointTarget` as up-to-date, skipping target execution and leaving `web_plugin_registrant.dart` stale. Fixes flutter#189128
1 parent cf9e8af commit 6d50e5b

2 files changed

Lines changed: 32 additions & 1 deletion

File tree

  • packages/flutter_tools

‎packages/flutter_tools/lib/src/build_system/targets/web.dart‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,16 @@ class WebEntrypointTarget extends Target {
5454
@override
5555
List<Source> get inputs => const <Source>[
5656
Source.pattern('{FLUTTER_ROOT}/packages/flutter_tools/lib/src/build_system/targets/web.dart'),
57+
Source.pattern('{WORKSPACE_DIR}/.dart_tool/package_config.json'),
58+
Source.pattern('{PROJECT_DIR}/pubspec.yaml'),
59+
Source.pattern('{PROJECT_DIR}/.flutter-plugins-dependencies', optional: true),
5760
];
5861

5962
@override
60-
List<Source> get outputs => const <Source>[Source.pattern('{BUILD_DIR}/main.dart')];
63+
List<Source> get outputs => const <Source>[
64+
Source.pattern('{BUILD_DIR}/main.dart'),
65+
Source.pattern('{BUILD_DIR}/web_plugin_registrant.dart'),
66+
];
6167

6268
@override
6369
Future<void> build(Environment environment) async {

‎packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,31 @@ name: foo
134134
),
135135
);
136136

137+
test(
138+
'WebEntrypointTarget declares package_config.json, pubspec.yaml, and plugin dependencies as inputs',
139+
() => testbed.run(() async {
140+
const target = WebEntrypointTarget();
141+
expect(
142+
target.inputs,
143+
equals(<Source>[
144+
const Source.pattern(
145+
'{FLUTTER_ROOT}/packages/flutter_tools/lib/src/build_system/targets/web.dart',
146+
),
147+
const Source.pattern('{WORKSPACE_DIR}/.dart_tool/package_config.json'),
148+
const Source.pattern('{PROJECT_DIR}/pubspec.yaml'),
149+
const Source.pattern('{PROJECT_DIR}/.flutter-plugins-dependencies', optional: true),
150+
]),
151+
);
152+
expect(
153+
target.outputs,
154+
equals(<Source>[
155+
const Source.pattern('{BUILD_DIR}/main.dart'),
156+
const Source.pattern('{BUILD_DIR}/web_plugin_registrant.dart'),
157+
]),
158+
);
159+
}),
160+
);
161+
137162
test(
138163
'version.json is created after release build',
139164
() => testbed.run(() async {

0 commit comments

Comments
 (0)