@office-iss/react-native-win32 0.73.2 → 0.74.0-preview.2

package/Libraries/Utilities/Platform.win32.js

@@ -23,15 +23,19 @@ const Platform: PlatformType = {
   },
   // $FlowFixMe[unsafe-getters-setters]
   get constants(): {|
+    forceTouchAvailable: boolean,
+    interfaceIdiom: string,
     isTesting: boolean,
     isDisableAnimations?: boolean,
+    osVersion: number,
     reactNativeVersion: {|
       major: number,
       minor: number,
       patch: number,
       prerelease: ?string | number,
     |},
-    osVersion: number,
+    systemName: string,
+    isMacCatalyst?: boolean,
   |} {
     // $FlowFixMe[object-this-reference]
     if (this.__constants == null) {
@@ -59,6 +63,10 @@ const Platform: PlatformType = {
     // $FlowFixMe[object-this-reference]
     return false;
   },
+  // $FlowFixMe[unsafe-getters-setters]
+  get isVision(): boolean {
+    return false;
+  },
   select: <T>(spec: PlatformSelectSpec<T>): T =>
     'win32' in spec
       ? // $FlowFixMe[incompatible-return]

package/Libraries/Utilities/binaryToBase64.js

@@ -24,7 +24,7 @@ function binaryToBase64(data: ArrayBuffer | $ArrayBufferView): string {
     throw new Error('data must be ArrayBuffer or typed array');
   }
   // Already checked that `data` is `DataView` in `ArrayBuffer.isView(data)`
-  const {buffer, byteOffset, byteLength} = ((data: $FlowFixMe): DataView);
+  const {buffer, byteOffset, byteLength}: DataView = (data: $FlowFixMe);
   return base64.fromByteArray(new Uint8Array(buffer, byteOffset, byteLength));
 }
 

package/Libraries/Utilities/codegenNativeComponent.js

@@ -35,12 +35,10 @@ function codegenNativeComponent<Props>(
   componentName: string,
   options?: Options,
 ): NativeComponentType<Props> {
-  if (global.RN$Bridgeless === true) {
-    const errorMessage =
-      "Native Component '" +
-      componentName +
-      "' that calls codegenNativeComponent was not code generated at build time. Please check its definition.";
-    console.error(errorMessage);
+  if (global.RN$Bridgeless === true && __DEV__) {
+    console.warn(
+      `Codegen didn't run for ${componentName}. This will be an error in the future. Make sure you are using @react-native/babel-preset when building your JavaScript code.`,
+    );
   }
 
   let componentNameInUse =

package/Libraries/Utilities/createPerformanceLogger.js

@@ -16,18 +16,12 @@ import type {
 } from './IPerformanceLogger';
 
 import * as Systrace from '../Performance/Systrace';
-import ReactNativeFeatureFlags from '../ReactNative/ReactNativeFeatureFlags';
-import NativePerformance from '../WebPerformance/NativePerformance';
 import infoLog from './infoLog';
 
 const _cookies: {[key: string]: number, ...} = {};
 
 const PRINT_TO_CONSOLE: false = false; // Type as false to prevent accidentally committing `true`;
 
-// This is the prefix for optional logging points/timespans as marks/measures via Performance API,
-// used to separate these internally from other marks/measures
-const WEB_PERFORMANCE_PREFIX = 'global_perf_';
-
 export const getCurrentTimestamp: () => number =
   global.nativeQPLTimestamp ?? (() => global.performance.now());
 
@@ -37,51 +31,6 @@ class PerformanceLogger implements IPerformanceLogger {
   _points: {[key: string]: ?number} = {};
   _pointExtras: {[key: string]: ?Extras, ...} = {};
   _closed: boolean = false;
-  _isGlobalLogger: boolean = false;
-  _isGlobalWebPerformanceLoggerEnabled: ?boolean;
-
-  constructor(isGlobalLogger?: boolean) {
-    this._isGlobalLogger = isGlobalLogger === true;
-  }
-
-  _isLoggingForWebPerformance(): boolean {
-    if (!this._isGlobalLogger || NativePerformance == null) {
-      return false;
-    }
-    if (this._isGlobalWebPerformanceLoggerEnabled == null) {
-      this._isGlobalWebPerformanceLoggerEnabled =
-        ReactNativeFeatureFlags.isGlobalWebPerformanceLoggerEnabled();
-    }
-    return this._isGlobalWebPerformanceLoggerEnabled === true;
-  }
-
-  // NOTE: The Performance.mark/measure calls are wrapped here to ensure that
-  // we are safe from the cases when the global 'peformance' object is still not yet defined.
-  // It is only necessary in this file because of potential race conditions in the initialization
-  // order between 'createPerformanceLogger' and 'setUpPerformance'.
-  //
-  // In most of the other cases this kind of check for `performance` being defined
-  // wouldn't be necessary.
-  _performanceMark(key: string, startTime: number) {
-    if (this._isLoggingForWebPerformance()) {
-      global.performance?.mark?.(key, {
-        startTime,
-      });
-    }
-  }
-
-  _performanceMeasure(
-    key: string,
-    start: number | string,
-    end: number | string,
-  ) {
-    if (this._isLoggingForWebPerformance()) {
-      global.performance?.measure?.(key, {
-        start,
-        end,
-      });
-    }
-  }
 
   addTimespan(
     key: string,
@@ -113,12 +62,6 @@ class PerformanceLogger implements IPerformanceLogger {
       startExtras,
       endExtras,
     };
-
-    this._performanceMeasure(
-      `${WEB_PERFORMANCE_PREFIX}_${key}`,
-      startTime,
-      endTime,
-    );
   }
 
   append(performanceLogger: IPerformanceLogger) {
@@ -233,8 +176,6 @@ class PerformanceLogger implements IPerformanceLogger {
     if (extras) {
       this._pointExtras[key] = extras;
     }
-
-    this._performanceMark(`${WEB_PERFORMANCE_PREFIX}_${key}`, timestamp);
   }
 
   removeExtra(key: string): ?ExtraValue {
@@ -296,11 +237,6 @@ class PerformanceLogger implements IPerformanceLogger {
     if (PRINT_TO_CONSOLE) {
       infoLog('PerformanceLogger.js', 'start: ' + key);
     }
-
-    this._performanceMark(
-      `${WEB_PERFORMANCE_PREFIX}_timespan_start_${key}`,
-      timestamp,
-    );
   }
 
   stopTimespan(
@@ -346,12 +282,6 @@ class PerformanceLogger implements IPerformanceLogger {
       Systrace.endAsyncEvent(key, _cookies[key]);
       delete _cookies[key];
     }
-
-    this._performanceMeasure(
-      `${WEB_PERFORMANCE_PREFIX}_${key}`,
-      `${WEB_PERFORMANCE_PREFIX}_timespan_start_${key}`,
-      timestamp,
-    );
   }
 }
 
@@ -364,8 +294,6 @@ export type {Extras, ExtraValue, IPerformanceLogger, Timespan};
  * various performance data such as timespans, points and extras.
  * The loggers need to have minimal overhead since they're used in production.
  */
-export default function createPerformanceLogger(
-  isGlobalLogger?: boolean,
-): IPerformanceLogger {
-  return new PerformanceLogger(isGlobalLogger);
+export default function createPerformanceLogger(): IPerformanceLogger {
+  return new PerformanceLogger();
 }

package/Libraries/Utilities/useMergeRefs.js

@@ -8,13 +8,9 @@
  * @format
  */
 
+import * as React from 'react';
 import {useCallback} from 'react';
 
-type CallbackRef<T> = T => mixed;
-type ObjectRef<T> = {current: T, ...};
-
-type Ref<T> = CallbackRef<T> | ObjectRef<T>;
-
 /**
  * Constructs a new ref that forwards new values to each of the given refs. The
  * given refs will always be invoked in the order that they are supplied.
@@ -24,11 +20,11 @@ type Ref<T> = CallbackRef<T> | ObjectRef<T>;
  * the returned callback ref is supplied as a `ref` to a React element, this may
  * lead to problems with the given refs being invoked more times than desired.
  */
-export default function useMergeRefs<T>(
-  ...refs: $ReadOnlyArray<?Ref<T>>
-): CallbackRef<T> {
+export default function useMergeRefs<Instance>(
+  ...refs: $ReadOnlyArray<?React.RefSetter<Instance>>
+): (Instance | null) => void {
   return useCallback(
-    (current: T) => {
+    (current: Instance | null) => {
       for (const ref of refs) {
         if (ref != null) {
           if (typeof ref === 'function') {

package/Libraries/Vibration/NativeVibration.js

@@ -8,17 +8,6 @@
  * @format
  */
 
-import type {TurboModule} from '../TurboModule/RCTExport';
-
-import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
-
-export interface Spec extends TurboModule {
-  +getConstants: () => {||};
-  +vibrate: (pattern: number) => void;
-
-  // Android only
-  +vibrateByPattern: (pattern: Array<number>, repeat: number) => void;
-  +cancel: () => void;
-}
-
-export default (TurboModuleRegistry.getEnforcing<Spec>('Vibration'): Spec);
+export * from '../../src/private/specs/modules/NativeVibration';
+import NativeVibration from '../../src/private/specs/modules/NativeVibration';
+export default NativeVibration;

package/Libraries/WebSocket/NativeWebSocketModule.js

@@ -4,31 +4,10 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  */
 
-import type {TurboModule} from '../TurboModule/RCTExport';
-
-import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
-
-export interface Spec extends TurboModule {
-  +connect: (
-    url: string,
-    protocols: ?Array<string>,
-    options: {|headers?: Object|},
-    socketID: number,
-  ) => void;
-  +send: (message: string, forSocketID: number) => void;
-  +sendBinary: (base64String: string, forSocketID: number) => void;
-  +ping: (socketID: number) => void;
-  +close: (code: number, reason: string, socketID: number) => void;
-
-  // RCTEventEmitter
-  +addListener: (eventName: string) => void;
-  +removeListeners: (count: number) => void;
-}
-
-export default (TurboModuleRegistry.getEnforcing<Spec>(
-  'WebSocketModule',
-): Spec);
+export * from '../../src/private/specs/modules/NativeWebSocketModule';
+import NativeWebSocketModule from '../../src/private/specs/modules/NativeWebSocketModule';
+export default NativeWebSocketModule;

package/Libraries/YellowBox/YellowBoxDeprecated.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  */
 

package/Libraries/platform-types.d.ts

@@ -11,10 +11,9 @@ export { AccessibilityPropsWin32 } from '@office-iss/react-native-win32/Librarie
 export type IViewWin32Props = IViewWin32PropsOnly & AccessibilityPropsWin32;
 export {ViewWin32} from './Components/View/ViewWin32';
 export {IKeyboardEvent, IHandledKeyboardEvent, EventPhase} from './Components/View/ViewPropTypes';
-import {TextPropsWin32 as ITextWin32PropsOnly} from './Text/Text';
+import {TextPropsWin32 as ITextWin32PropsOnly} from './Components/Text/Text';
 export type ITextWin32Props = ITextWin32PropsOnly & AccessibilityPropsWin32;
-export {TextWin32TextStyle } from './Components/Text/TextWin32.Props';
-export {TextWin32} from './Components/Text/TextWin32';
+export {TextWin32TextStyle, Text as TextWin32 } from './Components/Text/Text';
 export {IButtonWin32Props, IButtonWin32Style} from './Components/Button/ButtonWin32.Props';
 export {ButtonWin32} from './Components/Button/ButtonWin32';
 export {GradientColorStop, GradientColorValueWin32, ColorGradientWin32} from './StyleSheet/PlatformColorValueTypesWin32';

package/Libraries/vendor/emitter/EventEmitter.js

@@ -35,6 +35,7 @@ interface Registration<TArgs> {
   +remove: () => void;
 }
 
+// $FlowFixMe[deprecated-type]
 type Registry<TEventToArgsMap: {...}> = $ObjMap<
   TEventToArgsMap,
   <TArgs>(TArgs) => Set<Registration<TArgs>>,

package/babel.config.js

@@ -1,3 +1,3 @@
 module.exports = {
   presets: ["module:@rnw-scripts/babel-react-native-config"],
-};
+};

package/flow/jest.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow
+ * @flow strict-local
  * @format
  * @oncall react_native
  */

package/flow/react.js

@@ -0,0 +1,15 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @nolint
+ * @format
+ */
+
+declare opaque type React$Element<
+  +ElementType: React$ElementType,
+  +P = React$ElementProps<ElementType>,
+>: {...};

package/index.js

@@ -10,96 +10,97 @@
 
 'use strict';
 
+// APIs
+import typeof ActionSheetIOS from './Libraries/ActionSheetIOS/ActionSheetIOS';
+import typeof Alert from './Libraries/Alert/Alert';
+import typeof Animated from './Libraries/Animated/Animated';
+import typeof * as AnimatedModule from './Libraries/Animated/Animated';
+import typeof Easing from './Libraries/Animated/Easing';
+import typeof useAnimatedValue from './Libraries/Animated/useAnimatedValue';
+import typeof AppState from './Libraries/AppState/AppState';
+import typeof NativeModules from './Libraries/BatchedBridge/NativeModules';
 // Components
 import typeof AccessibilityInfo from './Libraries/Components/AccessibilityInfo/AccessibilityInfo';
 import typeof ActivityIndicator from './Libraries/Components/ActivityIndicator/ActivityIndicator';
 import typeof Button from './Libraries/Components/Button';
+import typeof Clipboard from './Libraries/Components/Clipboard/Clipboard';
 import typeof DrawerLayoutAndroid from './Libraries/Components/DrawerAndroid/DrawerLayoutAndroid';
-import typeof FlatList from './Libraries/Lists/FlatList';
-import typeof Image from './Libraries/Image/Image';
-import typeof ImageBackground from './Libraries/Image/ImageBackground';
-import typeof InputAccessoryView from './Libraries/Components/TextInput/InputAccessoryView';
+import typeof Keyboard from './Libraries/Components/Keyboard/Keyboard';
 import typeof KeyboardAvoidingView from './Libraries/Components/Keyboard/KeyboardAvoidingView';
-import typeof Modal from './Libraries/Modal/Modal';
 import typeof Pressable from './Libraries/Components/Pressable/Pressable';
 import typeof ProgressBarAndroid from './Libraries/Components/ProgressBarAndroid/ProgressBarAndroid';
 import typeof RefreshControl from './Libraries/Components/RefreshControl/RefreshControl';
 import typeof SafeAreaView from './Libraries/Components/SafeAreaView/SafeAreaView';
 import typeof ScrollView from './Libraries/Components/ScrollView/ScrollView';
-import typeof SectionList from './Libraries/Lists/SectionList';
 import typeof StatusBar from './Libraries/Components/StatusBar/StatusBar';
 import typeof Switch from './Libraries/Components/Switch/Switch';
-import typeof Text from './Libraries/Text/Text';
+import typeof InputAccessoryView from './Libraries/Components/TextInput/InputAccessoryView';
 import typeof TextInput from './Libraries/Components/TextInput/TextInput';
+import typeof ToastAndroid from './Libraries/Components/ToastAndroid/ToastAndroid';
 import typeof Touchable from './Libraries/Components/Touchable/Touchable';
 import typeof TouchableHighlight from './Libraries/Components/Touchable/TouchableHighlight';
 import typeof TouchableNativeFeedback from './Libraries/Components/Touchable/TouchableNativeFeedback';
 import typeof TouchableOpacity from './Libraries/Components/Touchable/TouchableOpacity';
 import typeof TouchableWithoutFeedback from './Libraries/Components/Touchable/TouchableWithoutFeedback';
 import typeof View from './Libraries/Components/View/View';
-import typeof VirtualizedList from './Libraries/Lists/VirtualizedList';
-import typeof VirtualizedSectionList from './Libraries/Lists/VirtualizedSectionList';
-
-// APIs
-import typeof ActionSheetIOS from './Libraries/ActionSheetIOS/ActionSheetIOS';
-import typeof Alert from './Libraries/Alert/Alert';
-import typeof Animated from './Libraries/Animated/Animated';
-import typeof * as AnimatedModule from './Libraries/Animated/Animated';
-import typeof Appearance from './Libraries/Utilities/Appearance';
-import typeof AppRegistry from './Libraries/ReactNative/AppRegistry';
-import typeof AppState from './Libraries/AppState/AppState';
-import typeof BackHandler from './Libraries/Utilities/BackHandler';
-import typeof Clipboard from './Libraries/Components/Clipboard/Clipboard';
-import typeof DeviceInfo from './Libraries/Utilities/DeviceInfo';
-import typeof DevSettings from './Libraries/Utilities/DevSettings';
-import typeof Dimensions from './Libraries/Utilities/Dimensions';
-import typeof Easing from './Libraries/Animated/Easing';
-import typeof ReactNative from './Libraries/Renderer/shims/ReactNative';
-import typeof I18nManager from './Libraries/ReactNative/I18nManager';
+import typeof RegisterCallableModule from './Libraries/Core/registerCallableModule';
+import typeof NativeEventEmitter from './Libraries/EventEmitter/NativeEventEmitter';
+import typeof RCTDeviceEventEmitter from './Libraries/EventEmitter/RCTDeviceEventEmitter';
+import typeof RCTNativeAppEventEmitter from './Libraries/EventEmitter/RCTNativeAppEventEmitter';
+import typeof Image from './Libraries/Image/Image';
+import typeof ImageBackground from './Libraries/Image/ImageBackground';
 import typeof InteractionManager from './Libraries/Interaction/InteractionManager';
-import typeof Keyboard from './Libraries/Components/Keyboard/Keyboard';
+import typeof PanResponder from './Libraries/Interaction/PanResponder';
 import typeof LayoutAnimation from './Libraries/LayoutAnimation/LayoutAnimation';
 import typeof Linking from './Libraries/Linking/Linking';
+import typeof FlatList from './Libraries/Lists/FlatList';
+import typeof SectionList from './Libraries/Lists/SectionList';
+import typeof VirtualizedList from './Libraries/Lists/VirtualizedList';
+import typeof VirtualizedSectionList from './Libraries/Lists/VirtualizedSectionList';
 import typeof LogBox from './Libraries/LogBox/LogBox';
+import typeof Modal from './Libraries/Modal/Modal';
 import typeof NativeDialogManagerAndroid from './Libraries/NativeModules/specs/NativeDialogManagerAndroid';
-import typeof NativeEventEmitter from './Libraries/EventEmitter/NativeEventEmitter';
 import typeof Networking from './Libraries/Network/RCTNetworking';
-import typeof PanResponder from './Libraries/Interaction/PanResponder';
+import typeof * as Systrace from './Libraries/Performance/Systrace';
 import typeof PermissionsAndroid from './Libraries/PermissionsAndroid/PermissionsAndroid';
-import typeof PixelRatio from './Libraries/Utilities/PixelRatio';
 import typeof PushNotificationIOS from './Libraries/PushNotificationIOS/PushNotificationIOS';
+import typeof AppRegistry from './Libraries/ReactNative/AppRegistry';
+import typeof I18nManager from './Libraries/ReactNative/I18nManager';
+import typeof {RootTagContext} from './Libraries/ReactNative/RootTag';
+import typeof UIManager from './Libraries/ReactNative/UIManager';
+import typeof ReactNative from './Libraries/Renderer/shims/ReactNative';
+import type {HostComponent as _HostComponentInternal} from './Libraries/Renderer/shims/ReactNativeTypes';
 import typeof Settings from './Libraries/Settings/Settings';
 import typeof Share from './Libraries/Share/Share';
+import typeof {PlatformColor} from './Libraries/StyleSheet/PlatformColorValueTypes';
+// Plugins
+import typeof {DynamicColorIOS} from './Libraries/StyleSheet/PlatformColorValueTypesIOS';
+import typeof processColor from './Libraries/StyleSheet/processColor';
 import typeof StyleSheet from './Libraries/StyleSheet/StyleSheet';
-import typeof * as Systrace from './Libraries/Performance/Systrace';
-import typeof ToastAndroid from './Libraries/Components/ToastAndroid/ToastAndroid';
+import typeof Text from './Libraries/Text/Text';
 import typeof * as TurboModuleRegistry from './Libraries/TurboModule/TurboModuleRegistry';
-import typeof UIManager from './Libraries/ReactNative/UIManager';
-import typeof useAnimatedValue from './Libraries/Animated/useAnimatedValue';
+import typeof UTFSequence from './Libraries/UTFSequence';
+import typeof Appearance from './Libraries/Utilities/Appearance';
+import typeof BackHandler from './Libraries/Utilities/BackHandler';
+import typeof DeviceInfo from './Libraries/Utilities/DeviceInfo';
+import typeof DevSettings from './Libraries/Utilities/DevSettings';
+import typeof Dimensions from './Libraries/Utilities/Dimensions';
+import typeof PixelRatio from './Libraries/Utilities/PixelRatio';
+import typeof Platform from './Libraries/Utilities/Platform';
 import typeof useColorScheme from './Libraries/Utilities/useColorScheme';
 import typeof useWindowDimensions from './Libraries/Utilities/useWindowDimensions';
-import typeof UTFSequence from './Libraries/UTFSequence';
 import typeof Vibration from './Libraries/Vibration/Vibration';
 import typeof YellowBox from './Libraries/YellowBox/YellowBoxDeprecated';
 
-// Plugins
-import typeof {DynamicColorIOS} from './Libraries/StyleSheet/PlatformColorValueTypesIOS';
-import typeof NativeModules from './Libraries/BatchedBridge/NativeModules';
-import typeof Platform from './Libraries/Utilities/Platform';
-import typeof {PlatformColor} from './Libraries/StyleSheet/PlatformColorValueTypes';
-import typeof processColor from './Libraries/StyleSheet/processColor';
-import typeof RCTDeviceEventEmitter from './Libraries/EventEmitter/RCTDeviceEventEmitter';
-import typeof RCTNativeAppEventEmitter from './Libraries/EventEmitter/RCTNativeAppEventEmitter';
-import typeof {RootTagContext} from './Libraries/ReactNative/RootTag';
-
-import type {HostComponent as _HostComponentInternal} from './Libraries/Renderer/shims/ReactNativeTypes';
+const warnOnce = require('./Libraries/Utilities/warnOnce');
+const invariant = require('invariant');
 
 export type HostComponent<T> = _HostComponentInternal<T>;
 
-const invariant = require('invariant');
-const warnOnce = require('./Libraries/Utilities/warnOnce');
-
 module.exports = {
+  get registerCallableModule(): RegisterCallableModule {
+    return require('./Libraries/Core/registerCallableModule').default;
+  },
   // Components
   get AccessibilityInfo(): AccessibilityInfo {
     return require('./Libraries/Components/AccessibilityInfo/AccessibilityInfo')
@@ -110,7 +111,7 @@ module.exports = {
       .default;
   },
   get Button(): Button {
-    return require('./Libraries/Components/Button');
+    return require('./Libraries/Components/Button').default;
   },
   // $FlowFixMe[value-as-type]
   get DrawerLayoutAndroid(): DrawerLayoutAndroid {
@@ -126,7 +127,8 @@ module.exports = {
     return require('./Libraries/Image/ImageBackground');
   },
   get InputAccessoryView(): InputAccessoryView {
-    return require('./Libraries/Components/TextInput/InputAccessoryView');
+    return require('./Libraries/Components/TextInput/InputAccessoryView')
+      .default;
   },
   get KeyboardAvoidingView(): KeyboardAvoidingView {
     return require('./Libraries/Components/Keyboard/KeyboardAvoidingView')
@@ -173,7 +175,7 @@ module.exports = {
     return require('./Libraries/Components/TextInput/TextInput');
   },
   get Touchable(): Touchable {
-    return require('./Libraries/Components/Touchable/Touchable');
+    return require('./Libraries/Components/Touchable/Touchable').default;
   },
   get TouchableHighlight(): TouchableHighlight {
     return require('./Libraries/Components/Touchable/TouchableHighlight');
@@ -288,7 +290,7 @@ module.exports = {
       'pushNotificationIOS-moved',
       'PushNotificationIOS has been extracted from react-native core and will be removed in a future release. ' +
         "It can now be installed and imported from '@react-native-community/push-notification-ios' instead of 'react-native'. " +
-        'See https://github.com/react-native-push-notification-ios/push-notification-ios',
+        'See https://github.com/react-native-push-notification/ios',
     );
     return require('./Libraries/PushNotificationIOS/PushNotificationIOS');
   },
@@ -378,47 +380,6 @@ module.exports = {
         'LogBox is enabled by default so there is no need to call unstable_enableLogBox() anymore. This is a no op and will be removed in the next version.',
       );
   },
-  // Deprecated Prop Types
-  get ColorPropType(): $FlowFixMe {
-    console.error(
-      'ColorPropType will be removed from React Native, along with all ' +
-        'other PropTypes. We recommend that you migrate away from PropTypes ' +
-        'and switch to a type system like TypeScript. If you need to ' +
-        'continue using ColorPropType, migrate to the ' +
-        "'deprecated-react-native-prop-types' package.",
-    );
-    return require('deprecated-react-native-prop-types').ColorPropType;
-  },
-  get EdgeInsetsPropType(): $FlowFixMe {
-    console.error(
-      'EdgeInsetsPropType will be removed from React Native, along with all ' +
-        'other PropTypes. We recommend that you migrate away from PropTypes ' +
-        'and switch to a type system like TypeScript. If you need to ' +
-        'continue using EdgeInsetsPropType, migrate to the ' +
-        "'deprecated-react-native-prop-types' package.",
-    );
-    return require('deprecated-react-native-prop-types').EdgeInsetsPropType;
-  },
-  get PointPropType(): $FlowFixMe {
-    console.error(
-      'PointPropType will be removed from React Native, along with all ' +
-        'other PropTypes. We recommend that you migrate away from PropTypes ' +
-        'and switch to a type system like TypeScript. If you need to ' +
-        'continue using PointPropType, migrate to the ' +
-        "'deprecated-react-native-prop-types' package.",
-    );
-    return require('deprecated-react-native-prop-types').PointPropType;
-  },
-  get ViewPropTypes(): $FlowFixMe {
-    console.error(
-      'ViewPropTypes will be removed from React Native, along with all ' +
-        'other PropTypes. We recommend that you migrate away from PropTypes ' +
-        'and switch to a type system like TypeScript. If you need to ' +
-        'continue using ViewPropTypes, migrate to the ' +
-        "'deprecated-react-native-prop-types' package.",
-    );
-    return require('deprecated-react-native-prop-types').ViewPropTypes;
-  },
 };
 
 if (__DEV__) {
@@ -432,7 +393,8 @@ if (__DEV__) {
       invariant(
         false,
         'ART has been removed from React Native. ' +
-          "It can now be installed and imported from '@react-native-community/art' instead of 'react-native'. " +
+          "Please upgrade to use either 'react-native-svg' or a similar package. " +
+          "If you cannot upgrade to a different library, please install the deprecated '@react-native-community/art' package. " +
           'See https://github.com/react-native-art/art',
       );
     },
@@ -512,7 +474,7 @@ if (__DEV__) {
       invariant(
         false,
         'CameraRoll has been removed from React Native. ' +
-          "It can now be installed and imported from '@react-native-community/cameraroll' instead of 'react-native'. " +
+          "It can now be installed and imported from '@react-native-camera-roll/camera-roll' instead of 'react-native'. " +
           'See https://github.com/react-native-cameraroll/react-native-cameraroll',
       );
     },
@@ -625,7 +587,7 @@ if (__DEV__) {
       invariant(
         false,
         'SegmentedControlIOS has been removed from React Native. ' +
-          "It can now be installed and imported from '@react-native-community/segmented-checkbox' instead of 'react-native'." +
+          "It can now be installed and imported from '@react-native-segmented-control/segmented-control' instead of 'react-native'." +
           'See https://github.com/react-native-segmented-control/segmented-control',
       );
     },
@@ -703,7 +665,7 @@ if (__DEV__) {
       invariant(
         false,
         'MaskedViewIOS has been removed from React Native. ' +
-          "It can now be installed and imported from '@react-native-community/react-native-masked-view' instead of 'react-native'. " +
+          "It can now be installed and imported from '@react-native-masked-view/masked-view' instead of 'react-native'. " +
           'See https://github.com/react-native-masked-view/masked-view',
       );
     },
@@ -733,7 +695,7 @@ if (__DEV__) {
       invariant(
         false,
         'ImagePickerIOS has been removed from React Native. ' +
-          "Please upgrade to use either '@react-native-community/react-native-image-picker' or 'expo-image-picker'. " +
+          "Please upgrade to use either 'react-native-image-picker' or 'expo-image-picker'. " +
           "If you cannot upgrade to a different library, please install the deprecated '@react-native-community/image-picker-ios' package. " +
           'See https://github.com/rnc-archive/react-native-image-picker-ios',
       );