Skip to content

Commit

Permalink
fix(dynamic-links): expo config plugin conflict with main firebase ap…
Browse files Browse the repository at this point in the history 
…p plugin
  • Loading branch information
@rlemasquerier @mikehardy
rlemasquerier authored and mikehardy committed Nov 12, 2022
1 parent 9bde409 commit ab465ec
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions packages/dynamic-links/plugin/__tests__/__snapshots__/iosPlugin.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ static void InitializeFlipper(UIApplication *application) {
InitializeFlipper(application);
#endif
// @generated begin @react-native-firebase/app-didFinishLaunchingWithOptions - expo prebuild (DO NOT MODIFY) sync-5b7813c3af090f886568429140e982730142dbe7
// @generated begin @react-native-firebase/dynamic-links-didFinishLaunchingWithOptions - expo prebuild (DO NOT MODIFY) sync-5b7813c3af090f886568429140e982730142dbe7
[RNFBDynamicLinksAppDelegateInterceptor sharedInstance];
// @generated end @react-native-firebase/app-didFinishLaunchingWithOptions
// @generated end @react-native-firebase/dynamic-links-didFinishLaunchingWithOptions
RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"main" initialProperties:nil];
id rootViewBackgroundColor = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"RCTRootViewBackgroundColor"];
Expand Down Expand Up @@ -134,9 +134,9 @@ static void InitializeFlipper(UIApplication *application) {
InitializeFlipper(application);
#endif
// @generated begin @react-native-firebase/app-didFinishLaunchingWithOptions - expo prebuild (DO NOT MODIFY) sync-5b7813c3af090f886568429140e982730142dbe7
// @generated begin @react-native-firebase/dynamic-links-didFinishLaunchingWithOptions - expo prebuild (DO NOT MODIFY) sync-5b7813c3af090f886568429140e982730142dbe7
[RNFBDynamicLinksAppDelegateInterceptor sharedInstance];
// @generated end @react-native-firebase/app-didFinishLaunchingWithOptions
// @generated end @react-native-firebase/dynamic-links-didFinishLaunchingWithOptions
RCTBridge *bridge = [self.reactDelegate createBridgeWithDelegate:self launchOptions:launchOptions];
RCTRootView *rootView = [self.reactDelegate createRootViewWithBridge:bridge moduleName:@"main" initialProperties:nil];
rootView.backgroundColor = [UIColor whiteColor];
Expand Down Expand Up @@ -287,9 +287,9 @@ static void InitializeFlipper(UIApplication *application) {
InitializeFlipper(application);
#endif
// @generated begin @react-native-firebase/app-didFinishLaunchingWithOptions - expo prebuild (DO NOT MODIFY) sync-5b7813c3af090f886568429140e982730142dbe7
// @generated begin @react-native-firebase/dynamic-links-didFinishLaunchingWithOptions - expo prebuild (DO NOT MODIFY) sync-5b7813c3af090f886568429140e982730142dbe7
[RNFBDynamicLinksAppDelegateInterceptor sharedInstance];
// @generated end @react-native-firebase/app-didFinishLaunchingWithOptions
// @generated end @react-native-firebase/dynamic-links-didFinishLaunchingWithOptions
self.moduleRegistryAdapter = [[UMModuleRegistryAdapter alloc] initWithModuleRegistryProvider:[[UMModuleRegistryProvider alloc] init]];
self.launchOptions = launchOptions;
self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
Expand Down Expand Up @@ -386,9 +386,9 @@ exports[`Config Plugin iOS Tests works with AppDelegate.mm (RN 0.68+) 1`] = `
{
RCTAppSetupPrepareApp(application);
// @generated begin @react-native-firebase/app-didFinishLaunchingWithOptions - expo prebuild (DO NOT MODIFY) sync-5b7813c3af090f886568429140e982730142dbe7
// @generated begin @react-native-firebase/dynamic-links-didFinishLaunchingWithOptions - expo prebuild (DO NOT MODIFY) sync-5b7813c3af090f886568429140e982730142dbe7
[RNFBDynamicLinksAppDelegateInterceptor sharedInstance];
// @generated end @react-native-firebase/app-didFinishLaunchingWithOptions
// @generated end @react-native-firebase/dynamic-links-didFinishLaunchingWithOptions
RCTBridge *bridge = [self.reactDelegate createBridgeWithDelegate:self launchOptions:launchOptions];
#if RCT_NEW_ARCH_ENABLED
Expand Down
2 changes: 1 addition & 1 deletion packages/dynamic-links/plugin/src/ios/appDelegate.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export function modifyObjcAppDelegate(contents: string): string {
// Add invocation
try {
return mergeContents({
tag: '@react-native-firebase/app-didFinishLaunchingWithOptions',
tag: '@react-native-firebase/dynamic-links-didFinishLaunchingWithOptions',
src: contents,
newSrc: methodInvocationBlock,
anchor: methodInvocationLineMatcher,
Expand Down

1 comment on commit ab465ec

@vercel
Copy link

@vercel vercel bot commented on ab465ec Nov 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

react-native-firebase – ./

react-native-firebase.vercel.app
react-native-firebase-invertase.vercel.app
react-native-firebase-git-main-invertase.vercel.app
rnfirebase.io

Please sign in to comment.