Fix measureIOS release build broken after RN 0.62

Author: Kudo

src/commands/common/ObjcPatcher.ts

@@ -17,8 +17,8 @@ export default class ObjcPatcher {
     return this._content.indexOf(this._patchSig) >= 0;
   }
 
-  addImport(file: string): ObjcPatcher {
-    const lastImportBegin = this._content.lastIndexOf('\n#import');
+  addImport(file: string, searchPattern = '\n#import'): ObjcPatcher {
+    const lastImportBegin = this._content.lastIndexOf(searchPattern);
     const lastImportEnd = this._content.indexOf('\n', lastImportBegin + 1);
     const headPart = this._content.substring(0, lastImportEnd);
     const tailPart = this._content.substring(lastImportEnd);

src/commands/common/__tests__/objcPatcher.test.ts

@@ -42,6 +42,50 @@ describe('ObjcPatcher', () => {
     expect(fs.writeFileSync.mock.calls[0][1]).toBe(afterPatch);
   });
 
+  test('addImport() will append imports for specified searchPattern', () => {
+    const beforePatch = `\
+#import <UIKit/UIKit.h>
+#import <React/RCTRootView.h>
+
+#if DEBUG
+#import <FlipperKit/FlipperClient.h>
+#endif
+
+@implementation AppDelegate
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+  return NO;
+}
+`;
+
+    const afterPatch = `\
+/* Patched by ObjcPatcher: foo */
+#import <UIKit/UIKit.h>
+#import <React/RCTRootView.h>
+#import <React/Foo.h>
+
+#if DEBUG
+#import <FlipperKit/FlipperClient.h>
+#endif
+
+@implementation AppDelegate
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+  return NO;
+}
+`;
+    fs.readFileSync = jest.fn().mockReturnValueOnce(beforePatch);
+
+    fs.writeFileSync = jest.fn();
+
+    const patcher = new ObjcPatcher('/foo', 'foo');
+    patcher
+      .addImport('<React/Foo.h>', '\n#import <React/RCTRootView.h>')
+      .write('/bar');
+    expect(fs.writeFileSync.mock.calls[0][0]).toBe('/bar');
+    expect(fs.writeFileSync.mock.calls[0][1]).toBe(afterPatch);
+  });
+
   test('isPatched() returns false if the file has not been patched', () => {
     const beforePatch = `\
 #import <UIKit/UIKit.h>

src/commands/measureIOS.ts

@@ -79,9 +79,12 @@ static vm_size_t RCTGetResidentMemorySize(void)
       continue;
     }
     patcher
-      .addImport('<mach/mach.h>')
+      .addImport('<mach/mach.h>', '\n#import <React/RCTRootView.h>')
       .addFunction(addFunctionGetRssMemory)
-      .addImport('<React/RCTPerformanceLogger.h>')
+      .addImport(
+        '<React/RCTPerformanceLogger.h>',
+        '\n#import <React/RCTRootView.h>',
+      )
       .replace(
         searchPatternWithinDidFinishLaunchingWithOptions,
         `$1\n${addCodeMeasureAfterFiveSeconds}`,