@appzung/react-native-code-push 5.7.1 → 6.3.1

package/package-mixins.js

@@ -1,5 +1,4 @@
 import { NativeEventEmitter } from "react-native";
-import RestartManager from "./RestartManager";
 import log from "./logging";
 
 // This function is used to augment remote and local
@@ -55,9 +54,9 @@ module.exports = (NativeCodePush) => {
       await NativeCodePush.installUpdate(localPackageCopy, installMode, minimumBackgroundDuration);
       updateInstalledCallback && updateInstalledCallback();
       if (installMode == NativeCodePush.codePushInstallModeImmediate) {
-        RestartManager.restartApp(false);
+        NativeCodePush.restartApp(false);
       } else {
-        RestartManager.clearPendingRestart();
+        NativeCodePush.clearPendingRestart();
         localPackage.isPending = true; // Mark the package as pending since it hasn't been applied yet
       }
     },

package/package.json

@@ -1,38 +1,61 @@
 {
   "name": "@appzung/react-native-code-push",
-  "version": "5.7.1",
+  "version": "6.3.1",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "typings": "typings/react-native-code-push.d.ts",
   "author": "Louis Lagrange <lagrange.louis@gmail.com> (https://github.com/Minishlink)",
   "license": "MIT",
+  "scripts": {
+    "clean": "shx rm -rf bin",
+    "setup": "npm install --quiet --no-progress",
+    "prebuild:tests": "npm run clean && npm run tslint",
+    "build:tests": "tsc",
+    "test": "npm run build:tests && npm run test:setup && npm run test:fast",
+    "test:android": "npm run build:tests && npm run test:setup:android && npm run test:fast:android",
+    "test:ios": "npm run build:tests && npm run test:setup:ios && npm run test:fast:ios",
+    "test:setup": "mocha --recursive bin/test --android --ios --setup",
+    "test:setup:android": "mocha --recursive bin/test --android --setup",
+    "test:setup:ios": "mocha --recursive bin/test --ios --setup",
+    "test:fast": "mocha --recursive bin/test --android --ios",
+    "test:fast:android": "mocha --recursive bin/test --android",
+    "test:fast:ios": "mocha --recursive bin/test --ios",
+    "test:debugger:android": "mocha --recursive --inspect-brk=0.0.0.0 bin/test --android",
+    "test:debugger:ios": "mocha --recursive --inspect-brk=0.0.0.0 bin/test --ios",
+    "tslint": "tslint -c tslint.json test/**/*.ts"
+  },
   "dependencies": {
-    "code-push": "^3.0.1",
-    "glob": "^5.0.15",
-    "hoist-non-react-statics": "^2.3.1",
-    "inquirer": "^1.1.2",
+    "code-push": "^3.1.0",
+    "glob": "^7.1.6",
+    "hoist-non-react-statics": "^3.3.2",
+    "inquirer": "^7.2.0",
     "plist": "3.0.1",
-    "semver": "^5.6.0",
-    "xcode": "1.0.0"
+    "semver": "^7.3.2",
+    "xcode": "3.0.1"
   },
   "devDependencies": {
+    "@types/assert": "^1.4.3",
+    "@types/mkdirp": "^1.0.0",
+    "@types/mocha": "^7.0.2",
+    "@types/node": "^14.0.13",
+    "@types/q": "^1.5.2",
     "archiver": "latest",
     "body-parser": "latest",
     "code-push-plugin-testing-framework": "file:./code-push-plugin-testing-framework",
     "del": "latest",
     "express": "latest",
-    "gulp-insert": "latest",
-    "gulp-tslint": "latest",
-    "gulp-typescript": "^5.0.1",
     "mkdirp": "latest",
+    "mocha": "^8.0.1",
     "q": "^1.5.1",
     "run-sequence": "latest",
-    "tslint": "^5.18.0",
-    "typescript": "^2.9.2"
+    "shx": "^0.3.2",
+    "slash": "^3.0.0",
+    "tslint": "^6.1.1",
+    "typescript": "^3.9.5"
   },
   "rnpm": {
     "android": {
-      "packageInstance": "new CodePush(getResources().getString(R.string.reactNativeCodePush_androidDeploymentKey), getApplicationContext(), BuildConfig.DEBUG)"
+      "packageInstance": "new CodePush(getResources().getString(R.string.CodePushDeploymentKey), getApplicationContext(), BuildConfig.DEBUG)"
     },
     "ios": {
       "sharedLibraries": [

package/react-native.config.js

@@ -0,0 +1,10 @@
+module.exports = {
+    dependency: {
+        platforms: {
+            android: {
+                packageInstance:
+                    "new CodePush(getResources().getString(R.string.CodePushDeploymentKey), getApplicationContext(), BuildConfig.DEBUG)"
+            }
+        }
+    }
+};

package/request-fetch-adapter.js

@@ -37,7 +37,7 @@ module.exports = {
 
 function getHttpMethodName(verb) {
   // Note: This should stay in sync with the enum definition in
-  // https://github.com/Microsoft/code-push/blob/master/sdk/script/acquisition-sdk.ts#L6
+  // https://github.com/microsoft/code-push/blob/master/sdk/script/acquisition-sdk.ts#L6
   return [
     "GET",
     "HEAD",

package/scripts/generateBundledResourcesHash.js

@@ -83,7 +83,7 @@ function addJsBundleAndMetaToManifest() {
             // "CodePushHash.json" file name breaks flow type checking.
             // To fix the issue we need to delete "CodePushHash.json" file and
             // use "CodePushHash" file name instead to store the hash value.
-            // Relates to https://github.com/Microsoft/react-native-code-push/issues/577
+            // Relates to https://github.com/microsoft/react-native-code-push/issues/577
             var oldSavedResourcesManifestPath = assetsDir + "/" + CODE_PUSH_HASH_OLD_FILE_NAME;
             if (fs.existsSync(oldSavedResourcesManifestPath)) {
                 fs.unlinkSync(oldSavedResourcesManifestPath);

package/scripts/postlink/android/postlink.js

@@ -37,14 +37,14 @@ module.exports = () => {
         } else {
             return Promise.reject(`Couldn't find Android application entry point. You might need to update it manually. \
     Please refer to plugin configuration section for Android at \
-    https://github.com/microsoft/react-native-code-push#plugin-configuration-android for more details`);
+    https://github.com/microsoft/react-native-code-push/blob/master/docs/setup-android.md#plugin-configuration-for-react-native-lower-than-060-android for more details`);
         }
     }
 
     if (!fs.existsSync(buildGradlePath)) {
         return Promise.reject(`Couldn't find build.gradle file. You might need to update it manually. \
     Please refer to plugin installation section for Android at \
-    https://github.com/microsoft/react-native-code-push#plugin-installation-android---manual`);
+    https://github.com/microsoft/react-native-code-push/blob/master/docs/setup-android.md#plugin-installation-android---manual`);
     }
 
     // 2. Add the codepush.gradle build task definitions

package/scripts/postunlink/android/postunlink.js

@@ -31,7 +31,7 @@ module.exports = () => {
         } else {
             console.log(`Couldn't find Android application entry point. You might need to update it manually. \
     Please refer to plugin configuration section for Android at \
-    https://github.com/microsoft/react-native-code-push#plugin-configuration-android for more details`);
+    https://github.com/microsoft/react-native-code-push/blob/master/docs/setup-android.md#plugin-configuration-for-react-native-lower-than-060-android for more details`);
         }
     }
 
@@ -41,7 +41,7 @@ module.exports = () => {
     if (!fs.existsSync(buildGradlePath)) {
         console.log(`Couldn't find build.gradle file. You might need to update it manually. \
     Please refer to plugin installation section for Android at \
-    https://github.com/microsoft/react-native-code-push#plugin-installation-android---manual`);
+    https://github.com/microsoft/react-native-code-push/blob/master/docs/setup-android.md#plugin-installation-android---manual`);
     } else {
         var buildGradleContents = fs.readFileSync(buildGradlePath, "utf8");
         var codePushGradleLink = linkTools.codePushGradleLink;
@@ -63,7 +63,7 @@ module.exports = () => {
         if (!~stringsResourcesContent.indexOf(deploymentKeyName)) {
             console.log(`${deploymentKeyName} already removed from the strings.xml`);
         } else {
-            var AndroidDeploymentKey = stringsResourcesContent.match(/(<string moduleConfig="true" name="reactNativeCodePush_androidDeploymentKey">.*<\/string>)/);
+            var AndroidDeploymentKey = stringsResourcesContent.match(/(<string moduleConfig="true" name="CodePushDeploymentKey">.*<\/string>)/);
             if (AndroidDeploymentKey) {
                 stringsResourcesContent = stringsResourcesContent.replace(`\n\t${AndroidDeploymentKey[0]}`,"");
                 fs.writeFileSync(stringsResourcesPath, stringsResourcesContent);

package/scripts/tools/linkToolsAndroid.js

@@ -14,7 +14,7 @@ exports.getJSBundleFileOverride = `
 exports.reactNativeHostInstantiation = "new ReactNativeHost(this) {";
 exports.mainActivityClassDeclaration = "public class MainActivity extends ReactActivity {";
 exports.codePushGradleLink = `\napply from: "../../node_modules/react-native-code-push/android/codepush.gradle"`;
-exports.deploymentKeyName = "reactNativeCodePush_androidDeploymentKey";
+exports.deploymentKeyName = "CodePushDeploymentKey";
 
 exports.getMainApplicationLocation = function () {
     return findMainApplication() || glob.sync("**/MainApplication.java", ignoreFolders)[0];

package/scripts/tools/linkToolsIos.js

@@ -22,7 +22,7 @@ exports.getJsCodeLocationPatch = function(defaultJsCodeLocationAssignmentStateme
   #endif`;
 }
 
-// Fix for https://github.com/Microsoft/react-native-code-push/issues/477
+// Fix for https://github.com/microsoft/react-native-code-push/issues/477
 // Typical location of AppDelegate.m for newer RN versions: $PROJECT_ROOT/ios/<project_name>/AppDelegate.m
 // Let's try to find that path by filtering the whole array for any path containing <project_name>
 // If we can't find it there, play dumb and pray it is the first path we find.
@@ -71,7 +71,7 @@ exports.getPlistPath = function() {
     }
 
     //also remove surrounding quotes from plistPathValue to get correct path resolved
-    //(see https://github.com/Microsoft/react-native-code-push/issues/534#issuecomment-302069326 for details)
+    //(see https://github.com/microsoft/react-native-code-push/issues/534#issuecomment-302069326 for details)
     return path.resolve(path.dirname(xcodeProjectPath), '..', plistPathValue.replace(/^"(.*)"$/, '$1'));
 }
 

package/tsconfig.json

@@ -0,0 +1,14 @@
+{
+    "compilerOptions": {
+        "target": "ES5",
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noEmitOnError": true,
+        "moduleResolution": "node",
+        "sourceMap": true,
+        "rootDir": "test",
+        "outDir": "bin",
+        "removeComments": true
+    }
+}

package/tslint.json

@@ -0,0 +1,32 @@
+{
+    "defaultSeverity": "error",
+    "rules": {
+        "class-name": true,
+        "comment-format": [true,
+            "check-space"
+        ],
+        "indent": [true,
+            "spaces"
+        ],
+        "one-line": [true,
+            "check-open-brace"
+        ],
+        "quotemark": [true,
+            "double"
+        ],
+        "semicolon": true,
+        "whitespace": [true,
+            "check-branch",
+            "check-operator",
+            "check-separator",
+            "check-type"
+        ],
+        "typedef-whitespace": [true, {
+            "call-signature": "nospace",
+            "index-signature": "nospace",
+            "parameter": "nospace",
+            "property-declaration": "nospace",
+            "variable-declaration": "nospace"
+        }]
+    }
+}

package/typings/react-native-code-push.d.ts

@@ -122,9 +122,9 @@ export interface SyncOptions {
 
     /**
      * Specifies the minimum number of seconds that the app needs to have been in the background before restarting the app. This property
-     * only applies to updates which are installed using `InstallMode.ON_NEXT_RESUME`, and can be useful for getting your update in front
-     * of end users sooner, without being too obtrusive. Defaults to `0`, which has the effect of applying the update immediately after a
-     * resume, regardless how long it was in the background.
+     * only applies to updates which are installed using `InstallMode.ON_NEXT_RESUME` or `InstallMode.ON_NEXT_SUSPEND`, and can be useful 
+     * for getting your update in front of end users sooner, without being too obtrusive. Defaults to `0`, which has the effect of applying 
+     * the update immediately after a resume or unless the app suspension is long enough to not matter, regardless how long it was in the background.
      */
     minimumBackgroundDuration?: number;
 
@@ -239,6 +239,13 @@ export interface StatusReport {
  */
 declare function CodePush(options?: CodePushOptions): (x: any) => any;
 
+/**
+ * Decorates a React Component configuring it to sync for updates with the CodePush server.
+ *
+ * @param x the React Component that will decorated
+ */
+declare function CodePush(x: any): any
+
 declare namespace CodePush {
     /**
      * Represents the default settings that will be used by the sync method if
@@ -317,8 +324,10 @@ declare namespace CodePush {
         ON_NEXT_RESTART,
 
         /**
-         * Indicates that you want to install the update, but don't want to restart the
-         * app until the next time the end user resumes it from the background.
+         * Indicates that you want to install the update, but don't want to restart the app until the next time
+         * the end user resumes it from the background. This way, you don't disrupt their current session,
+         * but you can get the update in front of them sooner then having to wait for the next natural restart. 
+         * This value is appropriate for silent installs that can be applied on resume in a non-invasive way.
          */
         ON_NEXT_RESUME,
 

package/RestartManager.js

@@ -1,59 +0,0 @@
-const log = require("./logging");
-const NativeCodePush = require("react-native").NativeModules.CodePush;
-
-const RestartManager = (() => {
-    let _allowed = true;
-    let _restartInProgress = false;
-    let _restartQueue = [];
-
-    function allow() {
-        log("Re-allowing restarts");
-        _allowed = true;
-
-        if (_restartQueue.length) {
-            log("Executing pending restart");
-            restartApp(_restartQueue.shift(1));
-        }
-    }
-
-    function clearPendingRestart() {
-        _restartQueue = [];
-    }
-
-    function disallow() {
-        log("Disallowing restarts");
-        _allowed = false;
-    }
-
-    async function restartApp(onlyIfUpdateIsPending = false) {
-        if (_restartInProgress) {
-            log("Restart request queued until the current restart is completed");
-            _restartQueue.push(onlyIfUpdateIsPending);
-        } else if (!_allowed) {
-            log("Restart request queued until restarts are re-allowed");
-            _restartQueue.push(onlyIfUpdateIsPending);
-        } else {
-            _restartInProgress = true;
-            if (await NativeCodePush.restartApp(onlyIfUpdateIsPending)) {
-                // The app has already restarted, so there is no need to
-                // process the remaining queued restarts.
-                log("Restarting app");
-                return;
-            }
-
-            _restartInProgress = false;
-            if (_restartQueue.length) {
-                restartApp(_restartQueue.shift(1));
-            }
-        }
-    }
-
-    return {
-        allow,
-        clearPendingRestart,
-        disallow,
-        restartApp
-    };
-})();
-
-module.exports = RestartManager;