Merge branch 'main' into dev-menu

Author: coado

CHANGELOG.md

@@ -88,7 +88,6 @@ Diff: ${styleText(['dim', 'underline'], newVersion?.diffUrl ?? 'none')}
   }
 }
 
-// $FlowFixMe
 function isDiffPurgeEntry(data: Partial<DiffPurge>): data is DiffPurge {
   return (
     // $FlowFixMe[incompatible-type-guard]

packages/community-cli-plugin/src/utils/version.js

@@ -65,25 +65,26 @@ internal fun Project.configureReactTasks(variant: Variant, config: ReactExtensio
   if (!isDebuggableVariant) {
     val entryFileEnvVariable = System.getenv("ENTRY_FILE")
     val bundleTask =
-        tasks.register("createBundle${targetName}JsAndAssets", BundleHermesCTask::class.java) {
-          it.root.set(config.root)
-          it.nodeExecutableAndArgs.set(config.nodeExecutableAndArgs)
-          it.cliFile.set(cliFile)
-          it.bundleCommand.set(config.bundleCommand)
-          it.entryFile.set(detectedEntryFile(config, entryFileEnvVariable))
-          it.extraPackagerArgs.set(config.extraPackagerArgs)
-          it.bundleConfig.set(config.bundleConfig)
-          it.bundleAssetName.set(config.bundleAssetName)
-          it.jsBundleDir.set(jsBundleDir)
-          it.resourcesDir.set(resourcesDir)
-          it.hermesEnabled.set(isHermesEnabledInThisVariant)
-          it.minifyEnabled.set(!isHermesEnabledInThisVariant)
-          it.devEnabled.set(false)
-          it.jsIntermediateSourceMapsDir.set(jsIntermediateSourceMapsDir)
-          it.jsSourceMapsDir.set(jsSourceMapsDir)
-          it.hermesCommand.set(config.hermesCommand)
-          it.hermesFlags.set(config.hermesFlags)
-          it.reactNativeDir.set(config.reactNativeDir)
+        tasks.register("createBundle${targetName}JsAndAssets", BundleHermesCTask::class.java) { task
+          ->
+          task.root.set(config.root)
+          task.nodeExecutableAndArgs.set(config.nodeExecutableAndArgs)
+          task.cliFile.set(cliFile)
+          task.bundleCommand.set(config.bundleCommand)
+          task.entryFile.set(detectedEntryFile(config, entryFileEnvVariable))
+          task.extraPackagerArgs.set(config.extraPackagerArgs)
+          task.bundleConfig.set(config.bundleConfig)
+          task.bundleAssetName.set(config.bundleAssetName)
+          task.jsBundleDir.set(jsBundleDir)
+          task.resourcesDir.set(resourcesDir)
+          task.hermesEnabled.set(isHermesEnabledInThisVariant)
+          task.minifyEnabled.set(!isHermesEnabledInThisVariant)
+          task.devEnabled.set(false)
+          task.jsIntermediateSourceMapsDir.set(jsIntermediateSourceMapsDir)
+          task.jsSourceMapsDir.set(jsSourceMapsDir)
+          task.hermesCommand.set(config.hermesCommand)
+          task.hermesFlags.set(config.hermesFlags)
+          task.reactNativeDir.set(config.reactNativeDir)
         }
     variant.sources.res?.addGeneratedSourceDirectory(bundleTask, BundleHermesCTask::resourcesDir)
     variant.sources.assets?.addGeneratedSourceDirectory(bundleTask, BundleHermesCTask::jsBundleDir)

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt

@@ -102,7 +102,6 @@ export function testBadSectionsShape(): React.MixedElement {
       ],
     },
   ];
-  // $FlowExpectedError - section missing `data` field
   return <SectionList renderItem={renderMyListItem} sections={sections} />;
 }
 

packages/react-native/Libraries/Lists/__flowtests__/SectionList-flowtest.js

@@ -649,8 +649,6 @@ class XMLHttpRequest extends EventTarget {
         this._url,
         this._headers,
         data,
-        /* $FlowFixMe(>=0.78.0 site=react_native_android_fb) This issue was found
-         * when making Flow check .android.js files. */
         nativeResponseType,
         incrementalEvents,
         this.timeout,

packages/react-native/Libraries/Network/XMLHttpRequest.js

@@ -41,11 +41,7 @@ export function testBadCompose() {
   (StyleSheet.compose(textStyle, textStyle): ImageStyleProp);
 
   // $FlowExpectedError[incompatible-type]  - Incompatible type.
-  (StyleSheet.compose(
-    // $FlowExpectedError - Incompatible type.
-    [textStyle],
-    null,
-  ): ImageStyleProp);
+  (StyleSheet.compose([textStyle], null): ImageStyleProp);
 
   // $FlowExpectedError[incompatible-type]  - Incompatible type.
   (StyleSheet.compose(

packages/react-native/Libraries/StyleSheet/__flowtests__/StyleSheet-flowtest.js

@@ -141,7 +141,7 @@ - (void)setBridge:(RCTBridge *)bridge
     RCTExecuteOnUIManagerQueue(^{
       RCTBaseTextInputShadowView *shadowView =
           (RCTBaseTextInputShadowView *)[self.bridge.uiManager shadowViewForReactTag:viewTag];
-      if (value) {
+      if (value != nullptr) {
         [shadowView setText:value];
       }
       [self.bridge.uiManager setNeedsLayout];

packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm

@@ -16,7 +16,7 @@ @implementation _RCTTypedModuleConstants {
 + (instancetype)newWithUnsafeDictionary:(NSDictionary<NSString *, id> *)dictionary
 {
   _RCTTypedModuleConstants *constants = [self new];
-  if (constants) {
+  if (constants != nullptr) {
     constants->_dictionary = dictionary;
   }
   return constants;

packages/react-native/Libraries/TypeSafety/RCTTypedModuleConstants.mm

@@ -53,7 +53,7 @@ - (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry
                        launchOptions:(nullable NSDictionary *)launchOptions
 {
   self = [super self];
-  if (self) {
+  if (self != nullptr) {
     _uiManagerProxy = [[RCTUIManagerProxy alloc] initWithViewRegistry:viewRegistry];
     _moduleRegistry = moduleRegistry;
     _bundleManager = bundleManager;
@@ -75,7 +75,7 @@ - (void)dispatchBlock:(dispatch_block_t)block queue:(dispatch_queue_t)queue
 
   if (queue == RCTJSThread) {
     _dispatchToJSThread(block);
-  } else if (queue) {
+  } else if (queue != nullptr) {
     dispatch_async(queue, block);
   }
 }
@@ -427,7 +427,7 @@ @implementation RCTUIManagerProxy {
 - (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry
 {
   self = [super self];
-  if (self) {
+  if (self != nullptr) {
     _viewRegistry = viewRegistry;
     _legacyViewRegistry = [NSMutableDictionary new];
   }
@@ -443,8 +443,8 @@ - (UIView *)viewForReactTag:(NSNumber *)reactTag
 {
   [self logWarning:@"Please migrate to RCTViewRegistry: @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED."
                cmd:_cmd];
-  UIView *view = [_viewRegistry viewForReactTag:reactTag] ? [_viewRegistry viewForReactTag:reactTag]
-                                                          : [_legacyViewRegistry objectForKey:reactTag];
+  UIView *view = ([_viewRegistry viewForReactTag:reactTag] != nullptr) ? [_viewRegistry viewForReactTag:reactTag]
+                                                                       : [_legacyViewRegistry objectForKey:reactTag];
   return RCTPaperViewOrCurrentView(view);
 }
 
@@ -457,7 +457,7 @@ - (void)addUIBlock:(RCTViewManagerUIBlock)block
   __weak __typeof(self) weakSelf = self;
   RCTExecuteOnMainQueue(^{
     __typeof(self) strongSelf = weakSelf;
-    if (strongSelf) {
+    if (strongSelf != nullptr) {
       RCTUIManager *proxiedManager = (RCTUIManager *)strongSelf;
       RCTComposedViewRegistry *composedViewRegistry =
           [[RCTComposedViewRegistry alloc] initWithUIManager:proxiedManager

packages/react-native/React/Base/RCTBridgeProxy.mm

@@ -18,17 +18,17 @@ void RCTSurfaceMinimumSizeAndMaximumSizeFromSizeAndSizeMeasureMode(
   *minimumSize = CGSizeZero;
   *maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
 
-  if (sizeMeasureMode & RCTSurfaceSizeMeasureModeWidthExact) {
+  if ((sizeMeasureMode & RCTSurfaceSizeMeasureModeWidthExact) != 0) {
     minimumSize->width = size.width;
     maximumSize->width = size.width;
-  } else if (sizeMeasureMode & RCTSurfaceSizeMeasureModeWidthAtMost) {
+  } else if ((sizeMeasureMode & RCTSurfaceSizeMeasureModeWidthAtMost) != 0) {
     maximumSize->width = size.width;
   }
 
-  if (sizeMeasureMode & RCTSurfaceSizeMeasureModeHeightExact) {
+  if ((sizeMeasureMode & RCTSurfaceSizeMeasureModeHeightExact) != 0) {
     minimumSize->height = size.height;
     maximumSize->height = size.height;
-  } else if (sizeMeasureMode & RCTSurfaceSizeMeasureModeHeightAtMost) {
+  } else if ((sizeMeasureMode & RCTSurfaceSizeMeasureModeHeightAtMost) != 0) {
     maximumSize->height = size.height;
   }
 }