onesignal-expo-plugin 1.0.2 → 1.1.0

package/README.md

@@ -1,6 +1,8 @@
 <h1 align="center">Welcome to onesignal-expo-plugin 👋</h1>
 <p>
-  <img alt="Version" src="https://img.shields.io/badge/version-1.0.1-blue.svg?cacheSeconds=2592000" />
+  <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">
+  </a>
   <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>
@@ -41,7 +43,7 @@ yarn add react-native-onesignal
 
 ## Configuration in app.json / app.config.js
 ### Plugin
-Add the plugin to the [plugin array](https://docs.expo.dev/versions/latest/config/app/):
+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:
 
 **app.json**
 ```json
@@ -174,5 +176,5 @@ Give a ⭐️ if this project helped you!
 
 ## 📝 License
 
-Copyright © 2021 [OneSignal](https://github.com/OneSignal).<br />
+Copyright © 2022 [OneSignal](https://github.com/OneSignal).<br />
 This project is [MIT](https://github.com/OneSignal/onesignal-expo-plugin/blob/main/LICENSE) licensed.

package/build/onesignal/withOneSignalAndroid.js

@@ -5,25 +5,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withOneSignalAndroid = void 0;
-const config_plugins_1 = require("@expo/config-plugins");
-const androidConstants_1 = require("../support/androidConstants");
 const OneSignalLog_1 = require("../support/OneSignalLog");
-const withGradleBuildConfig = (config) => {
-    return (0, config_plugins_1.withAppBuildGradle)(config, (newConfig) => {
-        let { contents } = newConfig.modResults;
-        // make sure we haven't previously added dependencies
-        if (!contents.includes(androidConstants_1.ONESIGNAL_GRADLE)) {
-            contents = `${androidConstants_1.ONESIGNAL_GRADLE}\n${contents}`;
-        }
-        else {
-            OneSignalLog_1.OneSignalLog.log("OneSignal dependencies already added to build.gradle. Skipping...");
-        }
-        newConfig.modResults.contents = contents;
-        return newConfig;
-    });
-};
 const withOneSignalAndroid = (config, props) => {
-    withGradleBuildConfig(config, props);
+    OneSignalLog_1.OneSignalLog.log("No specific actions required for OneSignal on Android...");
     return config;
 };
 exports.withOneSignalAndroid = withOneSignalAndroid;

package/build/onesignal/withOneSignalIos.js

@@ -103,7 +103,13 @@ const withOneSignalNSE = (config, onesignalProps) => {
             mode: onesignalProps === null || onesignalProps === void 0 ? void 0 : onesignalProps.mode,
             iPhoneDeploymentTarget: onesignalProps === null || onesignalProps === void 0 ? void 0 : onesignalProps.iPhoneDeploymentTarget
         };
-        xcodeProjectAddNse(props.modRequest.projectName || "", options, "node_modules/onesignal-expo-plugin/build/support/serviceExtensionFiles/");
+        // 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;
     });
 };

package/build/support/FileManager.js

@@ -54,5 +54,8 @@ class FileManager {
         const fileContents = await FileManager.readFile(path1);
         await FileManager.writeFile(path2, fileContents);
     }
+    static dirExists(path) {
+        return fs.existsSync(path);
+    }
 }
 exports.FileManager = FileManager;

package/onesignal/withOneSignalAndroid.ts

@@ -3,32 +3,15 @@
  * @see https://documentation.onesignal.com/docs/react-native-sdk-setup#step-4-install-for-ios-using-cocoapods-for-ios-apps
  */
 
-import { ConfigPlugin, withAppBuildGradle } from '@expo/config-plugins';
-import { ONESIGNAL_GRADLE } from '../support/androidConstants';
+import { ConfigPlugin } from '@expo/config-plugins';
 import { OneSignalLog } from '../support/OneSignalLog';
 import { OneSignalPluginProps } from '../types/types';
 
-const withGradleBuildConfig: ConfigPlugin<OneSignalPluginProps> = (config) => {
-  return withAppBuildGradle(config, (newConfig) => {
-    let { contents } = newConfig.modResults;
-
-    // make sure we haven't previously added dependencies
-    if (!contents.includes(ONESIGNAL_GRADLE)) {
-      contents = `${ONESIGNAL_GRADLE}\n${contents}`;
-    } else {
-      OneSignalLog.log("OneSignal dependencies already added to build.gradle. Skipping...");
-    }
-
-    newConfig.modResults.contents = contents;
-    return newConfig;
-  });
-};
-
 export const withOneSignalAndroid: ConfigPlugin<OneSignalPluginProps> = (
   config,
   props,
 ) => {
-  withGradleBuildConfig(config, props);
+  OneSignalLog.log("No specific actions required for OneSignal on Android...");
 
   return config;
 };

package/onesignal/withOneSignalIos.ts

@@ -105,10 +105,17 @@ const withOneSignalNSE: ConfigPlugin<OneSignalPluginProps> = (config, onesignalP
       iPhoneDeploymentTarget: onesignalProps?.iPhoneDeploymentTarget
     };
 
+    // 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,
-      "node_modules/onesignal-expo-plugin/build/support/serviceExtensionFiles/"
+      dir + "/onesignal-expo-plugin/build/support/serviceExtensionFiles/"
     );
 
     return props;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onesignal-expo-plugin",
-  "version": "1.0.2",
+  "version": "1.1.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": {

package/support/FileManager.ts

@@ -35,4 +35,8 @@ export class FileManager {
     const fileContents = await FileManager.readFile(path1);
     await FileManager.writeFile(path2, fileContents);
   }
+
+  static dirExists(path: string): boolean {
+    return fs.existsSync(path)
+  }
 }

package/build/support/androidConstants.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ONESIGNAL_GRADLE = void 0;
-exports.ONESIGNAL_GRADLE = `buildscript {
-    repositories {
-        gradlePluginPortal()
-    }
-    dependencies {
-        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.12.10, 0.99.99]'
-    }
-}
-
-apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'`;

package/support/androidConstants.ts

@@ -1,11 +0,0 @@
-export const ONESIGNAL_GRADLE =
-`buildscript {
-    repositories {
-        gradlePluginPortal()
-    }
-    dependencies {
-        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:[0.12.10, 0.99.99]'
-    }
-}
-
-apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'`;