Skip to content

fix(dynamic-links): expo config plugin conflict with main firebase app plugin #6688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 12, 2022
Merged

fix(dynamic-links): expo config plugin conflict with main firebase app plugin #6688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions packages/dynamic-links/plugin/__tests__/__snapshots__/iosPlugin.test.ts.snap
View file
Open in desktop
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
Open in desktop
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