Merge pull request #2067 from p-mazhnik/wasm

pichillilorenzo · web-flow · commit 768694264728 · 2024-09-23T12:30:31.000+02:00
[web] migrate to pkg:web and js_interop
diff --git a/flutter_inappwebview/example/integration_test/headless_in_app_webview/convert_to_inappwebview.dart b/flutter_inappwebview/example/integration_test/headless_in_app_webview/convert_to_inappwebview.dart
@@ -26,6 +26,7 @@ void convertToInAppWebView() {
     expect(headlessWebView.isRunning(), true);
 
     final InAppWebViewController controller = await controllerCompleter.future;
+    await tester.pump();
     await pageLoaded.future;
 
     final String? url = (await controller.getUrl())?.toString();
@@ -55,6 +56,7 @@ void convertToInAppWebView() {
     );
     final InAppWebViewController widgetController =
         await widgetControllerCompleter.future;
+    await tester.pump();
 
     expect(headlessWebView.isRunning(), false);
 
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/get_content_height.dart b/flutter_inappwebview/example/integration_test/in_app_webview/get_content_height.dart
@@ -33,9 +33,8 @@ void getContentHeight() {
     );
 
     final InAppWebViewController controller = await controllerCompleter.future;
-    await pageLoaded.future;
-
     await tester.pump();
+    await pageLoaded.future;
 
     final contentHeight = await controller.getContentHeight();
     expect(contentHeight, isNonZero);
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/get_favicons.dart b/flutter_inappwebview/example/integration_test/in_app_webview/get_favicons.dart
@@ -33,6 +33,7 @@ void getFavicons() {
     );
 
     final InAppWebViewController controller = await controllerCompleter.future;
+    await tester.pump();
     await pageLoaded.future;
 
     final List<Favicon>? favicons = await controller.getFavicons();
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/get_html.dart b/flutter_inappwebview/example/integration_test/in_app_webview/get_html.dart
@@ -33,6 +33,8 @@ void getHtml() {
     );
 
     final InAppWebViewController controller = await controllerCompleter.future;
+    // Platform view creation happens asynchronously.
+    await tester.pump();
     await pageLoaded.future;
 
     final String? html = await controller.getHtml();
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/get_meta_tags.dart b/flutter_inappwebview/example/integration_test/in_app_webview/get_meta_tags.dart
@@ -33,6 +33,7 @@ void getMetaTags() {
     );
 
     final InAppWebViewController controller = await controllerCompleter.future;
+    await tester.pump();
     await pageLoaded.future;
 
     List<MetaTag> metaTags = await controller.getMetaTags();
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/get_meta_theme_color.dart b/flutter_inappwebview/example/integration_test/in_app_webview/get_meta_theme_color.dart
@@ -33,6 +33,7 @@ void getMetaThemeColor() {
     );
 
     final InAppWebViewController controller = await controllerCompleter.future;
+    await tester.pump();
     await pageLoaded.future;
 
     expect(await controller.getMetaThemeColor(), isNotNull);
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/get_original_url.dart b/flutter_inappwebview/example/integration_test/in_app_webview/get_original_url.dart
@@ -33,6 +33,7 @@ void getOriginalUrl() {
     );
 
     final InAppWebViewController controller = await controllerCompleter.future;
+    await tester.pump();
     await pageLoaded.future;
     var originUrl = (await controller.getOriginalUrl())?.toString();
     expect(originUrl, url.toString());
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/get_title.dart b/flutter_inappwebview/example/integration_test/in_app_webview/get_title.dart
@@ -50,6 +50,7 @@ void getTitle() {
     );
 
     final InAppWebViewController controller = await controllerCompleter.future;
+    await tester.pump();
     await pageStarted.future;
     await pageLoaded.future;
 
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/initial_url_request.dart b/flutter_inappwebview/example/integration_test/in_app_webview/initial_url_request.dart
@@ -80,6 +80,8 @@ void initialUrlRequest() {
           ),
         ),
       );
+      // Platform view creation happens asynchronously.
+      await tester.pump();
 
       await pageLoaded.future;
       final InAppWebViewController controller =
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/inject_css.dart b/flutter_inappwebview/example/integration_test/in_app_webview/inject_css.dart
@@ -35,6 +35,7 @@ void injectCSS() {
 
       final InAppWebViewController controller =
           await controllerCompleter.future;
+      await tester.pump();
       await pageLoaded.future;
 
       await controller.injectCSSCode(source: """
@@ -74,6 +75,7 @@ void injectCSS() {
 
       final InAppWebViewController controller =
           await controllerCompleter.future;
+      await tester.pump();
       await pageLoaded.future;
 
       await controller.injectCSSFileFromUrl(
@@ -110,6 +112,7 @@ void injectCSS() {
 
       final InAppWebViewController controller =
           await controllerCompleter.future;
+      await tester.pump();
       await pageLoaded.future;
 
       await controller.injectCSSFileFromAsset(
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/inject_javascript_file.dart b/flutter_inappwebview/example/integration_test/in_app_webview/inject_javascript_file.dart
@@ -37,6 +37,7 @@ void injectJavascriptFile() {
 
       final InAppWebViewController controller =
           await controllerCompleter.future;
+      await tester.pump();
       await pageLoaded.future;
 
       await controller.injectJavascriptFileFromUrl(
@@ -97,6 +98,7 @@ void injectJavascriptFile() {
 
       final InAppWebViewController controller =
           await controllerCompleter.future;
+      await tester.pump();
       await pageLoaded.future;
 
       await controller.injectJavascriptFileFromAsset(
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/is_secure_context.dart b/flutter_inappwebview/example/integration_test/in_app_webview/is_secure_context.dart
@@ -34,6 +34,7 @@ void isSecureContext() {
     );
 
     final InAppWebViewController controller = await controllerCompleter.future;
+    await tester.pump();
     await pageLoads.stream.first;
     expect(await controller.isSecureContext(), true);
 
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/javascript_code_evaluation.dart b/flutter_inappwebview/example/integration_test/in_app_webview/javascript_code_evaluation.dart
@@ -40,6 +40,7 @@ void javascriptCodeEvaluation() {
       );
       final InAppWebViewController controller =
           await controllerCompleter.future;
+      await tester.pump();
       await pageLoaded.future;
 
       var result = await controller.evaluateJavascript(source: """
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/load_data.dart b/flutter_inappwebview/example/integration_test/in_app_webview/load_data.dart
@@ -32,6 +32,8 @@ void loadData() {
     );
 
     final InAppWebViewController controller = await controllerCompleter.future;
+    // do not wait for pump to not miss the load event
+    tester.pump();
     await pageLoads.stream.first;
 
     final data = """
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/load_file.dart b/flutter_inappwebview/example/integration_test/in_app_webview/load_file.dart
@@ -32,6 +32,8 @@ void loadFile() {
     );
 
     final InAppWebViewController controller = await controllerCompleter.future;
+    // do not wait for pump to not miss the load event
+    tester.pump();
     await pageLoads.stream.first;
 
     await controller.loadFile(
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/load_url.dart b/flutter_inappwebview/example/integration_test/in_app_webview/load_url.dart
@@ -39,6 +39,7 @@ void loadUrl() {
       ),
     );
     final InAppWebViewController controller = await controllerCompleter.future;
+    await tester.pump();
     expect(await firstUrlLoad.future, initialUrl.toString());
 
     await controller.loadUrl(
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/on_console_message.dart b/flutter_inappwebview/example/integration_test/in_app_webview/on_console_message.dart
@@ -33,7 +33,7 @@ void onConsoleMessage() {
         ),
       ),
     );
-
+    await tester.pump();
     final ConsoleMessage consoleMessage =
         await onConsoleMessageCompleter.future;
     expect(consoleMessage.message, 'message');
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/on_scroll_changed.dart b/flutter_inappwebview/example/integration_test/in_app_webview/on_scroll_changed.dart
@@ -38,9 +38,8 @@ void onScrollChanged() {
     );
 
     final InAppWebViewController controller = await controllerCompleter.future;
-    await pageLoaded.future;
-
     await tester.pump();
+    await pageLoaded.future;
 
     controller.scrollTo(x: 0, y: 500);
 
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/on_title_changed.dart b/flutter_inappwebview/example/integration_test/in_app_webview/on_title_changed.dart
@@ -41,8 +41,8 @@ void onTitleChanged() {
     );
 
     final InAppWebViewController controller = await controllerCompleter.future;
-    await pageLoaded.future;
     await tester.pump();
+    await pageLoaded.future;
     await controller.evaluateJavascript(
         source: "document.title = 'title test';");
     await expectLater(onTitleChangedCompleter.future, completes);
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/on_update_visited_history.dart b/flutter_inappwebview/example/integration_test/in_app_webview/on_update_visited_history.dart
@@ -43,6 +43,7 @@ void onUpdateVisitedHistory() {
     );
 
     final InAppWebViewController controller = await controllerCompleter.future;
+    await tester.pump();
     await pageLoaded.future;
 
     await controller.evaluateJavascript(source: """
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/on_window_blur.dart b/flutter_inappwebview/example/integration_test/in_app_webview/on_window_blur.dart
@@ -29,6 +29,7 @@ void onWindowBlur() {
         ),
       ),
     );
+    await tester.pump();
     await expectLater(onWindowBlurCompleter.future, completes);
   }, skip: shouldSkip);
 }
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/on_window_focus.dart b/flutter_inappwebview/example/integration_test/in_app_webview/on_window_focus.dart
@@ -29,6 +29,7 @@ void onWindowFocus() {
         ),
       ),
     );
+    await tester.pump();
     await expectLater(onWindowFocusCompleter.future, completes);
   }, skip: shouldSkip);
 }
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/print_current_page.dart b/flutter_inappwebview/example/integration_test/in_app_webview/print_current_page.dart
@@ -33,8 +33,8 @@ void printCurrentPage() {
     );
 
     final InAppWebViewController controller = await controllerCompleter.future;
-    await pageLoaded.future;
     await tester.pump();
+    await pageLoaded.future;
     await expectLater(controller.printCurrentPage(), completes);
   }, skip: shouldSkip);
 }
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/programmatic_scroll.dart b/flutter_inappwebview/example/integration_test/in_app_webview/programmatic_scroll.dart
@@ -69,9 +69,8 @@ void programmaticScroll() {
 
       final InAppWebViewController controller =
           await controllerCompleter.future;
-      await pageLoaded.future;
-
       await tester.pump();
+      await pageLoaded.future;
 
       await controller.scrollTo(x: 0, y: 0);
 
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/reload.dart b/flutter_inappwebview/example/integration_test/in_app_webview/reload.dart
@@ -71,6 +71,8 @@ void reload() {
       );
       final InAppWebViewController controller =
           await controllerCompleter.future;
+      // do not wait for pump to not miss the load event
+      tester.pump();
       String? reloadUrl = await pageLoads.stream.first;
       expect(reloadUrl, url.toString());
 
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/set_get_settings.dart b/flutter_inappwebview/example/integration_test/in_app_webview/set_get_settings.dart
@@ -32,6 +32,8 @@ void setGetSettings() {
         ),
       ),
     );
+    // Platform view creation happens asynchronously.
+    await tester.pumpAndSettle();
     final InAppWebViewController controller = await controllerCompleter.future;
     await pageLoaded.future;
 
diff --git a/flutter_inappwebview/example/integration_test/in_app_webview/webview_windows.dart b/flutter_inappwebview/example/integration_test/in_app_webview/webview_windows.dart
@@ -49,7 +49,7 @@ void webViewWindows() {
           ),
         ),
       );
-
+      await tester.pump();
       await expectLater(pageLoaded.future, completes);
     }, skip: shouldSkipTest1);
 
diff --git a/flutter_inappwebview/example/pubspec.yaml b/flutter_inappwebview/example/pubspec.yaml
@@ -12,8 +12,8 @@ version: 1.0.0+1
 publish_to: none
 
 environment:
-  sdk: ">=2.17.0 <4.0.0"
-  flutter: ">=3.0.0"
+  sdk: ">=3.3.0 <4.0.0"
+  flutter: ">=3.19.0"
 
 dependencies:
   flutter:
diff --git a/flutter_inappwebview_web/CHANGELOG.md b/flutter_inappwebview_web/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## 1.1.0
  
+- Migrates package to `package:web`.
 - Updates minimum supported SDK version to Flutter 3.24/Dart 3.5.
 
 ## 1.0.8
diff --git a/flutter_inappwebview_web/example/pubspec.lock b/flutter_inappwebview_web/example/pubspec.lock
diff --git a/flutter_inappwebview_web/lib/assets/web/web_support.js b/flutter_inappwebview_web/lib/assets/web/web_support.js
diff --git a/flutter_inappwebview_web/lib/web/headless_inappwebview_manager.dart b/flutter_inappwebview_web/lib/web/headless_inappwebview_manager.dart
diff --git a/flutter_inappwebview_web/lib/web/in_app_web_view_web_element.dart b/flutter_inappwebview_web/lib/web/in_app_web_view_web_element.dart
diff --git a/flutter_inappwebview_web/lib/web/js_bridge.dart b/flutter_inappwebview_web/lib/web/js_bridge.dart
diff --git a/flutter_inappwebview_web/lib/web/platform_util.dart b/flutter_inappwebview_web/lib/web/platform_util.dart
diff --git a/flutter_inappwebview_web/lib/web/shims/platform_view_registry.dart b/flutter_inappwebview_web/lib/web/shims/platform_view_registry.dart
diff --git a/flutter_inappwebview_web/lib/web/shims/platform_view_registry_dart_ui.dart b/flutter_inappwebview_web/lib/web/shims/platform_view_registry_dart_ui.dart
diff --git a/flutter_inappwebview_web/lib/web/shims/platform_view_registry_dart_ui_web.dart b/flutter_inappwebview_web/lib/web/shims/platform_view_registry_dart_ui_web.dart
diff --git a/flutter_inappwebview_web/lib/web/web_platform.dart b/flutter_inappwebview_web/lib/web/web_platform.dart
diff --git a/flutter_inappwebview_web/lib/web/web_platform_manager.dart b/flutter_inappwebview_web/lib/web/web_platform_manager.dart
diff --git a/flutter_inappwebview_web/pubspec.yaml b/flutter_inappwebview_web/pubspec.yaml
