customerio-expo-plugin 1.0.0-alpha.1 → 1.0.0-alpha.3

package/src/helpers/utils/injectCIOPodfileCode.ts

@@ -7,6 +7,7 @@ import {
   CIO_PODFILE_POST_INSTALL_FALLBACK_SNIPPET,
   CIO_PODFILE_NOTIFICATION_SNIPPET,
   CIO_PODFILE_NOTIFICATION_REGEX,
+  CIO_CIO_TARGET_REGEX,
 } from '../constants/ios';
 import { FileManagement } from './fileManagement';
 
@@ -14,26 +15,31 @@ export async function injectCIOPodfileCode(iosPath: string) {
   const filename = `${iosPath}/Podfile`;
   const podfile = await FileManagement.read(filename);
   const matches = podfile.match(CIO_PODFILE_REGEX);
+  const targetMatch = podfile.match(CIO_CIO_TARGET_REGEX);
 
-  const lines = podfile.split('\n');
-  const index = lines.findIndex((line) =>
-    CIO_PODFILE_POST_INSTALL_REGEX.test(line)
-  );
-  let content: string[] = lines;
-  if (index > -1) {
-    content = [
-      ...lines.slice(0, index - 1),
-      !matches ? CIO_PODFILE_SNIPPET : '',
-      CIO_PODFILE_TARGET_NAMES_SNIPPET,
-      ...lines.slice(index - 1, index + 1),
-      CIO_PODFILE_POST_INSTALL_SNIPPET,
-      ...lines.slice(index + 1),
-    ];
+  if (!targetMatch) {
+    const lines = podfile.split('\n');
+    const index = lines.findIndex((line) =>
+      CIO_PODFILE_POST_INSTALL_REGEX.test(line)
+    );
+    let content: string[] = lines;
+    if (index > -1) {
+      content = [
+        ...lines.slice(0, index - 1),
+        !matches ? CIO_PODFILE_SNIPPET : '',
+        CIO_PODFILE_TARGET_NAMES_SNIPPET,
+        ...lines.slice(index - 1, index + 1),
+        CIO_PODFILE_POST_INSTALL_SNIPPET,
+        ...lines.slice(index + 1),
+      ];
+    } else {
+      content.push(CIO_PODFILE_POST_INSTALL_FALLBACK_SNIPPET);
+    }
+
+    FileManagement.write(filename, content.join('\n'));
   } else {
-    content.push(CIO_PODFILE_POST_INSTALL_FALLBACK_SNIPPET);
+    console.log('Customerio Podfile snippets already exists. Skipping...');
   }
-
-  FileManagement.write(filename, content.join('\n'));
 }
 
 export async function injectCIONotificationPodfileCode(iosPath: string) {

package/src/index.ts

@@ -1,19 +1,24 @@
 import type { ExpoConfig } from '@expo/config-types';
 
+import { withAnalytics } from './analytics/injectAnalytics';
 import { withCIOAndroid } from './android/withCIOAndroid';
 import { withCIOIos } from './ios/withCIOIos';
-import type {
-  CustomerIOPluginOptionsIOS,
-  CustomerIOPluginOptionsAndroid,
-} from './types/cio-types';
+import type { CustomerIOPluginOptions } from './types/cio-types';
 
 // Entry point for config plugin
 function withCustomerIOPlugin(
   config: ExpoConfig,
-  props: CustomerIOPluginOptionsIOS | CustomerIOPluginOptionsAndroid
+  props: CustomerIOPluginOptions
 ) {
-  config = withCIOIos(config, props as CustomerIOPluginOptionsIOS);
-  config = withCIOAndroid(config, props as CustomerIOPluginOptionsAndroid);
+  if (props.ios) {
+    config = withCIOIos(config, props.ios);
+  }
+
+  if (props.android) {
+    config = withCIOAndroid(config, props.android);
+  }
+
+  config = withAnalytics(config, props);
 
   return config;
 }

package/src/ios/withAppDelegateModifications.ts

@@ -30,15 +30,11 @@ const pushCodeSnippets = [
 
 const additionalMethodsForPushNotifications = `${pushCodeSnippets.join(
   '\n'
-)}\n`; // Join w/ newlines and ensure a newline at the end.
+)}\n`; // Join newlines and ensure a newline at the end.
 
-const addImport = (stringContents: string) => {
+const addImport = (stringContents: string, appName: string) => {
   const importRegex = /^(#import .*)\n/gm;
-  const addedImport = `
-// Add swift bridge imports
-#import <ExpoModulesCore-Swift.h>
-#import <testiosapp-Swift.h>
-  `;
+  const addedImport = getImportSnippet(appName);
 
   const match = stringContents.match(importRegex);
   let endOfMatchIndex: number;
@@ -128,23 +124,43 @@ export const withAppDelegateModifications: ConfigPlugin<any> = (
 ) => {
   return withAppDelegate(configOuter, async (config) => {
     let stringContents = config.modResults.contents;
-    const headerPath = getAppDelegateHeaderFilePath(
-      config.modRequest.projectRoot
+    const regex = new RegExp(
+      `#import <${config.modRequest.projectName}-Swift.h>`
     );
-    let headerContent = await FileManagement.read(headerPath);
-    headerContent = addAppdelegateHeaderModification(headerContent);
-    FileManagement.write(headerPath, headerContent);
-
-    stringContents = addImport(stringContents);
-    stringContents = addNotificationHandlerDeclaration(stringContents);
-    stringContents = addNotificationConfiguration(stringContents);
-    stringContents = addAdditionalMethodsForPushNotifications(stringContents);
-    stringContents =
-      addDidFailToRegisterForRemoteNotificationsWithError(stringContents);
-    stringContents =
-      AddDidRegisterForRemoteNotificationsWithDeviceToken(stringContents);
-
-    config.modResults.contents = stringContents;
+    const match = stringContents.match(regex);
+
+    if (!match) {
+      const headerPath = getAppDelegateHeaderFilePath(
+        config.modRequest.projectRoot
+      );
+      let headerContent = await FileManagement.read(headerPath);
+      headerContent = addAppdelegateHeaderModification(headerContent);
+      FileManagement.write(headerPath, headerContent);
+
+      stringContents = addImport(
+        stringContents,
+        config.modRequest.projectName as string
+      );
+      stringContents = addNotificationHandlerDeclaration(stringContents);
+      stringContents = addNotificationConfiguration(stringContents);
+      stringContents = addAdditionalMethodsForPushNotifications(stringContents);
+      stringContents =
+        addDidFailToRegisterForRemoteNotificationsWithError(stringContents);
+      stringContents =
+        AddDidRegisterForRemoteNotificationsWithDeviceToken(stringContents);
+
+      config.modResults.contents = stringContents;
+    } else {
+      console.log('Customerio AppDelegate changes already exist. Skipping...');
+    }
+
     return config;
   });
 };
+function getImportSnippet(appName: string) {
+  return `
+// Add swift bridge imports
+#import <ExpoModulesCore-Swift.h>
+#import <${appName}-Swift.h>
+  `;
+}

package/src/ios/withAppDelegateXcodeProject.ts

@@ -1,5 +1,4 @@
 import { ConfigPlugin, withXcodeProject } from '@expo/config-plugins';
-import fs from 'fs';
 import xcode from 'xcode';
 
 import {
@@ -7,56 +6,36 @@ import {
   LOCAL_PATH_TO_CIO_NSE_FILES,
 } from '../helpers/constants/ios';
 import type { CustomerIOPluginOptionsIOS } from '../types/cio-types';
+import { FileManagement } from './../helpers/utils/fileManagement';
 
-const addNotificationServiceExtensionFile = async (
+const addNotificationSwiftFile = async (
   options: CustomerIOPluginOptionsIOS
 ) => {
   const { iosPath, appName } = options;
-
   const projPath = `${iosPath}/${appName}.xcodeproj/project.pbxproj`;
-
   const xcodeProject = xcode.project(projPath);
 
   xcodeProject.parse(async function (err: Error) {
-    if (err) {
-      throw new Error(`Error parsing iOS project: ${JSON.stringify(err)}`);
-    }
-
-    fs.mkdirSync(`${iosPath}/${appName}`, {
-      recursive: true,
-    });
-
     const file = 'PushNotification.swift';
-
     const getTargetFile = (filename: string) =>
       `${iosPath}/${appName}/${filename}`;
+    if (err) {
+      throw new Error(`Error parsing iOS project: ${JSON.stringify(err)}`);
+    }
 
-    const targetFile = getTargetFile(file);
-    fs.copyFileSync(`${LOCAL_PATH_TO_CIO_NSE_FILES}/${file}`, targetFile);
-
-    // Create new PBXGroup for the extension
-    const extGroup = xcodeProject.addPbxGroup([file], appName, appName);
-
-    // 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'];
-    Object.keys(groups).forEach((key) => {
-      if (groups[key].name === undefined) {
-        xcodeProject.addToPbxGroup(extGroup.uuid, key);
-      }
-    });
-
-    // WORK AROUND for codeProject.addTarget BUG
-    // Xcode projects don't contain these if there is only one target
-    // 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'] || {};
+    if (!FileManagement.exists(getTargetFile(file))) {
+      FileManagement.mkdir(`${iosPath}/${appName}`, {
+        recursive: true,
+      });
 
-    fs.writeFileSync(projPath, xcodeProject.writeSync());
+      const targetFile = getTargetFile(file);
+      FileManagement.copyFile(
+        `${LOCAL_PATH_TO_CIO_NSE_FILES}/${file}`,
+        targetFile
+      );
+    } else {
+      console.log(`${getTargetFile(file)} already exists. Skipping...`);
+    }
   });
 };
 
@@ -97,13 +76,13 @@ export const withCioAppdelegateXcodeProject: ConfigPlugin<
       appleTeamId,
       bundleIdentifier,
       bundleShortVersion,
-      bundleVersion: buildNumber ?? DEFAULT_BUNDLE_VERSION,
+      bundleVersion: buildNumber || DEFAULT_BUNDLE_VERSION,
       iosPath: platformProjectRoot,
       appName: projectName,
       iosDeploymentTarget,
     };
 
-    await addNotificationServiceExtensionFile(options);
+    await addNotificationSwiftFile(options);
 
     return config;
   });

package/src/ios/withCIOIos.ts

@@ -10,10 +10,16 @@ export function withCIOIos(
   config: ExpoConfig,
   props: CustomerIOPluginOptionsIOS
 ) {
-  config = withCioNotificationsXcodeProject(config, props);
-  config = withAppDelegateModifications(config, props);
+  if (props.pushNotification?.useRichPush) {
+    config = withCioNotificationsXcodeProject(config, props);
+  }
+
+  if (props.pushNotification) {
+    config = withAppDelegateModifications(config, props);
+    config = withCioAppdelegateXcodeProject(config, props);
+  }
+
   config = withCioXcodeProject(config, props);
-  config = withCioAppdelegateXcodeProject(config, props);
 
   return config;
 }

package/src/ios/withNotificationsXcodeProject.ts

@@ -1,5 +1,4 @@
 import { ConfigPlugin, withXcodeProject } from '@expo/config-plugins';
-import fs from 'fs';
 import xcode from 'xcode';
 
 import {
@@ -7,8 +6,10 @@ import {
   DEFAULT_BUNDLE_VERSION,
   LOCAL_PATH_TO_CIO_NSE_FILES,
 } from '../helpers/constants/ios';
+import { injectCodeByMultiLineRegex } from '../helpers/utils/codeInjection';
 import { injectCIONotificationPodfileCode } from '../helpers/utils/injectCIOPodfileCode';
 import type { CustomerIOPluginOptionsIOS } from '../types/cio-types';
+import { FileManagement } from './../helpers/utils/fileManagement';
 
 const PLIST_FILENAME = `${CIO_NOTIFICATION_TARGET_NAME}-Info.plist`;
 
@@ -38,15 +39,15 @@ const addNotificationServiceExtension = async (
 
     await injectCIONotificationPodfileCode(iosPath);
 
-    fs.mkdirSync(`${iosPath}/${CIO_NOTIFICATION_TARGET_NAME}`, {
+    FileManagement.mkdir(`${iosPath}/${CIO_NOTIFICATION_TARGET_NAME}`, {
       recursive: true,
     });
 
     const files = [
       PLIST_FILENAME,
-      'CIONotificationService.h',
-      'CIONotificationService.swift',
-      'CIONotificationService.m',
+      'NotificationService.h',
+      'NotificationService.swift',
+      'NotificationService.m',
     ];
 
     const getTargetFile = (filename: string) =>
@@ -54,7 +55,10 @@ const addNotificationServiceExtension = async (
 
     files.forEach((filename) => {
       const targetFile = getTargetFile(filename);
-      fs.copyFileSync(`${LOCAL_PATH_TO_CIO_NSE_FILES}/${filename}`, targetFile);
+      FileManagement.copyFile(
+        `${LOCAL_PATH_TO_CIO_NSE_FILES}/${filename}`,
+        targetFile
+      );
     });
 
     /* MODIFY COPIED EXTENSION FILES */
@@ -109,7 +113,7 @@ const addNotificationServiceExtension = async (
 
     // Add build phases to the new target
     xcodeProject.addBuildPhase(
-      ['CIONotificationService.m', 'CIONotificationService.swift'],
+      ['NotificationService.m', 'NotificationService.swift'],
       'PBXSourcesBuildPhase',
       'Sources',
       nseTarget.uuid
@@ -139,7 +143,7 @@ const addNotificationServiceExtension = async (
         const buildSettingsObj = configurations[key].buildSettings;
         buildSettingsObj.DEVELOPMENT_TEAM = appleTeamId;
         buildSettingsObj.IPHONEOS_DEPLOYMENT_TARGET =
-          iosDeploymentTarget ?? '13.0';
+          iosDeploymentTarget || '13.0';
         buildSettingsObj.TARGETED_DEVICE_FAMILY = TARGETED_DEVICE_FAMILY;
         buildSettingsObj.CODE_SIGN_STYLE = 'Automatic';
         buildSettingsObj.SWIFT_VERSION = 4.2;
@@ -150,7 +154,7 @@ const addNotificationServiceExtension = async (
     xcodeProject.addTargetAttribute('DevelopmentTeam', appleTeamId, nseTarget);
     xcodeProject.addTargetAttribute('DevelopmentTeam', appleTeamId);
 
-    fs.writeFileSync(projPath, xcodeProject.writeSync());
+    FileManagement.writeFile(projPath, xcodeProject.writeSync());
   });
 };
 
@@ -163,7 +167,7 @@ export const withCioNotificationsXcodeProject: ConfigPlugin<
 
     if (ios === undefined)
       throw new Error(
-        'Adding NotificationServiceExtension failed: ios config missing from app.config.js.'
+        'Adding NotificationServiceExtension failed: ios config missing from app.config.js or app.json.'
       );
 
     const { projectName, platformProjectRoot } = modRequest;
@@ -171,19 +175,19 @@ export const withCioNotificationsXcodeProject: ConfigPlugin<
 
     if (bundleShortVersion === undefined) {
       throw new Error(
-        'Adding NotificationServiceExtension failed: version missing from app.config.js'
+        'Adding NotificationServiceExtension failed: version missing from app.config.js or app.json'
       );
     }
 
     if (bundleIdentifier === undefined) {
       throw new Error(
-        'Adding NotificationServiceExtension failed: ios.bundleIdentifier missing from app.config.js'
+        'Adding NotificationServiceExtension failed: ios.bundleIdentifier missing from app.config.js or app.json'
       );
     }
 
     if (projectName === undefined) {
       throw new Error(
-        'Adding NotificationServiceExtension failed: name missing from app.config.js'
+        'Adding NotificationServiceExtension failed: name missing from app.config.js or app.json'
       );
     }
 
@@ -191,7 +195,7 @@ export const withCioNotificationsXcodeProject: ConfigPlugin<
       appleTeamId,
       bundleIdentifier,
       bundleShortVersion,
-      bundleVersion: buildNumber ?? DEFAULT_BUNDLE_VERSION,
+      bundleVersion: buildNumber || DEFAULT_BUNDLE_VERSION,
       iosPath: platformProjectRoot,
       appName: projectName,
       iosDeploymentTarget,
@@ -211,21 +215,23 @@ const updateNseInfoPlist = (payload: {
   const BUNDLE_SHORT_VERSION_RE = /\{\{BUNDLE_SHORT_VERSION\}\}/;
   const BUNDLE_VERSION_RE = /\{\{BUNDLE_VERSION\}\}/;
 
-  let plistFileString = fs.readFileSync(payload.infoPlistTargetFile, 'utf-8');
+  let plistFileString = FileManagement.readFile(payload.infoPlistTargetFile);
 
   if (payload.bundleVersion) {
-    plistFileString = plistFileString.replace(
+    plistFileString = injectCodeByMultiLineRegex(
+      plistFileString,
       BUNDLE_VERSION_RE,
       payload.bundleVersion
     );
   }
 
   if (payload.bundleShortVersion) {
-    plistFileString = plistFileString.replace(
+    plistFileString = injectCodeByMultiLineRegex(
+      plistFileString,
       BUNDLE_SHORT_VERSION_RE,
       payload.bundleShortVersion
     );
   }
 
-  fs.writeFileSync(payload.infoPlistTargetFile, plistFileString);
+  FileManagement.writeFile(payload.infoPlistTargetFile, plistFileString);
 };

package/src/types/cio-types.ts

@@ -15,6 +15,9 @@ export type CustomerIOPluginOptionsIOS = {
   iosDeploymentTarget?: string;
   appleTeamId?: string;
   appName?: string;
+  pushNotification?: {
+    useRichPush: boolean;
+  };
 };
 
 export type CustomerIOPluginOptionsAndroid = {
@@ -22,7 +25,7 @@ export type CustomerIOPluginOptionsAndroid = {
   googleServicesFilePath?: string;
 };
 
-export enum Mode {
-  Dev = 'development',
-  Prod = 'production',
-}
+export type CustomerIOPluginOptions = {
+  android: CustomerIOPluginOptionsAndroid;
+  ios: CustomerIOPluginOptionsIOS;
+};

package/src/version.ts

@@ -0,0 +1 @@
+export const LIB_VERSION = "1.0.0-alpha.3";