From a2595eadaec3d8902f3163d93ce0fcac3039fead Mon Sep 17 00:00:00 2001 From: Lorenzo Pichilli Date: Sun, 29 Sep 2024 17:13:31 +0200 Subject: [PATCH 1/2] version 6.1.3 --- flutter_inappwebview/CHANGELOG.md | 13 ++++++++++ flutter_inappwebview/pubspec.yaml | 14 +++++----- flutter_inappwebview_android/CHANGELOG.md | 4 +++ flutter_inappwebview_android/pubspec.yaml | 4 +-- flutter_inappwebview_ios/CHANGELOG.md | 4 +++ flutter_inappwebview_ios/pubspec.yaml | 4 +-- flutter_inappwebview_macos/CHANGELOG.md | 4 +++ flutter_inappwebview_macos/pubspec.yaml | 4 +-- flutter_inappwebview_web/CHANGELOG.md | 4 +++ flutter_inappwebview_web/pubspec.yaml | 4 +-- flutter_inappwebview_windows/CHANGELOG.md | 1 + package.json | 31 ++++++++++++++--------- 12 files changed, 64 insertions(+), 27 deletions(-) diff --git a/flutter_inappwebview/CHANGELOG.md b/flutter_inappwebview/CHANGELOG.md index 3d67c87cd..1c82efae3 100755 --- a/flutter_inappwebview/CHANGELOG.md +++ b/flutter_inappwebview/CHANGELOG.md @@ -1,3 +1,16 @@ +## 6.1.3 + +- Updated dependencies to the latest versions for all platform implementations: + - `flutter_inappwebview_platform_interface`: `^1.1.0` -> `^1.2.0` + - `flutter_inappwebview_android`: `^1.1.0+4` -> `^1.1.1` + - `flutter_inappwebview_ios`: `^1.1.0+3` -> `^1.1.1` + - `flutter_inappwebview_macos`: `^1.1.0+3` -> `^1.1.1` + - `flutter_inappwebview_web`: `^1.1.0+2` -> `^1.1.1` + - `flutter_inappwebview_windows`: `^0.3.0` -> `^0.4.0` + +#### Windows Platform + - Updated `shouldOverrideUrlLoading` implementation using the Chrome DevTools Protocol API Fetch.requestPaused event + ## 6.1.2 - Updated minimum platform implementation versions diff --git a/flutter_inappwebview/pubspec.yaml b/flutter_inappwebview/pubspec.yaml index 6c09cd43a..e69c66d4a 100755 --- a/flutter_inappwebview/pubspec.yaml +++ b/flutter_inappwebview/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_inappwebview description: A Flutter plugin that allows you to add an inline webview, to use an headless webview, and to open an in-app browser window. -version: 6.1.2 +version: 6.1.3 homepage: https://inappwebview.dev/ repository: https://github.com/pichillilorenzo/flutter_inappwebview issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues @@ -20,12 +20,12 @@ environment: dependencies: flutter: sdk: flutter - flutter_inappwebview_platform_interface: ^1.1.1 - flutter_inappwebview_android: ^1.1.0+4 - flutter_inappwebview_ios: ^1.1.0+3 - flutter_inappwebview_macos: ^1.1.0+3 - flutter_inappwebview_web: ^1.1.0+2 - flutter_inappwebview_windows: ^0.3.0 + flutter_inappwebview_platform_interface: ^1.2.0 + flutter_inappwebview_android: ^1.1.1 + flutter_inappwebview_ios: ^1.1.1 + flutter_inappwebview_macos: ^1.1.1 + flutter_inappwebview_web: ^1.1.1 + flutter_inappwebview_windows: ^0.4.0 dev_dependencies: flutter_test: diff --git a/flutter_inappwebview_android/CHANGELOG.md b/flutter_inappwebview_android/CHANGELOG.md index e2b00d945..cd85ce3b2 100644 --- a/flutter_inappwebview_android/CHANGELOG.md +++ b/flutter_inappwebview_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.1.1 + +- Updated flutter_inappwebview_platform_interface version to ^1.2.0 + ## 1.1.0+4 - Updated flutter_inappwebview_platform_interface version diff --git a/flutter_inappwebview_android/pubspec.yaml b/flutter_inappwebview_android/pubspec.yaml index 92c3e16aa..9c5739383 100644 --- a/flutter_inappwebview_android/pubspec.yaml +++ b/flutter_inappwebview_android/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_inappwebview_android description: Android implementation of the flutter_inappwebview plugin. -version: 1.1.0+4 +version: 1.1.1 homepage: https://inappwebview.dev/ repository: https://github.com/pichillilorenzo/flutter_inappwebview/tree/master/flutter_inappwebview_android issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues @@ -20,7 +20,7 @@ environment: dependencies: flutter: sdk: flutter - flutter_inappwebview_platform_interface: ^1.1.1 + flutter_inappwebview_platform_interface: ^1.2.0 dev_dependencies: flutter_test: diff --git a/flutter_inappwebview_ios/CHANGELOG.md b/flutter_inappwebview_ios/CHANGELOG.md index 60d87f3fb..c96d13c76 100644 --- a/flutter_inappwebview_ios/CHANGELOG.md +++ b/flutter_inappwebview_ios/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.1.1 + +- Updated flutter_inappwebview_platform_interface version to ^1.2.0 + ## 1.1.0+3 - Updated flutter_inappwebview_platform_interface version diff --git a/flutter_inappwebview_ios/pubspec.yaml b/flutter_inappwebview_ios/pubspec.yaml index 271c127d3..bc642819a 100644 --- a/flutter_inappwebview_ios/pubspec.yaml +++ b/flutter_inappwebview_ios/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_inappwebview_ios description: iOS implementation of the flutter_inappwebview plugin. -version: 1.1.0+3 +version: 1.1.1 homepage: https://inappwebview.dev/ repository: https://github.com/pichillilorenzo/flutter_inappwebview/tree/master/flutter_inappwebview_ios issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues @@ -20,7 +20,7 @@ environment: dependencies: flutter: sdk: flutter - flutter_inappwebview_platform_interface: ^1.1.1 + flutter_inappwebview_platform_interface: ^1.2.0 dev_dependencies: flutter_test: diff --git a/flutter_inappwebview_macos/CHANGELOG.md b/flutter_inappwebview_macos/CHANGELOG.md index c3461795b..5e9ac83fd 100644 --- a/flutter_inappwebview_macos/CHANGELOG.md +++ b/flutter_inappwebview_macos/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.1.1 + +- Updated flutter_inappwebview_platform_interface version to ^1.2.0 + ## 1.1.0+3 - Updated flutter_inappwebview_platform_interface version diff --git a/flutter_inappwebview_macos/pubspec.yaml b/flutter_inappwebview_macos/pubspec.yaml index ec63dd588..46e2261c6 100644 --- a/flutter_inappwebview_macos/pubspec.yaml +++ b/flutter_inappwebview_macos/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_inappwebview_macos description: macOS implementation of the flutter_inappwebview plugin. -version: 1.1.0+3 +version: 1.1.1 homepage: https://inappwebview.dev/ repository: https://github.com/pichillilorenzo/flutter_inappwebview/tree/master/flutter_inappwebview_macos issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues @@ -20,7 +20,7 @@ environment: dependencies: flutter: sdk: flutter - flutter_inappwebview_platform_interface: ^1.1.1 + flutter_inappwebview_platform_interface: ^1.2.0 dev_dependencies: flutter_test: diff --git a/flutter_inappwebview_web/CHANGELOG.md b/flutter_inappwebview_web/CHANGELOG.md index 9b237152d..2c5da0ea4 100644 --- a/flutter_inappwebview_web/CHANGELOG.md +++ b/flutter_inappwebview_web/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.1.1 + +- Updated flutter_inappwebview_platform_interface version to ^1.2.0 + ## 1.1.0+2 - Updated flutter_inappwebview_platform_interface version diff --git a/flutter_inappwebview_web/pubspec.yaml b/flutter_inappwebview_web/pubspec.yaml index a8f9f4d3e..c1146eb87 100644 --- a/flutter_inappwebview_web/pubspec.yaml +++ b/flutter_inappwebview_web/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_inappwebview_web description: Web implementation of the flutter_inappwebview plugin. -version: 1.1.0+2 +version: 1.1.1 homepage: https://inappwebview.dev/ repository: https://github.com/pichillilorenzo/flutter_inappwebview/tree/master/flutter_inappwebview_web issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues @@ -23,7 +23,7 @@ dependencies: flutter_web_plugins: sdk: flutter web: ^1.0.0 - flutter_inappwebview_platform_interface: ^1.1.1 + flutter_inappwebview_platform_interface: ^1.2.0 dev_dependencies: flutter_test: diff --git a/flutter_inappwebview_windows/CHANGELOG.md b/flutter_inappwebview_windows/CHANGELOG.md index 827a6948c..ebe264084 100644 --- a/flutter_inappwebview_windows/CHANGELOG.md +++ b/flutter_inappwebview_windows/CHANGELOG.md @@ -1,6 +1,7 @@ ## 0.4.0 - Updated `shouldOverrideUrlLoading` implementation using the Chrome DevTools Protocol API Fetch.requestPaused event +- Updated flutter_inappwebview_platform_interface version to ^1.2.0 ## 0.3.0+1 diff --git a/package.json b/package.json index e599b2d54..c41fa8b95 100644 --- a/package.json +++ b/package.json @@ -1,29 +1,36 @@ { "name": "flutter_inappwebview", "version": "1.0.0", - "directories": { - "example": "flutter_inappwebview/example", - "lib": "flutter_inappwebview/lib" - }, "private": true, "scripts": { - "build": ".fvm/flutter_sdk/bin/flutter pub run build_runner build --delete-conflicting-outputs", - "watch": ".fvm/flutter_sdk/bin/flutter pub run build_runner watch --delete-conflicting-outputs", + "build": "cd flutter_inappwebview_platform_interface && ../.fvm/flutter_sdk/bin/flutter pub run build_runner build --delete-conflicting-outputs", + "watch": "cd flutter_inappwebview_platform_interface && ../.fvm/flutter_sdk/bin/flutter pub run build_runner watch --delete-conflicting-outputs", + "publish:dry": ".fvm/flutter_sdk/bin/flutter pub publish --dry-run", - "publish": ".fvm/flutter_sdk/bin/flutter pub publish", "format": ".fvm/flutter_sdk/bin/dart format flutter_inappwebview/lib flutter_inappwebview/example/integration_test flutter_inappwebview_platform_interface/lib flutter_inappwebview_android/lib flutter_inappwebview_ios/lib flutter_inappwebview_macos/lib flutter_inappwebview_web/lib flutter_inappwebview_windows/lib", - "build:publish": "npm run format && npm run build && .fvm/flutter_sdk/bin/flutter pub publish", - "docs:gen": ".fvm/flutter_sdk/bin/dart doc", - "docs:serve": ".fvm/flutter_sdk/bin/flutter pub global activate dhttpd && .fvm/flutter_sdk/bin/flutter pub global run dhttpd:dhttpd --path doc/api" + + "docs:gen": "cd flutter_inappwebview && ../.fvm/flutter_sdk/bin/dart doc ../", + "docs:serve": ".fvm/flutter_sdk/bin/flutter pub global activate dhttpd && .fvm/flutter_sdk/bin/flutter pub global run dhttpd:dhttpd --path doc/api", + + "publish:platform_interface": "cd flutter_inappwebview_platform_interface && ../.fvm/flutter_sdk/bin/flutter pub publish && cd ..", + "publish:android": "cd flutter_inappwebview_android && ../.fvm/flutter_sdk/bin/flutter pub publish && cd ..", + "publish:ios": "cd flutter_inappwebview_ios && ../.fvm/flutter_sdk/bin/flutter pub publish && cd ..", + "publish:macos": "cd flutter_inappwebview_macos && ../.fvm/flutter_sdk/bin/flutter pub publish && cd ..", + "publish:web": "cd flutter_inappwebview_web && ../.fvm/flutter_sdk/bin/flutter pub publish && cd ..", + "publish:windows": "cd flutter_inappwebview_windows && ../.fvm/flutter_sdk/bin/flutter pub publish && cd ..", + "publish:all_platforms": "npm run publish:android && npm run publish:ios && npm run publish:macos && npm run publish:web && npm run publish:windows", + "publish:interface_and_all_platforms": "npm run publish:platform_interface && npm run publish:all_platforms", + + "publish:plugin": "cd flutter_inappwebview && ../.fvm/flutter_sdk/bin/flutter pub publish && cd .." }, "repository": { "type": "git", "url": "git+https://github.com/pichillilorenzo/flutter_inappwebview.git" }, - "author": "", + "author": "Lorenzo Pichilli", "license": "ISC", "bugs": { "url": "https://github.com/pichillilorenzo/flutter_inappwebview/issues" }, - "homepage": "https://github.com/pichillilorenzo/flutter_inappwebview#readme" + "homepage": "https://github.com/pichillilorenzo/flutter_inappwebview#README.md" } From fb88d0fce31cf4fceb4895f9c3b9f34fef0eaacf Mon Sep 17 00:00:00 2001 From: Lorenzo Pichilli Date: Tue, 1 Oct 2024 12:14:16 +0200 Subject: [PATCH 2/2] android: Removed webview/plugin_scripts_js/ConsoleLogJS.java file, use native WebChromeClient.onConsoleMessage instead --- flutter_inappwebview_android/CHANGELOG.md | 4 ++ .../plugin_scripts_js/ConsoleLogJS.java | 42 ------------------- .../webview/in_app_webview/InAppWebView.java | 2 - .../InAppWebViewChromeClient.java | 2 +- flutter_inappwebview_android/pubspec.yaml | 2 +- 5 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/ConsoleLogJS.java diff --git a/flutter_inappwebview_android/CHANGELOG.md b/flutter_inappwebview_android/CHANGELOG.md index cd85ce3b2..57982ec88 100644 --- a/flutter_inappwebview_android/CHANGELOG.md +++ b/flutter_inappwebview_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.1.2 + +- Removed webview/plugin_scripts_js/ConsoleLogJS.java file, use native WebChromeClient.onConsoleMessage instead + ## 1.1.1 - Updated flutter_inappwebview_platform_interface version to ^1.2.0 diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/ConsoleLogJS.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/ConsoleLogJS.java deleted file mode 100644 index acc640871..000000000 --- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/plugin_scripts_js/ConsoleLogJS.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js; - -import com.pichillilorenzo.flutter_inappwebview_android.types.PluginScript; -import com.pichillilorenzo.flutter_inappwebview_android.types.UserScriptInjectionTime; - -public class ConsoleLogJS { - public static final String CONSOLE_LOG_JS_PLUGIN_SCRIPT_GROUP_NAME = "IN_APP_WEBVIEW_CONSOLE_LOG_JS_PLUGIN_SCRIPT"; - public static final PluginScript CONSOLE_LOG_JS_PLUGIN_SCRIPT = new PluginScript( - ConsoleLogJS.CONSOLE_LOG_JS_PLUGIN_SCRIPT_GROUP_NAME, - ConsoleLogJS.CONSOLE_LOG_JS_SOURCE, - UserScriptInjectionTime.AT_DOCUMENT_START, - null, - true, - null - ); - - public static final String CONSOLE_LOG_JS_SOURCE = "(function(console) {" + - " function _buildMessage(args) {" + - " var message = '';" + - " for (var i in args) {" + - " try {" + - " message += message === '' ? args[i] : ' ' + args[i];" + - " } catch(ignored) {}" + - " }" + - " return message;" + - " }" + - " var oldLogs = {" + - " 'log': console.log," + - " 'debug': console.debug," + - " 'error': console.error," + - " 'info': console.info," + - " 'warn': console.warn" + - " };" + - " for (var k in oldLogs) {" + - " (function(oldLog) {" + - " console[oldLog] = function() {" + - " oldLogs[oldLog].call(console, _buildMessage(arguments));" + - " }" + - " })(k);" + - " }" + - "})(window.console);"; -} diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebView.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebView.java index 2acd82370..b0bfd5509 100755 --- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebView.java +++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebView.java @@ -71,7 +71,6 @@ import com.pichillilorenzo.flutter_inappwebview_android.content_blocker.ContentBlockerTrigger; import com.pichillilorenzo.flutter_inappwebview_android.find_interaction.FindInteractionController; import com.pichillilorenzo.flutter_inappwebview_android.in_app_browser.InAppBrowserDelegate; -import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.ConsoleLogJS; import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.InterceptAjaxRequestJS; import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.InterceptFetchRequestJS; import com.pichillilorenzo.flutter_inappwebview_android.plugin_scripts_js.JavaScriptBridgeJS; @@ -563,7 +562,6 @@ public boolean onLongClick(View v) { public void prepareAndAddUserScripts() { userContentController.addPluginScript(PromisePolyfillJS.PROMISE_POLYFILL_JS_PLUGIN_SCRIPT); userContentController.addPluginScript(JavaScriptBridgeJS.JAVASCRIPT_BRIDGE_JS_PLUGIN_SCRIPT); - userContentController.addPluginScript(ConsoleLogJS.CONSOLE_LOG_JS_PLUGIN_SCRIPT); userContentController.addPluginScript(PrintJS.PRINT_JS_PLUGIN_SCRIPT); userContentController.addPluginScript(OnWindowBlurEventJS.ON_WINDOW_BLUR_EVENT_JS_PLUGIN_SCRIPT); userContentController.addPluginScript(OnWindowFocusEventJS.ON_WINDOW_FOCUS_EVENT_JS_PLUGIN_SCRIPT); diff --git a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewChromeClient.java b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewChromeClient.java index 5732b21d1..2f328f345 100755 --- a/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewChromeClient.java +++ b/flutter_inappwebview_android/android/src/main/java/com/pichillilorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewChromeClient.java @@ -739,7 +739,7 @@ public boolean onConsoleMessage(ConsoleMessage consoleMessage) { consoleMessage.message(), consoleMessage.messageLevel().ordinal()); } - return true; + return super.onConsoleMessage(consoleMessage); } @Override diff --git a/flutter_inappwebview_android/pubspec.yaml b/flutter_inappwebview_android/pubspec.yaml index 9c5739383..17b03e9e9 100644 --- a/flutter_inappwebview_android/pubspec.yaml +++ b/flutter_inappwebview_android/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_inappwebview_android description: Android implementation of the flutter_inappwebview plugin. -version: 1.1.1 +version: 1.1.2 homepage: https://inappwebview.dev/ repository: https://github.com/pichillilorenzo/flutter_inappwebview/tree/master/flutter_inappwebview_android issue_tracker: https://github.com/pichillilorenzo/flutter_inappwebview/issues