diff --git a/CodePush.js b/CodePush.js index a688669..8889d2a 100644 --- 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 index 22250cc..3161a34 100644 --- 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 index bf27f6a..c06f8aa 100644 --- 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 index 393fdd2..b1c1369 100644 --- 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 index 5464e7a..fa82568 100644 --- 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 index 50f9d57..df432ca 100644 --- 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 index ba401f7..f6e3285 100644 --- 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 index caceded..1bf0be8 100644 --- 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 index ae3254c..d13201c 100644 --- 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 index 7841f66..096ab7b 100644 --- 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 index 72ee0dc..819693e 100644 --- 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 index da8f2f4..08fda7a 100644 --- 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 index 338e2ae..a74ba09 100644 --- 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 index d93d8dc..ef8e17d 100644 --- 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 index 7743f49..e525da3 100644 --- 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 index cfd0a98..491a391 100644 --- 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 index 5f426c7..df457b6 100644 --- 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 index 1877c84..33f7ebe 100644 --- 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 index 2f8b87f..b6d2ed7 100644 --- 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 index 12c9ce7..8b348a6 100644 --- 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 index 640b0fe..ede635f 100644 --- 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 index 5fa78fa..a383040 100644 --- 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 index 8596d61..c1109da 100644 --- 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 index 59a787f..d796645 100644 --- 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 index d31f910..748b8b0 100644 --- 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 index bd6825a..b5ae325 100644 --- 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 index df233f1..bd7fd49 100644 --- a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/NotifyApplicationReadyTest.js +++ b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/NotifyApplicationReadyTest.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/RollbackTest.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/RollbackTest.js index 6d4cd3e..0a64935 100644 --- a/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/RollbackTest.js +++ b/Examples/CodePushDemoApp/CodePushDemoAppTests/InstallUpdateTests/testcases/RollbackTest.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/utils/createTestCaseComponent.js b/Examples/CodePushDemoApp/CodePushDemoAppTests/utils/createTestCaseComponent.js index 9af45e3..498af1e 100644 --- a/Examples/CodePushDemoApp/CodePushDemoAppTests/utils/createTestCaseComponent.js +++ b/Examples/CodePushDemoApp/CodePushDemoAppTests/utils/createTestCaseComponent.js @@ -2,10 +2,10 @@ import React from "react-native"; import { DeviceEventEmitter, Text, View } from "react-native"; -let NativeCodePush = React.NativeModules.CodePush; +const NativeCodePush = React.NativeModules.CodePush; // RCTTestModule is not implemented yet for RN Android. -let RCTTestModule = React.NativeModules.TestModule || {}; +const RCTTestModule = React.NativeModules.TestModule || {}; function createTestCaseComponent(displayName, description, setUp, runTest, passAfterRun = true) { let TestCaseComponent = React.createClass({ diff --git a/package-mixins.js b/package-mixins.js index a74ee11..b4a89d6 100644 --- a/package-mixins.js +++ b/package-mixins.js @@ -23,8 +23,7 @@ export default (NativeCodePush) => { // so that the client knows what the current package version is. try { let downloadedPackage = await NativeCodePush.downloadUpdate(this); - downloadProgressSubscription && downloadProgressSubscription.remove(); - return Object.assign({}, downloadedPackage, local); + return { ...downloadedPackage, ...local }; } finally { downloadProgressSubscription && downloadProgressSubscription.remove(); }