customerio-expo-plugin 2.5.0 → 2.6.0

package/plugin/src/ios/withCIOIosSwift.ts

@@ -1,18 +1,25 @@
-import type { ConfigPlugin } from '@expo/config-plugins';
-import {
-  withAppDelegate,
-  withXcodeProject,
+import type {
+  ExportedConfigWithProps,
+  XcodeProject,
 } from '@expo/config-plugins';
+import { withAppDelegate, withXcodeProject } from '@expo/config-plugins';
+import type { ExpoConfig } from '@expo/config-types';
 import path from 'path';
-import type { CustomerIOPluginOptionsIOS } from '../types/cio-types';
-import { FileManagement } from '../helpers/utils/fileManagement';
+import { PLATFORM } from '../helpers/constants/common';
 import {
-  LOCAL_PATH_TO_CIO_NSE_FILES,
+  CIO_CONFIGUREDEEPLINK_KILLEDSTATE_SWIFT_SNIPPET,
+  CIO_MESSAGING_PUSH_APP_DELEGATE_INIT_REGEX,
+  CIO_NATIVE_SDK_INITIALIZE_CALL,
+  CIO_NATIVE_SDK_INITIALIZE_SNIPPET,
   CIO_REGISTER_PUSHNOTIFICATION_SNIPPET_v2,
   CIO_REGISTER_PUSH_NOTIFICATION_PLACEHOLDER,
-  CIO_CONFIGUREDEEPLINK_KILLEDSTATE_SWIFT_SNIPPET,
 } from '../helpers/constants/ios';
 import { replaceCodeByRegex } from '../helpers/utils/codeInjection';
+import { FileManagement } from '../helpers/utils/fileManagement';
+import { patchNativeSDKInitializer } from '../helpers/utils/patchPluginNativeCode';
+import type { CustomerIOPluginOptionsIOS, NativeSDKConfig } from '../types/cio-types';
+import { getIosNativeFilesPath } from '../utils/plugin';
+import { copyFileToXcode, getOrCreateCustomerIOGroup } from '../utils/xcode';
 import { isFcmPushProvider } from './utils';
 
 // Constants
@@ -23,29 +30,73 @@ const CIO_SDK_APP_DELEGATE_HANDLER_FILENAME = `${CIO_SDK_APP_DELEGATE_HANDLER_CL
  * Copy and configure the CioSdkAppDelegateHandler.swift file
  */
 const copyAndConfigureAppDelegateHandler = (
-  config: any,
-  props: CustomerIOPluginOptionsIOS
-): any => {
+  config: ExportedConfigWithProps<XcodeProject>,
+  sdkConfig: NativeSDKConfig | undefined,
+  props: CustomerIOPluginOptionsIOS,
+): ExportedConfigWithProps<XcodeProject> => {
+  // Destination path in the iOS project
+  const projectName = config.modRequest.projectName || '';
+  if (!projectName) {
+    console.warn(
+      'Project name is undefined, cannot copy CustomerIO files'
+    );
+    return config;
+  }
+
+  // Add files to the Xcode project
+  const xcodeProject = config.modResults;
   const projectRoot = config.modRequest.projectRoot;
   const iosProjectRoot = path.join(projectRoot, 'ios');
+
+  const group = getOrCreateCustomerIOGroup(xcodeProject, projectName);
+  if (props.pushNotification) {
+    // Copy CioSdkAppDelegateHandler.swift for full push notification + auto-init support
+    copyAndConfigurePushAppDelegateHandler({
+      xcodeProject,
+      group,
+      iosProjectRoot,
+      projectName,
+      sdkConfig,
+      props,
+    });
+  } else if (sdkConfig) {
+    // Copy only CustomerIOSDKInitializer.swift for auto-init without push notifications
+    copyAndConfigureNativeSDKInitializer({
+      xcodeProject,
+      group,
+      iosProjectRoot,
+      projectName,
+      sdkConfig,
+    });
+  }
+
+  return config;
+};
+
+const copyAndConfigurePushAppDelegateHandler = ({
+  xcodeProject,
+  group,
+  iosProjectRoot,
+  projectName,
+  sdkConfig,
+  props,
+}: {
+  xcodeProject: XcodeProject;
+  group: XcodeProject['pbxCreateGroup'];
+  iosProjectRoot: string;
+  projectName: string;
+  sdkConfig: NativeSDKConfig | undefined;
+  props: CustomerIOPluginOptionsIOS;
+}) => {
   const useFcm = isFcmPushProvider(props);
 
   // Source path for the handler file
   const handlerSourcePath = path.join(
-    LOCAL_PATH_TO_CIO_NSE_FILES,
+    getIosNativeFilesPath(),
     useFcm ? 'fcm' : 'apn',
     CIO_SDK_APP_DELEGATE_HANDLER_FILENAME
   );
 
-  // Destination path in the iOS project
-  const projectName = config.modRequest.projectName || '';
-  if (!projectName) {
-    console.warn(
-      'Project name is undefined, cannot copy CioSdkAppDelegateHandler.swift'
-    );
-    return config;
-  }
-
   const handlerDestPath = path.join(
     iosProjectRoot,
     projectName,
@@ -54,20 +105,6 @@ const copyAndConfigureAppDelegateHandler = (
 
   FileManagement.copyFile(handlerSourcePath, handlerDestPath);
 
-  // Add the file to the Xcode project
-  const xcodeProject = config.modResults;
-
-  // Create a group for CustomerIO files if it doesn't exist
-  let group;
-  const existingGroup = xcodeProject.pbxGroupByName('CustomerIO');
-  if (existingGroup) {
-    group = existingGroup;
-  } else {
-    group = xcodeProject.pbxCreateGroup('CustomerIO');
-    const classesKey = xcodeProject.findPBXGroupKey({ name: projectName });
-    xcodeProject.addToPbxGroup(group, classesKey);
-  }
-
   // Add the file to the Xcode project
   xcodeProject.addSourceFile(
     `${projectName}/${CIO_SDK_APP_DELEGATE_HANDLER_FILENAME}`,
@@ -115,32 +152,79 @@ const copyAndConfigureAppDelegateHandler = (
     showPushAppInForeground.toString()
   );
 
+  // Add auto initialization if sdkConfig is provided
+  if (sdkConfig) {
+    // Also copy CustomerIOSDKInitializer.swift for auto-initialization
+    copyAndConfigureNativeSDKInitializer({ xcodeProject, group, iosProjectRoot, projectName, sdkConfig });
+
+    // Inject auto initialization call before MessagingPush initialization
+    handlerFileContent = handlerFileContent.replace(CIO_MESSAGING_PUSH_APP_DELEGATE_INIT_REGEX, CIO_NATIVE_SDK_INITIALIZE_SNIPPET + '$1');
+  }
+
   FileManagement.writeFile(handlerDestPath, handlerFileContent);
+};
 
-  return config;
+const copyAndConfigureNativeSDKInitializer = ({
+  xcodeProject,
+  group,
+  iosProjectRoot,
+  projectName,
+  sdkConfig,
+}: {
+  xcodeProject: XcodeProject;
+  group: XcodeProject['pbxCreateGroup'];
+  iosProjectRoot: string;
+  projectName: string;
+  sdkConfig: NativeSDKConfig;
+}) => {
+  const filename = 'CustomerIOSDKInitializer.swift';
+  const sourcePath = path.join(getIosNativeFilesPath(), filename);
+  // Add the CustomerIOSDKInitializer.swift file to the same Xcode group as CioSdkAppDelegateHandler
+  copyFileToXcode({
+    xcodeProject,
+    iosProjectRoot,
+    projectName,
+    sourceFilePath: sourcePath,
+    targetFileName: filename,
+    transform: (content) => patchNativeSDKInitializer(content, PLATFORM.IOS, sdkConfig),
+    customerIOGroup: group,
+  });
 };
 
-export const withCIOIosSwift: ConfigPlugin<CustomerIOPluginOptionsIOS> = (
-  configOuter,
-  props
+export const withCIOIosSwift = (
+  configOuter: ExpoConfig,
+  sdkConfig: NativeSDKConfig | undefined,
+  props: CustomerIOPluginOptionsIOS,
 ) => {
-  // First, copy the CioSdkAppDelegateHandler.swift file to the iOS project and add it to Xcode project
+  // First, copy required swift files to iOS folder and add it to Xcode project
   configOuter = withXcodeProject(configOuter, async (config) => {
-    return copyAndConfigureAppDelegateHandler(config, props);
+    return copyAndConfigureAppDelegateHandler(config, sdkConfig, props);
   });
 
-  // Then modify the AppDelegate
-  return withAppDelegate(configOuter, async (config) => {
-    return modifyAppDelegate(config, props);
-  });
+  // Modify the AppDelegate based on configuration
+  if (props.pushNotification) {
+    // With push notifications: delegate to CioSdkAppDelegateHandler for both push and auto-init
+    return withAppDelegate(configOuter, async (config) => {
+      return modifyAppDelegateWithPushAppDelegateHandler(config, props);
+    });
+  } else if (sdkConfig) {
+    // Without push notifications: directly inject auto initialization into AppDelegate
+    return withAppDelegate(configOuter, async (config) => {
+      return modifyAppDelegateWithNativeSDKInitializer(config);
+    });
+  } else {
+    return configOuter;
+  }
 };
 
 /**
  * Modify the AppDelegate to integrate with Customer.io SDK
  */
-const modifyAppDelegate = (
+const modifyAppDelegateWithPushAppDelegateHandler = (
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   config: any,
   props: CustomerIOPluginOptionsIOS
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ): any => {
   const appDelegateContent = config.modResults.contents;
 
@@ -156,7 +240,10 @@ const modifyAppDelegate = (
   let modifiedContent = addHandlerPropertyDeclaration(appDelegateContent);
 
   // Modify didFinishLaunchingWithOptions to initialize and call the handler
-  modifiedContent = modifyDidFinishLaunchingWithOptions(modifiedContent);
+  modifiedContent = modifyDidFinishLaunchingWithOptions(
+    modifiedContent,
+    `  cioSdkHandler.application(application, didFinishLaunchingWithOptions: launchOptions)\n\n    `
+  );
 
   // Add didRegisterForRemoteNotificationsWithDeviceToken implementation
   modifiedContent =
@@ -165,7 +252,7 @@ const modifyAppDelegate = (
   // Add didFailToRegisterForRemoteNotificationsWithError implementation
   modifiedContent =
     addDidFailToRegisterForRemoteNotificationsWithError(modifiedContent);
-    
+
   // Add deep link handling for killed state if enabled
   if (props.pushNotification?.handleDeeplinkInKilledState === true) {
     modifiedContent = addHandleDeeplinkInKilledState(modifiedContent);
@@ -175,6 +262,34 @@ const modifyAppDelegate = (
   return config;
 };
 
+/**
+ * Modify the AppDelegate to integrate with Customer.io SDK
+ */
+const modifyAppDelegateWithNativeSDKInitializer = (
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  config: any,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+): any => {
+  const appDelegateContent = config.modResults.contents;
+
+  // Check if modifications have already been applied
+  if (appDelegateContent.includes(CIO_NATIVE_SDK_INITIALIZE_CALL)) {
+    console.log(
+      'CustomerIO Swift AppDelegate changes already exist. Skipping...'
+    );
+    return config;
+  }
+
+  // Modify didFinishLaunchingWithOptions to initialize and call the handler
+  const modifiedContent = modifyDidFinishLaunchingWithOptions(
+    appDelegateContent,
+    CIO_NATIVE_SDK_INITIALIZE_SNIPPET,
+  );
+
+  config.modResults.contents = modifiedContent;
+  return config;
+};
+
 /**
  * Check if a method exists in the AppDelegate content
  * @param content The AppDelegate content
@@ -203,7 +318,7 @@ const addHandlerPropertyDeclaration = (content: string): string => {
     return content;
   }
 
-  const position = match.index! + match[0].length;
+  const position = (match.index ?? 0) + match[0].length;
   return (
     content.substring(0, position) +
     `\n  let cioSdkHandler = ${CIO_SDK_APP_DELEGATE_HANDLER_CLASS}()\n` +
@@ -212,14 +327,15 @@ const addHandlerPropertyDeclaration = (content: string): string => {
 };
 
 /**
- * Modify didFinishLaunchingWithOptions to call the handler
- * This adds the handler call before the return statement in didFinishLaunchingWithOptions
+ * Modify didFinishLaunchingWithOptions to inject Customer.io code
+ * Injects the provided code (either handler call or auto initialization) before the return statement
  */
-const modifyDidFinishLaunchingWithOptions = (content: string): string => {
+const modifyDidFinishLaunchingWithOptions = (content: string, codeToInject: string): string => {
   // Find the return statement in didFinishLaunchingWithOptions
   // Always look for launchOptions since modifiedLaunchOptions is only set later
-  const returnStatementRegex = /return\s+super\.application\s*\(\s*application\s*,\s*didFinishLaunchingWithOptions\s*:\s*launchOptions\s*\)/;
-  
+  const returnStatementRegex =
+    /return\s+super\.application\s*\(\s*application\s*,\s*didFinishLaunchingWithOptions\s*:\s*launchOptions\s*\)/;
+
   const returnStatementMatch = content.match(returnStatementRegex);
 
   if (!returnStatementMatch) {
@@ -229,13 +345,12 @@ const modifyDidFinishLaunchingWithOptions = (content: string): string => {
     return content;
   }
 
-  // Add handler call before the return statement
-  const insertPosition = returnStatementMatch.index!;
-  const handlerCallCode = `  cioSdkHandler.application(application, didFinishLaunchingWithOptions: launchOptions)\n\n    `;
-  
+  // Inject Customer.io code before the return statement
+  const insertPosition = returnStatementMatch.index ?? 0;
+
   return (
     content.substring(0, insertPosition) +
-    handlerCallCode +
+    codeToInject +
     content.substring(insertPosition)
   );
 };
@@ -248,8 +363,9 @@ const modifyDidFinishLaunchingWithOptions = (content: string): string => {
 const addDidRegisterForRemoteNotificationsWithDeviceToken = (
   content: string
 ): string => {
-  const methodSignature = 'func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken:';
-  
+  const methodSignature =
+    'func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken:';
+
   // Check if method already exists
   if (methodExistsInAppDelegate(content, methodSignature)) {
     // Method exists, modify it to call our handler
@@ -283,7 +399,7 @@ const addDidRegisterForRemoteNotificationsWithDeviceToken = (
     }
 
     // Insert the method inside the class
-    const position = classEndMatch.index!;
+    const position = classEndMatch.index ?? 0;
     return (
       content.substring(0, position) +
       '\n  // Handle device token registration\n' +
@@ -305,8 +421,9 @@ const addDidRegisterForRemoteNotificationsWithDeviceToken = (
 const addDidFailToRegisterForRemoteNotificationsWithError = (
   content: string
 ): string => {
-  const methodSignature = 'func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error:';
-  
+  const methodSignature =
+    'func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error:';
+
   // Check if method already exists
   if (methodExistsInAppDelegate(content, methodSignature)) {
     // Method exists, modify it to call our handler
@@ -340,7 +457,7 @@ const addDidFailToRegisterForRemoteNotificationsWithError = (
     }
 
     // Insert the method inside the class
-    const position = classEndMatch.index!;
+    const position = classEndMatch.index ?? 0;
     return (
       content.substring(0, position) +
       '\n  // Handle remote notification registration errors\n' +
@@ -361,24 +478,29 @@ const addDidFailToRegisterForRemoteNotificationsWithError = (
  */
 const addHandleDeeplinkInKilledState = (content: string): string => {
   // Check if deep link code snippet is already present
-  const deepLinkMarker = "Deep link workaround for app killed state start";
+  const deepLinkMarker = 'Deep link workaround for app killed state start';
   if (content.includes(deepLinkMarker)) {
     return content;
   }
 
   // Find the return statement with launchOptions
-  const returnStatementRegex = /return\s+super\.application\s*\(\s*application\s*,\s*didFinishLaunchingWithOptions\s*:\s*launchOptions\s*\)/;
+  const returnStatementRegex =
+    /return\s+super\.application\s*\(\s*application\s*,\s*didFinishLaunchingWithOptions\s*:\s*launchOptions\s*\)/;
   const returnStatementMatch = content.match(returnStatementRegex);
-  
+
   if (!returnStatementMatch) {
-    console.warn("Could not find return statement with launchOptions");
+    console.warn('Could not find return statement with launchOptions');
     return content;
   }
-  
+
   // Create the replacement code with deep link handling and modified return statement
-  const modifiedReturnStatement = "return super.application(application, didFinishLaunchingWithOptions: modifiedLaunchOptions)";
-  const replacementCode = CIO_CONFIGUREDEEPLINK_KILLEDSTATE_SWIFT_SNIPPET + "\n\n    " + modifiedReturnStatement;
-  
+  const modifiedReturnStatement =
+    'return super.application(application, didFinishLaunchingWithOptions: modifiedLaunchOptions)';
+  const replacementCode =
+    CIO_CONFIGUREDEEPLINK_KILLEDSTATE_SWIFT_SNIPPET +
+    '\n\n    ' +
+    modifiedReturnStatement;
+
   // Replace the return statement with deep link handling code and modified return statement
   return content.replace(returnStatementRegex, replacementCode);
 };

package/plugin/src/ios/withGoogleServicesJsonFile.ts

@@ -1,11 +1,8 @@
-import {
-  withXcodeProject,
-  IOSConfig,
-} from '@expo/config-plugins';
-import type { ConfigPlugin } from '@expo/config-plugins';
+import type { ConfigPlugin, XcodeProject } from '@expo/config-plugins';
+import { IOSConfig, withXcodeProject } from '@expo/config-plugins';
 
-import { FileManagement } from './../helpers/utils/fileManagement';
 import type { CustomerIOPluginOptionsIOS } from '../types/cio-types';
+import { FileManagement } from './../helpers/utils/fileManagement';
 import { isFcmPushProvider } from './utils';
 
 export const withGoogleServicesJsonFile: ConfigPlugin<
@@ -20,7 +17,7 @@ export const withGoogleServicesJsonFile: ConfigPlugin<
 
     console.log(
       'Only specify Customer.io ios.pushNotification.googleServicesFile config if you are not already including' +
-        ' GoogleService-Info.plist as part of Firebase integration'
+      ' GoogleService-Info.plist as part of Firebase integration'
     );
 
     // googleServicesFile
@@ -50,7 +47,7 @@ export const withGoogleServicesJsonFile: ConfigPlugin<
       if (config.ios?.googleServicesFile) {
         console.warn(
           'Specifying both Expo ios.googleServicesFile and Customer.io ios.pushNotification.googleServicesFile can cause a conflict' +
-            ' duplicating GoogleService-Info.plist in the iOS project resources. Please remove Customer.io ios.pushNotification.googleServicesFile'
+          ' duplicating GoogleService-Info.plist in the iOS project resources. Please remove Customer.io ios.pushNotification.googleServicesFile'
         );
       }
 
@@ -61,7 +58,7 @@ export const withGoogleServicesJsonFile: ConfigPlugin<
         );
 
         addFileToXcodeProject(props.modResults, 'GoogleService-Info.plist');
-      } catch (e) {
+      } catch {
         console.error(
           `There was an error copying your GoogleService-Info.plist file. You can copy it manually into ${iosPath}/GoogleService-Info.plist`
         );
@@ -76,7 +73,7 @@ export const withGoogleServicesJsonFile: ConfigPlugin<
   });
 };
 
-function addFileToXcodeProject(project: any, fileName: string) {
+function addFileToXcodeProject(project: XcodeProject, fileName: string) {
   const groupName = 'Resources';
   const filepath = fileName;
 

package/plugin/src/ios/withNotificationsXcodeProject.ts

@@ -5,11 +5,11 @@ import {
   CIO_NOTIFICATION_TARGET_NAME,
   CIO_REGISTER_PUSHNOTIFICATION_SNIPPET,
   DEFAULT_BUNDLE_VERSION,
-  LOCAL_PATH_TO_CIO_NSE_FILES,
 } from '../helpers/constants/ios';
 import { replaceCodeByRegex } from '../helpers/utils/codeInjection';
 import { injectCIONotificationPodfileCode } from '../helpers/utils/injectCIOPodfileCode';
-import type { CustomerIOPluginOptionsIOS } from '../types/cio-types';
+import type { CustomerIOPluginOptionsIOS, RichPushConfig } from '../types/cio-types';
+import { getIosNativeFilesPath } from '../utils/plugin';
 import { FileManagement } from './../helpers/utils/fileManagement';
 import { isExpoVersion53OrHigher, isFcmPushProvider } from './utils';
 
@@ -21,11 +21,11 @@ const TARGETED_DEVICE_FAMILY = `"1,2"`;
 const addNotificationServiceExtension = async (
   options: CustomerIOPluginOptionsIOS,
   xcodeProject: XcodeProject,
-  isExpoVersion53OrHigher: boolean
+  isExpo53OrHigher: boolean,
 ) => {
   try {
     // PushService file is only needed for pre-Expo 53 code generation
-    if (options.pushNotification && !isExpoVersion53OrHigher) {
+    if (options.pushNotification && !isExpo53OrHigher) {
       await addPushNotificationFile(options, xcodeProject);
     }
 
@@ -33,7 +33,7 @@ const addNotificationServiceExtension = async (
       await addRichPushXcodeProj(options, xcodeProject);
     }
     return xcodeProject;
-  } catch (error: any) {
+  } catch (error: unknown) {
     console.error(error);
     return null;
   }
@@ -88,7 +88,7 @@ export const withCioNotificationsXcodeProject: ConfigPlugin<
     const modifiedProjectFile = await addNotificationServiceExtension(
       options,
       config.modResults,
-      isExpoVersion53OrHigher(configOuter)
+      isExpoVersion53OrHigher(configOuter),
     );
 
     if (modifiedProjectFile) {
@@ -101,7 +101,7 @@ export const withCioNotificationsXcodeProject: ConfigPlugin<
 
 const addRichPushXcodeProj = async (
   options: CustomerIOPluginOptionsIOS,
-  xcodeProject: any
+  xcodeProject: XcodeProject,
 ) => {
   const {
     appleTeamId,
@@ -145,8 +145,7 @@ const addRichPushXcodeProj = async (
   platformSpecificFiles.forEach((filename) => {
     const targetFile = getTargetFile(filename);
     FileManagement.copyFile(
-      `${LOCAL_PATH_TO_CIO_NSE_FILES}/${
-        isFcmProvider ? 'fcm' : 'apn'
+      `${getIosNativeFilesPath()}/${isFcmProvider ? 'fcm' : 'apn'
       }/${filename}`,
       targetFile
     );
@@ -156,7 +155,7 @@ const addRichPushXcodeProj = async (
   commonFiles.forEach((filename) => {
     const targetFile = getTargetFile(filename);
     FileManagement.copyFile(
-      `${LOCAL_PATH_TO_CIO_NSE_FILES}/common/${filename}`,
+      `${getIosNativeFilesPath()}/common/${filename}`,
       targetFile
     );
   });
@@ -168,7 +167,7 @@ const addRichPushXcodeProj = async (
     bundleShortVersion,
     infoPlistTargetFile,
   });
-  updateNseEnv(options, getTargetFile(ENV_FILENAME));
+  updateNseEnv(getTargetFile(ENV_FILENAME), options.pushNotification?.env);
 
   // Create new PBXGroup for the extension
   const extGroup = xcodeProject.addPbxGroup(
@@ -179,7 +178,7 @@ const addRichPushXcodeProj = async (
 
   // Add the new PBXGroup to the top level group. This makes the
   // files / folder appear in the file explorer in Xcode.
-  const groups = xcodeProject.hash.project.objects['PBXGroup'];
+  const groups = xcodeProject.hash.project.objects.PBXGroup;
   Object.keys(groups).forEach((key) => {
     if (groups[key].name === undefined && groups[key].path === undefined) {
       xcodeProject.addToPbxGroup(extGroup.uuid, key);
@@ -191,9 +190,8 @@ const addRichPushXcodeProj = async (
   // An upstream fix should be made to the code referenced in this link:
   //   - https://github.com/apache/cordova-node-xcode/blob/8b98cabc5978359db88dc9ff2d4c015cba40f150/lib/pbxProject.js#L860
   const projObjects = xcodeProject.hash.project.objects;
-  projObjects['PBXTargetDependency'] = projObjects['PBXTargetDependency'] || {};
-  projObjects['PBXContainerItemProxy'] =
-    projObjects['PBXTargetDependency'] || {};
+  projObjects.PBXTargetDependency = projObjects.PBXTargetDependency || {};
+  projObjects.PBXContainerItemProxy = projObjects.PBXTargetDependency || {};
 
   if (xcodeProject.pbxTargetByName(CIO_NOTIFICATION_TARGET_NAME)) {
     console.warn(
@@ -238,7 +236,7 @@ const addRichPushXcodeProj = async (
     if (
       typeof configurations[key].buildSettings !== 'undefined' &&
       configurations[key].buildSettings.PRODUCT_NAME ===
-        `"${CIO_NOTIFICATION_TARGET_NAME}"`
+      `"${CIO_NOTIFICATION_TARGET_NAME}"`
     ) {
       const buildSettingsObj = configurations[key].buildSettings;
       buildSettingsObj.DEVELOPMENT_TEAM = appleTeamId;
@@ -285,21 +283,21 @@ const updateNseInfoPlist = (payload: {
 };
 
 const updateNseEnv = (
-  options: CustomerIOPluginOptionsIOS,
-  envFileName: string
+  envFileName: string,
+  richPushConfig?: RichPushConfig
 ) => {
   const CDP_API_KEY_RE = /\{\{CDP_API_KEY\}\}/;
   const REGION_RE = /\{\{REGION\}\}/;
 
   let envFileContent = FileManagement.readFile(envFileName);
-  const { cdpApiKey, region } = options.pushNotification?.env || {
-    cdpApiKey: undefined,
-    region: undefined,
-  };
+
+  // Use merged config values (config takes precedence over env)
+  const cdpApiKey = richPushConfig?.cdpApiKey;
+  const region = richPushConfig?.region;
 
   if (!cdpApiKey) {
     throw new Error(
-      'Adding NotificationServiceExtension failed: ios.pushNotification.env.cdpApiKey is missing from app.config.js or app.json.'
+      'NotificationServiceExtension failed: cdpApiKey missing. Provide in config.cdpApiKey or ios.pushNotification.env.cdpApiKey.'
     );
   }
   envFileContent = replaceCodeByRegex(
@@ -313,7 +311,8 @@ const updateNseEnv = (
       us: 'Region.US',
       eu: 'Region.EU',
     };
-    const mappedRegion = (regionMap as any)[region.toLowerCase()] || '';
+    const mappedRegion =
+      regionMap[region.toLowerCase() as keyof typeof regionMap] || '';
     if (!mappedRegion) {
       console.warn(
         `${region} is an invalid region. Please use the values from the docs: https://customer.io/docs/sdk/expo/getting-started/#configure-the-plugin`
@@ -332,7 +331,7 @@ const updateNseEnv = (
 
 async function addPushNotificationFile(
   options: CustomerIOPluginOptionsIOS,
-  xcodeProject: any
+  xcodeProject: XcodeProject
 ) {
   // Maybe copy a different file with FCM config based on config
   const { iosPath, appName } = options;
@@ -352,7 +351,7 @@ async function addPushNotificationFile(
     });
 
     FileManagement.copyFile(
-      `${LOCAL_PATH_TO_CIO_NSE_FILES}/${sourceFile}`,
+      `${getIosNativeFilesPath()}/${sourceFile}`,
       targetFile
     );
   } else {

package/plugin/src/ios/withXcodeProject.ts

@@ -1,9 +1,9 @@
 import type { ConfigPlugin } from '@expo/config-plugins';
 import { withXcodeProject } from '@expo/config-plugins';
 
-import { isFcmPushProvider } from './utils';
 import { injectCIOPodfileCode } from '../helpers/utils/injectCIOPodfileCode';
 import type { CustomerIOPluginOptionsIOS } from '../types/cio-types';
+import { isFcmPushProvider } from './utils';
 
 export const withCioXcodeProject: ConfigPlugin<CustomerIOPluginOptionsIOS> = (
   config,

package/plugin/src/postInstallHelper.js

@@ -29,4 +29,4 @@ function runPostInstall() {
   }
 }
 
-exports.runPostInstall = runPostInstall;
+exports.runPostInstall = runPostInstall;