Skip to content

[webview_flutter_web] Migrate to package:web. #6792

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.

Sign up for GitHub

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
auto-submit merged 20 commits into from
Jul 10, 2024
Merged

[webview_flutter_web] Migrate to package:web. #6792

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
61b792d
Fix Web
ThomasAunvik May 15, 2024
5775d2e
Attempt to fix tests
ThomasAunvik May 23, 2024
efbad89
Do not create iframe mock
ThomasAunvik May 24, 2024
d622bb5
Refactoring
ThomasAunvik May 24, 2024
2e11ac2
Webview Flutter Web Changelog
ThomasAunvik May 24, 2024
ab527d9
Sort directives
ThomasAunvik May 24, 2024
39b12b6
Return Response instead, closing client on finally
ThomasAunvik May 24, 2024
5e378c4
Fix mock response headers to return valid object
ThomasAunvik May 24, 2024
516c357
Set SDK requirement to ^3.3.0
ThomasAunvik May 24, 2024
d03c9fc
Mock IFrame
ThomasAunvik May 24, 2024
bd2d8a7
Mock object of the fake iframe class
ThomasAunvik May 24, 2024
4d4f6d7
Add License to missing file
ThomasAunvik May 24, 2024
b77d3fb
Pubspec Flutter Version, Getters and Setters for in par with implemen…
ThomasAunvik May 24, 2024
a890b22
Implement HttpRequestFactory with fetch. Remove package:http dep.
ditman Jul 9, 2024
4ee87cc
Use the web.Response API.
ditman Jul 9, 2024
87c7243
Fake web.Response and IFrames with the new JS-interop style (without …
ditman Jul 9, 2024
e01a712
Regenerate/clean mocks.
ditman Jul 9, 2024
befc2d8
Remove webview_flutter_web from Wasm exclusion list.
ditman Jul 9, 2024
ba4a2e5
Roll a full minor version. Update CHANGELOG.
ditman Jul 9, 2024
da0b903
Apply suggestions from code review
ditman 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
Prev Previous commit
Next Next commit
Mock IFrame
  • Loading branch information
@ThomasAunvik @ditman
ThomasAunvik authored and ditman committed Jul 9, 2024
commit d03c9fc16eebc88da3210e176aa0977cc820ffc2
1 change: 1 addition & 0 deletions packages/webview_flutter/webview_flutter_web/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Migrates to `package:web`
* Updates `HttpRequestFactory.request` to use `package:http` `BrowserClient`
* Updates `ìndex.html` in the example to use `flutter_bootstrap.js`
* Updates minimum dart sdk to `^3.3.0`
* Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.

## 0.2.2+4
Expand Down
30 changes: 15 additions & 15 deletions packages/webview_flutter/webview_flutter_web/example/web/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<html>

<head>
<!--
<!--
If you are serving your web app in a path other than the root, change the
href value below to reflect the base path you are serving from.

Expand All @@ -18,27 +18,27 @@
This is a placeholder for base href that will be replaced by the value of
the `--base-href` argument provided to `flutter build`.
-->
<base href="$FLUTTER_BASE_HREF">
<base href="$FLUTTER_BASE_HREF">

<meta charset="UTF-8">
<meta content="IE=Edge" http-equiv="X-UA-Compatible">
<meta name="description" content="webview_flutter_web Example">
<meta charset="UTF-8">
<meta content="IE=Edge" http-equiv="X-UA-Compatible">
<meta name="description" content="webview_flutter_web Example">

<!-- iOS meta tags & icons -->
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="example">
<link rel="apple-touch-icon" href="icons/Icon-192.png">
<!-- iOS meta tags & icons -->
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="example">
<link rel="apple-touch-icon" href="icons/Icon-192.png">

<title>webview_flutter_web Example</title>
<link rel="manifest" href="manifest.json">
<title>webview_flutter_web Example</title>
<link rel="manifest" href="manifest.json">
</head>

<body>
<!-- This script installs service_worker.js to provide PWA functionality to
<!-- This script installs service_worker.js to provide PWA functionality to
application. For more information, see:
https://developers.google.com/web/fundamentals/primers/service-workers -->
<script src="flutter_bootstrap.js" async></script>
https://developers.google.com/web/fundamentals/primers/service-workers -->
<script src="flutter_bootstrap.js" async></script>
</body>

</html>
13 changes: 13 additions & 0 deletions packages/webview_flutter/webview_flutter_web/test/legacy/mock_fake_iframe_element.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import 'dart:js_interop';
import 'package:web/web.dart' as html;

@JSExport()
class FakeIFrameElement {
@JSExport('src')
String? src;
}

extension type MockHTMLIFrameElement(JSObject _)
implements html.HTMLIFrameElement, JSObject {
external String? src;
}
43 changes: 34 additions & 9 deletions packages/webview_flutter/webview_flutter_web/test/legacy/webview_flutter_web_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:js_interop';
import 'dart:typed_data';

import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:http/http.dart' as http;
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
import 'package:web/web.dart' as html;
import 'package:webview_flutter_platform_interface/src/webview_flutter_platform_interface_legacy.dart';
import 'package:webview_flutter_web/src/http_request_factory.dart';
import 'package:webview_flutter_web/src/webview_flutter_web_legacy.dart';

import 'mock_fake_iframe_element.dart';
import 'webview_flutter_web_test.mocks.dart';

@GenerateMocks(<Type>[
Expand Down Expand Up @@ -45,7 +46,11 @@ void main() {
group('WebWebViewPlatformController', () {
test('loadUrl sets url on iframe src attribute', () {
// Setup
final html.HTMLIFrameElement mockElement = html.HTMLIFrameElement();
final FakeIFrameElement fakeElem = FakeIFrameElement();
final MockHTMLIFrameElement mockElement =
createJSInteropWrapper<FakeIFrameElement>(fakeElem)
as MockHTMLIFrameElement;

final WebWebViewPlatformController controller =
WebWebViewPlatformController(
mockElement,
Expand All @@ -59,7 +64,11 @@ void main() {
group('loadHtmlString', () {
test('loadHtmlString loads html into iframe', () {
// Setup
final html.HTMLIFrameElement mockElement = html.HTMLIFrameElement();
final FakeIFrameElement fakeElem = FakeIFrameElement();
final MockHTMLIFrameElement mockElement =
createJSInteropWrapper<FakeIFrameElement>(fakeElem)
as MockHTMLIFrameElement;

final WebWebViewPlatformController controller =
WebWebViewPlatformController(
mockElement,
Expand All @@ -73,22 +82,30 @@ void main() {

test('loadHtmlString escapes "#" correctly', () {
// Setup
final html.HTMLIFrameElement mockElement = html.HTMLIFrameElement();
final FakeIFrameElement fakeElem = FakeIFrameElement();
final MockHTMLIFrameElement mockElement =
createJSInteropWrapper<FakeIFrameElement>(fakeElem)
as MockHTMLIFrameElement;

final WebWebViewPlatformController controller =
WebWebViewPlatformController(
mockElement,
);
// Run
controller.loadHtmlString('#');
// Verify
verify(mockElement.src = argThat(contains('%23')) ?? '');
verify(mockElement.src = argThat(contains('%23')));
});
});

group('loadRequest', () {
test('loadRequest throws ArgumentError on missing scheme', () {
// Setup
final html.HTMLIFrameElement mockElement = html.HTMLIFrameElement();
final FakeIFrameElement fakeElem = FakeIFrameElement();
final MockHTMLIFrameElement mockElement =
createJSInteropWrapper<FakeIFrameElement>(fakeElem)
as MockHTMLIFrameElement;

final WebWebViewPlatformController controller =
WebWebViewPlatformController(
mockElement,
Expand All @@ -107,7 +124,11 @@ void main() {
test('loadRequest makes request and loads response into iframe',
() async {
// Setup
final html.HTMLIFrameElement mockElement = html.HTMLIFrameElement();
final FakeIFrameElement fakeElem = FakeIFrameElement();
final MockHTMLIFrameElement mockElement =
createJSInteropWrapper<FakeIFrameElement>(fakeElem)
as MockHTMLIFrameElement;

final WebWebViewPlatformController controller =
WebWebViewPlatformController(
mockElement,
Expand Down Expand Up @@ -147,7 +168,11 @@ void main() {

test('loadRequest escapes "#" correctly', () async {
// Setup
final html.HTMLIFrameElement mockElement = html.HTMLIFrameElement();
final FakeIFrameElement fakeElem = FakeIFrameElement();
final MockHTMLIFrameElement mockElement =
createJSInteropWrapper<FakeIFrameElement>(fakeElem)
as MockHTMLIFrameElement;

final WebWebViewPlatformController controller =
WebWebViewPlatformController(
mockElement,
Expand Down Expand Up @@ -175,7 +200,7 @@ void main() {
headers: <String, String>{'Foo': 'Bar'}),
);
// Verify
verify(mockElement.src = argThat(contains('%23')) ?? '');
verify(mockElement.src = argThat(contains('%23')));
});
});
});
Expand Down