onesignal-expo-plugin 1.0.0-beta10 → 1.0.0-beta11

package/.eslintignore

@@ -0,0 +1,6 @@
+# don't ever lint node_modules
+node_modules
+# don't lint build output (make sure it's set to your correct build folder name)
+build
+# don't lint the examples projects
+examples

package/.eslintrc.js

@@ -0,0 +1,18 @@
+module.exports = {
+  root: true,
+  parser: '@typescript-eslint/parser',
+  plugins: [
+    '@typescript-eslint',
+  ],
+  parserOptions: {
+    project: "tsconfig.json",
+},
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+  ],
+  rules: {
+    "@typescript-eslint/no-floating-promises": "error",
+    "no-extra-boolean-cast": "off"
+  }
+};

package/README.md

@@ -1,6 +1,6 @@
 <h1 align="center">Welcome to onesignal-expo-plugin 👋</h1>
 <p>
-  <img alt="Version" src="https://img.shields.io/badge/version-1.0.0--beta10-blue.svg?cacheSeconds=2592000" />
+  <img alt="Version" src="https://img.shields.io/badge/version-1.0.0--beta11-blue.svg?cacheSeconds=2592000" />
   <a href="https://github.com/OneSignal/onesignal-expo-plugin#readme" target="_blank">
     <img alt="Documentation" src="https://img.shields.io/badge/documentation-yes-brightgreen.svg" />
   </a>

package/build/onesignal/withOneSignalIos.js

@@ -34,6 +34,7 @@ const iosConstants_1 = require("../support/iosConstants");
 const updatePodfile_1 = require("../support/updatePodfile");
 const NseUpdaterManager_1 = __importDefault(require("../support/NseUpdaterManager"));
 const OneSignalLog_1 = require("../support/OneSignalLog");
+const FileManager_1 = require("../support/FileManager");
 /**
  * Add 'app-environment' record with current environment to '<project-name>.entitlements' file
  * @see https://documentation.onesignal.com/docs/react-native-sdk-setup#step-4-install-for-ios-using-cocoapods-for-ios-apps
@@ -79,8 +80,8 @@ const withAppGroupPermissions = (config) => {
         if (!Array.isArray(newConfig.modResults[APP_GROUP_KEY])) {
             newConfig.modResults[APP_GROUP_KEY] = [];
         }
-        let modResultsArray = newConfig.modResults[APP_GROUP_KEY];
-        let entitlement = `group.${((_a = newConfig === null || newConfig === void 0 ? void 0 : newConfig.ios) === null || _a === void 0 ? void 0 : _a.bundleIdentifier) || ""}.onesignal`;
+        const modResultsArray = newConfig.modResults[APP_GROUP_KEY];
+        const entitlement = `group.${((_a = newConfig === null || newConfig === void 0 ? void 0 : newConfig.ios) === null || _a === void 0 ? void 0 : _a.bundleIdentifier) || ""}.onesignal`;
         if (modResultsArray.indexOf(entitlement) !== -1) {
             return newConfig;
         }
@@ -113,41 +114,38 @@ const withOneSignalIos = (config, props) => {
 exports.withOneSignalIos = withOneSignalIos;
 function xcodeProjectAddNse(appName, options, sourceDir) {
     const { iosPath, devTeam, bundleIdentifier, bundleVersion, bundleShortVersion, iPhoneDeploymentTarget } = options;
-    (0, updatePodfile_1.updatePodfile)(iosPath);
-    NseUpdaterManager_1.default.updateNSEEntitlements(`group.${bundleIdentifier}.onesignal`);
-    NseUpdaterManager_1.default.updateNSEBundleVersion(bundleVersion !== null && bundleVersion !== void 0 ? bundleVersion : iosConstants_1.DEFAULT_BUNDLE_VERSION);
-    NseUpdaterManager_1.default.updateNSEBundleShortVersion(bundleShortVersion !== null && bundleShortVersion !== void 0 ? bundleShortVersion : iosConstants_1.DEFAULT_BUNDLE_SHORT_VERSION);
+    // 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 targetName = "OneSignalNotificationServiceExtension";
     const extFiles = [
         "NotificationService.h",
         "NotificationService.m",
-        `${targetName}.entitlements`,
-        `${targetName}-Info.plist`
+        `${iosConstants_1.NSE_TARGET_NAME}.entitlements`,
+        `${iosConstants_1.NSE_TARGET_NAME}-Info.plist`
     ];
     const xcodeProject = xcode_1.default.project(projPath);
-    xcodeProject.parse(function (err) {
+    xcodeProject.parse(async function (err) {
         if (err) {
             OneSignalLog_1.OneSignalLog.log(`Error parsing iOS project: ${JSON.stringify(err)}`);
             return;
         }
-        // Copy in the extension files
-        fs.mkdirSync(`${iosPath}/${targetName}`, { recursive: true });
-        extFiles.forEach(function (extFile) {
-            let targetFile = `${iosPath}/${targetName}/${extFile}`;
-            try {
-                fs.createReadStream(`${sourceDir}${extFile}`).pipe(fs.createWriteStream(targetFile));
-            }
-            catch (err) {
-                OneSignalLog_1.OneSignalLog.log(err);
-            }
-        });
-        const projObjects = xcodeProject.hash.project.objects;
+        /* 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);
+        }
+        /* 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);
         // Create new PBXGroup for the extension
-        let extGroup = xcodeProject.addPbxGroup(extFiles, targetName, targetName);
+        const extGroup = xcodeProject.addPbxGroup(extFiles, 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.
-        let groups = xcodeProject.hash.project.objects["PBXGroup"];
+        const groups = xcodeProject.hash.project.objects["PBXGroup"];
         Object.keys(groups).forEach(function (key) {
             if (groups[key].name === undefined) {
                 xcodeProject.addToPbxGroup(extGroup.uuid, key);
@@ -157,30 +155,31 @@ function xcodeProjectAddNse(appName, options, sourceDir) {
         // Xcode projects don't contain these if there is only one target
         // An upstream fix should be made to the code referenced in this link:
         //   - https://github.com/apache/cordova-node-xcode/blob/8b98cabc5978359db88dc9ff2d4c015cba40f150/lib/pbxProject.js#L860
+        const projObjects = xcodeProject.hash.project.objects;
         projObjects['PBXTargetDependency'] = projObjects['PBXTargetDependency'] || {};
         projObjects['PBXContainerItemProxy'] = projObjects['PBXTargetDependency'] || {};
-        if (!!xcodeProject.pbxTargetByName(targetName)) {
-            OneSignalLog_1.OneSignalLog.log(`${targetName} already exists in project. Skipping...`);
+        if (!!xcodeProject.pbxTargetByName(iosConstants_1.NSE_TARGET_NAME)) {
+            OneSignalLog_1.OneSignalLog.log(`${iosConstants_1.NSE_TARGET_NAME} already exists in project. Skipping...`);
             return;
         }
         // Add the NSE target
         // This adds PBXTargetDependency and PBXContainerItemProxy for you
-        const nseTarget = xcodeProject.addTarget(targetName, "app_extension", targetName, `${bundleIdentifier}.${targetName}`);
+        const nseTarget = xcodeProject.addTarget(iosConstants_1.NSE_TARGET_NAME, "app_extension", iosConstants_1.NSE_TARGET_NAME, `${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);
         xcodeProject.addBuildPhase([], "PBXFrameworksBuildPhase", "Frameworks", nseTarget.uuid);
         // Edit the Deployment info of the new Target, only IphoneOS and Targeted Device Family
         // However, can be more
-        let configurations = xcodeProject.pbxXCBuildConfigurationSection();
-        for (let key in configurations) {
+        const configurations = xcodeProject.pbxXCBuildConfigurationSection();
+        for (const key in configurations) {
             if (typeof configurations[key].buildSettings !== "undefined" &&
-                configurations[key].buildSettings.PRODUCT_NAME == `"${targetName}"`) {
-                let buildSettingsObj = configurations[key].buildSettings;
+                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.TARGETED_DEVICE_FAMILY = iosConstants_1.TARGETED_DEVICE_FAMILY;
-                buildSettingsObj.CODE_SIGN_ENTITLEMENTS = `${targetName}/${targetName}.entitlements`;
+                buildSettingsObj.CODE_SIGN_ENTITLEMENTS = `${iosConstants_1.NSE_TARGET_NAME}/${iosConstants_1.NSE_TARGET_NAME}.entitlements`;
                 buildSettingsObj.CODE_SIGN_STYLE = "Automatic";
             }
         }

package/build/support/{ReaderManager.js → FileManager.js}

@@ -19,23 +19,40 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReaderManager = void 0;
+exports.FileManager = void 0;
 const fs = __importStar(require("fs"));
 const OneSignalLog_1 = require("./OneSignalLog");
-class ReaderManager {
-    static async readFile(path, replace) {
+/**
+ * FileManager contains static *awaitable* file-system functions
+ */
+class FileManager {
+    static async readFile(path) {
         return new Promise((resolve, reject) => {
             fs.readFile(path, 'utf8', (err, data) => {
-                if (err) {
-                    reject(err);
-                }
-                if (!data) {
+                if (err || !data) {
                     OneSignalLog_1.OneSignalLog.error("Couldn't read file:" + path);
+                    reject(err);
                     return;
                 }
                 resolve(data);
             });
         });
     }
+    static async writeFile(path, contents) {
+        return new Promise((resolve, reject) => {
+            fs.writeFile(path, contents, 'utf8', (err) => {
+                if (err) {
+                    OneSignalLog_1.OneSignalLog.error("Couldn't write file:" + path);
+                    reject(err);
+                    return;
+                }
+                resolve();
+            });
+        });
+    }
+    static async copyFile(path1, path2) {
+        const fileContents = await FileManager.readFile(path1);
+        await FileManager.writeFile(path2, fileContents);
+    }
 }
-exports.ReaderManager = ReaderManager;
+exports.FileManager = FileManager;

package/build/support/NseUpdaterManager.js

@@ -1,56 +1,32 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    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];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __importStar(require("fs"));
+const FileManager_1 = require("./FileManager");
 const iosConstants_1 = require("./iosConstants");
-const OneSignalLog_1 = require("./OneSignalLog");
-const ReaderManager_1 = require("./ReaderManager");
-const entitlementsFilePath = `${__dirname}/serviceExtensionFiles/OneSignalNotificationServiceExtension.entitlements`;
-const plistFilePath = `${__dirname}/serviceExtensionFiles/OneSignalNotificationServiceExtension-Info.plist`;
-const logIfError = (err) => {
-    if (err) {
-        OneSignalLog_1.OneSignalLog.error("Error updating OneSignal NSE Entitlement File.");
-    }
-};
+// project `ios/OneSignalNotificationServiceExtension` directory
+const entitlementsFileName = `OneSignalNotificationServiceExtension.entitlements`;
+const plistFileName = `OneSignalNotificationServiceExtension-Info.plist`;
 class NseUpdaterManager {
-    static async updateNSEEntitlements(groupIdentifier) {
-        let entitlementsFile = await ReaderManager_1.ReaderManager.readFile(entitlementsFilePath);
+    constructor(iosPath) {
+        this.nsePath = '';
+        this.nsePath = `${iosPath}/${iosConstants_1.NSE_TARGET_NAME}`;
+    }
+    async updateNSEEntitlements(groupIdentifier) {
+        const entitlementsFilePath = `${this.nsePath}/${entitlementsFileName}`;
+        let entitlementsFile = await FileManager_1.FileManager.readFile(entitlementsFilePath);
         entitlementsFile = entitlementsFile.replace(iosConstants_1.GROUP_IDENTIFIER_TEMPLATE_REGEX, groupIdentifier);
-        fs.writeFile(entitlementsFilePath, entitlementsFile, 'utf-8', (err) => {
-            logIfError(err);
-        });
+        await FileManager_1.FileManager.writeFile(entitlementsFilePath, entitlementsFile);
     }
-    static async updateNSEBundleVersion(version) {
-        let plistFile = await ReaderManager_1.ReaderManager.readFile(plistFilePath);
+    async updateNSEBundleVersion(version) {
+        const plistFilePath = `${this.nsePath}/${plistFileName}`;
+        let plistFile = await FileManager_1.FileManager.readFile(plistFilePath);
         plistFile = plistFile.replace(iosConstants_1.BUNDLE_VERSION_TEMPLATE_REGEX, version);
-        fs.writeFile(plistFilePath, plistFile, 'utf-8', err => {
-            logIfError(err);
-        });
+        await FileManager_1.FileManager.writeFile(plistFilePath, plistFile);
     }
-    static async updateNSEBundleShortVersion(version) {
-        let plistFile = await ReaderManager_1.ReaderManager.readFile(plistFilePath);
+    async updateNSEBundleShortVersion(version) {
+        const plistFilePath = `${this.nsePath}/${plistFileName}`;
+        let plistFile = await FileManager_1.FileManager.readFile(plistFilePath);
         plistFile = plistFile.replace(iosConstants_1.BUNDLE_SHORT_VERSION_TEMPLATE_REGEX, version);
-        fs.writeFile(plistFilePath, plistFile, 'utf-8', err => {
-            logIfError(err);
-        });
+        await FileManager_1.FileManager.writeFile(plistFilePath, plistFile);
     }
 }
 exports.default = NseUpdaterManager;

package/build/support/iosConstants.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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_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.TARGETED_DEVICE_FAMILY = `"1,2"`;
 exports.NSE_PODFILE_SNIPPET = `
 target 'OneSignalNotificationServiceExtension' do
   pod 'OneSignalXCFramework', '>= 3.0', '< 4.0'
@@ -13,3 +13,4 @@ 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";

package/build/support/updatePodfile.js

@@ -7,9 +7,9 @@ exports.updatePodfile = void 0;
 const fs_1 = __importDefault(require("fs"));
 const iosConstants_1 = require("./iosConstants");
 const OneSignalLog_1 = require("./OneSignalLog");
-const ReaderManager_1 = require("./ReaderManager");
+const FileManager_1 = require("./FileManager");
 async function updatePodfile(iosPath) {
-    const podfile = await ReaderManager_1.ReaderManager.readFile(`${iosPath}/Podfile`);
+    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...");

package/onesignal/withOneSignalIos.ts

@@ -16,11 +16,13 @@ import {
   DEFAULT_BUNDLE_SHORT_VERSION,
   DEFAULT_BUNDLE_VERSION,
   IPHONEOS_DEPLOYMENT_TARGET,
+  NSE_TARGET_NAME,
   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";
 
 /* I N T E R F A C E S */
 interface PluginOptions {
@@ -87,8 +89,8 @@ const withAppGroupPermissions: ConfigPlugin<OneSignalPluginProps> = (
     if (!Array.isArray(newConfig.modResults[APP_GROUP_KEY])) {
       newConfig.modResults[APP_GROUP_KEY] = [];
     }
-    let modResultsArray = (newConfig.modResults[APP_GROUP_KEY] as Array<any>);
-    let entitlement = `group.${newConfig?.ios?.bundleIdentifier || ""}.onesignal`;
+    const modResultsArray = (newConfig.modResults[APP_GROUP_KEY] as Array<any>);
+    const entitlement = `group.${newConfig?.ios?.bundleIdentifier || ""}.onesignal`;
     if (modResultsArray.indexOf(entitlement) !== -1) {
       return newConfig;
     }
@@ -130,7 +132,6 @@ export const withOneSignalIos: ConfigPlugin<OneSignalPluginProps> = (
   return config;
 };
 
-
 export function xcodeProjectAddNse(
   appName: string,
   options: PluginOptions,
@@ -138,51 +139,47 @@ export function xcodeProjectAddNse(
 ): void {
   const { iosPath, devTeam, bundleIdentifier, bundleVersion, bundleShortVersion, iPhoneDeploymentTarget } = options;
 
-  updatePodfile(iosPath);
-  NseUpdaterManager.updateNSEEntitlements(`group.${bundleIdentifier}.onesignal`)
-  NseUpdaterManager.updateNSEBundleVersion(bundleVersion ?? DEFAULT_BUNDLE_VERSION);
-  NseUpdaterManager.updateNSEBundleShortVersion(bundleShortVersion ?? DEFAULT_BUNDLE_SHORT_VERSION);
+  // not awaiting in order to not block main thread
+  updatePodfile(iosPath).catch(err => { OneSignalLog.error(err) });
 
   const projPath = `${iosPath}/${appName}.xcodeproj/project.pbxproj`;
-  const targetName = "OneSignalNotificationServiceExtension";
 
   const extFiles = [
     "NotificationService.h",
     "NotificationService.m",
-    `${targetName}.entitlements`,
-    `${targetName}-Info.plist`
+    `${NSE_TARGET_NAME}.entitlements`,
+    `${NSE_TARGET_NAME}-Info.plist`
   ];
 
   const xcodeProject = xcode.project(projPath);
 
-  xcodeProject.parse(function(err: Error) {
+  xcodeProject.parse(async function(err: Error) {
     if (err) {
       OneSignalLog.log(`Error parsing iOS project: ${JSON.stringify(err)}`);
       return;
     }
 
-    // Copy in the extension files
-    fs.mkdirSync(`${iosPath}/${targetName}`, { recursive: true });
-    extFiles.forEach(function (extFile) {
-      let targetFile = `${iosPath}/${targetName}/${extFile}`;
-
-      try {
-        fs.createReadStream(`${sourceDir}${extFile}`).pipe(
-          fs.createWriteStream(targetFile)
-        );
-      } catch (err) {
-        OneSignalLog.log(err as string);
-      }
-    });
+    /* COPY OVER EXTENSION FILES */
+    fs.mkdirSync(`${iosPath}/${NSE_TARGET_NAME}`, { recursive: true });
 
-    const projObjects = xcodeProject.hash.project.objects;
+    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.${bundleIdentifier}.onesignal`)
+    await nseUpdater.updateNSEBundleVersion(bundleVersion ?? DEFAULT_BUNDLE_VERSION);
+    await nseUpdater.updateNSEBundleShortVersion(bundleShortVersion ?? DEFAULT_BUNDLE_SHORT_VERSION);
 
     // Create new PBXGroup for the extension
-    let extGroup = xcodeProject.addPbxGroup(extFiles, targetName, targetName);
+    const extGroup = xcodeProject.addPbxGroup(extFiles, 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.
-    let groups = xcodeProject.hash.project.objects["PBXGroup"];
+    const groups = xcodeProject.hash.project.objects["PBXGroup"];
     Object.keys(groups).forEach(function (key) {
       if (groups[key].name === undefined) {
         xcodeProject.addToPbxGroup(extGroup.uuid, key);
@@ -193,17 +190,18 @@ export function xcodeProjectAddNse(
     // Xcode projects don't contain these if there is only one target
     // An upstream fix should be made to the code referenced in this link:
     //   - https://github.com/apache/cordova-node-xcode/blob/8b98cabc5978359db88dc9ff2d4c015cba40f150/lib/pbxProject.js#L860
+    const projObjects = xcodeProject.hash.project.objects;
     projObjects['PBXTargetDependency'] = projObjects['PBXTargetDependency'] || {};
     projObjects['PBXContainerItemProxy'] = projObjects['PBXTargetDependency'] || {};
 
-    if (!!xcodeProject.pbxTargetByName(targetName)) {
-      OneSignalLog.log(`${targetName} already exists in project. Skipping...`);
+    if (!!xcodeProject.pbxTargetByName(NSE_TARGET_NAME)) {
+      OneSignalLog.log(`${NSE_TARGET_NAME} already exists in project. Skipping...`);
       return;
     }
 
     // Add the NSE target
     // This adds PBXTargetDependency and PBXContainerItemProxy for you
-    const nseTarget = xcodeProject.addTarget(targetName, "app_extension", targetName, `${bundleIdentifier}.${targetName}`);
+    const nseTarget = xcodeProject.addTarget(NSE_TARGET_NAME, "app_extension", NSE_TARGET_NAME, `${bundleIdentifier}.${NSE_TARGET_NAME}`);
 
     // Add build phases to the new target
     xcodeProject.addBuildPhase(
@@ -223,17 +221,17 @@ export function xcodeProjectAddNse(
 
     // Edit the Deployment info of the new Target, only IphoneOS and Targeted Device Family
     // However, can be more
-    let configurations = xcodeProject.pbxXCBuildConfigurationSection();
-    for (let key in configurations) {
+    const configurations = xcodeProject.pbxXCBuildConfigurationSection();
+    for (const key in configurations) {
       if (
         typeof configurations[key].buildSettings !== "undefined" &&
-        configurations[key].buildSettings.PRODUCT_NAME == `"${targetName}"`
+        configurations[key].buildSettings.PRODUCT_NAME == `"${NSE_TARGET_NAME}"`
       ) {
-        let buildSettingsObj = configurations[key].buildSettings;
+        const buildSettingsObj = configurations[key].buildSettings;
         buildSettingsObj.DEVELOPMENT_TEAM = devTeam;
         buildSettingsObj.IPHONEOS_DEPLOYMENT_TARGET = iPhoneDeploymentTarget ?? IPHONEOS_DEPLOYMENT_TARGET;
         buildSettingsObj.TARGETED_DEVICE_FAMILY = TARGETED_DEVICE_FAMILY;
-        buildSettingsObj.CODE_SIGN_ENTITLEMENTS = `${targetName}/${targetName}.entitlements`;
+        buildSettingsObj.CODE_SIGN_ENTITLEMENTS = `${NSE_TARGET_NAME}/${NSE_TARGET_NAME}.entitlements`;
         buildSettingsObj.CODE_SIGN_STYLE = "Automatic";
       }
     }

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "onesignal-expo-plugin",
-  "version": "1.0.0-beta10",
+  "version": "1.0.0-beta11",
   "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": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "rm -rf build && tsc && cp -a support/serviceExtensionFiles build/support/",
+    "build": "yarn run lint && rm -rf build && tsc && cp -a support/serviceExtensionFiles build/support/",
+    "lint": "eslint . --ext .ts",
     "prepare": "yarn run build"
   },
   "repository": {
@@ -31,11 +32,14 @@
   },
   "homepage": "https://github.com/OneSignal/onesignal-expo-plugin#readme",
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^5.10.1",
+    "@typescript-eslint/parser": "^5.10.1",
+    "eslint": "^8.8.0",
     "expo-module-scripts": "^2.0.0",
-    "readme-md-generator": "^1.0.0"
+    "readme-md-generator": "^1.0.0",
+    "typescript": "^4.5.5"
   },
   "dependencies": {
-    "react-native-onesignal": "^4.3.1",
     "xcode": "^3.0.1"
   }
 }

package/support/FileManager.ts

@@ -0,0 +1,38 @@
+import * as fs from 'fs';
+import { OneSignalLog } from './OneSignalLog';
+
+/**
+ * FileManager contains static *awaitable* file-system functions
+ */
+export class FileManager {
+  static async readFile(path: string): Promise<string> {
+    return new Promise<string>((resolve, reject) => {
+      fs.readFile(path, 'utf8', (err, data) => {
+        if (err || !data) {
+          OneSignalLog.error("Couldn't read file:" + path);
+          reject(err);
+          return;
+        }
+        resolve(data);
+      });
+    });
+  }
+
+  static async writeFile(path: string, contents: string): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+      fs.writeFile(path, contents, 'utf8', (err) => {
+        if (err) {
+          OneSignalLog.error("Couldn't write file:" + path);
+          reject(err);
+          return;
+        }
+        resolve();
+      });
+    });
+  }
+
+  static async copyFile(path1: string, path2: string): Promise<void> {
+    const fileContents = await FileManager.readFile(path1);
+    await FileManager.writeFile(path2, fileContents);
+  }
+}

package/support/NseUpdaterManager.ts

@@ -1,42 +1,39 @@
-import * as fs from 'fs';
-import { BUNDLE_SHORT_VERSION_TEMPLATE_REGEX, BUNDLE_VERSION_TEMPLATE_REGEX, GROUP_IDENTIFIER_TEMPLATE_REGEX } from './iosConstants';
-import { OneSignalLog } from './OneSignalLog';
-import { ReaderManager } from './ReaderManager';
+import { FileManager } from './FileManager';
+import {
+  BUNDLE_SHORT_VERSION_TEMPLATE_REGEX,
+  BUNDLE_VERSION_TEMPLATE_REGEX,
+  GROUP_IDENTIFIER_TEMPLATE_REGEX,
+  NSE_TARGET_NAME
+} from './iosConstants';
+
+// project `ios/OneSignalNotificationServiceExtension` directory
+const entitlementsFileName =`OneSignalNotificationServiceExtension.entitlements`;
+const plistFileName = `OneSignalNotificationServiceExtension-Info.plist`;
 
-const entitlementsFilePath =`${__dirname}/serviceExtensionFiles/OneSignalNotificationServiceExtension.entitlements`;
-const plistFilePath = `${__dirname}/serviceExtensionFiles/OneSignalNotificationServiceExtension-Info.plist`;
-
-const logIfError = (err: NodeJS.ErrnoException | null) => {
-  if (err) {
-    OneSignalLog.error("Error updating OneSignal NSE Entitlement File.");
+export default class NseUpdaterManager {
+  private nsePath = '';
+  constructor(iosPath: string) {
+    this.nsePath = `${iosPath}/${NSE_TARGET_NAME}`;
   }
-}
 
-export default class NseUpdaterManager {
-  static async updateNSEEntitlements(groupIdentifier: string) {
-    let entitlementsFile = await ReaderManager.readFile(entitlementsFilePath);
+  async updateNSEEntitlements(groupIdentifier: string): Promise<void> {
+    const entitlementsFilePath = `${this.nsePath}/${entitlementsFileName}`;
+    let entitlementsFile = await FileManager.readFile(entitlementsFilePath);
     entitlementsFile = entitlementsFile.replace(GROUP_IDENTIFIER_TEMPLATE_REGEX, groupIdentifier);
-
-    fs.writeFile(entitlementsFilePath, entitlementsFile, 'utf-8', (err) => {
-      logIfError(err);
-    })
+    await FileManager.writeFile(entitlementsFilePath, entitlementsFile);
   }
 
-  static async updateNSEBundleVersion(version: string) {
-    let plistFile = await ReaderManager.readFile(plistFilePath);
+  async updateNSEBundleVersion(version: string): Promise<void> {
+    const plistFilePath = `${this.nsePath}/${plistFileName}`;
+    let plistFile = await FileManager.readFile(plistFilePath);
     plistFile = plistFile.replace(BUNDLE_VERSION_TEMPLATE_REGEX, version);
-
-    fs.writeFile(plistFilePath, plistFile, 'utf-8', err => {
-      logIfError(err);
-    });
+    await FileManager.writeFile(plistFilePath, plistFile);
   }
 
-  static async updateNSEBundleShortVersion(version: string) {
-    let plistFile = await ReaderManager.readFile(plistFilePath);
+  async updateNSEBundleShortVersion(version: string): Promise<void> {
+    const plistFilePath = `${this.nsePath}/${plistFileName}`;
+    let plistFile = await FileManager.readFile(plistFilePath);
     plistFile = plistFile.replace(BUNDLE_SHORT_VERSION_TEMPLATE_REGEX, version);
-
-    fs.writeFile(plistFilePath, plistFile, 'utf-8', err => {
-      logIfError(err);
-    });
+    await FileManager.writeFile(plistFilePath, plistFile);
   }
 }

package/support/iosConstants.ts

@@ -1,5 +1,5 @@
 export const IPHONEOS_DEPLOYMENT_TARGET = "11.0";
-export const TARGETED_DEVICE_FAMILY = `\"1,2\"`;
+export const TARGETED_DEVICE_FAMILY = `"1,2"`;
 
 export const NSE_PODFILE_SNIPPET = `
 target 'OneSignalNotificationServiceExtension' do
@@ -14,3 +14,5 @@ export const BUNDLE_VERSION_TEMPLATE_REGEX = /{{BUNDLE_VERSION}}/gm;
 
 export const DEFAULT_BUNDLE_VERSION = '1';
 export const DEFAULT_BUNDLE_SHORT_VERSION = '1.0';
+
+export const NSE_TARGET_NAME = "OneSignalNotificationServiceExtension";

package/support/updatePodfile.ts

@@ -1,10 +1,10 @@
 import fs from 'fs';
 import { NSE_PODFILE_REGEX, NSE_PODFILE_SNIPPET } from './iosConstants';
 import { OneSignalLog } from './OneSignalLog';
-import { ReaderManager } from './ReaderManager';
+import { FileManager } from './FileManager';
 
 export async function updatePodfile(iosPath: string) {
-  const podfile = await ReaderManager.readFile(`${iosPath}/Podfile`);
+  const podfile = await FileManager.readFile(`${iosPath}/Podfile`);
   const matches = podfile.match(NSE_PODFILE_REGEX);
 
   if (matches) {

package/support/ReaderManager.ts

@@ -1,19 +0,0 @@
-import * as fs from 'fs';
-import { OneSignalLog } from './OneSignalLog';
-
-export class ReaderManager {
-  static async readFile(path: string, replace?: string): Promise<string> {
-    return new Promise<string>((resolve, reject) => {
-      fs.readFile(path, 'utf8', (err, data) => {
-        if (err) {
-          reject(err);
-        }
-        if (!data) {
-          OneSignalLog.error("Couldn't read file:" + path);
-          return;
-        }
-        resolve(data);
-      });
-    });
-  }
-}