@office-iss/react-native-win32 0.84.0-preview.2 → 0.85.0-preview.1

package/Libraries/Core/ReactNativeVersion.js

@@ -27,8 +27,8 @@
  */
 export default class ReactNativeVersion {
   static major: number = 0;
-  static minor: number = 84;
-  static patch: number = 1;
+  static minor: number = 85;
+  static patch: number = 3;
   static prerelease: string | null = null;
 
   static getVersionString(): string {

package/Libraries/Core/Timers/JSTimers.js

@@ -11,6 +11,7 @@
 
 import NativeTiming from './NativeTiming';
 
+const toError = require('../../../src/private/utilities/toError').default;
 const BatchedBridge = require('../../BatchedBridge/BatchedBridge').default;
 const Systrace = require('../../Performance/Systrace');
 const invariant = require('invariant');
@@ -129,9 +130,9 @@ function _callTimer(timerID: number, frameTime: number, didTimeout: ?boolean) {
     } else {
       console.error('Tried to call a callback with invalid type: ' + type);
     }
-  } catch (e) {
+  } catch (e: unknown) {
     // Don't rethrow so that we can run all timers.
-    errors.push(e);
+    errors.push(toError(e));
   }
 
   if (__DEV__) {

package/Libraries/Core/setUpDeveloperTools.js

@@ -37,7 +37,7 @@ if (__DEV__) {
         ] as const
       ).forEach(level => {
         const originalFunction = console[level];
-        console[level] = function (...args: $ReadOnlyArray<unknown>) {
+        console[level] = function (...args: ReadonlyArray<unknown>) {
           HMRClient.log(level, args);
           originalFunction.apply(console, args);
         };

package/Libraries/Core/setUpErrorHandling.js

@@ -16,6 +16,7 @@ if (global.RN$useAlwaysAvailableJSErrorHandling !== true) {
    * You can use this module directly, or just require InitializeCore.
    */
   const ExceptionsManager = require('./ExceptionsManager').default;
+  const toError = require('../../src/private/utilities/toError').default;
   ExceptionsManager.installConsoleErrorReporter();
 
   // Set up error handler
@@ -23,8 +24,9 @@ if (global.RN$useAlwaysAvailableJSErrorHandling !== true) {
     const handleError = (e: unknown, isFatal: boolean) => {
       try {
         ExceptionsManager.handleException(e, isFatal);
-      } catch (ee) {
-        console.log('Failed to print error: ', ee.message);
+      } catch (ee: unknown) {
+        const error = toError(ee);
+        console.log('Failed to print error: ', error.message);
         throw e;
       }
     };

package/Libraries/Core/setUpReactDevTools.js

@@ -146,17 +146,34 @@ if (__DEV__) {
         ? guessHostFromDevServerUrl(devServer.url)
         : 'localhost';
 
-      // Read the optional global variable for backward compatibility.
-      // It was added in https://github.com/facebook/react-native/commit/bf2b435322e89d0aeee8792b1c6e04656c2719a0.
-      const port =
+      // Derive scheme and port from the dev server URL when possible,
+      // falling back to ws://host:8097 for local development.
+      let wsScheme = 'ws';
+      let port = 8097;
+
+      if (
         // $FlowFixMe[prop-missing]
         // $FlowFixMe[incompatible-use]
         window.__REACT_DEVTOOLS_PORT__ != null
-          ? window.__REACT_DEVTOOLS_PORT__
-          : 8097;
+      ) {
+        // $FlowFixMe[prop-missing]
+        port = window.__REACT_DEVTOOLS_PORT__;
+      } else if (devServer.bundleLoadedFromServer) {
+        try {
+          const devUrl = new URL(devServer.url);
+          if (devUrl.protocol === 'https:') {
+            wsScheme = 'wss';
+          }
+          if (devUrl.port) {
+            port = parseInt(devUrl.port, 10);
+          } else if (devUrl.protocol === 'https:') {
+            port = 443;
+          }
+        } catch (e) {}
+      }
 
       const WebSocket = require('../WebSocket/WebSocket').default;
-      ws = new WebSocket('ws://' + host + ':' + port);
+      ws = new WebSocket(wsScheme + '://' + host + ':' + port);
       ws.addEventListener('close', event => {
         isWebSocketOpen = false;
       });

package/Libraries/Core/setUpSegmentFetcher.js

@@ -19,7 +19,7 @@ export type FetchSegmentFunction = typeof __fetchSegment;
 
 function __fetchSegment(
   segmentId: number,
-  options: $ReadOnly<{
+  options: Readonly<{
     otaBuildNumber: ?string,
     requestedModuleName: string,
     segmentHash: string,

package/Libraries/Debugging/DebuggingOverlay.js

@@ -26,8 +26,8 @@ const isNativeComponentReady =
   UIManager.hasViewManagerConfig('DebuggingOverlay');
 
 type DebuggingOverlayHandle = {
-  highlightTraceUpdates(updates: $ReadOnlyArray<TraceUpdate>): void,
-  highlightElements(elements: $ReadOnlyArray<ElementRectangle>): void,
+  highlightTraceUpdates(updates: ReadonlyArray<TraceUpdate>): void,
+  highlightElements(elements: ReadonlyArray<ElementRectangle>): void,
   clearElementsHighlight(): void,
 };
 

package/Libraries/EventEmitter/NativeEventEmitter.js

@@ -45,9 +45,9 @@ type UnsafeNativeEventObject = Object;
  * can theoretically listen to `RCTDeviceEventEmitter` (although discouraged).
  */
 export default class NativeEventEmitter<
-  TEventToArgsMap: $ReadOnly<
-    Record<string, $ReadOnlyArray<UnsafeNativeEventObject>>,
-  > = $ReadOnly<Record<string, $ReadOnlyArray<UnsafeNativeEventObject>>>,
+  TEventToArgsMap: Readonly<
+    Record<string, ReadonlyArray<UnsafeNativeEventObject>>,
+  > = Readonly<Record<string, ReadonlyArray<UnsafeNativeEventObject>>>,
 > implements IEventEmitter<TEventToArgsMap>
 {
   _nativeModule: ?NativeModule;
@@ -83,7 +83,7 @@ export default class NativeEventEmitter<
     }
   }
 
-  addListener<TEvent: $Keys<TEventToArgsMap>>(
+  addListener<TEvent: keyof TEventToArgsMap>(
     eventType: TEvent,
     listener: (...args: TEventToArgsMap[TEvent]) => unknown,
     context?: unknown,
@@ -107,7 +107,7 @@ export default class NativeEventEmitter<
     };
   }
 
-  emit<TEvent: $Keys<TEventToArgsMap>>(
+  emit<TEvent: keyof TEventToArgsMap>(
     eventType: TEvent,
     ...args: TEventToArgsMap[TEvent]
   ): void {
@@ -116,9 +116,7 @@ export default class NativeEventEmitter<
     RCTDeviceEventEmitter.emit(eventType, ...args);
   }
 
-  removeAllListeners<TEvent: $Keys<TEventToArgsMap>>(
-    eventType?: ?TEvent,
-  ): void {
+  removeAllListeners<TEvent: keyof TEventToArgsMap>(eventType?: ?TEvent): void {
     invariant(
       eventType != null,
       '`NativeEventEmitter.removeAllListener()` requires a non-null argument.',
@@ -127,7 +125,7 @@ export default class NativeEventEmitter<
     RCTDeviceEventEmitter.removeAllListeners(eventType);
   }
 
-  listenerCount<TEvent: $Keys<TEventToArgsMap>>(eventType: TEvent): number {
+  listenerCount<TEvent: keyof TEventToArgsMap>(eventType: TEvent): number {
     return RCTDeviceEventEmitter.listenerCount(eventType);
   }
 }

package/Libraries/EventEmitter/RCTDeviceEventEmitter.js

@@ -25,7 +25,7 @@ type RCTDeviceEventDefinitions = {[name: string]: Array<any>};
  */
 class RCTDeviceEventEmitterImpl extends EventEmitter<RCTDeviceEventDefinitions> {
   // Add systrace to RCTDeviceEventEmitter.emit method for debugging
-  emit<TEvent: $Keys<RCTDeviceEventDefinitions>>(
+  emit<TEvent: keyof RCTDeviceEventDefinitions>(
     eventType: TEvent,
     ...args: RCTDeviceEventDefinitions[TEvent]
   ): void {

package/Libraries/Image/AssetSourceResolver.js

@@ -22,7 +22,7 @@ export type ResolvedAssetSource = {
 type AssetDestPathResolver = 'android' | 'generic';
 
 // From @react-native/assets-registry
-type PackagerAsset = $ReadOnly<{
+type PackagerAsset = Readonly<{
   __packager_asset: boolean,
   fileSystemLocation: string,
   httpServerLocation: string,