Merge branch 'main' into 0.67-merge-2021-09-15

.ado/variables/vars.yml

@@ -1,5 +1,5 @@
 variables:
-  VmImageApple: macOS-11
+  VmImageApple: internal-macos12
   PoolUbuntu: cxe-ubuntu-20-04-small
-  slice_name: 'Xcode_13_1'
-  xcode_version: '/Applications/Xcode_13.1.app'
+  slice_name: 'Xcode_13.3.1'
+  xcode_version: '/Applications/Xcode_13.3.1.app'

Libraries/WebSocket/RCTSRWebSocket.m

@@ -540,10 +540,33 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init)
     // ]TODO(macOS ISS#2323203)
   }
 
+  // [TODO(macOS GH#774)
+  // We've seen a rare ASan crash where _inputStream seems to be invalid. This is just a safety check.
+#if DEBUG
+  [self _validateStream:_outputStream name:@"_outputStream"];
+  [self _validateStream:_inputStream name:@"_inputStream"];
+#endif
+  // ]TODO(macOS GH#774)
+
   [_outputStream open];
   [_inputStream open];
 }
 
+// [TODO(macOS GH#774)
+#if DEBUG
+- (void)_validateStream:(NSStream *)stream name:(NSString *)name {
+  NSStreamStatus status = stream.streamStatus;
+  if (status != NSStreamStatusNotOpen) {
+    RCTLogWarn(@"%@ was already opened, why are we opening it again? status=%@", name, @(status));
+  }
+
+  if (stream.delegate == nil) {
+    RCTLogError(@"%@'s delegate is nil, did we clean it up too early?", name);
+  }
+}
+#endif
+// ]TODO(macOS GH#774)
+
 - (void)scheduleInRunLoop:(NSRunLoop *)aRunLoop forMode:(NSString *)mode
 {
   [_outputStream scheduleInRunLoop:aRunLoop forMode:mode];

packages/rn-tester/Podfile.lock

@@ -550,8 +550,8 @@ SPEC CHECKSUMS:
   boost-for-react-native: 8f7c9ecfe357664c072ffbe2432569667cbf1f1b
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: ed15e075aa758ac0e4c1f8b830bd4e4d40d669e8
-  FBLazyVector: d936d7e14d1fc76c87dced20a2601f473cf64072
-  FBReactNativeSpec: db322663675e02d05c2883f3c8f6794beb162d5b
+  FBLazyVector: 48581bce3f156798a8de77ebf53124872cf4fb59
+  FBReactNativeSpec: 40be37e7567787b98121ece7a7f8f80b28369a9d
   Flipper: 30e8eeeed6abdc98edaf32af0cda2f198be4b733
   Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
   Flipper-DoubleConversion: 57ffbe81ef95306cc9e69c4aa3aeeeeb58a6a28c
@@ -566,35 +566,35 @@ SPEC CHECKSUMS:
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
   RCT-Folly: 43adc9ce880eb76792f88c011773cb5c664c1419
-  RCTRequired: d3df383ab43dba92644346f8e080643cecaa7f1d
-  RCTTypeSafety: 22f89abc780400169c892727c723cbd84334b231
-  React: 747598713cd2ccb6c642377cd01302f97e0c5930
-  React-callinvoker: aa55083a290fb73f53171c500d91bb5adccbc5bf
-  React-Core: 4b7ee8d6889b3b64a96ca47342e7d9de04550819
-  React-CoreModules: 731cbd23114ee52cb70ea61daf91a473b56fc772
-  React-cxxreact: 75e0a65c9594649db8f3f7f5f92f3ec862930c2a
-  React-jsi: d8228427ee3c4404abe73a4ac800af01d5f08bac
-  React-jsiexecutor: d38abc67034c93baf83a003b784fc01580a16a45
-  React-jsinspector: feb1ac9dc7033d3a5d5036fc350de7a6c289fcf7
-  React-logger: decc9292183d0584e4e8f57a887083257a0ea16d
-  React-perflogger: a9f66b23b0ebf7fe7e2e557d9b59b89e0e6a036c
-  React-RCTActionSheet: 9084183a80702e8c2d1967bef4976140b52c3845
-  React-RCTAnimation: 0e0da62ff5cb6171759c334741a1750194bd8155
-  React-RCTBlob: c61875e5ebb1fa07312f77ebc74aac349444eb65
-  React-RCTImage: b610de655353804d524212127d0dca578bd757a1
-  React-RCTLinking: 6f78c0f1363dc38e1e0230407596b31938903039
-  React-RCTNetwork: 85f5e14b4e0d9a8553dbd3fbee4fe8b5e589d5b6
-  React-RCTPushNotification: 315495c7d1dc3f6f6a6c84200c6b735d41fd0832
-  React-RCTSettings: 17b2930bb75cfeb89bc4b3f5abbb014b48d144b0
-  React-RCTTest: a88e6d4ffa6b1bcd3d35cdddd1c0a63ec3a1c896
-  React-RCTText: 81301facd340aeea844b815b6fc0381555e15f64
-  React-RCTVibration: 1437c7189d07a18199da1c2d407a84b72d155369
-  React-runtimeexecutor: a4b9bb103010a314db052908759f62295e861645
+  RCTRequired: a38a3019767b1def3b7c1fed7b499aff34eabc5c
+  RCTTypeSafety: 3b9d31ebd289862e5603c29f9d3718fd230769b1
+  React: 17a0cf813af08dd8aef3e05b36cf6968a702a9e8
+  React-callinvoker: f966069a3d875cffefc49b54bd362e38b6aa9ad5
+  React-Core: 2b000a214cdf20ba9f1aa0312ed4dc7b04fb0803
+  React-CoreModules: 533a57d05c6818f5fcf695b54e7c12368e060d81
+  React-cxxreact: 493b6d755f1b29a7287589dca7ccbc8ff9d8ebaa
+  React-jsi: 3b06364dce575f833036ee3248abcb4636996259
+  React-jsiexecutor: 574afde14a75d980281d940d8ac69fe50f6a09bd
+  React-jsinspector: d7e3eb75f2570ef6b85c0ee7962367df19d38d7a
+  React-logger: b99efe7a50cc435822064c0f83c01bedabcb2331
+  React-perflogger: 7e7d11c8a421e125277af1f3ac2fe68304e5df76
+  React-RCTActionSheet: 22d1c18de33f428f7c56603d2a457a1d3e10ba67
+  React-RCTAnimation: ca6140491ea891fe04aeaecfdefe7d83d404fcb0
+  React-RCTBlob: 9a126ada47460628a155477af740f008173ee95f
+  React-RCTImage: e3ee667ed33032a0800055c783de366e37bd55bf
+  React-RCTLinking: 492453f98e206f7cbbca47c0991a7e9a86fa1f1d
+  React-RCTNetwork: 87506ca5c41cd793314e484d34c81107db80326c
+  React-RCTPushNotification: 3f3824c43334cfeb1bbe65b31eed2fefe3008241
+  React-RCTSettings: 9524ca912b629c33f679e2019a7afa16b98da0b7
+  React-RCTTest: c4cc45a0a2047bb63b61e6c90627601137a626f9
+  React-RCTText: 4226ef0abc1d39e7e0c4446690a23c88943787d0
+  React-RCTVibration: 2f20d1557044a70190312bc9ec948fda42c7cf99
+  React-runtimeexecutor: 4234aca16b808d428cbdeced751c047798fb4b5d
   React-TurboModuleCxx-RNW: f2e32cbfced49190a61d66c993a8975de79a158a
-  React-TurboModuleCxx-WinRTPort: b1c0d95d4dac7f3f788f77f7fb0b06ad45e3511e
-  ReactCommon: 8269735b2fbab813468149eb95e02ad8bbde07d8
+  React-TurboModuleCxx-WinRTPort: c79f4819b24ec7e2dd61d9bcf8f5d9b1f197ce62
+  ReactCommon: e472d5439f1d3a7b7b7722838bd0ea431fefe01b
   ScreenshotManager: da2454028d648a52b397251fbbc0a58e837fef5c
-  Yoga: 14f99b0a7c949b7e8f28f81d1f5365f3c6afe868
+  Yoga: e2e11c3406ab456164acc7c597f007fa3e555175
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
 PODFILE CHECKSUM: 54afd7797b4306f176be8caf7e8a1239ca2d8f4d