onesignal-expo-plugin 2.0.4 → 2.2.0

package/README.md

@@ -87,6 +87,8 @@ You can pass props to the plugin config object to configure:
 | `largeIcons`             | optional     | An array of local paths to large notification icons for Android. Image should be white, transparent, and 256x256 in size. e.g: `["./assets/ic_onesignal_large_icon_default.png"]`. See https://documentation.onesignal.com/docs/customize-notification-icons#large-notification-icons.                                                                                        |
 | `smallIconAccentColor`   | optional     | The accent color to use for notification icons on Android. Must be a valid hex value, e.g: `"#FF0000"`                                                                                                                                                                                                                                                                        |
 | `iosNSEFilePath`         | optional     | The local path to a custom Notification Service Extension (NSE), written in Objective-C. The NSE will typically start as a copy of the [default NSE](https://github.com/OneSignal/onesignal-expo-plugin/blob/main/support/serviceExtensionFiles/NotificationService.m), then altered to support any custom logic required. e.g: `"./assets/NotificationService.m"`.           |
+| `appGroupName`           | optional     | Used to configure a custom iOS [App Group](https://documentation.onesignal.com/docs/ios-sdk-setup#step-3-create-an-app-group) name. If not provided, defaults to `"group.{ios.bundleIdentifier}.onesignal"`. e.g: `"group.com.example.myapp.onesignal2"`. |
+| `nseBundleIdentifier`    | optional     | Used to configure a custom bundle identifier suffix for the iOS Notification Service Extension. The full bundle identifier will be `"{ios.bundleIdentifier}.{nseBundleIdentifier}"`. If not provided, defaults to `"OneSignalNotificationServiceExtension"`. |
 
 ### OneSignal App ID
 

package/build/onesignal/withOneSignalAndroid.js

@@ -17,11 +17,11 @@ const SMALL_ICON_DIRS_TO_SIZE = {
     'drawable-hdpi': 36,
     'drawable-xhdpi': 48,
     'drawable-xxhdpi': 72,
-    'drawable-xxxhdpi': 96
+    'drawable-xxxhdpi': 96,
 };
 // The name of each large icon folder resource, and the icon size for that folder.
 const LARGE_ICON_DIRS_TO_SIZE = {
-    'drawable-xxxhdpi': 256
+    'drawable-xxxhdpi': 256,
 };
 const withSmallIcons = (config, onesignalProps) => {
     if (!onesignalProps.smallIcons && !config.notification?.icon) {
@@ -83,7 +83,7 @@ async function saveIconsArrayAsync(projectRoot, icons, dirsToSize) {
 }
 async function saveIconAsync(icon, projectRoot, dirsToSize) {
     const name = (0, path_1.parse)(icon).name;
-    OneSignalLog_1.OneSignalLog.log("Saving icon " + icon + " as drawable resource " + name);
+    OneSignalLog_1.OneSignalLog.log('Saving icon ' + icon + ' as drawable resource ' + name);
     for (const iconResourceDir in dirsToSize) {
         const path = (0, path_1.resolve)(projectRoot, RESOURCE_ROOT_PATH, iconResourceDir);
         if (!(0, fs_1.existsSync)(path)) {

package/build/onesignal/withOneSignalIos.js

@@ -45,6 +45,7 @@ const config_plugins_1 = require("@expo/config-plugins");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const iosConstants_1 = require("../support/iosConstants");
+const helpers_1 = require("../support/helpers");
 const updatePodfile_1 = require("../support/updatePodfile");
 const NseUpdaterManager_1 = __importDefault(require("../support/NseUpdaterManager"));
 const OneSignalLog_1 = require("../support/OneSignalLog");
@@ -63,7 +64,7 @@ const withAppEnvironment = (config, onesignalProps) => {
         "mode" can be either "development" or "production".
         Please see onesignal-expo-plugin's README.md for more details.`);
         }
-        newConfig.modResults["aps-environment"] = onesignalProps.mode;
+        newConfig.modResults['aps-environment'] = onesignalProps.mode;
         return newConfig;
     });
 };
@@ -72,7 +73,7 @@ const withAppEnvironment = (config, onesignalProps) => {
  * @see https://documentation.onesignal.com/docs/react-native-sdk-setup#step-4-install-for-ios-using-cocoapods-for-ios-apps
  */
 const withRemoteNotificationsPermissions = (config) => {
-    const BACKGROUND_MODE_KEYS = ["remote-notification"];
+    const BACKGROUND_MODE_KEYS = ['remote-notification'];
     return (0, config_plugins_1.withInfoPlist)(config, (newConfig) => {
         if (!Array.isArray(newConfig.modResults.UIBackgroundModes)) {
             newConfig.modResults.UIBackgroundModes = [];
@@ -89,14 +90,14 @@ const withRemoteNotificationsPermissions = (config) => {
  * Add "App Group" permission
  * @see https://documentation.onesignal.com/docs/react-native-sdk-setup#step-4-install-for-ios-using-cocoapods-for-ios-apps (step 4.4)
  */
-const withAppGroupPermissions = (config) => {
-    const APP_GROUP_KEY = "com.apple.security.application-groups";
-    return (0, config_plugins_1.withEntitlementsPlist)(config, newConfig => {
+const withAppGroupPermissions = (config, props) => {
+    const APP_GROUP_KEY = 'com.apple.security.application-groups';
+    return (0, config_plugins_1.withEntitlementsPlist)(config, (newConfig) => {
         if (!Array.isArray(newConfig.modResults[APP_GROUP_KEY])) {
             newConfig.modResults[APP_GROUP_KEY] = [];
         }
         const modResultsArray = newConfig.modResults[APP_GROUP_KEY];
-        const entitlement = `group.${newConfig?.ios?.bundleIdentifier || ""}.onesignal`;
+        const entitlement = (0, helpers_1.getAppGroupIdentifier)(newConfig?.ios?.bundleIdentifier || '', props?.appGroupName);
         if (modResultsArray.indexOf(entitlement) !== -1) {
             return newConfig;
         }
@@ -104,44 +105,59 @@ const withAppGroupPermissions = (config) => {
         return newConfig;
     });
 };
-const withEasManagedCredentials = (config) => {
+/**
+ * Add OneSignal_app_groups_key to Info.plist when a custom app group name is provided.
+ * @see https://documentation.onesignal.com/docs/ios-sdk-setup#step-3-create-an-app-group
+ */
+const withCustomAppGroupsKey = (config, props) => {
+    return (0, config_plugins_1.withInfoPlist)(config, (newConfig) => {
+        if (props?.appGroupName) {
+            newConfig.modResults.OneSignal_app_groups_key = props.appGroupName;
+        }
+        return newConfig;
+    });
+};
+const withEasManagedCredentials = (config, props) => {
     (0, assert_1.default)(config.ios?.bundleIdentifier, "Missing 'ios.bundleIdentifier' in app config.");
-    config.extra = (0, getEasManagedCredentialsConfigExtra_1.default)(config);
+    config.extra = (0, getEasManagedCredentialsConfigExtra_1.default)(config, props?.appGroupName, props?.nseBundleIdentifier);
     return config;
 };
 const withOneSignalPodfile = (config) => {
     return (0, config_plugins_1.withDangerousMod)(config, [
         'ios',
         async (config) => {
-            // not awaiting in order to not block main thread
-            const iosRoot = path.join(config.modRequest.projectRoot, "ios");
-            (0, updatePodfile_1.updatePodfile)(iosRoot).catch(err => { OneSignalLog_1.OneSignalLog.error(err); });
+            const iosRoot = path.join(config.modRequest.projectRoot, 'ios');
+            await (0, updatePodfile_1.updatePodfile)(iosRoot);
             return config;
         },
     ]);
 };
 const withOneSignalNSE = (config, props) => {
     // support for monorepos where node_modules can be above the project directory.
-    const pluginDir = require.resolve("onesignal-expo-plugin/package.json");
-    const sourceDir = path.join(pluginDir, "../build/support/serviceExtensionFiles/");
+    const pluginDir = require.resolve('onesignal-expo-plugin/package.json');
+    const sourceDir = path.join(pluginDir, '../build/support/serviceExtensionFiles/');
     return (0, config_plugins_1.withDangerousMod)(config, [
         'ios',
         async (config) => {
-            const iosPath = path.join(config.modRequest.projectRoot, "ios");
+            const iosPath = path.join(config.modRequest.projectRoot, 'ios');
             /* COPY OVER EXTENSION FILES */
-            fs.mkdirSync(`${iosPath}/${iosConstants_1.NSE_TARGET_NAME}`, { recursive: true });
-            for (let i = 0; i < iosConstants_1.NSE_EXT_FILES.length; i++) {
-                const extFile = iosConstants_1.NSE_EXT_FILES[i];
-                const targetFile = `${iosPath}/${iosConstants_1.NSE_TARGET_NAME}/${extFile}`;
-                await FileManager_1.FileManager.copyFile(`${sourceDir}${extFile}`, targetFile);
+            fs.mkdirSync(`${iosPath}/${iosConstants_1.NSE_TARGET_NAME}`, {
+                recursive: true,
+            });
+            for (const file of iosConstants_1.NSE_EXT_FILES) {
+                const targetFile = `${iosPath}/${iosConstants_1.NSE_TARGET_NAME}/${file}`;
+                await FileManager_1.FileManager.copyFile(`${sourceDir}${file}`, targetFile);
             }
-            // Copy NSE source file either from configuration-provided location, falling back to the default one.
             const sourcePath = props.iosNSEFilePath ?? `${sourceDir}${iosConstants_1.NSE_SOURCE_FILE}`;
             const targetFile = `${iosPath}/${iosConstants_1.NSE_TARGET_NAME}/${iosConstants_1.NSE_SOURCE_FILE}`;
             await FileManager_1.FileManager.copyFile(`${sourcePath}`, targetFile);
             /* MODIFY COPIED EXTENSION FILES */
             const nseUpdater = new NseUpdaterManager_1.default(iosPath);
-            await nseUpdater.updateNSEEntitlements(`group.${config.ios?.bundleIdentifier}.onesignal`);
+            const appGroupId = (0, helpers_1.getAppGroupIdentifier)(config.ios?.bundleIdentifier ?? '', props.appGroupName);
+            await nseUpdater.updateNSEEntitlements(appGroupId);
+            if (props.appGroupName) {
+                await nseUpdater.updateNSEInfoPlistAppGroupKey(props.appGroupName);
+            }
             await nseUpdater.updateNSEBundleVersion(config.ios?.buildNumber ?? iosConstants_1.DEFAULT_BUNDLE_VERSION);
             await nseUpdater.updateNSEBundleShortVersion(config?.version ?? iosConstants_1.DEFAULT_BUNDLE_SHORT_VERSION);
             return config;
@@ -149,8 +165,9 @@ const withOneSignalNSE = (config, props) => {
     ]);
 };
 const withOneSignalXcodeProject = (config, props) => {
-    return (0, config_plugins_1.withXcodeProject)(config, newConfig => {
+    return (0, config_plugins_1.withXcodeProject)(config, (newConfig) => {
         const xcodeProject = newConfig.modResults;
+        const nseBundleId = `${config.ios?.bundleIdentifier}.${props.nseBundleIdentifier ?? iosConstants_1.NSE_TARGET_NAME}`;
         if (xcodeProject.pbxTargetByName(iosConstants_1.NSE_TARGET_NAME)) {
             OneSignalLog_1.OneSignalLog.log(`${iosConstants_1.NSE_TARGET_NAME} already exists in project. Skipping...`);
             return newConfig;
@@ -159,9 +176,11 @@ const withOneSignalXcodeProject = (config, props) => {
         const extGroup = xcodeProject.addPbxGroup([...iosConstants_1.NSE_EXT_FILES, iosConstants_1.NSE_SOURCE_FILE], iosConstants_1.NSE_TARGET_NAME, iosConstants_1.NSE_TARGET_NAME);
         // 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(function (key) {
-            if (typeof groups[key] === "object" && groups[key].name === undefined && groups[key].path === undefined) {
+            if (typeof groups[key] === 'object' &&
+                groups[key].name === undefined &&
+                groups[key].path === undefined) {
                 xcodeProject.addToPbxGroup(extGroup.uuid, key);
             }
         });
@@ -170,38 +189,42 @@ const withOneSignalXcodeProject = (config, props) => {
         // 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'] || {};
         // Add the NSE target
         // This adds PBXTargetDependency and PBXContainerItemProxy for you
-        const nseTarget = xcodeProject.addTarget(iosConstants_1.NSE_TARGET_NAME, "app_extension", iosConstants_1.NSE_TARGET_NAME, `${config.ios?.bundleIdentifier}.${iosConstants_1.NSE_TARGET_NAME}`);
+        const nseTarget = xcodeProject.addTarget(iosConstants_1.NSE_TARGET_NAME, 'app_extension', iosConstants_1.NSE_TARGET_NAME, nseBundleId);
         // Add build phases to the new target
-        xcodeProject.addBuildPhase(["NotificationService.m"], "PBXSourcesBuildPhase", "Sources", nseTarget.uuid);
-        xcodeProject.addBuildPhase([], "PBXResourcesBuildPhase", "Resources", nseTarget.uuid);
-        xcodeProject.addBuildPhase([], "PBXFrameworksBuildPhase", "Frameworks", nseTarget.uuid);
+        xcodeProject.addBuildPhase(['NotificationService.m'], 'PBXSourcesBuildPhase', 'Sources', nseTarget.uuid);
+        xcodeProject.addBuildPhase([], 'PBXResourcesBuildPhase', 'Resources', nseTarget.uuid);
+        xcodeProject.addBuildPhase([], 'PBXFrameworksBuildPhase', 'Frameworks', nseTarget.uuid);
         // Edit the Deployment info of the new Target, only IphoneOS and Targeted Device Family
         // However, can be more
         const configurations = xcodeProject.pbxXCBuildConfigurationSection();
         for (const key in configurations) {
-            if (typeof configurations[key].buildSettings !== "undefined" &&
+            if (typeof configurations[key].buildSettings !== 'undefined' &&
                 configurations[key].buildSettings.PRODUCT_NAME == `"${iosConstants_1.NSE_TARGET_NAME}"`) {
                 const buildSettingsObj = configurations[key].buildSettings;
                 buildSettingsObj.DEVELOPMENT_TEAM = props?.devTeam;
-                buildSettingsObj.IPHONEOS_DEPLOYMENT_TARGET = props?.iPhoneDeploymentTarget ?? iosConstants_1.IPHONEOS_DEPLOYMENT_TARGET;
+                buildSettingsObj.IPHONEOS_DEPLOYMENT_TARGET =
+                    props?.iPhoneDeploymentTarget ?? iosConstants_1.IPHONEOS_DEPLOYMENT_TARGET;
                 buildSettingsObj.TARGETED_DEVICE_FAMILY = iosConstants_1.TARGETED_DEVICE_FAMILY;
                 buildSettingsObj.CODE_SIGN_ENTITLEMENTS = `${iosConstants_1.NSE_TARGET_NAME}/${iosConstants_1.NSE_TARGET_NAME}.entitlements`;
-                buildSettingsObj.CODE_SIGN_STYLE = "Automatic";
+                buildSettingsObj.CODE_SIGN_STYLE = 'Automatic';
             }
         }
         // Add development teams to both your target and the original project
-        xcodeProject.addTargetAttribute("DevelopmentTeam", props?.devTeam, nseTarget);
-        xcodeProject.addTargetAttribute("DevelopmentTeam", props?.devTeam);
+        xcodeProject.addTargetAttribute('DevelopmentTeam', props?.devTeam, nseTarget);
+        xcodeProject.addTargetAttribute('DevelopmentTeam', props?.devTeam);
         return newConfig;
     });
 };
 const withOneSignalIos = (config, props) => {
     config = withAppEnvironment(config, props);
     config = withRemoteNotificationsPermissions(config, props);
+    config = withCustomAppGroupsKey(config, props);
     config = withAppGroupPermissions(config, props);
     config = withOneSignalPodfile(config, props);
     config = withOneSignalNSE(config, props);

package/build/support/NseUpdaterManager.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const FileManager_1 = require("./FileManager");
 const iosConstants_1 = require("./iosConstants");
-// project `ios/OneSignalNotificationServiceExtension` directory
-const entitlementsFileName = `OneSignalNotificationServiceExtension.entitlements`;
-const plistFileName = `OneSignalNotificationServiceExtension-Info.plist`;
+const entitlementsFileName = `${iosConstants_1.NSE_TARGET_NAME}.entitlements`;
+const plistFileName = `${iosConstants_1.NSE_TARGET_NAME}-Info.plist`;
 class NseUpdaterManager {
-    nsePath = '';
+    nsePath;
     constructor(iosPath) {
         this.nsePath = `${iosPath}/${iosConstants_1.NSE_TARGET_NAME}`;
     }
@@ -28,5 +27,12 @@ class NseUpdaterManager {
         plistFile = plistFile.replace(iosConstants_1.BUNDLE_SHORT_VERSION_TEMPLATE_REGEX, version);
         await FileManager_1.FileManager.writeFile(plistFilePath, plistFile);
     }
+    async updateNSEInfoPlistAppGroupKey(appGroupName) {
+        const plistFilePath = `${this.nsePath}/${plistFileName}`;
+        let plistFile = await FileManager_1.FileManager.readFile(plistFilePath);
+        const appGroupEntry = `\t<key>OneSignal_app_groups_key</key>\n\t<string>${appGroupName}</string>\n</dict>\n</plist>`;
+        plistFile = plistFile.replace('</dict>\n</plist>', appGroupEntry);
+        await FileManager_1.FileManager.writeFile(plistFilePath, plistFile);
+    }
 }
 exports.default = NseUpdaterManager;

package/build/support/eas/getEasManagedCredentialsConfigExtra.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = getEasManagedCredentialsConfigExtra;
 const iosConstants_1 = require("../iosConstants");
-function getEasManagedCredentialsConfigExtra(config) {
+const helpers_1 = require("../helpers");
+function getEasManagedCredentialsConfigExtra(config, appGroupName, nseBundleIdentifier) {
+    const bundleId = `${config?.ios?.bundleIdentifier}.${nseBundleIdentifier ?? iosConstants_1.NSE_TARGET_NAME}`;
     return {
         ...config.extra,
         eas: {
@@ -14,21 +16,21 @@ function getEasManagedCredentialsConfigExtra(config) {
                     ios: {
                         ...config.extra?.eas?.build?.experimental?.ios,
                         appExtensions: [
-                            ...(config.extra?.eas?.build?.experimental?.ios?.appExtensions ?? []),
+                            ...(config.extra?.eas?.build?.experimental?.ios?.appExtensions ??
+                                []),
                             {
-                                // keep in sync with native changes in NSE
                                 targetName: iosConstants_1.NSE_TARGET_NAME,
-                                bundleIdentifier: `${config?.ios?.bundleIdentifier}.${iosConstants_1.NSE_TARGET_NAME}`,
+                                bundleIdentifier: bundleId,
                                 entitlements: {
                                     'com.apple.security.application-groups': [
-                                        `group.${config?.ios?.bundleIdentifier}.onesignal`
-                                    ]
+                                        (0, helpers_1.getAppGroupIdentifier)(config?.ios?.bundleIdentifier ?? '', appGroupName),
+                                    ],
                                 },
-                            }
-                        ]
-                    }
-                }
-            }
-        }
+                            },
+                        ],
+                    },
+                },
+            },
+        },
     };
 }

package/build/support/helpers.js

@@ -1,30 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validatePluginProps = validatePluginProps;
+exports.getAppGroupIdentifier = getAppGroupIdentifier;
 const types_1 = require("../types/types");
 function validatePluginProps(props) {
     // check the type of each property
-    if (typeof props.mode !== "string") {
+    if (typeof props.mode !== 'string') {
         throw new Error("OneSignal Expo Plugin: 'mode' must be a string.");
     }
-    if (props.devTeam && typeof props.devTeam !== "string") {
+    if (props.devTeam && typeof props.devTeam !== 'string') {
         throw new Error("OneSignal Expo Plugin: 'devTeam' must be a string.");
     }
-    if (props.iPhoneDeploymentTarget && typeof props.iPhoneDeploymentTarget !== "string") {
+    if (props.iPhoneDeploymentTarget &&
+        typeof props.iPhoneDeploymentTarget !== 'string') {
         throw new Error("OneSignal Expo Plugin: 'iPhoneDeploymentTarget' must be a string.");
     }
     if (props.smallIcons && !Array.isArray(props.smallIcons)) {
         throw new Error("OneSignal Expo Plugin: 'smallIcons' must be an array.");
     }
-    if (props.smallIconAccentColor && typeof props.smallIconAccentColor !== "string") {
+    if (props.smallIconAccentColor &&
+        typeof props.smallIconAccentColor !== 'string') {
         throw new Error("OneSignal Expo Plugin: 'smallIconAccentColor' must be a string.");
     }
     if (props.largeIcons && !Array.isArray(props.largeIcons)) {
         throw new Error("OneSignal Expo Plugin: 'largeIcons' must be an array.");
     }
-    if (props.iosNSEFilePath && typeof props.iosNSEFilePath !== "string") {
+    if (props.iosNSEFilePath && typeof props.iosNSEFilePath !== 'string') {
         throw new Error("OneSignal Expo Plugin: 'iosNSEFilePath' must be a string.");
     }
+    if (props.appGroupName && typeof props.appGroupName !== 'string') {
+        throw new Error("OneSignal Expo Plugin: 'appGroupName' must be a string.");
+    }
+    if (props.nseBundleIdentifier &&
+        typeof props.nseBundleIdentifier !== 'string') {
+        throw new Error("OneSignal Expo Plugin: 'nseBundleIdentifier' must be a string.");
+    }
     // check for extra properties
     const inputProps = Object.keys(props);
     for (const prop of inputProps) {
@@ -33,3 +43,6 @@ function validatePluginProps(props) {
         }
     }
 }
+function getAppGroupIdentifier(bundleIdentifier, customAppGroupName) {
+    return customAppGroupName ?? `group.${bundleIdentifier}.onesignal`;
+}

package/build/support/iosConstants.js

@@ -1,23 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NSE_EXT_FILES = exports.NSE_SOURCE_FILE = exports.NSE_TARGET_NAME = exports.DEFAULT_BUNDLE_SHORT_VERSION = exports.DEFAULT_BUNDLE_VERSION = exports.BUNDLE_VERSION_TEMPLATE_REGEX = exports.BUNDLE_SHORT_VERSION_TEMPLATE_REGEX = exports.GROUP_IDENTIFIER_TEMPLATE_REGEX = exports.NSE_PODFILE_REGEX = exports.NSE_PODFILE_SNIPPET = exports.TARGETED_DEVICE_FAMILY = exports.IPHONEOS_DEPLOYMENT_TARGET = void 0;
-exports.IPHONEOS_DEPLOYMENT_TARGET = "11.0";
+exports.NSE_EXT_FILES = exports.NSE_PODFILE_REGEX = exports.NSE_PODFILE_SNIPPET = exports.NSE_SOURCE_FILE = exports.NSE_TARGET_NAME = exports.DEFAULT_BUNDLE_SHORT_VERSION = exports.DEFAULT_BUNDLE_VERSION = exports.BUNDLE_VERSION_TEMPLATE_REGEX = exports.BUNDLE_SHORT_VERSION_TEMPLATE_REGEX = exports.GROUP_IDENTIFIER_TEMPLATE_REGEX = exports.TARGETED_DEVICE_FAMILY = exports.IPHONEOS_DEPLOYMENT_TARGET = void 0;
+exports.IPHONEOS_DEPLOYMENT_TARGET = '11.0';
 exports.TARGETED_DEVICE_FAMILY = `"1,2"`;
-exports.NSE_PODFILE_SNIPPET = `
-target 'OneSignalNotificationServiceExtension' do
-  pod 'OneSignalXCFramework', '>= 5.0', '< 6.0'
-  use_frameworks! :linkage => podfile_properties['ios.useFrameworks'].to_sym if podfile_properties['ios.useFrameworks']
-end`;
-exports.NSE_PODFILE_REGEX = /target 'OneSignalNotificationServiceExtension'/;
 exports.GROUP_IDENTIFIER_TEMPLATE_REGEX = /{{GROUP_IDENTIFIER}}/gm;
 exports.BUNDLE_SHORT_VERSION_TEMPLATE_REGEX = /{{BUNDLE_SHORT_VERSION}}/gm;
 exports.BUNDLE_VERSION_TEMPLATE_REGEX = /{{BUNDLE_VERSION}}/gm;
 exports.DEFAULT_BUNDLE_VERSION = '1';
 exports.DEFAULT_BUNDLE_SHORT_VERSION = '1.0';
-exports.NSE_TARGET_NAME = "OneSignalNotificationServiceExtension";
-exports.NSE_SOURCE_FILE = "NotificationService.m";
+exports.NSE_TARGET_NAME = 'OneSignalNotificationServiceExtension';
+exports.NSE_SOURCE_FILE = 'NotificationService.m';
+exports.NSE_PODFILE_SNIPPET = `
+target '${exports.NSE_TARGET_NAME}' do
+  pod 'OneSignalXCFramework', '>= 5.0', '< 6.0'
+  use_frameworks! :linkage => podfile_properties['ios.useFrameworks'].to_sym if podfile_properties['ios.useFrameworks']
+end`;
+exports.NSE_PODFILE_REGEX = new RegExp(`target '${exports.NSE_TARGET_NAME}'`);
 exports.NSE_EXT_FILES = [
-    "NotificationService.h",
+    'NotificationService.h',
     `${exports.NSE_TARGET_NAME}.entitlements`,
-    `${exports.NSE_TARGET_NAME}-Info.plist`
+    `${exports.NSE_TARGET_NAME}-Info.plist`,
 ];

package/build/support/updatePodfile.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updatePodfile = updatePodfile;
-const fs_1 = __importDefault(require("fs"));
+const promises_1 = __importDefault(require("fs/promises"));
 const iosConstants_1 = require("./iosConstants");
 const OneSignalLog_1 = require("./OneSignalLog");
 const FileManager_1 = require("./FileManager");
@@ -12,13 +12,9 @@ async function updatePodfile(iosPath) {
     const podfile = await FileManager_1.FileManager.readFile(`${iosPath}/Podfile`);
     const matches = podfile.match(iosConstants_1.NSE_PODFILE_REGEX);
     if (matches) {
-        OneSignalLog_1.OneSignalLog.log("OneSignalNotificationServiceExtension target already added to Podfile. Skipping...");
-    }
-    else {
-        fs_1.default.appendFile(`${iosPath}/Podfile`, iosConstants_1.NSE_PODFILE_SNIPPET, (err) => {
-            if (err) {
-                OneSignalLog_1.OneSignalLog.error("Error writing to Podfile");
-            }
-        });
+        OneSignalLog_1.OneSignalLog.log(`${iosConstants_1.NSE_TARGET_NAME} target already added to Podfile. Skipping...`);
+        return;
     }
+    await promises_1.default.appendFile(`${iosPath}/Podfile`, iosConstants_1.NSE_PODFILE_SNIPPET);
+    OneSignalLog_1.OneSignalLog.log(`${iosConstants_1.NSE_TARGET_NAME} target added to Podfile.`);
 }

package/build/types/types.js

@@ -2,13 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Mode = exports.ONESIGNAL_PLUGIN_PROPS = void 0;
 exports.ONESIGNAL_PLUGIN_PROPS = [
-    "mode",
-    "devTeam",
-    "iPhoneDeploymentTarget",
-    "smallIcons",
-    "largeIcons",
-    "iosNSEFilePath",
-    "smallIconAccentColor"
+    'mode',
+    'devTeam',
+    'iPhoneDeploymentTarget',
+    'smallIcons',
+    'largeIcons',
+    'iosNSEFilePath',
+    'smallIconAccentColor',
+    'appGroupName',
+    'nseBundleIdentifier',
 ];
 var Mode;
 (function (Mode) {

package/package.json

@@ -1,17 +1,20 @@
 {
   "name": "onesignal-expo-plugin",
-  "version": "2.0.4",
-  "description": "The OneSignal Expo plugin allows you to use OneSignal without leaving the managed workflow. Developed in collaboration with SweetGreen.",
+  "version": "2.2.0",
+  "description": "Some Changez",
   "main": "./app.plugin.js",
   "files": [
     "build",
     "app.plugin.js"
   ],
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "bun test",
+    "test:coverage": "bun test --coverage",
     "build": "bun run lint && rm -rf build && tsc && cp -a src/support/serviceExtensionFiles build/support/",
-    "lint": "oxlint src examples",
-    "lint:fix": "oxlint src examples --fix"
+    "format:check": "prettier --check \"**/*.{ts,tsx}\" --ignore-path .prettierignore",
+    "format:fix": "prettier --write \"**/*.{ts,tsx}\" --ignore-path .prettierignore",
+    "lint": "oxlint src examples && bun run format:check",
+    "lint:fix": "oxlint src examples --fix && bun run format:fix"
   },
   "repository": {
     "type": "git",
@@ -38,10 +41,15 @@
   },
   "homepage": "https://github.com/OneSignal/onesignal-expo-plugin#readme",
   "devDependencies": {
+    "@types/bun": "^1.3.9",
     "expo-module-scripts": "^5.0.8",
     "oxlint": "^1.43.0",
+    "prettier": "^3.8.1",
     "typescript": "^5.9.3"
   },
+  "peerDependencies": {
+    "react-native-onesignal": ">=5.0.0"
+  },
   "dependencies": {
     "@expo/image-utils": "^0.8.8"
   }