Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Revert "[web] Accepts assetBase through JS config. (#40615)" #40670

Merged
ditman merged 1 commit into from
Mar 27, 2023
Merged

Revert "[web] Accepts assetBase through JS config. (#40615)" #40670

ditman merged 1 commit into from
Mar 27, 2023

Conversation

@ditman
Copy link
Member

@ditman ditman commented Mar 27, 2023 •
edited
Loading

This reverts commit f7d2571.

This commit is causing problems with new lint rules:

   info - test/engine/assets_test.dart:5:1 - This annotation must be attached to a library directive. Try attaching library annotations to library directives. - library_annotations

Issues

Reverts flutter/engine#f7d257198c1d4135a4d2e404f721ed24ca65c440

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

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

@ditman
Revert "[web] Accepts assetBase through JS config. (flutter#40615)"
52dd2f5 
This reverts commit f7d2571.

This commit is causing problems with new lint rules:

```
   info - test/engine/assets_test.dart:5:1 - This annotation must be attached to a library directive. Try attaching library annotations to library directives. - library_annotations
```
@flutter-dashboard flutter-dashboard bot added the platform-web Code specifically for the web engine label Mar 27, 2023
@ditman ditman requested a review from yjbanov March 27, 2023 18:48
@ditman ditman added warning: land on red to fix tree breakage Override tree-status signal (land even with closed tree), combine with the autosubmit label. revert Label used to revert changes in a closed and merged pull request. labels Mar 27, 2023
@auto-submit auto-submit bot removed the revert Label used to revert changes in a closed and merged pull request. label Mar 27, 2023
@auto-submit
Copy link
Contributor

auto-submit bot commented Mar 27, 2023

A reverts link could not be found or was formatted incorrectly. Format is 'Reverts owner/repo#id'

eyebrowsoffire
eyebrowsoffire approved these changes Mar 27, 2023
View reviewed changes
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!

@ditman ditman added the autosubmit Merge PR when tree becomes green via auto submit App label Mar 27, 2023
@ditman
Copy link
Member Author

ditman commented Mar 27, 2023

Step 17 (web engine analysis) is passing here:

https://ci.chromium.org/ui/p/flutter/builders/try/Linux%20Web%20Engine/35199/overview

Manually clicking Squash and merge, to make the tree green again.

@ditman ditman merged commit 6cc2f9b into flutter:main Mar 27, 2023
@ditman ditman deleted the revert-assetbase branch March 27, 2023 19:07
ditman added a commit to ditman/flutter-engine that referenced this pull request Mar 27, 2023
@ditman
Reland "[web] Accepts assetBase through JS config. (flutter#40615)"
43e723a 
This reverts commit 6cc2f9b, PR flutter#40670.
@ditman ditman mentioned this pull request Mar 27, 2023
Merged
8 tasks
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Mar 27, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Mar 27, 2023
@engine-flutter-autoroll
6cc2f9b Revert "[web] Accepts assetBase through JS config. (flutter#4…
9be7a7b 
…0615)" (flutter/engine#40670)
eyebrowsoffire pushed a commit to eyebrowsoffire/engine that referenced this pull request Mar 27, 2023
@ditman @eyebrowsoffire
Revert "[web] Accepts assetBase through JS config. (flutter#40615)" (f…
9c4508b 
…lutter#40670)

This reverts commit f7d2571.

This commit is causing problems with new lint rules:

```
   info - test/engine/assets_test.dart:5:1 - This annotation must be attached to a library directive. Try attaching library annotations to library directives. - library_annotations
```
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Mar 27, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Mar 27, 2023
@engine-flutter-autoroll
6cc2f9b Revert "[web] Accepts assetBase through JS config. (flutter#4…
4eaaa1d 
…0615)" (flutter/engine#40670)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Mar 27, 2023
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Mar 27, 2023
@engine-flutter-autoroll
6cc2f9b Revert "[web] Accepts assetBase through JS config. (flutter#4…
9be70c4 
…0615)" (flutter/engine#40670)
bdero pushed a commit to flutter/flutter that referenced this pull request Mar 28, 2023
@engine-flutter-autoroll
Manual roll Flutter Engine from 685fbc6 to 8cb0803 (43 revisions) (#1…
89da046 
…23568)

* c758114 Roll Dart SDK from 17655a04d99a to a040e32db8f2 (1 revision) (flutter/engine#40612)

* 274196e Make PathComponent POD, allow querying specific component type counts (flutter/engine#40605)

* f598224 [Impeller] Adds golden image tests. (flutter/engine#40366)

* f3b880d Roll Dart SDK from a040e32db8f2 to 25d7c5d88496 (1 revision) (flutter/engine#40618)

* a5002f6 Roll Fuchsia Linux SDK from jdkyVHuAgQFiwEVQj... to 6JDOgmv1GqjN0MccU... (flutter/engine#40622)

* bdee86a Roll Dart SDK from 25d7c5d88496 to 57061b644e84 (1 revision) (flutter/engine#40624)

* 6b27c10 Roll Fuchsia Mac SDK from Nrn4D-aMBpMe5ngaF... to odB7mmGuAH51yrWgy... (flutter/engine#40625)

* 1febe9d Roll Skia from 497dc2e1f01f to 17bce5f4f78f (2 revisions) (flutter/engine#40629)

* 3f90082 [Impeller] More sundry fixes to the Vulkan backend. (flutter/engine#40603)

* 20cf8eb Roll Skia from 17bce5f4f78f to d06e59e7d041 (1 revision) (flutter/engine#40630)

* 538c7ea Roll Fuchsia Linux SDK from 6JDOgmv1GqjN0MccU... to smNcvjxC6Ja3FkteX... (flutter/engine#40631)

* 2b5e95e Roll Fuchsia Mac SDK from odB7mmGuAH51yrWgy... to 34M7LHe2DUL5mebOm... (flutter/engine#40633)

* 2270e07 Roll Skia from d06e59e7d041 to 009ed54d103d (1 revision) (flutter/engine#40644)

* 6c5be6a Roll Fuchsia Linux SDK from smNcvjxC6Ja3FkteX... to y4h2rtyt6Mx8xHEte... (flutter/engine#40647)

* eefb0be Roll Fuchsia Mac SDK from 34M7LHe2DUL5mebOm... to d30zLnNyJDgYNmKD4... (flutter/engine#40649)

* d5e7ff2 [Impeller] Enable RendererTest::TheImpeller for Vulkan. (flutter/engine#40634)

* 61b92a7 [Impeller] Keep impeller scene build working (flutter/engine#40635)

* 5be21e2 [Impeller] Fix AtlasContents crash (flutter/engine#40637)

* ac76951 [Impeller] Fix accumulating translucency opacity peephole bug (flutter/engine#40639)

* 1cf3bf1 [Impeller] Fix stroke cap disconnection (flutter/engine#40643)

* 551f089 [Impeller] Remove verbose validation logs in the Vulkan pipeline cache. (flutter/engine#40651)

* 567be26 Roll Dart SDK from 57061b644e84 to c1185c030a98 (2 revisions) (flutter/engine#40654)

* 3ecc5cc Revert Dart SDK to a040e32db8f2 (flutter/engine#40656)

* 60b6a1f Roll Fuchsia Linux SDK from y4h2rtyt6Mx8xHEte... to v0tCO5SkPScqIBWIr... (flutter/engine#40655)

* 736b407 Roll Skia from 009ed54d103d to 4d02e783654f (1 revision) (flutter/engine#40657)

* 256ae60 Roll Skia from 4d02e783654f to 4ca827754bc1 (2 revisions) (flutter/engine#40659)

* a3d5d32 Roll Fuchsia Mac SDK from d30zLnNyJDgYNmKD4... to trm3jGwgZopG-wITx... (flutter/engine#40660)

* 5f517d6 Bump actions/checkout from 3.4.0 to 3.5.0 (flutter/engine#40662)

* 708bf70 Remove timezone from flutter (flutter/engine#40588)

* d21f657 Post 3.0 lint sync (flutter/engine#40394)

* d58d7d9 [Impeller] Document EntityPass, make positioning less confusing (flutter/engine#40636)

* 6c3f5fe Roll Fuchsia Linux SDK from v0tCO5SkPScqIBWIr... to jlj9dbwYl_4cILVwQ... (flutter/engine#40665)

* f7d2571 [web] Accepts assetBase through JS config. (flutter/engine#40615)

* 6cc2f9b Revert "[web] Accepts assetBase through JS config. (#40615)" (flutter/engine#40670)

* 4eea74c [Impeller] initialize text alpha to 1.0 (flutter/engine#40667)

* f7eea0e Roll Skia from 4ca827754bc1 to c55605969a59 (5 revisions) (flutter/engine#40668)

* 50f8374 [web] Add `js_types` sources to build. (flutter/engine#40597)

* d468552 Return an empty JavaScript object as a replacement for exports/module in patchCanvasKitModule (flutter/engine#40582)

* 36f8473 Simplify SkFontMgr classes for sk_sp (flutter/engine#40627)

* cc06014 [Impeller] Fix Impeller Metal wide gamut (flutter/engine#40671)

* 4bc9341 Revert "[web] Add `js_types` sources to build. (#40597)" (flutter/engine#40685)

* 9c0d1db Revert "Return an empty JavaScript object as a replacement for exports/module in patchCanvasKitModule (#40582)" (flutter/engine#40686)

* 8cb0803 Revert "Post 3.0 lint sync (#40394)" (flutter/engine#40687)
@ditman ditman mentioned this pull request Mar 28, 2023
Closed
8 tasks
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@yjbanov yjbanov Awaiting requested review from yjbanov

2 more reviewers

@bdero bdero bdero approved these changes

@eyebrowsoffire eyebrowsoffire eyebrowsoffire approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

autosubmit Merge PR when tree becomes green via auto submit App platform-web Code specifically for the web engine warning: land on red to fix tree breakage Override tree-status signal (land even with closed tree), combine with the autosubmit label.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ditman @bdero @eyebrowsoffire