onesignal-expo-plugin 1.3.0 → 1.3.2

package/.github/release-drafter.yml

@@ -0,0 +1,27 @@
+name-template: $RESOLVED_VERSION
+tag-template: $RESOLVED_VERSION
+categories:
+  - title: 🚀 Features
+    label: Enhancement / Feature
+  - title: 🐛 Bug Fixes
+    label: Bug
+  - title: 🧰 Improvements
+    label: Improvement  
+  - title: down arrow Dependency Updates
+    label: Dependencies 
+change-template: '- $TITLE (#$NUMBER)'
+version-resolver:
+  major:
+    labels:
+      - 'major'
+  minor:
+    labels:
+      - 'minor'
+  patch:
+    labels:
+      - 'patch'
+  default: patch
+template: |
+  ## Other Changes
+  
+  $CHANGES

package/.github/workflows/Zapier.yml

@@ -0,0 +1,34 @@
+# This is an action to close asana tasks that were generated by Github issues
+
+name: Zapier web hook
+
+# Controls when the workflow will run
+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:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # 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" : "$ISSUE_TITLE"
+          }'

package/.github/workflows/release-drafter.yml

@@ -0,0 +1,42 @@
+
+name: Release Drafter
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - main
+  # pull_request event is required only for autolabeler
+  pull_request:
+    # Only following types are handled by the action, but one can default to all as well
+    types: [opened, reopened, synchronize]
+  # pull_request_target event is required for autolabeler to support PRs from forks
+  # pull_request_target:
+  #   types: [opened, reopened, synchronize]
+
+permissions:
+  contents: read
+
+jobs:
+  update_release_draft:
+    permissions:
+      # write permission is required to create a github release
+      contents: write
+      # write permission is required for autolabeler
+      # otherwise, read permission is required at least
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      # (Optional) GitHub Enterprise requires GHE_HOST variable set
+      #- name: Set GHE_HOST
+      #  run: |
+      #    echo "GHE_HOST=${GITHUB_SERVER_URL##https:\/\/}" >> $GITHUB_ENV
+
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - uses: release-drafter/release-drafter@v5
+        # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
+        # with:
+        #   config-name: my-config.yml
+        #   disable-autolabeler: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package/CHANGELOG.md

@@ -1,6 +1,20 @@
 # 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
+- Update monorepo logic to rely on the more reliable `require.resolve` to find the `onesignal-expo-plugin` package.
+
 ## November 2022
 ### `1.3.0` - 11/30/22
 #### Changes

package/EAS.md

@@ -18,4 +18,4 @@ For development/internal distribution builds, you will need to install a [develo
 2. In the terminal, run `expo start --dev-client` to be able to serve the application to the client.
 3. Scan the generated QR code to open the dev client and fetch the app bundle from the running Expo process.
 4. You may be prompted to allow the app to find local area network devices. Approve.
-5. Rescan the QR code & open the app. At this point, you should see the mero bundler working. As soon as the bundle is complete, your working app should open!
+5. Rescan the QR code & open the app. At this point, you should see the metro bundler working. As soon as the bundle is complete, your working app should open!

package/README.md

@@ -1,4 +1,4 @@
-<h1 align="center">Welcome to onesignal-expo-plugin 👋</h1>
+<h1 align="center">Welcome to the onesignal-expo-plugin 👋</h1>
 <p>
   <a href="https://www.npmjs.com/package/onesignal-expo-plugin" target="_blank">
     <img alt="Version" src="https://img.shields.io/npm/v/onesignal-expo-plugin.svg">
@@ -30,9 +30,10 @@ This plugin is an [Expo Config Plugin](https://docs.expo.dev/guides/config-plugi
 ---
 
 ## Install
+You need both the `onesignal-expo-plugin` *and* the `react-native-onesignal` npm package.
 
 ```sh
-expo install onesignal-expo-plugin
+npx expo install onesignal-expo-plugin
 
 # npm
 npm install react-native-onesignal
@@ -43,7 +44,7 @@ yarn add react-native-onesignal
 
 ## Configuration in app.json / app.config.js
 ### Plugin
-Add the plugin to the **front** of the [plugin array](https://docs.expo.dev/versions/latest/config/app/). It should be added automatically if you ran `expo install`. Just make sure it is the first plugin in the array and to configure any desired plugin props:
+Add the plugin to the **front** of the [plugin array](https://docs.expo.dev/versions/latest/config/app/). It should be added automatically if you ran `npx expo install`. Just make sure it is the first plugin in the array and to configure any desired plugin props:
 
 **app.json**
 ```json
@@ -119,9 +120,9 @@ In your configuration file, make sure you set:
 
 | Property             | Details                                                                                                                                                                      |
 |-------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `version`         | Your app version. Corresponds to `CFBundleShortVersionString` on iOS. This value will be used in your NSE* target's plist file.                                               |
-| `ios.buildNumber` | Build number for your iOS standalone app. Corresponds to `CFBundleVersion` and must match Apple's specified format. This value will be used in your NSE* target's plist file. |
-| `ios.bundleIdentifier` | Bundle identifier for your iOS standalone app. Corresponds to `CFBundleIdentifier`. This value will be used in your NSE* target's plist and entitlements file.           |
+| `version`         | Your app version. Corresponds to `CFBundleShortVersionString` on iOS. It is a human-readable version number of an iOS app, and is typically in the format of "X.X.X" (e.g. "1.0" or "2.3.1"). It is the version number that is typically displayed to users in the App Store and in the app itself. This value will be used in your NSE* target's plist file.                                               |
+| `ios.buildNumber` | Build number for your iOS standalone app. Corresponds to `CFBundleVersion` and must match Apple's specified format (e.g: "42" or "100"). The build number is used by the App Store and iOS to identify and track different versions of an app, and is typically incremented for each new release. It is a number typically used for the developer's and system reference. This value will be used in your NSE* target's plist file. |
+| `ios.bundleIdentifier` | Bundle identifier for your iOS standalone app. Corresponds to `CFBundleIdentifier`. It's a unique identifier string that is used to identify an iOS app or bundle. It is typically in the format of `"com.companyname.appname"` (e.g. `"com.example.myapp"`). This value will be used in your NSE* target's plist and entitlements file.           |
 
 \* NSE = Notification Service Extension. Learn more about the NSE [here](https://documentation.onesignal.com/docs/service-extensions).
 
@@ -141,24 +142,24 @@ It may make sense to prebuild locally to inspect config plugin changes and help
 
 #### Run
 ```sh
-expo prebuild
+npx expo prebuild
 ```
 
 ```sh
 # nukes changes and rebuilds
-expo prebuild --clean
+npx expo prebuild --clean
 ```
 
-**EAS Note:** if you choose to stay in a fully managed workflow by not prebuilding, EAS will still run `expo prebuild` at build time. You can also prebuild locally but remain in a fully managed workflow by adding the `android` and `ios` directories to your .gitignore.
+**EAS Note:** if you choose to stay in a fully managed workflow by not prebuilding, EAS will still run `npx expo prebuild` at build time. You can also prebuild locally but remain in a fully managed workflow by adding the `android` and `ios` directories to your .gitignore.
 
 ## Run
 The following commands will prebuild *and* run your application. Note that for iOS, push notifications will **not** work in the Simulator.
 ```sh
 # Build and run your native iOS project
-expo run:ios
+npx expo run:ios
 
 # Build and run your native Android project
-expo run:android
+npx expo run:android
 ```
 
 ---
@@ -180,5 +181,5 @@ Give a ⭐️ if this project helped you!
 
 ## 📝 License
 
-Copyright © 2022 [OneSignal](https://github.com/OneSignal).<br />
+Copyright © 2023 [OneSignal](https://github.com/OneSignal).<br />
 This project is [MIT](https://github.com/OneSignal/onesignal-expo-plugin/blob/main/LICENSE) licensed.

package/build/onesignal/withOneSignalIos.js

@@ -30,10 +30,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 xcode_1 = __importDefault(require("xcode"));
+const path = __importStar(require("path"));
 const iosConstants_1 = require("../support/iosConstants");
 const updatePodfile_1 = require("../support/updatePodfile");
 const NseUpdaterManager_1 = __importDefault(require("../support/NseUpdaterManager"));
@@ -95,79 +95,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 up to 5 parents
-        // above the project directory.
-        let dir = "node_modules";
-        for (let x = 0; x < 5 && !FileManager_1.FileManager.dirExists(dir); x++) {
-            dir = "../" + dir;
-        }
-        xcodeProjectAddNse(props.modRequest.projectName || "", options, dir + "/onesignal-expo-plugin/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"];
@@ -185,11 +164,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);
@@ -201,17 +180,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/iosConstants.js

@@ -1,6 +1,6 @@
 "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 = `
@@ -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/onesignal/withOneSignalIos.ts

@@ -8,21 +8,24 @@ import {
   withEntitlementsPlist,
   withInfoPlist,
   withXcodeProject,
+  withDangerousMod
 } from "@expo/config-plugins";
 import * as fs from 'fs';
-import xcode from 'xcode';
+import * as path from 'path';
 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';
@@ -93,104 +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 up to 5 parents
-    // above the project directory.
-    let dir = "node_modules"
-    for(let x=0; x < 5 && !FileManager.dirExists(dir); x++) {
-      dir = "../" + dir
-    }
-
-    xcodeProjectAddNse(
-      props.modRequest.projectName || "",
-      options,
-      dir + "/onesignal-expo-plugin/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"];
@@ -210,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(
@@ -242,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";
@@ -251,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.0",
+  "version": "1.3.2",
   "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": {
@@ -41,7 +41,6 @@
     "typescript": "^4.5.5"
   },
   "dependencies": {
-    "xcode": "^3.0.1",
     "@expo/image-utils": "^0.3.22"
   }
 }

package/support/iosConstants.ts

@@ -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/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;
-}