feedback

geof90 · geof90 · commit 9b87d7e2a899 · 2015-12-23T22:53:58.000-08:00
diff --git a/CodePush.js b/CodePush.js
@@ -1,8 +1,8 @@
 'use strict';
 
 import { Alert } from "./AlertAdapter";
-let NativeCodePush = require("react-native").NativeModules.CodePush;
-let PackageMixins = require("./package-mixins")(NativeCodePush);
+const NativeCodePush = require("react-native").NativeModules.CodePush;
+const PackageMixins = require("./package-mixins")(NativeCodePush);
 import requestFetchAdapter from "./request-fetch-adapter.js";
 import { AcquisitionManager as Sdk } from "code-push/script/acquisition-sdk";
 import semver from "semver";
@@ -25,7 +25,7 @@ async function checkForUpdate(deploymentKey = null) {
    * dynamically "redirecting" end-users at different
    * deployments (e.g. an early access deployment for insiders).
    */
-  let config = deploymentKey ? Object.assign({}, nativeConfig, { deploymentKey })
+  let config = deploymentKey ? { ...nativeConfig, ...{ deploymentKey } }
                              : nativeConfig;
   let sdk = getPromisifiedSdk(requestFetchAdapter, config);
   // Use dynamically overridden getCurrentPackage() during tests.
@@ -58,7 +58,7 @@ async function checkForUpdate(deploymentKey = null) {
   if (!update || update.updateAppVersion || (update.packageHash === localPackage.packageHash)) {
     return null;
   } else {     
-    let remotePackage = Object.assign(update, PackageMixins.remote);
+    let remotePackage = { ...update, ...PackageMixins.remote };
     remotePackage.failedInstall = await NativeCodePush.isFailedUpdate(remotePackage.packageHash);
     return remotePackage;
   }
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/CheckForUpdateTestApp.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/CheckForUpdateTestApp.js
@@ -1,17 +1,15 @@
 "use strict";
 
-import React from "react-native";
-
-let {
+import React, {
   AppRegistry,
   ScrollView,
   StyleSheet,
   Text,
   TouchableOpacity,
   View,
-} = React;
+} from "react-native";
 
-let TESTS = [
+const TESTS = [
   require("./testcases/FirstUpdateTest"),
   require("./testcases/NewUpdateTest"),
   require("./testcases/NoRemotePackageTest"),
@@ -65,7 +63,7 @@ let CheckForUpdateTestApp = React.createClass({
   }
 });
 
-let styles = StyleSheet.create({
+const styles = StyleSheet.create({
   container: {
     backgroundColor: "white",
     marginTop: 40,
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/FirstUpdateTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/FirstUpdateTest.js
@@ -2,9 +2,9 @@
 
 import React from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
+const NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
 
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/NewUpdateTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/NewUpdateTest.js
@@ -2,9 +2,9 @@
 
 import React from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
+const NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
 
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/NoRemotePackageTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/NoRemotePackageTest.js
@@ -2,14 +2,14 @@
 
 import React from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
+const NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
 
-let serverPackage = null;
-let localPackage =  {};
+const serverPackage = null;
+const localPackage =  {};
 
 let NoRemotePackageTest = createTestCaseComponent(
   "NoRemotePackageTest",
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/RemotePackageAppVersionNewerTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/RemotePackageAppVersionNewerTest.js
@@ -2,14 +2,14 @@
 
 import React from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
+const NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
 
 import { updateAppVersionPackage as serverPackage } from "../resources/testPackages";
-let localPackage = {};
+const localPackage = {};
 
 let RemotePackageAppVersionNewerTest = createTestCaseComponent(
   "RemotePackageAppVersionNewerTest",
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/SamePackageTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/SamePackageTest.js
@@ -2,9 +2,9 @@
 
 import React from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
+const NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
 
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/SwitchDeploymentKeyTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/CheckForUpdateTests/testcases/SwitchDeploymentKeyTest.js
@@ -2,16 +2,16 @@
 
 import React from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
+const NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
 
 import { serverPackage } from "../resources/testPackages";
 const localPackage = {};
 
-let deploymentKey = "myKey123";
+const deploymentKey = "myKey123";
 
 let SwitchDeploymentKeyTest = createTestCaseComponent(
   "SwitchDeploymentKeyTest",
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/DownloadProgressTests/resources/TestPackages.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/DownloadProgressTests/resources/TestPackages.js
@@ -1,6 +1,6 @@
-let { Platform } = require("react-native");
+import { Platform } from "react-native";
 
-let packages = [
+const packages = [
   {
     downloadUrl: "smallFile",
     description: "Angry flappy birds",
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/DownloadProgressTests/testcases/DownloadProgressTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/DownloadProgressTests/testcases/DownloadProgressTest.js
@@ -2,13 +2,13 @@
 
 import React from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
+const NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 
 import testPackages from "../resources/TestPackages";
-let localPackage = {};
+const localPackage = {};
 let saveProgress;
 
 function checkReceivedAndExpectedBytesEqual() {
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/IsFailedUpdateTestBundleV1.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/IsFailedUpdateTestBundleV1.js
@@ -8,8 +8,8 @@ import React, {
 } from "react-native";
 
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const NativeCodePush = React.NativeModules.CodePush;
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import createMockAcquisitionSdk from "../../utils/mockAcquisitionSdk";
 
 let IsFailedUpdateTest = React.createClass({
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/IsFailedUpdateTestBundleV2.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/IsFailedUpdateTestBundleV2.js
@@ -1,13 +1,11 @@
 "use strict";
 
-import React from "react-native";
-import CodePush from "react-native-code-push";
-
-let {
+import React, {
   AppRegistry,
   Text,
   View,
-} = React;
+} from "react-native";
+import CodePush from "react-native-code-push";
 
 let IsFailedUpdateTest = React.createClass({
   componentDidMount() {
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/NotifyApplicationReadyAndRestart.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/NotifyApplicationReadyAndRestart.js
@@ -3,8 +3,8 @@
 import React from "react-native";
 import { Platform, AppRegistry, Text, View } from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
-let RCTTestModule = React.NativeModules.TestModule;
+const NativeCodePush = React.NativeModules.CodePush;
+const RCTTestModule = React.NativeModules.TestModule;
 
 let NotifyApplicationReadyTest = React.createClass({
   getInitialState() {
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/PassInstallModeImmediateTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/PassInstallModeImmediateTest.js
@@ -1,12 +1,10 @@
 "use strict";
 
-import React from "react-native";
-
-let {
+import React, {
   AppRegistry,
   Text,
   View,
-} = React;
+} from "react-native";
 
 let InstallModeImmediateTest = React.createClass({
   render() {
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/PassInstallModeOnNextRestartTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/PassInstallModeOnNextRestartTest.js
@@ -1,12 +1,10 @@
 "use strict";
 
-import React from "react-native";
-
-let {
+import React, {
   AppRegistry,
   Text,
   View,
-} = React;
+} from "react-native";
 
 let InstallModeOnNextRestartTest = React.createClass({
   render() {
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/PassInstallModeOnNextResumeTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/PassInstallModeOnNextResumeTest.js
@@ -1,12 +1,10 @@
 "use strict";
 
-import React from "react-native";
-
-let {
+import React, {
   AppRegistry,
   Text,
   View,
-} = React;
+} from "react-native";
 
 let InstallModeOnNextResumeTest = React.createClass({
   render() {
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/PassNotifyApplicationReadyTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/PassNotifyApplicationReadyTest.js
@@ -1,12 +1,10 @@
 "use strict";
 
-import React from "react-native";
-
-let {
+import React, {
   AppRegistry,
   Text,
   View,
-} = React;
+} from "react-native";
 
 let NotifyApplicationReadyTest = React.createClass({
   render() {
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/RollbackTestBundleV1.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/RollbackTestBundleV1.js
@@ -8,9 +8,9 @@ import React, {
 } from "react-native";
 
 import CodePush from "react-native-code-push";
-let RCTTestModule = React.NativeModules.TestModule;
-let NativeCodePush = React.NativeModules.CodePush;
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const RCTTestModule = React.NativeModules.TestModule;
+const NativeCodePush = React.NativeModules.CodePush;
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 
 let RollbackTest = React.createClass({
   async componentDidMount() {
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/RollbackTestBundleV1Pass.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/RollbackTestBundleV1Pass.js
@@ -1,12 +1,10 @@
 "use strict";
 
-import React from "react-native";
-
-let {
+import React, {
   AppRegistry,
   Text,
   View,
-} = React;
+} from "react-native";
 
 let RollbackTest = React.createClass({
   render() {
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/RollbackTestBundleV2.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/resources/RollbackTestBundleV2.js
@@ -1,13 +1,11 @@
 "use strict";
 
-import React from "react-native";
-import CodePush from "react-native-code-push";
-
-let {
+import React, {
   AppRegistry,
   Text,
   View,
-} = React;
+} from "react-native";
+import CodePush from "react-native-code-push";
 
 let RollbackTest = React.createClass({
   componentDidMount() {
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/InstallModeImmediateTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/InstallModeImmediateTest.js
@@ -3,9 +3,9 @@
 import React from "react-native";
 import { DeviceEventEmitter, Platform, AppRegistry } from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
+const NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 
 let remotePackage = require("../resources/remotePackage");
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/InstallModeOnNextRestartTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/InstallModeOnNextRestartTest.js
@@ -3,9 +3,9 @@
 import React from "react-native";
 import { DeviceEventEmitter, Platform, AppRegistry } from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
+const NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 
 let remotePackage = require("../resources/remotePackage");
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/InstallModeOnNextResumeTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/InstallModeOnNextResumeTest.js
@@ -3,9 +3,9 @@
 import React from "react-native";
 import { DeviceEventEmitter, Platform, AppRegistry } from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
+const NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 
 let remotePackage = require("../resources/remotePackage");
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/IsFailedUpdateTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/IsFailedUpdateTest.js
@@ -3,9 +3,9 @@
 import React from "react-native";
 import { DeviceEventEmitter, Platform, AppRegistry } from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
+const NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 
 let remotePackage = require("../resources/remotePackage");
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/IsFirstRunTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/IsFirstRunTest.js
@@ -3,9 +3,9 @@
 import React from "react-native";
 import { DeviceEventEmitter, Platform, AppRegistry } from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
+const NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 
 let remotePackage = require("../resources/remotePackage");
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/IsPendingTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/IsPendingTest.js
@@ -3,9 +3,9 @@
 import React from "react-native";
 import { DeviceEventEmitter, Platform, AppRegistry } from "react-native";
 import CodePush from "react-native-code-push";
-let NativeCodePush = React.NativeModules.CodePush;
+const NativeCodePush = React.NativeModules.CodePush;
 import createTestCaseComponent from "../../utils/createTestCaseComponent";
-let PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
+const PackageMixins = require("react-native-code-push/package-mixins.js")(NativeCodePush);
 import assert from "assert";
 
 let remotePackage = require("../resources/remotePackage");
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/NotifyApplicationReadyTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/NotifyApplicationReadyTest.js
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/RollbackTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/RollbackTest.js
diff --git a/Examples/CodePushDemoApp/CodePushDemoAppTests/utils/createTestCaseComponent.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/utils/createTestCaseComponent.js
diff --git a/package-mixins.js b/package-mixins.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-let { Platform } = require("react-native");`
	`1`	`+import { Platform } from "react-native";`
`2`	`2`
`3`		`-let packages = [`
	`3`	`+const packages = [`
`4`	`4`	`{`
`5`	`5`	`downloadUrl: "smallFile",`
`6`	`6`	`description: "Angry flappy birds",`