Skip to content

[flutter_tools] Include data assets from hooks when pubspec.yaml is empty - #193434

Merged
auto-submit[bot] merged 1 commit into
flutter:masterfrom
dcharkes:data-assets-empty-pubspec
Sep 28, 2026
Merged

auto-submit[bot] merged 1 commit into
flutter:masterfrom
dcharkes:data-assets-empty-pubspec

Conversation

@dcharkes

@dcharkes dcharkes commented Sep 28, 2026 •

Copy link
Copy Markdown
Contributor

When flutterManifest.isEmpty (for example, a pubspec.yaml without a flutter: section), ManifestAssetBundle.build previously returned early with an empty AssetManifest.bin, ignoring any data assets produced by build/link hooks (flutterHookResult.dataAssets).

Bug:

Changes

  • Only short-circuit with an empty manifest in ManifestAssetBundle.build when both flutterManifest.isEmpty and flutterHookResult?.dataAssets.isEmpty ?? true.
  • Skip computeTransitiveDependencies when flutterManifest.isEmpty.
  • Add a unit test in asset_bundle_test.dart verifying that data assets from hooks are bundled when pubspec.yaml is empty.

PR Stack

# PR Branch Commit
1 👉 #193434 (this PR) data-assets-empty-pubspec ab37f42
2 #193435 data-assets-flutter-test 4956c97
3 #193436 data-assets-dev-dependencies-release-test 596124d
4 #193437 data-assets-widget-preview bd246d9

Pre-launch Checklist

  • I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
  • I read the [AI contribution guidelines] and understand my responsibilities, or I am not using AI tools.
  • I read the [Tree Hygiene] wiki page, which explains my responsibilities.
  • I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
  • I signed the [CLA].
  • I listed at least one issue that this PR fixes in the description above.
  • I updated/added relevant in-code documentation (doc comments with ///).
  • If this PR introduces a new feature or capability, I created and linked a website documentation issue or PR in [flutter/website] (or verified none is needed).
  • I added new tests to check the change I am making, or this PR is [test-exempt].
  • I followed the [breaking change policy] and added [Data Driven Fixes] where supported.
  • All existing and new tests are passing.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates ManifestAssetBundle to bundle data assets from hooks even when the Flutter manifest is empty, and adds a test case to verify this behavior. However, skipping the computation of transitive dependencies when the manifest is empty could prevent the collection of license files for those dependencies, potentially causing compliance issues. It is recommended to keep computing transitive dependencies regardless of whether the manifest is empty.

Comment thread packages/flutter_tools/lib/src/asset.dart
@dcharkes dcharkes added the CICD Run CI/CD label Sep 28, 2026
@dcharkes dcharkes added the autosubmit Merge PR when tree becomes green via auto submit App label Sep 28, 2026
@auto-submit
auto-submit Bot added this pull request to the merge queue Sep 28, 2026
Merged via the queue into flutter:master with commit ab37f42 Sep 28, 2026
33 checks passed
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Sep 28, 2026
auto-submit Bot pushed a commit to flutter/packages that referenced this pull request Sep 29, 2026
…#13060)

Manual roll Flutter from 4fcd90be0045 to c5a061b18fa2 (222 revisions)

Manual roll requested by [email protected]

flutter/flutter@4fcd90b...c5a061b

2026-09-28 [email protected] [cross imports] navigator_test.dart (flutter/flutter#190954)
2026-09-28 [email protected] Revert: Reland: Only render views that need to be rendered  (flutter/flutter#193360)
2026-09-28 [email protected] ci(bringup): android_intent_security_test is green (flutter/flutter#193469)
2026-09-28 [email protected] Sync CHANGELOG.md from stable (flutter/flutter#193020)
2026-09-28 [email protected] Roll Fuchsia Linux SDK from ukukV5lEkKabtOATk... to QdgqP02_cYpRQQQNN... (flutter/flutter#193454)
2026-09-28 [email protected] Roll pub packages (flutter/flutter#193460)
2026-09-28 [email protected] Un-nest sceneBuildDuration and windowRenderDuration in web SceneBuilderRecorder (flutter/flutter#193260)
2026-09-28 [email protected] Fix unresolved doc comment references in dev/integration_tests and dev/benchmarks (flutter/flutter#193433)
2026-09-28 [email protected] Roll Packages from e55e7ac to ba0364a (9 revisions) (flutter/flutter#193450)
2026-09-28 [email protected] [tool] Require explicit dependency injection for FlutterDevice and FlutterDevice.create (flutter/flutter#192830)
2026-09-28 [email protected] Roll pub packages (flutter/flutter#193442)
2026-09-28 [email protected] [flutter_tools] Include data assets from hooks when pubspec.yaml is empty (flutter/flutter#193434)
2026-09-28 [email protected] Roll pub packages (flutter/flutter#193438)
2026-09-28 [email protected] Fix unresolved doc comment references in Material and Cupertino (flutter/flutter#193283)
2026-09-28 [email protected] Fix doc references to Material and Cupertino in the widgets library and its tests (flutter/flutter#193334)
2026-09-26 [email protected] wasm: enforce WasmGC opt-in capability checks and Firefox < 147 guard (flutter/flutter#193180)
2026-09-26 [email protected] [Android] Refuse external setters of engine entrypoint and cached engine arguments via `Intent`s (flutter/flutter#190249)
2026-09-26 [email protected] [web] Unskip TextPainter.getWordBoundary test (flutter/flutter#193378)
2026-09-26 [email protected] Specify non-obvious types in pattern variable declarations (flutter/flutter#192632)
2026-09-26 [email protected] Removes feedback loop from advanced filters without offscreen msaa and framebufferfetch (flutter/flutter#193306)
2026-09-26 [email protected] [web] Unskip 8 passing image tests in painting and rendering (flutter/flutter#193377)
2026-09-26 [email protected] Revert: Allow resetting test invariants in `addTearDown` (flutter/flutter#193383)
2026-09-25 [email protected] [tool] Migrate CoverageCollector to modular dependency injection (flutter/flutter#192924)
2026-09-25 [email protected] Fix more unresolved doc comment references (flutter/flutter#193336)
2026-09-25 [email protected] Allow resetting test invariants in `addTearDown` (flutter/flutter#192082)
2026-09-25 [email protected] [a11y] Add a semantics role for slider (flutter/flutter#193324)
2026-09-25 [email protected] Fix plugin tests after Pigeon plugin template changes (flutter/flutter#193302)
2026-09-25 [email protected] [Android 17] Bump Standard Test Apps in flutter/flutter to AGP 9.3.1 (flutter/flutter#193263)
2026-09-25 [email protected] SSBO-based gradients in UberSDF (flutter/flutter#192962)
2026-09-25 [email protected] [Linux] Handle FlView being destroyed before rendering is complete. (flutter/flutter#193268)
2026-09-25 [email protected] [flutter_tools] Handle Windows reserved characters in test target path (flutter/flutter#191900)
2026-09-25 [email protected] docs(tools): nit: say hook/build.dart in CMake native assets comment (flutter/flutter#192205)
2026-09-25 [email protected] [web] Enable Firefox Skwasm UI CI suites, configure COI configs, and fail fast on loader rejections (flutter/flutter#193187)
2026-09-25 [email protected] [Android 17] Bumped Engine Dependencies to 9.3.1 (flutter/flutter#193265)
2026-09-25 [email protected] [web] Omit group role on menu scrollables and assign region role to named routes (flutter/flutter#192965)
2026-09-25 [email protected] Roll Skia from 8eedeed98e79 to f441ca223b2b (5 revisions) (flutter/flutter#193353)
2026-09-25 [email protected] Roll Fuchsia Linux SDK from EbPpoJW-Lnsu-8dyZ... to ukukV5lEkKabtOATk... (flutter/flutter#193326)
2026-09-25 [email protected] Roll Packages from 431ea69 to e55e7ac (6 revisions) (flutter/flutter#193351)
2026-09-25 [email protected] Support DynamicLibrary.codeAsset in Flutter (flutter/flutter#188947)
2026-09-25 [email protected] Roll Dart SDK from 75d9e87d4e3d to 0e7642b85457 (1 revision) (flutter/flutter#193346)
2026-09-25 [email protected] Exclude iOS PRs from macOS link (flutter/flutter#193315)
2026-09-25 [email protected] Roll Skia from 6357608543ec to 8eedeed98e79 (4 revisions) (flutter/flutter#193341)
2026-09-25 [email protected] Roll Dart SDK from d3aedb186aab to 75d9e87d4e3d (3 revisions) (flutter/flutter#193335)
2026-09-25 [email protected] Cache the paint offset adjusted line metrics in TextPainter (flutter/flutter#191223)
...
mattkae pushed a commit to canonical/flutter that referenced this pull request Oct 1, 2026
…r#193435)

Previously, `flutter test` ran native assets hooks via
`TestCompilerNativeAssetsBuilder.build(buildInfo)`, which only returned
the `NativeAssetsManifest.json` URI and discarded the
`FlutterHookResult` containing hook-generated data assets.

Bug:

* flutter#146264

### Changes
- Add `buildWithHookResult` to `TestCompilerNativeAssetsBuilder`
returning both `nativeAssetsManifest` and `flutterHookResult`.
- Pass `flutterHookResult` to `_buildTestAsset` / `assetBundle.build` in
`TestCommand`.
- Update `TestCommand._needsRebuild` to check if bundled asset files
exist on disk, guard `pub.existsSync()`, and check
`flutterHookResult.dependencies` modification timestamps.
- Add a hermetic test in `test_test.dart` verifying that `flutter test`
bundles data assets from hooks into `build/unit_test_assets`.

### PR Stack
| # | PR | Branch | Commit |
| :-: | :--- | :--- | :--- |
| 1 | flutter#193434 |
`data-assets-empty-pubspec` |
flutter@62199c4
|
| **2** | **👉 flutter#193435 (this PR)**
| `data-assets-flutter-test` |
flutter@390c757
|
| 3 | flutter#193436 |
`data-assets-dev-dependencies-release-test` |
flutter@cca04e9
|
| 4 | flutter#193437 |
`data-assets-widget-preview` |
flutter@0a5a8e9
|

> **Note:** This PR is stacked on
flutter#193434. To review only this PR's
diff before the base PR lands, view commit
flutter@390c757.

## Pre-launch Checklist

- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [AI contribution guidelines] and understand my
responsibilities, or I am not using AI tools.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide], including [Features
we expect every widget to implement].
- [x] I signed the [CLA].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant in-code documentation (doc comments with
`///`).
- [x] If this PR introduces a new feature or capability, I created and
linked a website documentation issue or PR in [flutter/website] (or
verified none is needed).
- [x] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [x] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [x] All existing and new tests are passing.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CICD Run CI/CD tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants