fix(expo): extend expo config plugin regex to match latest version of…

… AppDelegate (#6957)
invertase · Mar 5, 2023 · 281deed · 281deed · vercel · Mar 5, 2023
1 parent c1fc96d
commit 281deed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/app/plugin/src/ios/appDelegate.ts b/packages/app/plugin/src/ios/appDelegate.ts
@@ -6,7 +6,7 @@ import fs from 'fs';
 const methodInvocationBlock = `[FIRApp configure];`;
 // https://regex101.com/r/mPgaq6/1
 const methodInvocationLineMatcher =
-  /(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[(\[RCTBridge alloc\]|self\.reactDelegate))/g;
+  /(?:self\.moduleName\s*=\s*@\"([^"]*)\";)|(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[(\[RCTBridge alloc\]|self\.reactDelegate))/g;
 
 // https://regex101.com/r/nHrTa9/1/
 // if the above regex fails, we can use this one as a fallback:

diff --git a/packages/dynamic-links/plugin/src/ios/appDelegate.ts b/packages/dynamic-links/plugin/src/ios/appDelegate.ts
@@ -6,7 +6,7 @@ import fs from 'fs';
 const methodInvocationBlock = `[RNFBDynamicLinksAppDelegateInterceptor sharedInstance];`;
 // https://regex101.com/r/mPgaq6/1
 const methodInvocationLineMatcher =
-  /(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[(\[RCTBridge alloc\]|self\.reactDelegate))/g;
+  /(?:self\.moduleName\s*=\s*@\"([^"]*)\";)|(?:(self\.|_)(\w+)\s?=\s?\[\[UMModuleRegistryAdapter alloc\])|(?:RCTBridge\s?\*\s?(\w+)\s?=\s?\[(\[RCTBridge alloc\]|self\.reactDelegate))/g;
 
 // https://regex101.com/r/nHrTa9/1/
 // if the above regex fails, we can use this one as a fallback: