Skip to content

[google_fonts] Fix file type priority in asset path lookup#10907

Merged
auto-submit[bot] merged 2 commits intoflutter:mainfrom
Frank3K:google-fonts-woff2-web-preferred
Feb 4, 2026
Merged

[google_fonts] Fix file type priority in asset path lookup#10907
auto-submit[bot] merged 2 commits intoflutter:mainfrom
Frank3K:google-fonts-woff2-web-preferred

Conversation

@Frank3K
Copy link
Contributor

@Frank3K Frank3K commented Jan 27, 2026

Description

Follow-up to #10703 which added WOFF/WOFF2 support for web.

The previous implementation iterated through manifest assets first, then checked file extensions. This meant if a .ttf file appeared before a .woff2 file in the manifest, the .ttf would be selected even though .woff2 should be preferred on web.

This fix inverts the loop order to iterate by file type priority first (woff2 > woff > ttf > otf on web), ensuring the preferred format is selected regardless of manifest order.


While working on #10703 I already looked at the specific for-loop, but not immediately notice this might be an issue. For Flutter projects with web-only support it is not; one can just include the woff2 fonts only. But for cross-platform projects it is an issue. Sample from an assets.gen.dart file:

  /// File path: assets/google_fonts/Roboto-Regular.ttf
  String get robotoRegularTtf => 'assets/google_fonts/Roboto-Regular.ttf';

  /// File path: assets/google_fonts/Roboto-Regular.woff2
  String get robotoRegularWoff2 => 'assets/google_fonts/Roboto-Regular.woff2';

With the old loop, the .ttf would be selected, even though a better alternative (the .woff2) is present.

Pre-Review Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the gemini-code-assist bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

Footnotes

  1. Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling. 2 3

Follow-up to flutter#10703 which added WOFF/WOFF2 support for web.

The previous implementation iterated through manifest assets first, then
checked file extensions. This meant if a .ttf file appeared before a
.woff2 file in the manifest, the .ttf would be selected even though
.woff2 should be preferred on web.

This fix inverts the loop order to iterate by file type priority first
(woff2 > woff > ttf > otf on web), ensuring the preferred format is
selected regardless of manifest order.
@Frank3K Frank3K requested a review from Piinks as a code owner January 27, 2026 06:00
@github-actions github-actions bot added p: google_fonts triage-framework Should be looked at in framework triage labels Jan 27, 2026
Copy link

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

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 fixes a bug in how bundled font assets are selected. The logic in findFamilyWithVariantAssetPath has been changed to prioritize more optimized font formats (like WOFF2/WOFF on web) over others, regardless of their order in the asset manifest. This is achieved by iterating through a list of preferred file types first, then searching the manifest for a matching asset. The change is supported by an updated test to verify the new behavior, a version bump to 8.0.1, and a corresponding changelog entry.

@Frank3K
Copy link
Contributor Author

Frank3K commented Jan 27, 2026

@guidezpl This is a bug fix for #10703, which you reviewed last week. Could you take a look at this fix?

Copy link
Member

@guidezpl guidezpl left a comment

Choose a reason for hiding this comment

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

This is consistent with guidance on asset manifests which says that the order doesn't matter

██╗      ██████╗ ████████╗███╗   ███╗
██║     ██╔════╝ ╚══██╔══╝████╗ ████║
██║     ██║  ███╗   ██║   ██╔████╔██║
██║     ██║   ██║   ██║   ██║╚██╔╝██║
███████╗╚██████╔╝   ██║   ██║ ╚═╝ ██║
╚══════╝ ╚═════╝    ╚═╝   ╚═╝     ╚═╝

@stuartmorgan-g
Copy link
Collaborator

@Frank3K While waiting for the secondary review, the analyzer issue that's causing CI failures will need to be fixed before this can land.

Copy link
Contributor

@Piinks Piinks left a comment

Choose a reason for hiding this comment

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

This LGTM! Thank you! Once the failures in CI are addressed, we can land this. 👍

@Frank3K
Copy link
Contributor Author

Frank3K commented Feb 4, 2026

@Piinks Done, it's green now. Thanks.

@stuartmorgan-g stuartmorgan-g added autosubmit Merge PR when tree becomes green via auto submit App and removed triage-framework Should be looked at in framework triage labels Feb 4, 2026
@auto-submit auto-submit bot merged commit 3cbdaca into flutter:main Feb 4, 2026
80 checks passed
@github-actions github-actions bot added the triage-framework Should be looked at in framework triage label Feb 4, 2026
github-merge-queue bot pushed a commit to flutter/flutter that referenced this pull request Feb 5, 2026
flutter/packages@3bddf2c...c197455

2026-02-05 engine-flutter-autoroll@skia.org Roll Flutter from
bf701fe to f916dd6 (44 revisions) (flutter/packages#10967)
2026-02-05 stuartmorgan@google.com [webview_flutter] Fix crash in iOS
external native API (flutter/packages#10959)
2026-02-04 8014077+Frank3K@users.noreply.github.com [google_fonts] Fix
file type priority in asset path lookup (flutter/packages#10907)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages-flutter-autoroll
Please CC flutter-ecosystem@google.com on the revert to ensure that a
human
is aware of the problem.

To file a bug in Flutter:
https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

autosubmit Merge PR when tree becomes green via auto submit App p: google_fonts triage-framework Should be looked at in framework triage

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants