deps: Run yarn upgrade.

This is a lot at once, but all our tests pass, and manual testing confirms that basic functionality is preserved on Android and iOS. We should make sure this spends some time out in a beta release before going out to all users. I'm guessing the changes to generatedEs3.js (made by running `tools/generate-webview-js` after this upgrade) have something to do with Babel; we've encountered something like this before: zulip#4152 (comment) Greg points out that "it's more practical to seriously test an infrequent bigger upgrade than many small ones" [1], and that "if we have a regression that we bisect to a big upgrade commit, we can still do a bisect on the upgrades themselves within the commit" [2]. [1] https://chat.zulip.org/#narrow/stream/243-mobile-team/topic/Dependabot/near/1202825 [2] https://chat.zulip.org/#narrow/stream/243-mobile-team/topic/Dependabot/near/1202866
chrisbobbe · Jun 11, 2021 · 78a7763 · 78a7763
1 parent 9501761
commit 78a7763
Show file tree

Hide file tree

Showing 4 changed files with 2,689 additions and 2,668 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -2,9 +2,9 @@ PODS:
   - boost-for-react-native (1.63.0)
   - CocoaAsyncSocket (7.6.5)
   - DoubleConversion (1.1.6)
-  - EXAppleAuthentication (2.1.1):
+  - EXAppleAuthentication (2.2.2):
     - UMCore
-  - EXApplication (2.1.1):
+  - EXApplication (2.4.1):
     - UMCore
   - EXConstants (9.1.1):
     - UMConstantsInterface
@@ -19,7 +19,7 @@ PODS:
   - EXPermissions (9.0.1):
     - UMCore
     - UMPermissionsInterface
-  - EXScreenOrientation (1.0.0):
+  - EXScreenOrientation (1.1.1):
     - React-Core
     - UMCore
   - EXSplashScreen (0.5.0):
@@ -271,19 +271,19 @@ PODS:
     - React-Core
   - react-native-image-picker (2.3.4):
     - React-Core
-  - react-native-netinfo (5.9.5):
-    - React
+  - react-native-netinfo (5.9.10):
+    - React-Core
   - react-native-notifications (1.5.0):
     - React
   - react-native-photo-view (1.5.2):
     - React
-  - react-native-safe-area-context (3.1.7):
-    - React
-  - react-native-simple-toast (1.0.0):
-    - React
+  - react-native-safe-area-context (3.2.0):
+    - React-Core
+  - react-native-simple-toast (1.1.3):
+    - React-Core
     - Toast (~> 4.0.0)
-  - react-native-webview (10.8.3):
-    - React
+  - react-native-webview (10.10.2):
+    - React-Core
   - React-RCTActionSheet (0.63.4):
     - React-Core/RCTActionSheetHeaders (= 0.63.4)
   - React-RCTAnimation (0.63.4):
@@ -352,16 +352,16 @@ PODS:
     - React-jsi (= 0.63.4)
   - rn-fetch-blob (0.11.2):
     - React-Core
-  - RNCAsyncStorage (1.6.3):
-    - React
-  - RNCMaskedView (0.1.10):
-    - React
-  - RNDeviceInfo (6.0.2):
-    - React
-  - RNGestureHandler (1.8.0):
-    - React
-  - RNReanimated (1.13.0):
+  - RNCAsyncStorage (1.12.1):
+    - React-Core
+  - RNCMaskedView (0.1.11):
     - React
+  - RNDeviceInfo (6.2.1):
+    - React-Core
+  - RNGestureHandler (1.10.3):
+    - React-Core
+  - RNReanimated (1.13.3):
+    - React-Core
   - RNSentry (2.4.3):
     - React-Core
     - Sentry (= 6.1.4)
@@ -641,13 +641,13 @@ SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: cde416483dac037923206447da6e1454df403714
-  EXAppleAuthentication: 046c76335343eaa97f6ed8d35a9cf493a2c4d351
-  EXApplication: 7cf81de6fafccff42f5d1caa5c24a159db6b9437
+  EXAppleAuthentication: 97d5db59f3fb7aefc6cb06e351ba0828c8982232
+  EXApplication: e3c201e7b913d081bbd37bd3c5d0e2cdc21733b4
   EXConstants: f907b3b6ce16e20d1750f22af1e095e924574bcb
   EXFileSystem: 76875135b61708b9afa7e6a89b72a60ba0fdfa20
   EXImageLoader: 02ca02c9cd5cc8a97b423207a73a791e0a86bea5
   EXPermissions: 80ac3acbdb145930079810fe5b08c022b3428aa8
-  EXScreenOrientation: 44d3cd3a99a86b9cb681e742697bc2c057d7fbd2
+  EXScreenOrientation: c9cfb33eaff7ce83330c5238eba523d027b9eb53
   EXSplashScreen: 9423d258b71afa5bf128a83dcb57b636d9900a74
   EXWebBrowser: 0b466c50e5ff61c9758095d49d5081e3229d77ac
   FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
@@ -675,12 +675,12 @@ SPEC CHECKSUMS:
   React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a
   react-native-cameraroll: 88f4e62d9ecd0e1f253abe4f685474f2ea14bfa2
   react-native-image-picker: c6d75c4ab2cf46f9289f341242b219cb3c1180d3
-  react-native-netinfo: a53b00d949b6456913aaf507d9dba90c4008c611
+  react-native-netinfo: 30fb89fa913c342be82a887b56e96be6d71201dd
   react-native-notifications: ce37363008fe2d6a226da4e721eace23b6ae3ad9
   react-native-photo-view: 63e9e61da873531f931008b545d8d10c5373ddf8
-  react-native-safe-area-context: 955ecfce672683b495d9294d2f154a9ad1d9796b
-  react-native-simple-toast: 6c376bd79b1e255a4bee90a72ead6447f96ea10d
-  react-native-webview: 598605cd213f5096e695f5b33fbee210a47e60ab
+  react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
+  react-native-simple-toast: bf002828cf816775a6809f7a9ec3907509bce11f
+  react-native-webview: 0aa2cde4ee7e3e1c5fffdf64dbce9c709aa18155
   React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336
   React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b
   React-RCTBlob: a97d378b527740cc667e03ebfa183a75231ab0f0
@@ -693,11 +693,11 @@ SPEC CHECKSUMS:
   React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d
   ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
   rn-fetch-blob: f525a73a78df9ed5d35e67ea65e79d53c15255bc
-  RNCAsyncStorage: 3c304d1adfaea02ec732ac218801cb13897aa8c0
-  RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
-  RNDeviceInfo: bdd61e8b070d13a1dd9d022091981075ed4cde16
-  RNGestureHandler: 7a5833d0f788dbd107fbb913e09aa0c1ff333c39
-  RNReanimated: 89f5e0a04d1dd52fbf27e7e7030d8f80a646a3fc
+  RNCAsyncStorage: b03032fdbdb725bea0bd9e5ec5a7272865ae7398
+  RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
+  RNDeviceInfo: 9b6aba9ffaed69ecb72bd13c7bcb0debf277bc9f
+  RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
+  RNReanimated: 514a11da3a2bcc6c3dfd9de32b38e2b9bf101926
   RNSentry: 6f8f9ee7e4c939dcd35e5633b94d0e3782888e46
   RNSound: da030221e6ac7e8290c6b43f2b5f2133a8e225b0
   RNVectorIcons: da6fe858f5a65d7bbc3379540a889b0b12aa5976

diff --git a/jest/jestSetup.js b/jest/jestSetup.js
@@ -3,6 +3,7 @@
 import * as ReactNative from 'react-native';
 import { polyfillGlobal } from 'react-native/Libraries/Utilities/PolyfillFunctions';
 import { URL, URLSearchParams } from 'react-native-url-polyfill';
+// $FlowIgnore[untyped-import] - this is not anywhere near critical
 import mockAsyncStorage from '@react-native-community/async-storage/jest/async-storage-mock';
 
 // Use the same `URL` polyfill we do in the app.

diff --git a/src/webview/js/generatedEs3.js b/src/webview/js/generatedEs3.js
@@ -14,6 +14,44 @@ export default `
 var compiledWebviewJs = (function (exports) {
   'use strict';
 
+  function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+
+    if (Object.getOwnPropertySymbols) {
+      var symbols = Object.getOwnPropertySymbols(object);
+
+      if (enumerableOnly) {
+        symbols = symbols.filter(function (sym) {
+          return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+        });
+      }
+
+      keys.push.apply(keys, symbols);
+    }
+
+    return keys;
+  }
+
+  function _objectSpread2(target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i] != null ? arguments[i] : {};
+
+      if (i % 2) {
+        ownKeys(Object(source), true).forEach(function (key) {
+          _defineProperty(target, key, source[key]);
+        });
+      } else if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+      } else {
+        ownKeys(Object(source)).forEach(function (key) {
+          Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+      }
+    }
+
+    return target;
+  }
+
   function _classCallCheck(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
       throw new TypeError("Cannot call a class as a function");
@@ -51,40 +89,6 @@ var compiledWebviewJs = (function (exports) {
     return obj;
   }
 
-  function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-
-    if (Object.getOwnPropertySymbols) {
-      var symbols = Object.getOwnPropertySymbols(object);
-      if (enumerableOnly) symbols = symbols.filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-      });
-      keys.push.apply(keys, symbols);
-    }
-
-    return keys;
-  }
-
-  function _objectSpread2(target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i] != null ? arguments[i] : {};
-
-      if (i % 2) {
-        ownKeys(Object(source), true).forEach(function (key) {
-          _defineProperty(target, key, source[key]);
-        });
-      } else if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-      } else {
-        ownKeys(Object(source)).forEach(function (key) {
-          Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-      }
-    }
-
-    return target;
-  }
-
   var makeUserId = function makeUserId(id) {
     return id;
   };
@@ -99,64 +103,6 @@ var compiledWebviewJs = (function (exports) {
   };
 
   var InboundEventLogger = function () {
-    _createClass(InboundEventLogger, null, [{
-      key: "scrubInboundEvent",
-      value: function scrubInboundEvent(event) {
-        switch (event.type) {
-          case 'content':
-            {
-              return {
-                type: event.type,
-                scrollMessageId: event.scrollMessageId,
-                auth: 'redacted',
-                content: placeholdersDivTagFromContent(event.content),
-                updateStrategy: event.updateStrategy
-              };
-            }
-
-          case 'fetching':
-            {
-              return {
-                type: event.type,
-                showMessagePlaceholders: event.showMessagePlaceholders,
-                fetchingOlder: event.fetchingOlder,
-                fetchingNewer: event.fetchingNewer
-              };
-            }
-
-          case 'typing':
-            {
-              return {
-                type: event.type,
-                content: event.content !== ''
-              };
-            }
-
-          case 'ready':
-            {
-              return {
-                type: event.type
-              };
-            }
-
-          case 'read':
-            {
-              return {
-                type: event.type,
-                messageIds: event.messageIds
-              };
-            }
-
-          default:
-            {
-              return {
-                type: event.type
-              };
-            }
-        }
-      }
-    }]);
-
     function InboundEventLogger() {
       _classCallCheck(this, InboundEventLogger);
 
@@ -225,6 +171,62 @@ var compiledWebviewJs = (function (exports) {
           this._capturedInboundEventItems.push(item);
         }
       }
+    }], [{
+      key: "scrubInboundEvent",
+      value: function scrubInboundEvent(event) {
+        switch (event.type) {
+          case 'content':
+            {
+              return {
+                type: event.type,
+                scrollMessageId: event.scrollMessageId,
+                auth: 'redacted',
+                content: placeholdersDivTagFromContent(event.content),
+                updateStrategy: event.updateStrategy
+              };
+            }
+
+          case 'fetching':
+            {
+              return {
+                type: event.type,
+                showMessagePlaceholders: event.showMessagePlaceholders,
+                fetchingOlder: event.fetchingOlder,
+                fetchingNewer: event.fetchingNewer
+              };
+            }
+
+          case 'typing':
+            {
+              return {
+                type: event.type,
+                content: event.content !== ''
+              };
+            }
+
+          case 'ready':
+            {
+              return {
+                type: event.type
+              };
+            }
+
+          case 'read':
+            {
+              return {
+                type: event.type,
+                messageIds: event.messageIds
+              };
+            }
+
+          default:
+            {
+              return {
+                type: event.type
+              };
+            }
+        }
+      }
     }]);
 
     return InboundEventLogger;
@@ -1073,6 +1075,8 @@ var compiledWebviewJs = (function (exports) {
 
   exports.handleInitialLoad = handleInitialLoad;
 
+  Object.defineProperty(exports, '__esModule', { value: true });
+
   return exports;
 
 }({}));