Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing

exports[`Analytics Config Plugin iOS Tests adds the Podfile flag when googleAppMeasurementOnDeviceConversion is enabled 1`] = `
"platform :ios, '15.0'

prepare_react_native_project!
# @generated begin @react-native-firebase/analytics-googleAppMeasurementOnDeviceConversion - expo prebuild (DO NOT MODIFY) sync-6d1952a1f7b9ccb2d313cbd66659db4cdeae591f
$RNFirebaseAnalyticsGoogleAppMeasurementOnDeviceConversion = true
# @generated end @react-native-firebase/analytics-googleAppMeasurementOnDeviceConversion

target 'ReactNativeFirebaseDemo' do
end
"
`;

exports[`Analytics Config Plugin iOS Tests adds the Podfile flag when withoutAdIdSupport is enabled 1`] = `
"platform :ios, '15.0'

Expand Down
21 changes: 20 additions & 1 deletion packages/analytics/plugin/__tests__/iosPlugin.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, expect, it } from '@jest/globals';

import { setAnalyticsPodfileWithoutAdIdSupport } from '../src/ios/podfile';
import { setAnalyticsPodfileWithoutAdIdSupport, setAnalyticsPodfileGoogleAppMeasurementOnDeviceConversion } from '../src/ios/podfile';

const podfileFixture = `platform :ios, '15.0'

Expand Down Expand Up @@ -29,4 +29,23 @@ describe('Analytics Config Plugin iOS Tests', function () {

expect(restored).toEqual(podfileFixture);
});

it('adds the Podfile flag when googleAppMeasurementOnDeviceConversion is enabled', function () {
const result = setAnalyticsPodfileGoogleAppMeasurementOnDeviceConversion(podfileFixture, true);
expect(result).toMatchSnapshot();
});

it('is idempotent when the ODM Podfile flag is already present', function () {
const onceModified = setAnalyticsPodfileGoogleAppMeasurementOnDeviceConversion(podfileFixture, true);
const twiceModified = setAnalyticsPodfileGoogleAppMeasurementOnDeviceConversion(onceModified, true);

expect(twiceModified).toEqual(onceModified);
});

it('removes the generated Podfile flag when googleAppMeasurementOnDeviceConversion is disabled', function () {
const onceModified = setAnalyticsPodfileGoogleAppMeasurementOnDeviceConversion(podfileFixture, true);
const restored = setAnalyticsPodfileGoogleAppMeasurementOnDeviceConversion(onceModified, false);

expect(restored).toEqual(podfileFixture);
});
});
3 changes: 2 additions & 1 deletion packages/analytics/plugin/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ConfigPlugin, withPlugins, createRunOncePlugin } from '@expo/config-plugins';

import { withIosWithoutAdIdSupport } from './ios';
import { withIosWithoutAdIdSupport, withIosGoogleAppMeasurementOnDeviceConversion } from './ios';
import { PluginConfigType } from './pluginConfig';

/**
Expand All @@ -10,6 +10,7 @@ const withRnFirebaseAnalytics: ConfigPlugin<PluginConfigType> = (config, props)
return withPlugins(config, [
// iOS
[withIosWithoutAdIdSupport, props],
[withIosGoogleAppMeasurementOnDeviceConversion, props],
]);
};

Expand Down
4 changes: 2 additions & 2 deletions packages/analytics/plugin/src/ios/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { withIosWithoutAdIdSupport } from './podfile';
import { withIosWithoutAdIdSupport, withIosGoogleAppMeasurementOnDeviceConversion } from './podfile';

export { withIosWithoutAdIdSupport };
export { withIosWithoutAdIdSupport, withIosGoogleAppMeasurementOnDeviceConversion };
31 changes: 31 additions & 0 deletions packages/analytics/plugin/src/ios/podfile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import { PluginConfigType } from '../pluginConfig';
const TAG = '@react-native-firebase/analytics-withoutAdIdSupport';
const ANCHOR = /prepare_react_native_project!/;
const FLAG = '$RNFirebaseAnalyticsWithoutAdIdSupport = true';
const TAG_ODM = '@react-native-firebase/analytics-googleAppMeasurementOnDeviceConversion';
const FLAG_ODM = '$RNFirebaseAnalyticsGoogleAppMeasurementOnDeviceConversion = true';

export function setAnalyticsPodfileWithoutAdIdSupport(
src: string,
Expand All @@ -28,6 +30,35 @@ export function setAnalyticsPodfileWithoutAdIdSupport(
}).contents;
}

export function setAnalyticsPodfileGoogleAppMeasurementOnDeviceConversion(
src: string,
enabled: boolean = false,
): string {
if (!enabled) {
return removeGeneratedContents(src, TAG_ODM) ?? src;
}

return mergeContents({
src,
newSrc: FLAG_ODM,
tag: TAG_ODM,
anchor: ANCHOR,
offset: 1,
comment: '#',
}).contents;
}
Comment on lines +33 to +49
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

low

The logic in setAnalyticsPodfileGoogleAppMeasurementOnDeviceConversion is identical to setAnalyticsPodfileWithoutAdIdSupport. To improve maintainability and reduce duplication, consider extracting this into a shared helper function that takes the tag and flag as arguments.

function setPodfileFlag(src: string, tag: string, flag: string, enabled: boolean): string {
  if (!enabled) {
    return removeGeneratedContents(src, tag) ?? src;
  }

  return mergeContents({
    src,
    newSrc: flag,
    tag,
    anchor: ANCHOR,
    offset: 1,
    comment: '#',
  }).contents;
}

export function setAnalyticsPodfileGoogleAppMeasurementOnDeviceConversion(
  src: string,
  enabled: boolean = false,
): string {
  return setPodfileFlag(src, TAG_ODM, FLAG_ODM, enabled);
}


export const withIosGoogleAppMeasurementOnDeviceConversion: ConfigPlugin<PluginConfigType> = (config, props) => {
return withPodfile(config, config => {
config.modResults.contents = setAnalyticsPodfileGoogleAppMeasurementOnDeviceConversion(
config.modResults.contents,
props?.ios?.googleAppMeasurementOnDeviceConversion === true,
);

return config;
});
};

export const withIosWithoutAdIdSupport: ConfigPlugin<PluginConfigType> = (config, props) => {
return withPodfile(config, config => {
config.modResults.contents = setAnalyticsPodfileWithoutAdIdSupport(
Expand Down
4 changes: 4 additions & 0 deletions packages/analytics/plugin/src/pluginConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ export interface PluginConfigType {

export interface PluginConfigTypeIos {
withoutAdIdSupport?: boolean;
/**
* @platform ios iOS
*/
googleAppMeasurementOnDeviceConversion?: boolean;
}
Loading