onesignal-expo-plugin 1.3.1 → 2.0.0

package/.github/workflows/Zapier.yml

@@ -7,6 +7,9 @@ on:
   # Triggers the workflow on push or pull request events but only for the "main" branch
   issues:
     types: [closed]
+    
+permissions:
+  issues: read
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -20,10 +23,12 @@ jobs:
       # Runs a set of commands using the runners shell
       - name: Call Zapier web hook to close Asana task
         if: ${{ !github.event.issue.pull_request }}
+        env:
+          ISSUE_TITLE: ${{ github.event.issue.title }}
         run: |
           curl --location --request POST 'https://hooks.zapier.com/hooks/catch/12728683/b7009qc/' \
           --header 'Content-Type: application/json' \
           --header 'Accept: application/json' \
           --data-raw '{
-            "task_name" : "${{ github.event.issue.title }}"
+            "task_name" : "$ISSUE_TITLE"
           }'

package/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## April 2023
+### `1.3.2` - 04/18/23
+#### Changes
+- Update iOS generation to write xcode project via expo mod rather than directly to file system.
+- Bump qs from 6.5.2 to 6.5.3
+- Bump decode-uri-component from 0.2.0 to 0.2.2 
+- Bump @xmldom/xmldom from 0.7.5 to 0.7.10
+- Bump multiple dependency versions in OneSignal Example App (ua-parser-js, decode-uri-component, @sideway/formula, @xmldom/xmldom)
+
 ## March 2023
 ### `1.3.1` - 03/03/23
 #### Changes

package/build/onesignal/withOneSignalAndroid.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Expo config plugin for One Signal (Android)
+ * Expo config plugin for OneSignal (Android)
  * @see https://documentation.onesignal.com/docs/react-native-sdk-setup#step-4-install-for-ios-using-cocoapods-for-ios-apps
  */
 Object.defineProperty(exports, "__esModule", { value: true });

package/build/onesignal/withOneSignalIos.js

@@ -5,11 +5,7 @@
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -30,11 +26,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.xcodeProjectAddNse = exports.withOneSignalIos = void 0;
+exports.withOneSignalIos = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const xcode_1 = __importDefault(require("xcode"));
 const iosConstants_1 = require("../support/iosConstants");
 const updatePodfile_1 = require("../support/updatePodfile");
 const NseUpdaterManager_1 = __importDefault(require("../support/NseUpdaterManager"));
@@ -96,75 +91,58 @@ const withAppGroupPermissions = (config) => {
         return newConfig;
     });
 };
-const withOneSignalNSE = (config, onesignalProps) => {
-    return (0, config_plugins_1.withXcodeProject)(config, async (props) => {
-        var _a, _b;
-        const options = {
-            iosPath: props.modRequest.platformProjectRoot,
-            bundleIdentifier: (_a = props.ios) === null || _a === void 0 ? void 0 : _a.bundleIdentifier,
-            devTeam: onesignalProps === null || onesignalProps === void 0 ? void 0 : onesignalProps.devTeam,
-            bundleVersion: (_b = props.ios) === null || _b === void 0 ? void 0 : _b.buildNumber,
-            bundleShortVersion: props === null || props === void 0 ? void 0 : props.version,
-            mode: onesignalProps === null || onesignalProps === void 0 ? void 0 : onesignalProps.mode,
-            iPhoneDeploymentTarget: onesignalProps === null || onesignalProps === void 0 ? void 0 : onesignalProps.iPhoneDeploymentTarget,
-            iosNSEFilePath: onesignalProps.iosNSEFilePath
-        };
-        // support for monorepos where node_modules can be above the project directory.
-        const pluginDir = require.resolve("onesignal-expo-plugin/package.json");
-        xcodeProjectAddNse(props.modRequest.projectName || "", options, path.join(pluginDir, "../build/support/serviceExtensionFiles/"));
-        return props;
-    });
-};
 const withEasManagedCredentials = (config) => {
     var _a;
     (0, assert_1.default)((_a = config.ios) === null || _a === void 0 ? void 0 : _a.bundleIdentifier, "Missing 'ios.bundleIdentifier' in app config.");
     config.extra = (0, getEasManagedCredentialsConfigExtra_1.default)(config);
     return config;
 };
-const withOneSignalIos = (config, props) => {
-    withAppEnvironment(config, props);
-    withRemoteNotificationsPermissions(config, props);
-    withAppGroupPermissions(config, props);
-    withOneSignalNSE(config, props);
-    withEasManagedCredentials(config, props);
-    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); });
+            return config;
+        },
+    ]);
 };
-exports.withOneSignalIos = withOneSignalIos;
-function xcodeProjectAddNse(appName, options, sourceDir) {
-    const { iosPath, devTeam, bundleIdentifier, bundleVersion, bundleShortVersion, iPhoneDeploymentTarget, iosNSEFilePath } = options;
-    // not awaiting in order to not block main thread
-    (0, updatePodfile_1.updatePodfile)(iosPath).catch(err => { OneSignalLog_1.OneSignalLog.error(err); });
-    const projPath = `${iosPath}/${appName}.xcodeproj/project.pbxproj`;
-    const sourceFile = "NotificationService.m";
-    const extFiles = [
-        "NotificationService.h",
-        `${iosConstants_1.NSE_TARGET_NAME}.entitlements`,
-        `${iosConstants_1.NSE_TARGET_NAME}-Info.plist`
-    ];
-    const xcodeProject = xcode_1.default.project(projPath);
-    xcodeProject.parse(async function (err) {
-        if (err) {
-            OneSignalLog_1.OneSignalLog.log(`Error parsing iOS project: ${JSON.stringify(err)}`);
-            return;
-        }
-        /* COPY OVER EXTENSION FILES */
-        fs.mkdirSync(`${iosPath}/${iosConstants_1.NSE_TARGET_NAME}`, { recursive: true });
-        for (let i = 0; i < extFiles.length; i++) {
-            const extFile = extFiles[i];
-            const targetFile = `${iosPath}/${iosConstants_1.NSE_TARGET_NAME}/${extFile}`;
-            await FileManager_1.FileManager.copyFile(`${sourceDir}${extFile}`, targetFile);
-        }
-        // Copy NSE source file either from configuration-provided location, falling back to the default one.
-        const sourcePath = iosNSEFilePath !== null && iosNSEFilePath !== void 0 ? iosNSEFilePath : `${sourceDir}${sourceFile}`;
-        const targetFile = `${iosPath}/${iosConstants_1.NSE_TARGET_NAME}/${sourceFile}`;
-        await FileManager_1.FileManager.copyFile(`${sourcePath}`, targetFile);
-        /* MODIFY COPIED EXTENSION FILES */
-        const nseUpdater = new NseUpdaterManager_1.default(iosPath);
-        await nseUpdater.updateNSEEntitlements(`group.${bundleIdentifier}.onesignal`);
-        await nseUpdater.updateNSEBundleVersion(bundleVersion !== null && bundleVersion !== void 0 ? bundleVersion : iosConstants_1.DEFAULT_BUNDLE_VERSION);
-        await nseUpdater.updateNSEBundleShortVersion(bundleShortVersion !== null && bundleShortVersion !== void 0 ? bundleShortVersion : iosConstants_1.DEFAULT_BUNDLE_SHORT_VERSION);
+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/");
+    return (0, config_plugins_1.withDangerousMod)(config, [
+        'ios',
+        async (config) => {
+            var _a, _b, _c, _d, _e;
+            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);
+            }
+            // Copy NSE source file either from configuration-provided location, falling back to the default one.
+            const sourcePath = (_a = props.iosNSEFilePath) !== null && _a !== void 0 ? _a : `${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.${(_b = config.ios) === null || _b === void 0 ? void 0 : _b.bundleIdentifier}.onesignal`);
+            await nseUpdater.updateNSEBundleVersion((_d = (_c = config.ios) === null || _c === void 0 ? void 0 : _c.buildNumber) !== null && _d !== void 0 ? _d : iosConstants_1.DEFAULT_BUNDLE_VERSION);
+            await nseUpdater.updateNSEBundleShortVersion((_e = config === null || config === void 0 ? void 0 : config.version) !== null && _e !== void 0 ? _e : iosConstants_1.DEFAULT_BUNDLE_SHORT_VERSION);
+            return config;
+        },
+    ]);
+};
+const withOneSignalXcodeProject = (config, props) => {
+    return (0, config_plugins_1.withXcodeProject)(config, newConfig => {
+        var _a, _b;
+        const xcodeProject = newConfig.modResults;
         // Create new PBXGroup for the extension
-        const extGroup = xcodeProject.addPbxGroup([...extFiles, sourceFile], iosConstants_1.NSE_TARGET_NAME, iosConstants_1.NSE_TARGET_NAME);
+        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"];
@@ -182,11 +160,11 @@ function xcodeProjectAddNse(appName, options, sourceDir) {
         projObjects['PBXContainerItemProxy'] = projObjects['PBXTargetDependency'] || {};
         if (!!xcodeProject.pbxTargetByName(iosConstants_1.NSE_TARGET_NAME)) {
             OneSignalLog_1.OneSignalLog.log(`${iosConstants_1.NSE_TARGET_NAME} already exists in project. Skipping...`);
-            return;
+            return newConfig;
         }
         // 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, `${bundleIdentifier}.${iosConstants_1.NSE_TARGET_NAME}`);
+        const nseTarget = xcodeProject.addTarget(iosConstants_1.NSE_TARGET_NAME, "app_extension", iosConstants_1.NSE_TARGET_NAME, `${(_a = config.ios) === null || _a === void 0 ? void 0 : _a.bundleIdentifier}.${iosConstants_1.NSE_TARGET_NAME}`);
         // Add build phases to the new target
         xcodeProject.addBuildPhase(["NotificationService.m"], "PBXSourcesBuildPhase", "Sources", nseTarget.uuid);
         xcodeProject.addBuildPhase([], "PBXResourcesBuildPhase", "Resources", nseTarget.uuid);
@@ -198,17 +176,27 @@ function xcodeProjectAddNse(appName, options, sourceDir) {
             if (typeof configurations[key].buildSettings !== "undefined" &&
                 configurations[key].buildSettings.PRODUCT_NAME == `"${iosConstants_1.NSE_TARGET_NAME}"`) {
                 const buildSettingsObj = configurations[key].buildSettings;
-                buildSettingsObj.DEVELOPMENT_TEAM = devTeam;
-                buildSettingsObj.IPHONEOS_DEPLOYMENT_TARGET = iPhoneDeploymentTarget !== null && iPhoneDeploymentTarget !== void 0 ? iPhoneDeploymentTarget : iosConstants_1.IPHONEOS_DEPLOYMENT_TARGET;
+                buildSettingsObj.DEVELOPMENT_TEAM = props === null || props === void 0 ? void 0 : props.devTeam;
+                buildSettingsObj.IPHONEOS_DEPLOYMENT_TARGET = (_b = props === null || props === void 0 ? void 0 : props.iPhoneDeploymentTarget) !== null && _b !== void 0 ? _b : 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";
             }
         }
         // Add development teams to both your target and the original project
-        xcodeProject.addTargetAttribute("DevelopmentTeam", devTeam, nseTarget);
-        xcodeProject.addTargetAttribute("DevelopmentTeam", devTeam);
-        fs.writeFileSync(projPath, xcodeProject.writeSync());
+        xcodeProject.addTargetAttribute("DevelopmentTeam", props === null || props === void 0 ? void 0 : props.devTeam, nseTarget);
+        xcodeProject.addTargetAttribute("DevelopmentTeam", props === null || props === void 0 ? void 0 : props.devTeam);
+        return newConfig;
     });
-}
-exports.xcodeProjectAddNse = xcodeProjectAddNse;
+};
+const withOneSignalIos = (config, props) => {
+    config = withAppEnvironment(config, props);
+    config = withRemoteNotificationsPermissions(config, props);
+    config = withAppGroupPermissions(config, props);
+    config = withOneSignalPodfile(config, props);
+    config = withOneSignalNSE(config, props);
+    config = withOneSignalXcodeProject(config, props);
+    config = withEasManagedCredentials(config, props);
+    return config;
+};
+exports.withOneSignalIos = withOneSignalIos;

package/build/support/FileManager.js

@@ -1,11 +1,7 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/build/support/iosConstants.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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.TARGETED_DEVICE_FAMILY = `"1,2"`;
 exports.NSE_PODFILE_SNIPPET = `
 target 'OneSignalNotificationServiceExtension' do
-  pod 'OneSignalXCFramework', '>= 3.0', '< 4.0'
+  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'/;
@@ -15,3 +15,9 @@ 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_EXT_FILES = [
+    "NotificationService.h",
+    `${exports.NSE_TARGET_NAME}.entitlements`,
+    `${exports.NSE_TARGET_NAME}-Info.plist`
+];

package/build/support/serviceExtensionFiles/NotificationService.m

@@ -1,4 +1,4 @@
-#import <OneSignal/OneSignal.h>
+#import <OneSignalFramework/OneSignalFramework.h>
 
 #import "NotificationService.h"
 

package/onesignal/withOneSignalAndroid.ts

@@ -1,5 +1,5 @@
 /**
- * Expo config plugin for One Signal (Android)
+ * Expo config plugin for OneSignal (Android)
  * @see https://documentation.onesignal.com/docs/react-native-sdk-setup#step-4-install-for-ios-using-cocoapods-for-ios-apps
  */
 
@@ -13,8 +13,8 @@ import { existsSync, mkdirSync, writeFileSync } from 'fs';
 const RESOURCE_ROOT_PATH = 'android/app/src/main/res/';
 
 // The name of each small icon folder resource, and the icon size for that folder.
-const SMALL_ICON_DIRS_TO_SIZE: { [name: string]: number } = { 
-        'drawable-mdpi': 24, 
+const SMALL_ICON_DIRS_TO_SIZE: { [name: string]: number } = {
+        'drawable-mdpi': 24,
         'drawable-hdpi': 36,
         'drawable-xhdpi': 48,
         'drawable-xxhdpi': 72,
@@ -22,7 +22,7 @@ const SMALL_ICON_DIRS_TO_SIZE: { [name: string]: number } = {
   };
 
 // The name of each large icon folder resource, and the icon size for that folder.
-const LARGE_ICON_DIRS_TO_SIZE: { [name: string]: number } = { 
+const LARGE_ICON_DIRS_TO_SIZE: { [name: string]: number } = {
         'drawable-xxxhdpi': 256
   };
 

package/onesignal/withOneSignalIos.ts

@@ -8,22 +8,24 @@ import {
   withEntitlementsPlist,
   withInfoPlist,
   withXcodeProject,
+  withDangerousMod
 } from "@expo/config-plugins";
 import * as fs from 'fs';
 import * as path from 'path';
-import xcode from 'xcode';
 import {
   DEFAULT_BUNDLE_SHORT_VERSION,
   DEFAULT_BUNDLE_VERSION,
   IPHONEOS_DEPLOYMENT_TARGET,
   NSE_TARGET_NAME,
+  NSE_SOURCE_FILE,
+  NSE_EXT_FILES,
   TARGETED_DEVICE_FAMILY
 } from "../support/iosConstants";
 import { updatePodfile } from "../support/updatePodfile";
 import NseUpdaterManager from "../support/NseUpdaterManager";
 import { OneSignalLog } from "../support/OneSignalLog";
 import { FileManager } from "../support/FileManager";
-import { OneSignalPluginProps, PluginOptions } from "../types/types";
+import { OneSignalPluginProps } from "../types/types";
 import assert from 'assert';
 import getEasManagedCredentialsConfigExtra from "../support/eas/getEasManagedCredentialsConfigExtra";
 import { ExpoConfig } from '@expo/config-types';
@@ -94,100 +96,67 @@ const withAppGroupPermissions: ConfigPlugin<OneSignalPluginProps> = (
   });
 };
 
-const withOneSignalNSE: ConfigPlugin<OneSignalPluginProps> = (config, onesignalProps) => {
-  return withXcodeProject(config, async props => {
-    const options: PluginOptions = {
-      iosPath: props.modRequest.platformProjectRoot,
-      bundleIdentifier: props.ios?.bundleIdentifier,
-      devTeam: onesignalProps?.devTeam,
-      bundleVersion: props.ios?.buildNumber,
-      bundleShortVersion: props?.version,
-      mode: onesignalProps?.mode,
-      iPhoneDeploymentTarget: onesignalProps?.iPhoneDeploymentTarget,
-      iosNSEFilePath: onesignalProps.iosNSEFilePath
-    };
-
-    // support for monorepos where node_modules can be above the project directory.
-    const pluginDir = require.resolve("onesignal-expo-plugin/package.json")
-
-    xcodeProjectAddNse(
-      props.modRequest.projectName || "",
-      options,
-      path.join(pluginDir, "../build/support/serviceExtensionFiles/")
-    );
-
-    return props;
-  });
-}
-
 const withEasManagedCredentials: ConfigPlugin<OneSignalPluginProps> = (config) => {
   assert(config.ios?.bundleIdentifier, "Missing 'ios.bundleIdentifier' in app config.")
   config.extra = getEasManagedCredentialsConfigExtra(config as ExpoConfig);
   return config;
 }
 
-export const withOneSignalIos: ConfigPlugin<OneSignalPluginProps> = (
-  config,
-  props
-) => {
-  withAppEnvironment(config, props);
-  withRemoteNotificationsPermissions(config, props);
-  withAppGroupPermissions(config, props);
-  withOneSignalNSE(config, props);
-  withEasManagedCredentials(config, props);
-  return config;
-};
-
-export function xcodeProjectAddNse(
-  appName: string,
-  options: PluginOptions,
-  sourceDir: string
-): void {
-  const { iosPath, devTeam, bundleIdentifier, bundleVersion, bundleShortVersion, iPhoneDeploymentTarget, iosNSEFilePath } = options;
-
-  // not awaiting in order to not block main thread
-  updatePodfile(iosPath).catch(err => { OneSignalLog.error(err) });
+const withOneSignalPodfile: ConfigPlugin<OneSignalPluginProps> = (config) => {
+  return withDangerousMod(config, [
+    'ios',
+    async config => {
+      // not awaiting in order to not block main thread
+      const iosRoot = path.join(config.modRequest.projectRoot, "ios")
+      updatePodfile(iosRoot).catch(err => { OneSignalLog.error(err) });
+
+      return config;
+    },
+  ]);
+}
 
-  const projPath = `${iosPath}/${appName}.xcodeproj/project.pbxproj`;
+const withOneSignalNSE: ConfigPlugin<OneSignalPluginProps> = (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 sourceFile = "NotificationService.m"
-  const extFiles = [
-    "NotificationService.h",
-    `${NSE_TARGET_NAME}.entitlements`,
-    `${NSE_TARGET_NAME}-Info.plist`
-  ];
+  return withDangerousMod(config, [
+    'ios',
+    async config => {
+      const iosPath = path.join(config.modRequest.projectRoot, "ios")
 
-  const xcodeProject = xcode.project(projPath);
+      /* COPY OVER EXTENSION FILES */
+      fs.mkdirSync(`${iosPath}/${NSE_TARGET_NAME}`, { recursive: true });
 
-  xcodeProject.parse(async function(err: Error) {
-    if (err) {
-      OneSignalLog.log(`Error parsing iOS project: ${JSON.stringify(err)}`);
-      return;
-    }
+      for (let i = 0; i < NSE_EXT_FILES.length; i++) {
+        const extFile = NSE_EXT_FILES[i];
+        const targetFile = `${iosPath}/${NSE_TARGET_NAME}/${extFile}`;
+        await FileManager.copyFile(`${sourceDir}${extFile}`, targetFile);
+      }
 
-    /* COPY OVER EXTENSION FILES */
-    fs.mkdirSync(`${iosPath}/${NSE_TARGET_NAME}`, { recursive: true });
+      // Copy NSE source file either from configuration-provided location, falling back to the default one.
+      const sourcePath = props.iosNSEFilePath ?? `${sourceDir}${NSE_SOURCE_FILE}`
+      const targetFile = `${iosPath}/${NSE_TARGET_NAME}/${NSE_SOURCE_FILE}`;
+      await FileManager.copyFile(`${sourcePath}`, targetFile);
 
-    for (let i = 0; i < extFiles.length; i++) {
-      const extFile = extFiles[i];
-      const targetFile = `${iosPath}/${NSE_TARGET_NAME}/${extFile}`;
-      await FileManager.copyFile(`${sourceDir}${extFile}`, targetFile);
-    }
+      /* MODIFY COPIED EXTENSION FILES */
+      const nseUpdater = new NseUpdaterManager(iosPath);
+      await nseUpdater.updateNSEEntitlements(`group.${config.ios?.bundleIdentifier}.onesignal`)
+      await nseUpdater.updateNSEBundleVersion(config.ios?.buildNumber ?? DEFAULT_BUNDLE_VERSION);
+      await nseUpdater.updateNSEBundleShortVersion(config?.version ?? DEFAULT_BUNDLE_SHORT_VERSION);
 
-    // Copy NSE source file either from configuration-provided location, falling back to the default one.
-    const sourcePath = iosNSEFilePath ?? `${sourceDir}${sourceFile}`
-    const targetFile = `${iosPath}/${NSE_TARGET_NAME}/${sourceFile}`;
-    await FileManager.copyFile(`${sourcePath}`, targetFile);
+      return config;
+    },
+  ]);
+}
 
-    /* MODIFY COPIED EXTENSION FILES */
-    const nseUpdater = new NseUpdaterManager(iosPath);
-    await nseUpdater.updateNSEEntitlements(`group.${bundleIdentifier}.onesignal`)
-    await nseUpdater.updateNSEBundleVersion(bundleVersion ?? DEFAULT_BUNDLE_VERSION);
-    await nseUpdater.updateNSEBundleShortVersion(bundleShortVersion ?? DEFAULT_BUNDLE_SHORT_VERSION);
+const withOneSignalXcodeProject: ConfigPlugin<OneSignalPluginProps> = (config, props) => {
+  return withXcodeProject(config, newConfig => {
+    const xcodeProject = newConfig.modResults
 
     // Create new PBXGroup for the extension
-    const extGroup = xcodeProject.addPbxGroup([...extFiles, sourceFile], NSE_TARGET_NAME, NSE_TARGET_NAME);
-
+    const extGroup = xcodeProject.addPbxGroup([...NSE_EXT_FILES, NSE_SOURCE_FILE], NSE_TARGET_NAME, 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"];
@@ -207,12 +176,12 @@ export function xcodeProjectAddNse(
 
     if (!!xcodeProject.pbxTargetByName(NSE_TARGET_NAME)) {
       OneSignalLog.log(`${NSE_TARGET_NAME} already exists in project. Skipping...`);
-      return;
+      return newConfig;
     }
 
     // Add the NSE target
     // This adds PBXTargetDependency and PBXContainerItemProxy for you
-    const nseTarget = xcodeProject.addTarget(NSE_TARGET_NAME, "app_extension", NSE_TARGET_NAME, `${bundleIdentifier}.${NSE_TARGET_NAME}`);
+    const nseTarget = xcodeProject.addTarget(NSE_TARGET_NAME, "app_extension", NSE_TARGET_NAME, `${config.ios?.bundleIdentifier}.${NSE_TARGET_NAME}`);
 
     // Add build phases to the new target
     xcodeProject.addBuildPhase(
@@ -239,8 +208,8 @@ export function xcodeProjectAddNse(
         configurations[key].buildSettings.PRODUCT_NAME == `"${NSE_TARGET_NAME}"`
       ) {
         const buildSettingsObj = configurations[key].buildSettings;
-        buildSettingsObj.DEVELOPMENT_TEAM = devTeam;
-        buildSettingsObj.IPHONEOS_DEPLOYMENT_TARGET = iPhoneDeploymentTarget ?? IPHONEOS_DEPLOYMENT_TARGET;
+        buildSettingsObj.DEVELOPMENT_TEAM = props?.devTeam;
+        buildSettingsObj.IPHONEOS_DEPLOYMENT_TARGET = props?.iPhoneDeploymentTarget ?? IPHONEOS_DEPLOYMENT_TARGET;
         buildSettingsObj.TARGETED_DEVICE_FAMILY = TARGETED_DEVICE_FAMILY;
         buildSettingsObj.CODE_SIGN_ENTITLEMENTS = `${NSE_TARGET_NAME}/${NSE_TARGET_NAME}.entitlements`;
         buildSettingsObj.CODE_SIGN_STYLE = "Automatic";
@@ -248,9 +217,19 @@ export function xcodeProjectAddNse(
     }
 
     // Add development teams to both your target and the original project
-    xcodeProject.addTargetAttribute("DevelopmentTeam", devTeam, nseTarget);
-    xcodeProject.addTargetAttribute("DevelopmentTeam", devTeam);
-
-    fs.writeFileSync(projPath, xcodeProject.writeSync());
+    xcodeProject.addTargetAttribute("DevelopmentTeam", props?.devTeam, nseTarget);
+    xcodeProject.addTargetAttribute("DevelopmentTeam", props?.devTeam);
+    return newConfig;
   })
 }
+
+export const withOneSignalIos: ConfigPlugin<OneSignalPluginProps> = (config, props) => {
+  config = withAppEnvironment(config, props);
+  config = withRemoteNotificationsPermissions(config, props);
+  config = withAppGroupPermissions(config, props);
+  config = withOneSignalPodfile(config, props)
+  config = withOneSignalNSE(config, props)
+  config = withOneSignalXcodeProject(config, props)
+  config = withEasManagedCredentials(config, props);
+  return config;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onesignal-expo-plugin",
-  "version": "1.3.1",
+  "version": "2.0.0",
   "description": "The OneSignal Expo plugin allows you to use OneSignal without leaving the managed workflow. Developed in collaboration with SweetGreen.",
   "main": "./app.plugin.js",
   "scripts": {
@@ -25,7 +25,8 @@
     "Karen Grigoryan",
     "Rodrigo Gomez-Palacio",
     "Charlie Cruzan",
-    "Wojciech Kozyra"
+    "Wojciech Kozyra",
+    "Brian Smith"
   ],
   "license": "MIT",
   "bugs": {
@@ -41,7 +42,6 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "xcode": "^3.0.1",
     "@expo/image-utils": "^0.3.22"
   }
 }

package/support/iosConstants.ts

@@ -3,7 +3,7 @@ export const TARGETED_DEVICE_FAMILY = `"1,2"`;
 
 export const NSE_PODFILE_SNIPPET = `
 target 'OneSignalNotificationServiceExtension' do
-  pod 'OneSignalXCFramework', '>= 3.0', '< 4.0'
+  pod 'OneSignalXCFramework', '>= 5.0', '< 6.0'
   use_frameworks! :linkage => podfile_properties['ios.useFrameworks'].to_sym if podfile_properties['ios.useFrameworks']
 end`;
 
@@ -17,3 +17,9 @@ export const DEFAULT_BUNDLE_VERSION = '1';
 export const DEFAULT_BUNDLE_SHORT_VERSION = '1.0';
 
 export const NSE_TARGET_NAME = "OneSignalNotificationServiceExtension";
+export const NSE_SOURCE_FILE = "NotificationService.m"
+export const NSE_EXT_FILES = [
+  "NotificationService.h",
+  `${NSE_TARGET_NAME}.entitlements`,
+  `${NSE_TARGET_NAME}-Info.plist`
+];

package/support/serviceExtensionFiles/NotificationService.m

@@ -1,4 +1,4 @@
-#import <OneSignal/OneSignal.h>
+#import <OneSignalFramework/OneSignalFramework.h>
 
 #import "NotificationService.h"
 

package/types/types.ts

@@ -37,21 +37,6 @@
    iosNSEFilePath?:       string;
 };
 
-/**
- * Not to be confused with OneSignalPluginProps, PluginOptions are the *internal* properties used by the config plugin
- * These include a combination of user-defined properties (from OneSignalPluginProps) and other data to pass between functions
- */
-export type PluginOptions = {
-  iosPath:                  string,
-  mode:                     Mode,
-  devTeam?:                 string,
-  bundleVersion?:           string,
-  bundleShortVersion?:      string,
-  bundleIdentifier?:        string,
-  iPhoneDeploymentTarget?:  string,
-  iosNSEFilePath?:          string
-}
-
 export enum Mode {
   Dev = "development",
   Prod = "production"

package/build/testRuniOS.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const withOneSignalIos_1 = require("./onesignal/withOneSignalIos");
-const types_1 = require("./types/types");
-// Quick testing on any Xcode project
-// 1. Update values for your project
-// 2. Run `yarn build` from here
-// 3. Open a terminal to the root of your Xcode project
-// 4. Run `node ~/WHERE_YOU_CLONED_ME/onesignal-expo-plugin/build/testRuniOS.js`
-// 5. Run `pod init`, if you haven't already.
-//    - Make sure you are testing with 2 targets in your Podfile, your main target AND your NSE
-//    - If you forget your main target in your Podfile you will get the
-//     "Please add the host targets for the embedded targets to the Podfile." error
-//      even if your .xcodeproj is correct.
-const options = {
-    iosPath: '.',
-    mode: types_1.Mode.Dev,
-    bundleIdentifier: "com.onesignal.XcodeTestProj",
-    devTeam: "99SW8E36CT",
-    iPhoneDeploymentTarget: '12.0'
-};
-(0, withOneSignalIos_1.xcodeProjectAddNse)("XcodeTestProj", options, "../../repos/onesignal-expo-plugin/support/serviceExtensionFiles/");

package/testRuniOS.ts

@@ -1,28 +0,0 @@
-import { xcodeProjectAddNse } from "./onesignal/withOneSignalIos";
-import { Mode } from "./types/types";
-
-// Quick testing on any Xcode project
-
-// 1. Update values for your project
-// 2. Run `yarn build` from here
-// 3. Open a terminal to the root of your Xcode project
-// 4. Run `node ~/WHERE_YOU_CLONED_ME/onesignal-expo-plugin/build/testRuniOS.js`
-// 5. Run `pod init`, if you haven't already.
-//    - Make sure you are testing with 2 targets in your Podfile, your main target AND your NSE
-//    - If you forget your main target in your Podfile you will get the
-//     "Please add the host targets for the embedded targets to the Podfile." error
-//      even if your .xcodeproj is correct.
-
-const options = {
-  iosPath: '.',
-  mode: Mode.Dev,
-  bundleIdentifier: "com.onesignal.XcodeTestProj",
-  devTeam: "99SW8E36CT",
-  iPhoneDeploymentTarget: '12.0'
-};
-
-xcodeProjectAddNse(
-    "XcodeTestProj",
-    options,
-    "../../repos/onesignal-expo-plugin/support/serviceExtensionFiles/"
-);

package/types/xcode.d.ts

@@ -1,8 +0,0 @@
-declare module 'xcode' {
-  interface xcode {
-    project(projPath: string): any;
-  }
-
-  const xcode: xcode;
-  export default xcode;
-}