facebook · nissy-dev · Nov 5, 2018
diff --git a/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js b/ReactAndroid/src/androidTest/js/ProgressBarTestModule.js
@@ -9,12 +9,12 @@
 
 'use strict';
 
-var BatchedBridge = require('BatchedBridge');
-var React = require('React');
-var ProgressBar = require('ProgressBarAndroid');
-var View = require('View');
+const BatchedBridge = require('BatchedBridge');
+const React = require('React');
+const ProgressBar = require('ProgressBarAndroid');
+const View = require('View');
 
-var renderApplication = require('renderApplication');
+const renderApplication = require('renderApplication');
 
 class ProgressBarSampleApp extends React.Component {
   state = {};
@@ -37,7 +37,7 @@ class ProgressBarSampleApp extends React.Component {
   }
 }
 
-var ProgressBarTestModule = {
+const ProgressBarTestModule = {
   renderProgressBarApplication: function(rootTag) {
     renderApplication(ProgressBarSampleApp, {}, rootTag);
   },

diff --git a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
@@ -47,8 +47,8 @@ class Item extends React.Component<ItemProps, ItemState> {
 }
 
 const getInitialState = function() {
-  var data = [];
-  for (var i = 0; i < NUM_ITEMS; i++) {
+  const data = [];
+  for (let i = 0; i < NUM_ITEMS; i++) {
     data[i] = {text: 'Item ' + i + '!'};
   }
   return {
@@ -101,7 +101,7 @@ class ScrollViewTestApp extends React.Component<Props, State> {
 
   render() {
     scrollViewApp = this;
-    var children = this.state.data.map((item, index) => (
+    const children = this.state.data.map((item, index) => (
       <Item
         key={index}
         text={item.text}
@@ -135,7 +135,7 @@ class HorizontalScrollViewTestApp extends React.Component<Props, State> {
 
   render() {
     scrollViewApp = this;
-    var children = this.state.data.map((item, index) => (
+    const children = this.state.data.map((item, index) => (
       <Item
         key={index}
         text={item.text}
@@ -150,7 +150,7 @@ class HorizontalScrollViewTestApp extends React.Component<Props, State> {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   item_container: {
     padding: 30,
     backgroundColor: '#ffffff',
@@ -162,7 +162,7 @@ var styles = StyleSheet.create({
   },
 });
 
-var ScrollViewTestModule = {
+const ScrollViewTestModule = {
   ScrollViewTestApp: ScrollViewTestApp,
   HorizontalScrollViewTestApp: HorizontalScrollViewTestApp,
   scrollTo(destX: number, destY: number) {

diff --git a/ReactAndroid/src/androidTest/js/ShareTestModule.js b/ReactAndroid/src/androidTest/js/ShareTestModule.js
@@ -9,19 +9,19 @@
 
 'use strict';
 
-var BatchedBridge = require('BatchedBridge');
-var React = require('React');
-var RecordingModule = require('NativeModules').ShareRecordingModule;
-var Share = require('Share');
-var View = require('View');
+const BatchedBridge = require('BatchedBridge');
+const React = require('React');
+const RecordingModule = require('NativeModules').ShareRecordingModule;
+const Share = require('Share');
+const View = require('View');
 
 class ShareTestApp extends React.Component {
   render() {
     return <View />;
   }
 }
 
-var ShareTestModule = {
+const ShareTestModule = {
   ShareTestApp: ShareTestApp,
   showShareDialog: function(content, options) {
     Share.share(content, options).then(

diff --git a/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js b/ReactAndroid/src/androidTest/js/SubviewsClippingTestModule.js
@@ -9,19 +9,19 @@
 
 'use strict';
 
-var BatchedBridge = require('BatchedBridge');
-var React = require('React');
-var ScrollView = require('ScrollView');
-var StyleSheet = require('StyleSheet');
-var View = require('View');
+const BatchedBridge = require('BatchedBridge');
+const React = require('React');
+const ScrollView = require('ScrollView');
+const StyleSheet = require('StyleSheet');
+const View = require('View');
 
-var requireNativeComponent = require('requireNativeComponent');
+const requireNativeComponent = require('requireNativeComponent');
 
-var ClippableView = requireNativeComponent('ClippableView');
+const ClippableView = requireNativeComponent('ClippableView');
 
 class ClippingSample1 extends React.Component {
   render() {
-    var styles = sample1Styles;
+    const styles = sample1Styles;
     return (
       <View>
         <ClippableView
@@ -54,7 +54,7 @@ class ClippingSample1 extends React.Component {
   }
 }
 
-var sample1Styles = StyleSheet.create({
+const sample1Styles = StyleSheet.create({
   outer: {
     width: 200,
     height: 200,
@@ -90,7 +90,7 @@ var sample1Styles = StyleSheet.create({
 
 class ClippingSample2 extends React.Component {
   render() {
-    var styles = sample2Styles;
+    const styles = sample2Styles;
     return (
       <View>
         <ClippableView
@@ -124,7 +124,7 @@ class ClippingSample2 extends React.Component {
   }
 }
 
-var sample2Styles = StyleSheet.create({
+const sample2Styles = StyleSheet.create({
   outer: {
     width: 200,
     height: 200,
@@ -164,12 +164,12 @@ var sample2Styles = StyleSheet.create({
 
 class UpdatingSample1 extends React.Component {
   render() {
-    var styles = updating1Styles;
-    var inner1Styles = [
+    const styles = updating1Styles;
+    const inner1Styles = [
       styles.inner1,
       {height: this.props.update1 ? 200 : 100},
     ];
-    var inner2Styles = [styles.inner2, {top: this.props.update2 ? 200 : 50}];
+    const inner2Styles = [styles.inner2, {top: this.props.update2 ? 200 : 50}];
     return (
       <View>
         <ClippableView
@@ -184,7 +184,7 @@ class UpdatingSample1 extends React.Component {
   }
 }
 
-var updating1Styles = StyleSheet.create({
+const updating1Styles = StyleSheet.create({
   outer: {
     width: 200,
     height: 200,
@@ -210,8 +210,8 @@ var updating1Styles = StyleSheet.create({
 
 class UpdatingSample2 extends React.Component {
   render() {
-    var styles = updating2Styles;
-    var outerStyles = [styles.outer, {height: this.props.update ? 200 : 100}];
+    const styles = updating2Styles;
+    const outerStyles = [styles.outer, {height: this.props.update ? 200 : 100}];
     return (
       <View>
         <ClippableView
@@ -225,7 +225,7 @@ class UpdatingSample2 extends React.Component {
   }
 }
 
-var updating2Styles = StyleSheet.create({
+const updating2Styles = StyleSheet.create({
   outer: {
     width: 100,
     height: 100,
@@ -242,15 +242,15 @@ var updating2Styles = StyleSheet.create({
 
 class ScrollViewTest extends React.Component {
   render() {
-    var styles = scrollTestStyles;
-    var children = [];
-    for (var i = 0; i < 4; i++) {
+    const styles = scrollTestStyles;
+    const children = [];
+    for (let i = 0; i < 4; i++) {
       children[i] = (
         <ClippableView key={i} style={styles.row} clippableViewID={'' + i} />
       );
     }
-    for (var i = 4; i < 6; i++) {
-      var viewID = 'C' + (i - 4);
+    for (let i = 4; i < 6; i++) {
+      const viewID = 'C' + (i - 4);
       children[i] = (
         <ClippableView
           key={i}
@@ -274,7 +274,7 @@ class ScrollViewTest extends React.Component {
   }
 }
 
-var scrollTestStyles = StyleSheet.create({
+const scrollTestStyles = StyleSheet.create({
   scrollView: {
     width: 200,
     height: 300,
@@ -303,7 +303,7 @@ var scrollTestStyles = StyleSheet.create({
   },
 });
 
-var appInstance = null;
+let appInstance = null;
 
 class SubviewsClippingTestApp extends React.Component {
   state = {};
@@ -317,12 +317,12 @@ class SubviewsClippingTestApp extends React.Component {
   };
 
   render() {
-    var component = this.state.component;
+    const component = this.state.component;
     return <View>{component}</View>;
   }
 }
 
-var SubviewsClippingTestModule = {
+const SubviewsClippingTestModule = {
   App: SubviewsClippingTestApp,
   renderClippingSample1: function() {
     appInstance.setComponent(<ClippingSample1 />);

diff --git a/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js b/ReactAndroid/src/androidTest/js/SwipeRefreshLayoutTestModule.js
@@ -9,15 +9,15 @@
 
 'use strict';
 
-var BatchedBridge = require('BatchedBridge');
-var React = require('React');
-var RecordingModule = require('NativeModules')
+const BatchedBridge = require('BatchedBridge');
+const React = require('React');
+const RecordingModule = require('NativeModules')
   .SwipeRefreshLayoutRecordingModule;
-var ScrollView = require('ScrollView');
-var RefreshControl = require('RefreshControl');
-var Text = require('Text');
-var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
-var View = require('View');
+const ScrollView = require('ScrollView');
+const RefreshControl = require('RefreshControl');
+const Text = require('Text');
+const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
+const View = require('View');
 
 class Row extends React.Component {
   state = {
@@ -39,7 +39,7 @@ class Row extends React.Component {
   };
 }
 
-var app = null;
+let app = null;
 
 class SwipeRefreshLayoutTestApp extends React.Component {
   state = {
@@ -51,8 +51,8 @@ class SwipeRefreshLayoutTestApp extends React.Component {
   }
 
   render() {
-    var rows = [];
-    for (var i = 0; i < this.state.rows; i++) {
+    const rows = [];
+    for (let i = 0; i < this.state.rows; i++) {
       rows.push(<Row key={i} />);
     }
     return (
@@ -71,7 +71,7 @@ class SwipeRefreshLayoutTestApp extends React.Component {
   }
 }
 
-var SwipeRefreshLayoutTestModule = {
+const SwipeRefreshLayoutTestModule = {
   SwipeRefreshLayoutTestApp,
   setRows: function(rows) {
     if (app != null) {

diff --git a/ReactAndroid/src/androidTest/js/TestBundle.js b/ReactAndroid/src/androidTest/js/TestBundle.js
@@ -32,9 +32,9 @@ require('TextInputTestModule');
 require('TimePickerDialogTestModule');
 
 // Define catalyst test apps used in integration tests
-var AppRegistry = require('AppRegistry');
+const AppRegistry = require('AppRegistry');
 
-var apps = [
+const apps = [
   {
     appKey: 'CatalystRootViewTestApp',
     component: () =>

diff --git a/ReactAndroid/src/androidTest/js/TestIdTestModule.js b/ReactAndroid/src/androidTest/js/TestIdTestModule.js
@@ -9,16 +9,16 @@
 
 'use strict';
 
-var Image = require('Image');
-var React = require('React');
-var StyleSheet = require('StyleSheet');
-var Text = require('Text');
-var TextInput = require('TextInput');
-var TouchableBounce = require('TouchableBounce');
-var TouchableHighlight = require('TouchableHighlight');
-var TouchableOpacity = require('TouchableOpacity');
-var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
-var View = require('View');
+const Image = require('Image');
+const React = require('React');
+const StyleSheet = require('StyleSheet');
+const Text = require('Text');
+const TextInput = require('TextInput');
+const TouchableBounce = require('TouchableBounce');
+const TouchableHighlight = require('TouchableHighlight');
+const TouchableOpacity = require('TouchableOpacity');
+const TouchableWithoutFeedback = require('TouchableWithoutFeedback');
+const View = require('View');
 
 /**
  * All the views implemented on Android, each with the testID property set.
@@ -72,7 +72,7 @@ class TestIdTestApp extends React.Component {
   }
 }
 
-var styles = StyleSheet.create({
+const styles = StyleSheet.create({
   base: {
     width: 150,
     height: 50,

diff --git a/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js b/ReactAndroid/src/androidTest/js/TestJSLocaleModule.js
@@ -9,10 +9,10 @@
 
 'use strict';
 
-var BatchedBridge = require('BatchedBridge');
-var Recording = require('NativeModules').Recording;
+const BatchedBridge = require('BatchedBridge');
+const Recording = require('NativeModules').Recording;
 
-var TestJSLocaleModule = {
+const TestJSLocaleModule = {
   toUpper: function(s) {
     Recording.record(s.toUpperCase());
   },