Skip to content

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

Merged
auto-submit[bot] merged 7 commits into
flutter:masterfrom
mdebbar:revert_93002
Mar 8, 2023
Merged

Revert "[web:tools] always use CanvasKit from the cache when building web apps (#93002)"#117693
auto-submit[bot] merged 7 commits into
flutter:masterfrom
mdebbar:revert_93002

Conversation

@mdebbar

@mdebbarmdebbar commented Dec 27, 2022

Copy link
Copy Markdown
Contributor

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-team-archive/engine#38448

Part of #118799

@flutter-dashboardflutter-dashboardBot added the tool Affects the "flutter" command-line tool. See also t: labels. label Dec 27, 2022

@eyebrowsoffireeyebrowsoffire 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.

LGTM!

@mdebbar

Copy link
Copy Markdown
ContributorAuthor

@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
Copy Markdown
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
Copy Markdown
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
Copy Markdown
ContributorAuthor

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

@yjbanovyjbanov 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.

I think you missed a spot. Otherwise, LGTM.


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

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.

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

File_canvasKitFile(String relativePath) {

Copy link
Copy Markdown
ContributorAuthor

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 yjbanovMarch 7, 2023 22:36

@yjbanovyjbanov 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.

lgtm

@mdebbarmdebbar added the autosubmit Merge PR when tree becomes green via auto submit App label Mar 8, 2023
@auto-submit
auto-submitBot merged commit a9700ff into flutter:masterMar 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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

autosubmitMerge PR when tree becomes green via auto submit ApptoolAffects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@mdebbar@eyebrowsoffire@christopherfujino@yjbanov