@bravemobile/react-native-code-push 8.2.5 → 8.3.1

package/.azurepipelines/test-rn-code-push.yml

@@ -0,0 +1,94 @@
+trigger:
+- master
+
+pr:
+- master
+
+variables:
+- name: api-level
+  value: '27' 
+
+pool:
+  vmImage: 'macOS-12'
+
+stages:
+- stage: RunTests
+  displayName: 'Run Android & IOS tests'
+  jobs:
+  - job: TestAndroid
+    timeoutInMinutes: 120
+    displayName: 'Test android'
+    steps:
+
+    - script: |
+        adb devices
+      displayName: 'Start adb server'
+
+    - script: |
+        $ANDROID_HOME/tools/bin/sdkmanager "system-images;android-$(api-level);google_apis;x86"
+      displayName: 'Download system image'
+
+    - script: |
+        $ANDROID_HOME/tools/bin/avdmanager create avd --force --name TestEmulator --abi google_apis/x86 --package 'system-images;android-$(api-level);google_apis;x86' --device "Nexus 6P"
+      displayName: 'Creating Android emulator'
+
+    - script: |
+        $ANDROID_HOME/emulator/emulator -avd TestEmulator -noaudio -no-window -no-snapshot-save -no-boot-anim -memory 6144 &
+      displayName: 'Start Android emulator'
+
+    - script: |
+        $ANDROID_HOME/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed | tr -d '\r') ]]; do sleep 1; done'
+      displayName: 'Wait for emulator to boot'
+   
+    - script: |
+         adb shell settings put global window_animation_scale 0.0    
+      displayName: 'Disable animations and transitions'  
+
+    - script: |
+         adb shell settings put global transition_animation_scale 0.0
+      displayName: 'Disable animations and transitions'
+
+    - script: |
+         adb shell settings put global animator_duration_scale 0.0   
+      displayName: 'Disable animations and transitions'
+
+    
+    - task: JavaToolInstaller@0
+      inputs:
+        versionSpec: '11'
+        jdkArchitectureOption: 'x64'
+        jdkSourceOption: 'PreInstalled'
+      displayName: 'Change Java version'
+
+    - script: |
+        npm install
+      displayName: 'Package Installation'
+
+    - script: |
+        npm run build:tests && npm run test:setup:android
+      displayName: 'Setup Android tests'
+
+    - script: |
+        npm run test:fast:android
+      displayName: 'Run Android test'
+
+  - job: TestIOS
+    timeoutInMinutes: 120
+    displayName: 'Test IOS'
+    steps:
+
+    - script: |
+        npm install
+      displayName: 'Install dependencies'
+
+    - script: |
+        npm run build:tests && npm run test:setup:ios
+      displayName: 'Setup iOS tests'
+
+    - script: |
+        npm run test:fast:ios
+      displayName: 'Run tests'
+
+    
+          
+

package/CodePush.js

@@ -625,42 +625,41 @@ function codePushify(options = {}) {
   sharedCodePushOptions.setUpdateChecker(options.updateChecker);
   sharedCodePushOptions.setFallbackToAppCenter(options.fallbackToAppCenter);
 
-  var decorator = (RootComponent) => {
-    const extended = class CodePushComponent extends React.Component {
+  const decorator = (RootComponent) => {
+    class CodePushComponent extends React.Component {
+      constructor(props) {
+        super(props);
+        this.rootComponentRef = React.createRef();
+      }
+
       componentDidMount() {
         if (options.checkFrequency === CodePush.CheckFrequency.MANUAL) {
           CodePush.notifyAppReady();
         } else {
-          let rootComponentInstance = this.refs.rootComponent;
+          const rootComponentInstance = this.rootComponentRef.current;
 
           let syncStatusCallback;
           if (rootComponentInstance && rootComponentInstance.codePushStatusDidChange) {
-            syncStatusCallback = rootComponentInstance.codePushStatusDidChange;
-            if (rootComponentInstance instanceof React.Component) {
-              syncStatusCallback = syncStatusCallback.bind(rootComponentInstance);
-            }
+            syncStatusCallback = rootComponentInstance.codePushStatusDidChange.bind(rootComponentInstance);
           }
 
           let downloadProgressCallback;
           if (rootComponentInstance && rootComponentInstance.codePushDownloadDidProgress) {
-            downloadProgressCallback = rootComponentInstance.codePushDownloadDidProgress;
-            if (rootComponentInstance instanceof React.Component) {
-              downloadProgressCallback = downloadProgressCallback.bind(rootComponentInstance);
-            }
+            downloadProgressCallback = rootComponentInstance.codePushDownloadDidProgress.bind(rootComponentInstance);
           }
 
           let handleBinaryVersionMismatchCallback;
           if (rootComponentInstance && rootComponentInstance.codePushOnBinaryVersionMismatch) {
-            handleBinaryVersionMismatchCallback = rootComponentInstance.codePushOnBinaryVersionMismatch;
-            if (rootComponentInstance instanceof React.Component) {
-              handleBinaryVersionMismatchCallback = handleBinaryVersionMismatchCallback.bind(rootComponentInstance);
-            }
+            handleBinaryVersionMismatchCallback = rootComponentInstance.codePushOnBinaryVersionMismatch.bind(rootComponentInstance);
           }
 
           CodePush.sync(options, syncStatusCallback, downloadProgressCallback, handleBinaryVersionMismatchCallback);
+
           if (options.checkFrequency === CodePush.CheckFrequency.ON_APP_RESUME) {
             ReactNative.AppState.addEventListener("change", (newState) => {
-              newState === "active" && CodePush.sync(options, syncStatusCallback, downloadProgressCallback);
+              if (newState === "active") {
+                CodePush.sync(options, syncStatusCallback, downloadProgressCallback);
+              }
             });
           }
         }
@@ -669,17 +668,17 @@ function codePushify(options = {}) {
       render() {
         const props = {...this.props};
 
-        // we can set ref property on class components only (not stateless)
-        // check it by render method
-        if (RootComponent.prototype.render) {
-          props.ref = "rootComponent";
+        // We can set ref property on class components only (not stateless)
+        // Check it by render method
+        if (RootComponent.prototype && RootComponent.prototype.render) {
+          props.ref = this.rootComponentRef;
         }
 
         return <RootComponent {...props} />
       }
     }
 
-    return hoistStatics(extended, RootComponent);
+    return hoistStatics(CodePushComponent, RootComponent);
   }
 
   if (typeof options === "function") {

package/android/app/src/debug/AndroidManifest.xml

@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.microsoft.codepush.react">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application>
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    </application>
+
+</manifest>

package/android/app/src/main/AndroidManifest.xml

@@ -3,8 +3,4 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
 
-    <application>
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-    </application>
-
-</manifest>
+</manifest>

package/android/app/src/main/java/com/microsoft/codepush/react/CodePushUpdateUtils.java

@@ -98,7 +98,7 @@ public class CodePushUpdateUtils {
     }
 
     public static void copyNecessaryFilesFromCurrentPackage(String diffManifestFilePath, String currentPackageFolderPath, String newPackageFolderPath) throws IOException {
-        FileUtils.copyDirectoryContents(currentPackageFolderPath, newPackageFolderPath);
+        FileUtils.copyDirectoryContents(currentPackageFolderPath, newPackageFolderPath);        
         JSONObject diffManifest = CodePushUtils.getJsonObjectFromFile(diffManifestFilePath);
         try {
             JSONArray deletedFiles = diffManifest.getJSONArray("deletedFiles");

package/android/app/src/main/java/com/microsoft/codepush/react/CodePushUtils.java

@@ -67,7 +67,9 @@ public class CodePushUtils {
             String key = it.next();
             Object obj = null;
             try {
-                obj = jsonObj.get(key);
+                if (!jsonObj.isNull(key)) {
+                    obj = jsonObj.get(key);
+                }
             } catch (JSONException jsonException) {
                 // Should not happen.
                 throw new CodePushUnknownException("Key " + key + " should exist in " + jsonObj.toString() + ".", jsonException);

package/android/codepush.gradle

@@ -2,8 +2,8 @@
 
 import java.nio.file.Paths;
 
-def config = project.extensions.findByName("react") ?: []
-def bundleAssetName = config.bundleAssetName.get() ?: "index.android.bundle"
+def config = project.extensions.findByName("react") ?: [:]
+def bundleAssetName = config.bundleAssetName ? config.bundleAssetName.get() : "index.android.bundle"
 
 // because elvis operator
 def elvisFile(thing) {
@@ -17,6 +17,41 @@ void runBefore(String dependentTaskName, Task task) {
     }
 }
 
+/**
+ * Finds the path of the installed npm package with the given name using Node's
+ * module resolution algorithm, which searches "node_modules" directories up to
+ * the file system root. This handles various cases, including:
+ *
+ *   - Working in the open-source RN repo:
+ *       Gradle: /path/to/react-native/ReactAndroid
+ *       Node module: /path/to/react-native/node_modules/[package]
+ *
+ *   - Installing RN as a dependency of an app and searching for hoisted
+ *     dependencies:
+ *       Gradle: /path/to/app/node_modules/react-native/ReactAndroid
+ *       Node module: /path/to/app/node_modules/[package]
+ *
+ *   - Working in a larger repo (e.g., Facebook) that contains RN:
+ *       Gradle: /path/to/repo/path/to/react-native/ReactAndroid
+ *       Node module: /path/to/repo/node_modules/[package]
+ *
+ * The search begins at the given base directory (a File object). The returned
+ * path is a string.
+ */
+static def findNodeModulePath(baseDir, packageName) {
+    def basePath = baseDir.toPath().normalize()
+    // Node's module resolution algorithm searches up to the root directory,
+    // after which the base path will be null
+    while (basePath) {
+        def candidatePath = Paths.get(basePath.toString(), "node_modules", packageName)
+        if (candidatePath.toFile().exists()) {
+            return candidatePath.toString()
+        }
+        basePath = basePath.getParent()
+    }
+    return null
+}
+
 android.buildTypes.each { buildType ->
     // to prevent incorrect long value restoration from strings.xml we need to wrap it with double quotes
     // https://github.com/microsoft/cordova-plugin-code-push/issues/264
@@ -24,7 +59,7 @@ android.buildTypes.each { buildType ->
 }
 
 gradle.projectsEvaluated {
-    def debuggableVariants = config.debuggableVariants.get() ?: ['debug']
+    def debuggableVariants = config.debuggableVariants ? config.debuggableVariants.get() : ['debug']
 
     android.applicationVariants.all { variant ->
         // No code push for debuggable variants
@@ -34,11 +69,9 @@ gradle.projectsEvaluated {
 
         def nodeModulesPath;
         if (project.hasProperty('nodeModulesPath')) {
-            nodeModulesPath = project.nodeModulesPath
-        } else if (config.root) {
-            nodeModulesPath = Paths.get(config.root.asFile.get().absolutePath, "/node_modules");
+            nodeModulesPath = "${project.nodeModulesPath}/react-native-code-push"
         } else {
-            nodeModulesPath = "../../node_modules";
+            nodeModulesPath = findNodeModulePath(projectDir, "react-native-code-push")
         }
 
         def targetName = variant.name.capitalize()
@@ -49,8 +82,8 @@ gradle.projectsEvaluated {
         def jsBundleFile;
 
         // Additional node commandline arguments
-        def nodeExecutableAndArgs = config.nodeExecutableAndArgs.get() ?: ["node"]
-        def extraPackagerArgs = config.extraPackagerArgs.get() ?: []
+        def nodeExecutableAndArgs = config.nodeExecutableAndArgs ? config.nodeExecutableAndArgs.get(): ["node"]
+        def extraPackagerArgs = config.extraPackagerArgs ? config.extraPackagerArgs.get() : []
 
         // Make this task run right after the bundle task
         def generateBundledResourcesHash;
@@ -59,6 +92,9 @@ gradle.projectsEvaluated {
         if (reactBundleTask) {
             jsBundleDir = reactBundleTask.property('jsBundleDir').asFile.get()
             resourcesDir = reactBundleTask.property('resourcesDir').asFile.get()
+
+            // mitigates Resource and asset merger: Duplicate resources error
+            project.delete(files("${jsBundleDir}"))
             
             jsBundleDir.mkdirs()
             resourcesDir.mkdirs()
@@ -68,7 +104,7 @@ gradle.projectsEvaluated {
             generateBundledResourcesHash = tasks.create(
                     name: "generateBundledResourcesHash${targetName}",
                     type: Exec) {
-                commandLine (*nodeExecutableAndArgs, "${nodeModulesPath}/react-native-code-push/scripts/generateBundledResourcesHash.js", resourcesDir, jsBundleFile, jsBundleDir)
+                commandLine (*nodeExecutableAndArgs, "${nodeModulesPath}/scripts/generateBundledResourcesHash.js", resourcesDir, jsBundleFile, jsBundleDir)
 
                 enabled !debuggableVariants.contains(variant.name) ?: targetName.toLowerCase().contains("release")
             }
@@ -77,11 +113,11 @@ gradle.projectsEvaluated {
             runBefore("merge${targetName}Assets", generateBundledResourcesHash)
         } else {
             def jsBundleDirConfigName = "jsBundleDir${targetName}"
-            jsBundleDir = elvisFile(config."$jsBundleDirConfigName").get() ?:
+            jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ? elvisFile(config."$jsBundleDirConfigName").get():
                     file("$buildDir/intermediates/assets/${targetPath}")
 
             def resourcesDirConfigName = "resourcesDir${targetName}"
-            resourcesDir = elvisFile(config."${resourcesDirConfigName}").get() ?:
+            resourcesDir = elvisFile(config."${resourcesDirConfigName}") ? elvisFile(config."${resourcesDirConfigName}").get():
                     file("$buildDir/intermediates/res/merged/${targetPath}")
 
             // In case version of 'Android Plugin for Gradle'' is lower than 1.3.0
@@ -98,14 +134,14 @@ gradle.projectsEvaluated {
             generateBundledResourcesHash = tasks.create(
                     name: "generateBundledResourcesHash${targetName}",
                     type: Exec) {
-                commandLine (*nodeExecutableAndArgs, "${nodeModulesPath}/react-native-code-push/scripts/generateBundledResourcesHash.js", resourcesDir, jsBundleFile, jsBundleDir, resourcesMapTempFileName)
+                commandLine (*nodeExecutableAndArgs, "${nodeModulesPath}/scripts/generateBundledResourcesHash.js", resourcesDir, jsBundleFile, jsBundleDir, resourcesMapTempFileName)
             }
 
             // Make this task run right before the bundle task
             def recordFilesBeforeBundleCommand = tasks.create(
                     name: "recordFilesBeforeBundleCommand${targetName}",
                     type: Exec) {
-                commandLine (*nodeExecutableAndArgs, "${nodeModulesPath}/react-native-code-push/scripts/recordFilesBeforeBundleCommand.js", resourcesDir, resourcesMapTempFileName)
+                commandLine (*nodeExecutableAndArgs, "${nodeModulesPath}/scripts/recordFilesBeforeBundleCommand.js", resourcesDir, resourcesMapTempFileName)
             }
 
             recordFilesBeforeBundleCommand.dependsOn("merge${targetName}Resources")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bravemobile/react-native-code-push",
-  "version": "8.2.5",
+  "version": "8.3.1",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",
@@ -36,7 +36,7 @@
     "url": "https://github.com/Soomgo-Mobile/react-native-code-push"
   },
   "dependencies": {
-    "code-push": "^4.2.1",
+    "code-push": "^4.2.2",
     "glob": "^7.1.7",
     "hoist-non-react-statics": "^3.3.2",
     "inquirer": "^8.1.5",