Skip to content

Revert "[web:tools] always use CanvasKit from the cache when building web apps (#93002)" #117693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 8, 2023

Conversation

mdebbar
Copy link
Contributor

@mdebbar mdebbar commented Dec 27, 2022

This reverts commit 7737893.

Now that CanvasKit is built from sources, let's revert #93002 so that the locally built CanvasKit is copied to the app's build/web/ folder.

Depends on flutter/engine#38448

Part of #118799

@flutter-dashboard flutter-dashboard bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Dec 27, 2022
Copy link
Contributor

@eyebrowsoffire eyebrowsoffire left a comment

Choose a reason for hiding this comment

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

LGTM!

@mdebbar
Copy link
Contributor Author

mdebbar commented Dec 28, 2022

@eyebrowsoffire in order for this to fully work, we need to change our engine build so that the canvaskit files are generated in out/wasm_release/canvaskit/ instead of directly under out/wasm_release/, right? (If so, my other PR does that).

@eyebrowsoffire
Copy link
Contributor

Sounds good to me. It sounds like @zanderso has some notes on that PR and so we'll wait on merging this until those are resolved.

@christopherfujino
Copy link
Contributor

@mdebbar are you still planning to land this?

@mdebbar mdebbar marked this pull request as draft January 30, 2023 22:45
@mdebbar mdebbar marked this pull request as ready for review March 3, 2023 21:26
@mdebbar
Copy link
Contributor Author

mdebbar commented Mar 3, 2023

cc @yjbanov I would love to get your review on this one since you are the author of the PR being reverted.

Copy link
Contributor

@yjbanov yjbanov left a comment

Choose a reason for hiding this comment

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

I think you missed a spot. Otherwise, LGTM.

@@ -511,15 +510,7 @@ class WebBuiltInAssets extends Target {

@override
Future<void> build(Environment environment) async {
// TODO(yjbanov): https://github.com/flutter/flutter/issues/52588
Copy link
Contributor

Choose a reason for hiding this comment

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

There's a similar TODO here that also needs to be cleaned up:

File _canvasKitFile(String relativePath) {

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, that TODO was added in a different PR than the one I'm reverting. That's why I didn't catch it.

I also made other changes:

@yjbanov PTAL :)

@mdebbar mdebbar requested a review from yjbanov March 7, 2023 22:36
Copy link
Contributor

@yjbanov yjbanov left a comment

Choose a reason for hiding this comment

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

lgtm

@mdebbar mdebbar added the autosubmit Merge PR when tree becomes green via auto submit App label Mar 8, 2023
@auto-submit auto-submit bot merged commit a9700ff into flutter:master Mar 8, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 9, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 10, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 10, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 10, 2023
hannah-hyj pushed a commit to hannah-hyj/flutter that referenced this pull request Mar 11, 2023
… web apps (flutter#93002)" (flutter#117693)

Revert "[web:tools] always use CanvasKit from the cache when building web apps (flutter#93002)"
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 11, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 12, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 10, 2023
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 10, 2023
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 tool Affects the "flutter" command-line tool. See also t: labels.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants