Merge branch 'develop'

Author: hebertcisco

.azurepipelines/build-rn-code-push-1es.yml

@@ -150,9 +150,6 @@ proguard/
 # Android Studio captures folder
 captures/
 
-# Remove after this framework is published on NPM
-code-push-plugin-testing-framework/node_modules
-
 # Windows
 windows/.vs/
 windows/obj/
@@ -192,3 +189,4 @@ Examples/testapp_rn
 
 # Android debug build files (conflict ignoring #Visual Studio files)
 !android/app/src/debug/
+.temp/

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

@@ -34,10 +34,8 @@ Recipes/
 bin/
 test/
 
-# Remove after this framework is published on NPM
-code-push-plugin-testing-framework/
-
 # Android build artifacts and Android Studio bits
+android/build
 android/app/build
 android/local.properties
 android/.gradle
@@ -100,4 +98,4 @@ packages/
 .git/
 
 .watchmanconfig
-
+.temp/

.gitignore

@@ -2,7 +2,22 @@ import React, { Platform } from "react-native";
 let { Alert } = React;
 
 if (Platform.OS === "android") {
-  const { NativeModules: { CodePushDialog } } = React;
+  function resolveNativeModule(name) {
+    const ReactNative = require("react-native");
+    try {
+      const turboModule =
+        ReactNative.TurboModuleRegistry && ReactNative.TurboModuleRegistry.get
+          ? ReactNative.TurboModuleRegistry.get(name)
+          : null;
+      if (turboModule) return turboModule;
+    } catch (_e) {
+      // Ignore and fall back to legacy NativeModules.
+    }
+
+    return ReactNative.NativeModules ? ReactNative.NativeModules[name] : null;
+  }
+
+  const CodePushDialog = resolveNativeModule("CodePushDialog");
 
   Alert = {
     alert(title, message, buttons) {
@@ -13,6 +28,10 @@ if (Platform.OS === "android") {
       const button1Text = buttons[0] ? buttons[0].text : null,
             button2Text = buttons[1] ? buttons[1].text : null;
 
+      if (!CodePushDialog) {
+        throw "CodePushDialog native module is not installed.";
+      }
+
       CodePushDialog.showDialog(
         title, message, button1Text, button2Text,
         (buttonId) => { buttons[buttonId].onPress && buttons[buttonId].onPress(); }, 
@@ -21,4 +40,4 @@ if (Platform.OS === "android") {
   };
 }
 
-module.exports = { Alert };
+module.exports = { Alert };

.npmignore

@@ -4,7 +4,7 @@
 
 ### Environment setup
 
-`node.js` and `npm` are needed for using this project. `npm` comes bundled with the `node.js` installer. You can download the `node.js` installer here: https://nodejs.org/download/.
+`node.js` and `npm` are needed for using this project. `npm` comes bundled with the `node.js` installer. You can download the `node.js` installer here: <https://nodejs.org/download/>.
 
 Once you have installed `node.js` and `npm`, install the dev dependencies for the project.
 
@@ -15,19 +15,22 @@ npm install
 ### Using the plugin manually
 
 Follow these steps to test your modifications to the plugin manually:
+
 - clone this repository
 - install the dependencies
 
-	Navigate to the root folder from your command line console and run:
-	```
-	npm install
-	```
+ Navigate to the root folder from your command line console and run:
+ ```
+ npm install
+ ```
+
 - install the plugin in a React-Native project
 
-	Navigate to the root folder of your React-Native project from your command line console and run:
-	```
-	npm install local_path_to_your_clone_of_this_repo
-	```
+ Navigate to the root folder of your React-Native project from your command line console and run:
+ ```
+ npm install local_path_to_your_clone_of_this_repo
+ ```
+
 - configure the plugin using the steps in the README.md
 - build and run your app on an emulator or device
 
@@ -81,20 +84,23 @@ If you would like to pull the plugin from NPM rather than running the tests on t
 #### Default
 
 To run all of the unit tests on Android and iOS:
+
 ```
 npm run test
 ```
 
 #### iOS
 
 To run all of the unit tests on iOS:
+
 ```
 npm run test:ios
 ```
 
 #### Android
 
 To run all of the unit tests on Android:
+
 ```
 npm run test:android
 ```
@@ -107,26 +113,31 @@ The platforms are ordered as follows, and ran in that order:
 android, ios
 
 To run the core unit tests on Android:
+
 ```
 CORE=true npm run test:android
 ```
 
 To run all of the unit tests on iOS and pull the plugin from NPM:
+
 ```
 NPM=true npm run test:ios
 ```
 
 To run all of the unit tests on Android and iOS without building first:
+
 ```
 npm run test:fast
 ```
 
 To run all of the unit tests on iOS and restart the emulators:
+
 ```
 CLEAN=true npm run test:ios
 ```
 
 To run the core unit tests on Android and pull the plugin from NPM:
+
 ```
 NPM=true CORE=true npm run test:android
 ```

AlertAdapter.js

@@ -5,7 +5,22 @@ import { AppState, Platform } from "react-native";
 import log from "./logging";
 import hoistStatics from 'hoist-non-react-statics';
 
-let NativeCodePush = require("react-native").NativeModules.CodePush;
+function resolveNativeModule(name) {
+  const ReactNative = require("react-native");
+  try {
+    const turboModule =
+      ReactNative.TurboModuleRegistry && ReactNative.TurboModuleRegistry.get
+        ? ReactNative.TurboModuleRegistry.get(name)
+        : null;
+    if (turboModule) return turboModule;
+  } catch (_e) {
+    // Ignore and fall back to legacy NativeModules.
+  }
+
+  return ReactNative.NativeModules ? ReactNative.NativeModules[name] : null;
+}
+
+let NativeCodePush = resolveNativeModule("CodePush");
 const PackageMixins = require("./package-mixins")(NativeCodePush);
 
 async function checkForUpdate(deploymentKey = null, handleBinaryVersionMismatchCallback = null) {