Skip to content
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

Merged
auto-submit merged 6 commits into from
Jul 10, 2024
Merged

Reland (x2) "Output .js files as ES6 modules. (flutter#52023)" #53718

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
01e806b
Reland (x2) "Output .js files as ES6 modules. (#52023)"
eyebrowsoffire Jul 3, 2024
2adb472
Pass the main script url explicitly to the worker so it can load prop…
eyebrowsoffire Jul 3, 2024
de62389
Deal with relative URIs.
eyebrowsoffire Jul 3, 2024
1ba2721
Use an absolute path for canvasKitBaseUrl in tests.
eyebrowsoffire Jul 3, 2024
17ab8dc
Fix DomURL constructor.
eyebrowsoffire Jul 9, 2024
1d6e74e
Merge branch 'main' into reland_es6_2
eyebrowsoffire Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Copy link
Member

@ditman ditman Jul 10, 2024

Choose a reason for hiding this comment

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

You could wrap the .toJSString().toDart in a toString() method in the DomURLExtension :)

}

/// Downloads the CanvasKit JavaScript file at [url].
Expand Down
8 changes: 6 additions & 2 deletions lib/web_ui/lib/src/engine/dom.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2368,12 +2368,16 @@ extension DomPopStateEventExtension on DomPopStateEvent {
dynamic get state => _state?.toObjectDeep;
}

@JS()
@JS('URL')
@staticInterop
class DomURL {
external factory DomURL(JSString url, JSString? base);
external factory DomURL.arg1(JSString url);
external factory DomURL.arg2(JSString url, JSString? base);
}

DomURL createDomURL(String url, [String? base]) =>
base == null ? DomURL.arg1(url.toJS) : DomURL.arg2(url.toJS, base.toJS);

extension DomURLExtension on DomURL {
@JS('createObjectURL')
external JSString _createObjectURL(JSAny object);
Expand Down