update to master again

Author: geof90

CodePush.h

@@ -1,7 +1,18 @@
 #import "RCTBridgeModule.h"
 
-@interface CodePush : NSObject<RCTBridgeModule>
-
+@interface CodePush : NSObject <RCTBridgeModule>
+
+/*
+ * This method is used to retrieve the URL for the most recent
+ * version of the JavaScript bundle. This could be either the
+ * bundle that was packaged with the app binary, or the bundle
+ * that was downloaded as part of a CodePush update. The value returned
+ * should be used to "bootstrap" the React Native bridge.
+ *
+ * This method assumes that your JS bundle is named "main.jsbundle"
+ * and therefore, if it isn't, you should use either the bundleURLForResource:
+ * or bundleURLForResource:withExtension: methods to override that behavior.
+*/
 + (NSURL *)bundleURL;
 
 + (NSURL *)bundleURLForResource:(NSString *)resourceName;
@@ -25,7 +36,7 @@
 
 @end
 
-@interface CodePushDownloadHandler : NSObject<NSURLConnectionDelegate>
+@interface CodePushDownloadHandler : NSObject <NSURLConnectionDelegate>
 
 @property (strong) NSOutputStream *outputFileStream;
 @property long expectedContentLength;

CodePush.js

@@ -5,24 +5,20 @@ var Sdk = require("code-push/script/acquisition-sdk").AcquisitionManager;
 var { NativeCodePush, PackageMixins, Alert } = require("./CodePushNativePlatformAdapter");
 
 function checkForUpdate(deploymentKey = null) {
-  var config;
-  var sdk;
+  var config, sdk;
 
   return getConfiguration()
-          .then((configResult) => {
-            config = configResult;
-            
+          .then((configResult) => {            
             // If a deployment key was explicitly provided,
             // then let's override the one we retrieved
             // from the native-side of the app.
             if (deploymentKey) {
-              config.deploymentKey = deploymentKey;  
+              config = Object.assign({}, configResult, { deploymentKey });
+            } else {
+              config = configResult;
             }
 
-            return getSdk();
-          })
-          .then((sdkResult) => {
-            sdk = sdkResult;
+            sdk = getSDK(config);
             // Allow dynamic overwrite of function. This is only to be used for tests.
             return module.exports.getCurrentPackage();
           })
@@ -74,23 +70,6 @@ var getConfiguration = (() => {
   }
 })();
 
-var getSdk = (() => {
-  var sdk;
-  return function getSdk() {
-    if (sdk) {
-      return Promise.resolve(sdk);
-    } else if (testSdk) {
-      return Promise.resolve(testSdk);
-    } else {
-      return getConfiguration()
-        .then((configuration) => {
-          sdk = new Sdk(requestFetchAdapter, configuration);
-          return sdk;
-        });
-    }
-  }
-})();
-
 function getCurrentPackage() {
   return new Promise((resolve, reject) => {
     var localPackage;
@@ -112,6 +91,14 @@ function getCurrentPackage() {
   });
 }
 
+function getSDK(config) {
+   if (testSdk) {
+      return testSdk;
+   } else {
+      return new Sdk(requestFetchAdapter, config);
+   }
+}
+
 /* Logs messages to console with the [CodePush] prefix */
 function log(message) {
   console.log(`[CodePush] ${message}`)