This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Reland (x2) "Output .js files as ES6 modules. (flutter#52023)" #53718
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eyebrowsoffire
changed the title
|
🤞 |
ditman
approved these changes
Jul 9, 2024
| @@ -54,5 +51,5 @@ export function getCanvaskitBaseUrl(config, buildConfig) { | |||
| if (buildConfig.engineRevision && !buildConfig.useLocalCanvasKit) { | |||
| return joinPathSegments("https://www.gstatic.com/flutter-canvaskit", buildConfig.engineRevision); | |||
There was a problem hiding this comment.
(The gstatic.com/flutter-canvaskit URL should come from buildConfig as well)
There was a problem hiding this comment.
Ah yeah, I agree. Although I'm not going to tackle that with this change (and would require other changes in the framework first).
ditman
reviewed
Jul 10, 2024
| @@ -3698,7 +3698,7 @@ Future<CanvasKitModule> _downloadOneOf(Iterable<String> urls) async { | |||
| } | |||
|
|
|||
| String _resolveUrl(String url) { | |||
| return DomURL(url.toJS, domWindow.document.baseUri?.toJS).toJSString().toDart; | |||
| return createDomURL(url, domWindow.document.baseUri).toJSString().toDart; | |||
There was a problem hiding this comment.
You could wrap the .toJSString().toDart in a toString() method in the DomURLExtension :)
eyebrowsoffire
added
the
autosubmit
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Jul 10, 2024
auto-submit bot
pushed a commit
to flutter/flutter
that referenced
this pull request
Jul 10, 2024
…151550) flutter/engine@db2b45b...1c23c8f 2024-07-10 jacksongardner@google.com Reland (x2) "Output .js files as ES6 modules. (#52023)" (flutter/engine#53718) 2024-07-10 skia-flutter-autoroll@skia.org Roll Skia from 46e5bf98158a to 2783ba54bf8e (2 revisions) (flutter/engine#53796) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC bdero@google.com,rmistry@google.com,zra@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
eyebrowsoffire
added a commit
to eyebrowsoffire/flutter
that referenced
this pull request
Jul 10, 2024
Now that flutter/engine#53718 is fixed, these tests should be fine.
auto-submit bot
pushed a commit
to flutter/flutter
that referenced
this pull request
Jul 11, 2024
Now that flutter/engine#53718 is fixed, these tests should be fine. After this, we should be able to close #147731
eyebrowsoffire
added
the
cp: beta
|
Failed to create CP due to merge conflicts. |
7 tasks
mdebbar
added
cp: stable
flutteractionsbot
pushed a commit
to flutteractionsbot/engine
that referenced
this pull request
Aug 8, 2024
…er#53718) Second attempt to reland flutter#52023 Fixes since the previous reland attempt: * We need to pass the skwasm main JS URI when loading the module so that it can pass that along to the worker. Since the worker uses the workaround to allow a cross script worker, it has trouble locating the main JS URI in relation to itself in a way that actually works for dynamic imports, so passing it along fixes that issue. * Some of the Google3 tests relied on the relative default canvaskit path. Dynamic module imports seems to not handle relative paths the way we expect, so we do our own URL resolution using the URL constructor before passing it into the dynamic import API. Also cleaned up some of the other relative pathing stuff that we do around the base URI. in flutter.js
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Second attempt to reland #52023
Fixes since the previous reland attempt: