Auto merged - #2582 at Thu, 09 Sep 2021 15:17:08 GMT

Fix webview problem in the Android version.

Author: blckmn

cordova/package_template.json

@@ -27,7 +27,10 @@
     "cordova-plugin-whitelist": "^1.3.4",
     "cordova-plugin-theme-detection": "^1.2.1",
     "cordova-chrome-sockets-tcp": "^1.4.0",
-    "bf-cordovarduino": "^1.0.0"
+    "bf-cordovarduino": "^1.0.0",
+    "@ionic-native/core": "^5.1.0",
+    "@ionic-native/ionic-webview": "^5.36.0",
+    "rxjs": "^6.5.0"
   },
   "cordova": {
     "platforms": [
@@ -52,7 +55,8 @@
       "bf-cordova-open-native-settings": {},
       "cordova-plugin-theme-detection": {},
       "bf-cordova-plugin-appavailability": {},
-      "cordova-chrome-sockets-tcp": {}
+      "cordova-chrome-sockets-tcp": {},
+      "cordova-plugin-ionic-webview": {}
     }
   }
 }

cordova/yarn.lock

@@ -2,6 +2,20 @@
 # yarn lockfile v1
 
 
+"@ionic-native/core@^5.1.0":
+  version "5.36.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/core/-/core-5.36.0.tgz#712c40a530b119b0039e8d16cb577899f50541d4"
+  integrity sha512-lOrkktadlKYbYf1LrDyAtsu1JnQ0oCCdkOU7iHQ8oXnNOkMwobFfD2m62F1CoOr0u9LIkpYnZSPjng8lZbmbNw==
+  dependencies:
+    "@types/cordova" latest
+
+"@ionic-native/ionic-webview@^5.36.0":
+  version "5.36.0"
+  resolved "https://registry.yarnpkg.com/@ionic-native/ionic-webview/-/ionic-webview-5.36.0.tgz#26d0085dbc81db4891f46606882be9724983f157"
+  integrity sha512-Xeabtfjw/OCa8tZUh3yVqomVNMztwmg0hXYrcX18r3+Zq0XYRSgNtsBHrye1rBgNkXYqblWQHZQErwrAC2UNxQ==
+  dependencies:
+    "@types/cordova" latest
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -15,6 +29,11 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
+"@types/cordova@latest":
+  version "0.0.34"
+  resolved "https://registry.yarnpkg.com/@types/cordova/-/cordova-0.0.34.tgz#ea7addf74ecec3d7629827a0c39e2c9addc73d04"
+  integrity sha1-6nrd907Ow9dimCegw54smt3HPQQ=
+
 "@types/events@*":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
@@ -2433,6 +2452,13 @@ rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.5.0:
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+  dependencies:
+    tslib "^1.9.0"
+
 [email protected]:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"