Adds the JavaScript info loglevel

flutter · Jul 24, 2023 · c1091ac · c1091ac
1 parent 0929696
commit c1091ac
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 7 deletions.
diff --git a/packages/webview_flutter/webview_flutter/example/pubspec.yaml b/packages/webview_flutter/webview_flutter/example/pubspec.yaml
@@ -36,3 +36,8 @@ flutter:
     - assets/sample_video.mp4
     - assets/www/index.html
     - assets/www/styles/style.css
+
+# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
+# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
+dependency_overrides:
+   {webview_flutter_platform_interface: {path: ../../../webview_flutter/webview_flutter_platform_interface}, webview_flutter_wkwebview: {path: ../../../webview_flutter/webview_flutter_wkwebview}}
diff --git a/packages/webview_flutter/webview_flutter/pubspec.yaml b/packages/webview_flutter/webview_flutter/pubspec.yaml
@@ -29,3 +29,8 @@ dev_dependencies:
     sdk: flutter
   mockito: 5.4.1
   plugin_platform_interface: ^2.1.3
+
+# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
+# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
+dependency_overrides:
+   {webview_flutter_platform_interface: {path: ../../webview_flutter/webview_flutter_platform_interface}, webview_flutter_wkwebview: {path: ../../webview_flutter/webview_flutter_wkwebview}}
diff --git a/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml b/packages/webview_flutter/webview_flutter_android/example/pubspec.yaml
@@ -33,3 +33,8 @@ flutter:
     - assets/sample_video.mp4
     - assets/www/index.html
     - assets/www/styles/style.css
+
+# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
+# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
+dependency_overrides:
+   {webview_flutter_platform_interface: {path: ../../../webview_flutter/webview_flutter_platform_interface}}
diff --git a/packages/webview_flutter/webview_flutter_android/pubspec.yaml b/packages/webview_flutter/webview_flutter_android/pubspec.yaml
@@ -28,3 +28,8 @@ dev_dependencies:
     sdk: flutter
   mockito: 5.4.1
   pigeon: ^9.2.4
+
+# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
+# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
+dependency_overrides:
+   {webview_flutter_platform_interface: {path: ../../webview_flutter/webview_flutter_platform_interface}}
diff --git a/...ebview_flutter/webview_flutter_platform_interface/lib/src/types/javascript_log_level.dart b/...ebview_flutter/webview_flutter_platform_interface/lib/src/types/javascript_log_level.dart
@@ -11,6 +11,10 @@ enum JavaScriptLogLevel {
   /// Indicates a debug message was logged using the `console.debug` method.
   debug,
 
+  /// Indicates an informational message was logged using the `console.info`
+  /// method.
+  info,
+
   /// Indicates a log message was logged using the `console.log` method.
   log,
 }
diff --git a/packages/webview_flutter/webview_flutter_web/example/pubspec.yaml b/packages/webview_flutter/webview_flutter_web/example/pubspec.yaml
@@ -28,3 +28,8 @@ dev_dependencies:
 
 flutter:
   uses-material-design: true
+
+# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
+# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
+dependency_overrides:
+   {webview_flutter_platform_interface: {path: ../../../webview_flutter/webview_flutter_platform_interface}}
diff --git a/packages/webview_flutter/webview_flutter_web/pubspec.yaml b/packages/webview_flutter/webview_flutter_web/pubspec.yaml
@@ -28,3 +28,8 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   mockito: 5.4.1
+
+# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
+# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
+dependency_overrides:
+   {webview_flutter_platform_interface: {path: ../../webview_flutter/webview_flutter_platform_interface}}
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/pubspec.yaml b/packages/webview_flutter/webview_flutter_wkwebview/example/pubspec.yaml
@@ -32,3 +32,8 @@ flutter:
     - assets/sample_video.mp4
     - assets/www/index.html
     - assets/www/styles/style.css
+
+# FOR TESTING AND INITIAL REVIEW ONLY. DO NOT MERGE.
+# See https://github.com/flutter/flutter/wiki/Contributing-to-Plugins-and-Packages#changing-federated-plugins
+dependency_overrides:
+   {webview_flutter_platform_interface: {path: ../../../webview_flutter/webview_flutter_platform_interface}, webview_flutter_wkwebview: {path: ../../../webview_flutter/webview_flutter_wkwebview}}
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/example/pubspec_overrides.yaml b/packages/webview_flutter/webview_flutter_wkwebview/example/pubspec_overrides.yaml
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/webkit_webview_controller.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/webkit_webview_controller.dart
@@ -540,10 +540,14 @@ class WebKitWebViewController extends PlatformWebViewController {
               _onConsoleLogCallback!(
                   JavaScriptLogLevel.warning, consoleLog['message']! as String);
               break;
-            case 'default':
+            case 'debug':
               _onConsoleLogCallback!(
                   JavaScriptLogLevel.debug, consoleLog['message']! as String);
               break;
+            case 'info':
+              _onConsoleLogCallback!(
+                  JavaScriptLogLevel.info, consoleLog['message']! as String);
+              break;
             case 'log':
             default:
               _onConsoleLogCallback!(
@@ -574,11 +578,13 @@ function log(type, args) {
 }
 
 let originalLog = console.log;
+let originalInfo = console.info;
 let originalWarn = console.warn;
 let originalError = console.error;
 let originalDebug = console.debug;
 
 console.log = function() { log("log", arguments); originalLog.apply(null, arguments) };
+console.info = function() { log("info", arguments); originalInfo.apple(null, arguments) };
 console.warn = function() { log("warning", arguments); originalWarn.apply(null, arguments) };
 console.error = function() { log("error", arguments); originalError.apply(null, arguments) };
 console.debug = function() { log("debug", arguments); originalDebug.apply(null, arguments) };

diff --git a/packages/webview_flutter/webview_flutter_wkwebview/pubspec_overrides.yaml b/packages/webview_flutter/webview_flutter_wkwebview/pubspec_overrides.yaml
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/webkit_webview_controller_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/webkit_webview_controller_test.dart
@@ -1221,11 +1221,13 @@ function log(type, args) {
 }
 
 let originalLog = console.log;
+let originalInfo = console.info;
 let originalWarn = console.warn;
 let originalError = console.error;
 let originalDebug = console.debug;
 
 console.log = function() { log("log", arguments); originalLog.apply(null, arguments) };
+console.info = function() { log("info", arguments); originalInfo.apple(null, arguments) };
 console.warn = function() { log("warning", arguments); originalWarn.apply(null, arguments) };
 console.error = function() { log("error", arguments); originalError.apply(null, arguments) };
 console.debug = function() { log("debug", arguments); originalDebug.apply(null, arguments) };