Rebased from original codepush repo

.github/ISSUE_TEMPLATE.md

@@ -16,7 +16,7 @@ What actually happens?
 
 ### Reproducible Demo
 
-* Download https://github.com/Microsoft/react-native-code-push/archive/master.zip and unzip. From `Examples` folder run `node create-app.js appName react-native@0.47.1 react-native-code-push@5.0.0-beta` command to generate plain CodePushified React Native app. Please see description on top of `create-app.js` file content if needed
+* Download https://github.com/microsoft/react-native-code-push/archive/master.zip and unzip. From `Examples` folder run `node create-app.js appName react-native@0.61.5 react-native-code-push@6.0.0` command to generate plain CodePushified React Native app. Please see description on top of `create-app.js` file content if needed
 * If you can't reproduce the bug on it, provide us as much info as possible about your project
 
 ### Environment

.github/workflows/react-native-code-push-ci.yml

@@ -0,0 +1,52 @@
+name: React-native-code-push CI
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test-android:
+    name: Test Android app
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        api-level: [27]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Start adb server
+        run: adb devices
+      - name: Download system image "android-${{ matrix.api-level }}"
+        run: $ANDROID_HOME/tools/bin/sdkmanager "system-images;android-${{ matrix.api-level }};google_apis;x86"
+      - name: Create android emulator
+        run: $ANDROID_HOME/tools/bin/avdmanager create avd --force --name TestEmulator --abi google_apis/x86 --package 'system-images;android-${{ matrix.api-level }};google_apis;x86' --device "Nexus 6P"
+      - name: Start android emulator
+        run: $ANDROID_HOME/emulator/emulator -avd TestEmulator -noaudio -no-window -no-snapshot-save -no-boot-anim -memory 6144 &
+      - run: sleep 120
+      - run: adb shell settings put global window_animation_scale 0.0
+      - run: adb shell settings put global transition_animation_scale 0.0
+      - run: adb shell settings put global animator_duration_scale 0.0
+      - name: Package Installation
+        run: npm install
+      - name: Install react-native-cli
+        run: npm install react-native-cli
+      - name: test:android
+        run: npm run test:android
+
+  test-iOS:
+    name: Test iOS app
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install dependecies
+        run: npm install
+      - name: Install react-native-cli
+        run: npm install react-native-cli
+      - name: Build tests
+        run: npm run build:tests
+      - name: Setup tests
+        run: npm run test:setup:ios
+      - name: Run tests
+        run: npm run test:fast:ios

.vscode/launch.json

@@ -0,0 +1,41 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Tests-android",
+            "type": "node",
+            "request": "launch",
+            "preLaunchTask": "Setup-android",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "test:debugger:android"
+            ],
+            "port": 9229,
+            "stopOnEntry": false,
+            "sourceMaps": true,
+            "console": "internalConsole",
+            "internalConsoleOptions": "openOnSessionStart",
+            "autoAttachChildProcesses": true,
+            "timeout": 100000
+        },
+        {
+            "name": "Tests-ios",
+            "type": "node",
+            "request": "launch",
+            "preLaunchTask": "Setup-ios",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "test:debugger:ios"
+            ],
+            "port": 9229,
+            "stopOnEntry": false,
+            "sourceMaps": true,
+            "console": "internalConsole",
+            "internalConsoleOptions": "openOnSessionStart",
+            "autoAttachChildProcesses": true,
+            "timeout": 100000
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "typescript.tsdk": "node_modules/typescript/lib"
+}

.vscode/tasks.json

@@ -0,0 +1,55 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "type": "shell",
+            "label": "Build",
+            "command": "npm",
+            "args": [
+                "run",
+                "build:tests"
+            ],
+            "presentation": {
+                "echo": false,
+                "focus": false
+            },
+            "problemMatcher": [
+                "$tsc"
+            ]
+        },
+        {
+            "type": "shell",
+            "label": "Setup-android",
+            "dependsOn": "Build",
+            "command": "npm",
+            "args": [
+                "run",
+                "test:setup:android"
+            ],
+            "presentation": {
+                "echo": false,
+                "focus": false
+            },
+            "problemMatcher": [
+                "$tsc"
+            ]
+        },
+        {
+            "type": "shell",
+            "label": "Setup-ios",
+            "dependsOn": "Build",
+            "command": "npm",
+            "args": [
+                "run",
+                "test:setup:ios"
+            ],
+            "presentation": {
+                "echo": false,
+                "focus": false
+            },
+            "problemMatcher": [
+                "$tsc"
+            ]
+        }
+    ]
+}

CONTRIBUTING.md

@@ -37,13 +37,13 @@ Follow these steps to test your modifications to the plugin manually:
 
 First, make sure you have installed the dependencies for the plugin by following the steps above.
 
-Then, make sure you have installed `gulp`.
+Then, make sure you have installed `react-native-cli`.
 
 ```
-npm install -g gulp
+npm install -g react-native-cli
 ```
 
-To run Android tests, make sure you have `sdk\tools` and  `sdk\platform-tools` in your PATH.
+To run Android tests, make sure you have `sdk\tools`, `sdk\emulator` and  `sdk\platform-tools` in your PATH.
 
 To run iOS tests, make sure you've installed CocoaPods and have `.gem/bin` in your PATH.
 
@@ -62,43 +62,41 @@ The tests first build the app.
 
 They then check if the required emulators are currently running.
 
-If an Android emulator is not running, it attempts to boot an Android emulator named `emulator`. You can specify an emulator by adding `--androidemu yourEmulatorNameHere` as a command line option to the gulp task.
+If an Android emulator is not running, it attempts to boot the latest Android emulator. You can specify an emulator by adding env variable `ANDROID_EMU=yourEmulatorNameHere` to the npm command. For example: `ANDROID_EMU=yourEmulatorNameHere npm run test:android`.
 
-If an iOS simulator is not running, it attempts to boot the latest iOS iPhone simulator. You can specify a simulator by adding `--iosemu yourSimulatorNameHere` as a command line option to the gulp task.
+If an iOS simulator is not running, it attempts to boot the latest iOS iPhone simulator. You can specify a simulator by adding env variable `IOS_EMU=yourSimulatorNameHere` to the npm command. For example: `IOS_EMU="iPhone 8 (0567DFF8-329E-41A3-BD6D-E48E9DD5EF39)" npm run test:ios`.
 
 If all the required emulators are not running and the tests fail to boot them, the tests will fail.
 
-If you would like the tests to always restart the necessary emulators (killing them if they are currently running), add a `--clean` flag to the command.
+If you would like the tests to always restart the necessary emulators (killing them if they are currently running), setup a env variable `CLEAN=true` to the command. For example: `CLEAN=true npm run test`.
 
 The desired unit tests are then run.
 
-If you would like to skip building, add a `-fast` to the end of the command you'd like to run. For example, `gulp test-ios` becomes `gulp test-ios-fast`.
+If you would like to skip building, add a `:fast` in the command you'd like to run. For example, `npm run test:ios` becomes `npm run test:fast:ios` or `npm run test:android` becomes `npm run test:fast:android`.
 
-There is a both a full unit test suite and a "core" set of unit tests that you may run. If you would like to run only the core tests, add a `--core` flag to the command.
+There is a both a full unit test suite and a "core" set of unit tests that you may run. If you would like to run only the core tests, setup a env variable `CORE=true` to the command. For example: `CORE=true npm run test:android`.
 
-If you would like to pull the plugin from NPM rather than running the tests on the local version, add a `--npm` flag to the command.
-
-If you add a `--report` flag to the command, the mocha reporter outputs individual results files for each platform. These are `./test_android.xml`, `./test-ios-ui.xml`, and `./test-ios-wk.xml`.
+If you would like to pull the plugin from NPM rather than running the tests on the local version, setup a env variable `NPM=true` to the command. For example: `NPM=true npm run test:ios`.
 
 #### Default
 
 To run all of the unit tests on Android and iOS:
 ```
-gulp test
+npm run test
 ```
 
 #### iOS
 
 To run all of the unit tests on iOS:
 ```
-gulp test-ios
+npm run test:ios
 ```
 
 #### Android
 
 To run all of the unit tests on Android:
 ```
-gulp test-android
+npm run test:android
 ```
 
 #### More examples
@@ -110,27 +108,27 @@ android, ios
 
 To run the core unit tests on Android:
 ```
-gulp test-android --core
+CORE=true npm run test:android
 ```
 
 To run all of the unit tests on iOS and pull the plugin from NPM:
 ```
-gulp test-ios --npm
+NPM=true npm run test:ios
 ```
 
 To run all of the unit tests on Android and iOS without building first:
 ```
-gulp test-fast
+npm run test:fast
 ```
 
 To run all of the unit tests on iOS and restart the emulators:
 ```
-gulp test-ios --clean
+CLEAN=true npm run test:ios
 ```
 
 To run the core unit tests on Android and pull the plugin from NPM:
 ```
-gulp test-android --core --npm
+NPM=true CORE=true npm run test:android
 ```
 
 ...and so on!

CodePush.js

@@ -2,7 +2,6 @@ import { AcquisitionManager as Sdk } from "code-push/script/acquisition-sdk";
 import { Alert } from "./AlertAdapter";
 import requestFetchAdapter from "./request-fetch-adapter";
 import { AppState, Platform } from "react-native";
-import RestartManager from "./RestartManager";
 import log from "./logging";
 import hoistStatics from 'hoist-non-react-statics';
 
@@ -39,7 +38,7 @@ async function checkForUpdate(deploymentKey = null, handleBinaryVersionMismatchC
    * then we want to use its package hash to determine whether a new
    * release has been made on the server. Otherwise, we only need
    * to send the app version to the server, since we are interested
-   * in any updates for current app store version, regardless of hash.
+   * in any updates for current binary version, regardless of hash.
    */
   let queryPackage;
   if (localPackage) {
@@ -58,7 +57,7 @@ async function checkForUpdate(deploymentKey = null, handleBinaryVersionMismatchC
    * ----------------------------------------------------------------
    * 1) The server said there isn't an update. This is the most common case.
    * 2) The server said there is an update but it requires a newer binary version.
-   *    This would occur when end-users are running an older app store version than
+   *    This would occur when end-users are running an older binary version than
    *    is available, and CodePush is making sure they don't get an update that
    *    potentially wouldn't be compatible with what they are running.
    * 3) The server said there is an update, but the update's hash is the same as
@@ -189,6 +188,10 @@ async function tryReportStatus(statusReport, resumeListener) {
     if (statusReport.appVersion) {
       log(`Reporting binary update (${statusReport.appVersion})`);
 
+      if (!config.deploymentKey) {
+        throw new Error("Deployment key is missed");
+      }
+
       const sdk = getPromisifiedSdk(requestFetchAdapter, config);
       await sdk.reportStatusDeploy(/* deployedPackage */ null, /* status */ null, previousLabelOrAppVersion, previousDeploymentKey);
     } else {
@@ -300,6 +303,10 @@ function setUpTestDependencies(testSdk, providedTestConfig, testNativeBridge) {
   if (testNativeBridge) NativeCodePush = testNativeBridge;
 }
 
+async function restartApp(onlyIfUpdateIsPending = false) {
+  NativeCodePush.restartApp(onlyIfUpdateIsPending);
+}
+
 // This function allows only one syncInternal operation to proceed at any given time.
 // Parallel calls to sync() while one is ongoing yields CodePush.SyncStatus.SYNC_IN_PROGRESS.
 const sync = (() => {
@@ -698,12 +705,13 @@ if (NativeCodePush) {
     log,
     notifyAppReady: notifyApplicationReady,
     notifyApplicationReady,
-    restartApp: RestartManager.restartApp,
+    restartApp,
     setUpTestDependencies,
     sync,
     downloadAndInstall,
-    disallowRestart: RestartManager.disallow,
-    allowRestart: RestartManager.allow,
+    disallowRestart: NativeCodePush.disallow,
+    allowRestart: NativeCodePush.allow,
+    downloadAndInstall,
     clearUpdates: NativeCodePush.clearUpdates,
     InstallMode: {
       IMMEDIATE: NativeCodePush.codePushInstallModeImmediate, // Restart the app immediately

CodePush.podspec

@@ -9,8 +9,8 @@ Pod::Spec.new do |s|
   s.author         = package['author']
   s.license        = package['license']
   s.homepage       = package['homepage']
-  s.source         = { :git => 'https://github.com/Microsoft/react-native-code-push.git', :tag => "v#{s.version}"}
-  s.ios.deployment_target = '7.0'
+  s.source         = { :git => 'https://github.com/microsoft/react-native-code-push.git', :tag => "v#{s.version}"}
+  s.ios.deployment_target = '9.0'
   s.tvos.deployment_target = '9.0'
   s.preserve_paths = '*.js'
   s.library        = 'z'
@@ -20,8 +20,8 @@ Pod::Spec.new do |s|
   # Note: Even though there are copy/pasted versions of some of these dependencies in the repo, 
   # we explicitly let CocoaPods pull in the versions below so all dependencies are resolved and 
   # linked properly at a parent workspace level.
-  s.dependency 'React'
-  s.dependency 'SSZipArchive', '~> 2.1'
-  s.dependency 'JWT', '~> 3.0.0-beta.7'
+  s.dependency 'React-Core'
+  s.dependency 'SSZipArchive', '~> 2.2.2'
+  s.dependency 'JWT', '~> 3.0.0-beta.12'
   s.dependency 'Base64', '~> 1.1'
 end