Skip to content

Reverts "[web, tool] Support recompiling shaders and unify asset processing (#185534)"#186837

Merged
auto-submit[bot] merged 1 commit into
masterfrom
revert_f15c3a34d3b1f6c03a4f4ac7762ccc5bdba8bd65
May 20, 2026
Merged

Reverts "[web, tool] Support recompiling shaders and unify asset processing (#185534)"#186837
auto-submit[bot] merged 1 commit into
masterfrom
revert_f15c3a34d3b1f6c03a4f4ac7762ccc5bdba8bd65

Conversation

@auto-submit
Copy link
Copy Markdown
Contributor

@auto-submit auto-submit Bot commented May 20, 2026

Reverts: #185534

Initiated by: chunhtai

Reason for reverting: cause test flakes

Original PR Author: kevmoo

Reviewed By: {harryterkelsen}

This change reverts the following previous change:
User-visible fixes:

  • Hot RESTART: should reload for all assets.
  • Hot RELOAD: should reload all assets EXCEPT shaders. Will need to do that in a follow-up.

Addresses SOME of #137265 (Images, JSON, Text, Data Files)

Extracted core asset sync logic (incremental checks, transformers, and
shader recompilation) into a shared static method DevFS.updateBundle.
This aligns the web asset path with other platforms and correctly
enables support for asset transformers during web hot reload/restart.

Previously, WebDevFS used a custom asset loop that bypassed the
transformer step and silently ignored shader compilation failures.

Changes:

  • Refactored DevFS.update to use the new DevFS.updateBundle helper.
  • Updated WebDevFS to leverage DevFS.updateBundle and LocalDevFSWriter.
  • Fixed a path resolution bug in WebDevFS where assets were resolving
    to incorrect nested paths.
  • Added comprehensive tests in devfs_web_test.dart for shader
    recompilation, asset transformers, and failure handling.
  • Ensured that shader compilation failures correctly report an update
    failure in the FS report.

@auto-submit auto-submit Bot added the revert of Bot Only: Tracking label for bot. Tracks new revert of pull requests. label May 20, 2026
@github-actions github-actions Bot added the tool Affects the "flutter" command-line tool. See also t: labels. label May 20, 2026
@auto-submit auto-submit Bot removed the revert of Bot Only: Tracking label for bot. Tracks new revert of pull requests. label May 20, 2026
@auto-submit
Copy link
Copy Markdown
Contributor Author

auto-submit Bot commented May 20, 2026

auto label is removed for flutter/flutter/186837, Failed to enqueue flutter/flutter/186837 with HTTP 400: Pull request Required status check "Merge Queue Guard" is expected..

Copy link
Copy Markdown
Contributor

@chunhtai chunhtai left a comment

Choose a reason for hiding this comment

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

LGTM

@chunhtai chunhtai added autosubmit Merge PR when tree becomes green via auto submit App emergency Jump the queue; land PR in front of all others; only use for emergencies labels May 20, 2026
@flutter-dashboard
Copy link
Copy Markdown

Detected the emergency label.

If you add the autosubmit label, the bot will wait until all presubmits pass but ignore the tree status, allowing fixes for tree breakages while still validating that they don't break any existing presubmits.

The "Merge" button is also unlocked. To bypass presubmits as well as the tree status, press the GitHub "Add to Merge Queue".

1 similar comment
@flutter-dashboard
Copy link
Copy Markdown

Detected the emergency label.

If you add the autosubmit label, the bot will wait until all presubmits pass but ignore the tree status, allowing fixes for tree breakages while still validating that they don't break any existing presubmits.

The "Merge" button is also unlocked. To bypass presubmits as well as the tree status, press the GitHub "Add to Merge Queue".

@chunhtai chunhtai added the CICD Run CI/CD label May 20, 2026
@auto-submit
Copy link
Copy Markdown
Contributor Author

auto-submit Bot commented May 20, 2026

auto label is removed for flutter/flutter/186837, Failed to enqueue flutter/flutter/186837 with HTTP 400: Pull request Required status check "Merge Queue Guard" is queued..

@auto-submit auto-submit Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label May 20, 2026
@chunhtai chunhtai added the autosubmit Merge PR when tree becomes green via auto submit App label May 20, 2026
@auto-submit auto-submit Bot added this pull request to the merge queue May 20, 2026
Merged via the queue into master with commit 7ed7e21 May 20, 2026
185 of 188 checks passed
@auto-submit auto-submit Bot deleted the revert_f15c3a34d3b1f6c03a4f4ac7762ccc5bdba8bd65 branch May 20, 2026 23:57
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label May 20, 2026
matthewhendrix pushed a commit to matthewhendrix/flutter that referenced this pull request May 23, 2026
…essing (flutter#185534)" (flutter#186837)

<!-- start_original_pr_link -->
Reverts: flutter#185534
<!-- end_original_pr_link -->
<!-- start_initiating_author -->
Initiated by: chunhtai
<!-- end_initiating_author -->
<!-- start_revert_reason -->
Reason for reverting: cause test flakes
<!-- end_revert_reason -->
<!-- start_original_pr_author -->
Original PR Author: kevmoo
<!-- end_original_pr_author -->

<!-- start_reviewers -->
Reviewed By: {harryterkelsen}
<!-- end_reviewers -->

<!-- start_revert_body -->
This change reverts the following previous change:
User-visible fixes:

- Hot RESTART: should reload for all assets.
- Hot RELOAD: should reload all assets EXCEPT shaders. Will need to do
that in a follow-up.

Addresses SOME of flutter#137265 (Images, JSON, Text, Data Files)

Extracted core asset sync logic (incremental checks, transformers, and
shader recompilation) into a shared static method `DevFS.updateBundle`.
This aligns the web asset path with other platforms and correctly
enables support for asset transformers during web hot reload/restart.

Previously, `WebDevFS` used a custom asset loop that bypassed the
transformer step and silently ignored shader compilation failures.

Changes:
- Refactored `DevFS.update` to use the new `DevFS.updateBundle` helper.
- Updated `WebDevFS` to leverage `DevFS.updateBundle` and
`LocalDevFSWriter`.
- Fixed a path resolution bug in `WebDevFS` where assets were resolving
to incorrect nested paths.
- Added comprehensive tests in `devfs_web_test.dart` for shader
recompilation, asset transformers, and failure handling.
- Ensured that shader compilation failures correctly report an update
failure in the FS report.


<!-- end_revert_body -->

Co-authored-by: auto-submit[bot] <flutter-engprod-team@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CICD Run CI/CD emergency Jump the queue; land PR in front of all others; only use for emergencies 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