From 6074664f73c6b1ea1f774f2bc698224e3677cef0 Mon Sep 17 00:00:00 2001 From: Raphael Amorim Date: Thu, 30 Nov 2017 21:59:05 -0200 Subject: [PATCH] react-reconciler: convert vars into let/const (#11729) --- packages/react-reconciler/index.js | 2 +- .../src/ReactDebugCurrentFiber.js | 2 +- packages/react-reconciler/src/ReactFiber.js | 4 +- .../src/ReactFiberBeginWork.js | 18 ++--- .../src/ReactFiberCommitWork.js | 8 +- .../src/ReactFiberCompleteWork.js | 12 +-- .../src/ReactFiberInstrumentation.js | 2 +- .../src/ReactFiberReconciler.js | 4 +- .../src/ReactFiberScheduler.js | 8 +- .../src/ReactFiberTreeReflection.js | 8 +- .../src/__tests__/ReactExpiration-test.js | 4 +- .../__tests__/ReactFiberHostContext-test.js | 8 +- .../src/__tests__/ReactFragment-test.js | 32 ++++---- .../src/__tests__/ReactIncremental-test.js | 80 +++++++++---------- .../ReactIncrementalErrorHandling-test.js | 28 +++---- ...ctIncrementalErrorLogging-test.internal.js | 4 +- .../ReactIncrementalReflection-test.js | 4 +- .../ReactIncrementalScheduling-test.js | 8 +- .../ReactIncrementalSideEffects-test.js | 26 +++--- .../ReactIncrementalTriangle-test.js | 6 +- .../__tests__/ReactIncrementalUpdates-test.js | 4 +- .../ReactPersistent-test.internal.js | 26 +++--- .../__tests__/ReactTopLevelFragment-test.js | 30 +++---- .../src/__tests__/ReactTopLevelText-test.js | 4 +- 24 files changed, 170 insertions(+), 162 deletions(-) diff --git a/packages/react-reconciler/index.js b/packages/react-reconciler/index.js index 9d5fdbe777..f513c9c965 100644 --- a/packages/react-reconciler/index.js +++ b/packages/react-reconciler/index.js @@ -16,7 +16,7 @@ export type { Reconciler, } from './src/ReactFiberReconciler'; -var ReactFiberReconciler = require('./src/ReactFiberReconciler'); +const ReactFiberReconciler = require('./src/ReactFiberReconciler'); // TODO: decide on the top-level export form. // This is hacky but makes it work with both Rollup and Jest. diff --git a/packages/react-reconciler/src/ReactDebugCurrentFiber.js b/packages/react-reconciler/src/ReactDebugCurrentFiber.js index 31644180d7..7b0f6b5cf8 100644 --- a/packages/react-reconciler/src/ReactDebugCurrentFiber.js +++ b/packages/react-reconciler/src/ReactDebugCurrentFiber.js @@ -58,7 +58,7 @@ function setCurrentPhase(phase: LifeCyclePhase | null) { ReactDebugCurrentFiber.phase = phase; } -var ReactDebugCurrentFiber = { +const ReactDebugCurrentFiber = { current: (null: Fiber | null), phase: (null: LifeCyclePhase | null), resetCurrentFiber, diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js index 1562dca186..941247574f 100644 --- a/packages/react-reconciler/src/ReactFiber.js +++ b/packages/react-reconciler/src/ReactFiber.js @@ -40,7 +40,7 @@ import {NoContext} from './ReactTypeOfInternalContext'; if (__DEV__) { var hasBadMapPolyfill = false; try { - const nonExtensibleObject = Object.preventExtensions({}); + var nonExtensibleObject = Object.preventExtensions({}); /* eslint-disable no-new */ new Map([[nonExtensibleObject, null]]); new Set([nonExtensibleObject]); @@ -212,7 +212,7 @@ function FiberNode( // is faster. // 5) It should be easy to port this to a C struct and keep a C implementation // compatible. -var createFiber = function( +const createFiber = function( tag: TypeOfWork, pendingProps: mixed, key: null | string, diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js index 3c0f53a5d3..c0affc90cc 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.js @@ -180,10 +180,10 @@ export default function( // It used to be here. } - var unmaskedContext = getUnmaskedContext(workInProgress); - var context = getMaskedContext(workInProgress, unmaskedContext); + const unmaskedContext = getUnmaskedContext(workInProgress); + const context = getMaskedContext(workInProgress, unmaskedContext); - var nextChildren; + let nextChildren; if (__DEV__) { ReactCurrentOwner.current = workInProgress; @@ -438,12 +438,12 @@ export default function( 'An indeterminate component should never have mounted. This error is ' + 'likely caused by a bug in React. Please file an issue.', ); - var fn = workInProgress.type; - var props = workInProgress.pendingProps; - var unmaskedContext = getUnmaskedContext(workInProgress); - var context = getMaskedContext(workInProgress, unmaskedContext); + const fn = workInProgress.type; + const props = workInProgress.pendingProps; + const unmaskedContext = getUnmaskedContext(workInProgress); + const context = getMaskedContext(workInProgress, unmaskedContext); - var value; + let value; if (__DEV__) { if (fn.prototype && typeof fn.prototype.render === 'function') { @@ -523,7 +523,7 @@ export default function( } function updateCallComponent(current, workInProgress, renderExpirationTime) { - var nextCall = (workInProgress.pendingProps: ReactCall); + let nextCall = (workInProgress.pendingProps: ReactCall); if (hasContextChanged()) { // Normally we can bail out on props equality but if context has changed // we don't do the bailout and we have to reuse existing props instead. diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js index 68b990c1d2..038704559e 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.js @@ -31,7 +31,11 @@ import {commitCallbacks} from './ReactFiberUpdateQueue'; import {onCommitUnmount} from './ReactFiberDevToolsHook'; import {startPhaseTimer, stopPhaseTimer} from './ReactDebugFiberPerf'; -var {invokeGuardedCallback, hasCaughtError, clearCaughtError} = ReactErrorUtils; +const { + invokeGuardedCallback, + hasCaughtError, + clearCaughtError, +} = ReactErrorUtils; export default function( config: HostConfig, @@ -39,7 +43,7 @@ export default function( ) { const {getPublicInstance, mutation, persistence} = config; - var callComponentWillUnmountWithTimer = function(current, instance) { + const callComponentWillUnmountWithTimer = function(current, instance) { startPhaseTimer(current, 'componentWillUnmount'); instance.props = current.memoizedProps; instance.state = current.memoizedState; diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js index d918f769dc..9e07f34b34 100644 --- a/packages/react-reconciler/src/ReactFiberCompleteWork.js +++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js @@ -115,7 +115,7 @@ export default function( workInProgress: Fiber, renderExpirationTime: ExpirationTime, ) { - var call = (workInProgress.memoizedProps: ?ReactCall); + const call = (workInProgress.memoizedProps: ?ReactCall); invariant( call, 'Should be resolved by now. This error is likely caused by a bug in ' + @@ -133,13 +133,13 @@ export default function( // Build up the returns. // TODO: Compare this to a generator or opaque helpers like Children. - var returns: Array = []; + const returns: Array = []; appendAllReturns(returns, workInProgress); - var fn = call.handler; - var props = call.props; - var nextChildren = fn(props, returns); + const fn = call.handler; + const props = call.props; + const nextChildren = fn(props, returns); - var currentFirstChild = current !== null ? current.child : null; + const currentFirstChild = current !== null ? current.child : null; workInProgress.child = reconcileChildFibers( workInProgress, currentFirstChild, diff --git a/packages/react-reconciler/src/ReactFiberInstrumentation.js b/packages/react-reconciler/src/ReactFiberInstrumentation.js index 3f8aaf1cdf..a753317705 100644 --- a/packages/react-reconciler/src/ReactFiberInstrumentation.js +++ b/packages/react-reconciler/src/ReactFiberInstrumentation.js @@ -11,7 +11,7 @@ // See https://github.com/facebook/react/pull/8033. // This is not part of the public API, not even for React DevTools. // You may only inject a debugTool if you work on React Fiber itself. -var ReactFiberInstrumentation = { +const ReactFiberInstrumentation = { debugTool: null, }; diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js index d34fdbc8a5..dac06f0dd1 100644 --- a/packages/react-reconciler/src/ReactFiberReconciler.js +++ b/packages/react-reconciler/src/ReactFiberReconciler.js @@ -285,9 +285,9 @@ function getContextForSubtree( export default function( config: HostConfig, ): Reconciler { - var {getPublicInstance} = config; + const {getPublicInstance} = config; - var { + const { computeAsyncExpiration, computeUniqueAsyncExpiration, computeExpirationForFiber, diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js index 2284036e68..c69f4bbcb3 100644 --- a/packages/react-reconciler/src/ReactFiberScheduler.js +++ b/packages/react-reconciler/src/ReactFiberScheduler.js @@ -79,7 +79,11 @@ import {AsyncUpdates} from './ReactTypeOfInternalContext'; import {getUpdateExpirationTime} from './ReactFiberUpdateQueue'; import {resetContext} from './ReactFiberContext'; -var {invokeGuardedCallback, hasCaughtError, clearCaughtError} = ReactErrorUtils; +const { + invokeGuardedCallback, + hasCaughtError, + clearCaughtError, +} = ReactErrorUtils; export type CapturedError = { componentName: ?string, @@ -101,7 +105,7 @@ if (__DEV__) { var didWarnStateUpdateForUnmountedComponent = {}; var warnAboutUpdateOnUnmounted = function(fiber: Fiber) { - const componentName = getComponentName(fiber) || 'ReactClass'; + var componentName = getComponentName(fiber) || 'ReactClass'; if (didWarnStateUpdateForUnmountedComponent[componentName]) { return; } diff --git a/packages/react-reconciler/src/ReactFiberTreeReflection.js b/packages/react-reconciler/src/ReactFiberTreeReflection.js index e25d065d27..c988465b75 100644 --- a/packages/react-reconciler/src/ReactFiberTreeReflection.js +++ b/packages/react-reconciler/src/ReactFiberTreeReflection.js @@ -24,9 +24,9 @@ import { } from 'shared/ReactTypeOfWork'; import {NoEffect, Placement} from 'shared/ReactTypeOfSideEffect'; -var MOUNTING = 1; -var MOUNTED = 2; -var UNMOUNTED = 3; +const MOUNTING = 1; +const MOUNTED = 2; +const UNMOUNTED = 3; function isFiberMountedImpl(fiber: Fiber): number { let node = fiber; @@ -80,7 +80,7 @@ export function isMounted(component: React$Component): boolean { } } - var fiber: ?Fiber = ReactInstanceMap.get(component); + const fiber: ?Fiber = ReactInstanceMap.get(component); if (!fiber) { return false; } diff --git a/packages/react-reconciler/src/__tests__/ReactExpiration-test.js b/packages/react-reconciler/src/__tests__/ReactExpiration-test.js index 643606d7ee..1227237f7d 100644 --- a/packages/react-reconciler/src/__tests__/ReactExpiration-test.js +++ b/packages/react-reconciler/src/__tests__/ReactExpiration-test.js @@ -7,8 +7,8 @@ 'use strict'; -var React; -var ReactNoop; +let React; +let ReactNoop; describe('ReactExpiration', () => { beforeEach(() => { diff --git a/packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.js b/packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.js index da47a3e2bc..2441bd3124 100644 --- a/packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.js +++ b/packages/react-reconciler/src/__tests__/ReactFiberHostContext-test.js @@ -9,8 +9,8 @@ 'use strict'; -var React; -var ReactFiberReconciler; +let React; +let ReactFiberReconciler; describe('ReactFiberHostContext', () => { beforeEach(() => { @@ -20,8 +20,8 @@ describe('ReactFiberHostContext', () => { }); it('works with null host context', () => { - var creates = 0; - var Renderer = ReactFiberReconciler({ + let creates = 0; + const Renderer = ReactFiberReconciler({ prepareForCommit: function() {}, resetAfterCommit: function() {}, getRootHostContext: function() { diff --git a/packages/react-reconciler/src/__tests__/ReactFragment-test.js b/packages/react-reconciler/src/__tests__/ReactFragment-test.js index 65e416f839..00ae2aa2e9 100644 --- a/packages/react-reconciler/src/__tests__/ReactFragment-test.js +++ b/packages/react-reconciler/src/__tests__/ReactFragment-test.js @@ -81,7 +81,7 @@ describe('ReactFragment', () => { }); it('should preserve state of children with 1 level nesting', function() { - var ops = []; + const ops = []; class Stateful extends React.Component { componentDidUpdate() { @@ -121,7 +121,7 @@ describe('ReactFragment', () => { }); it('should preserve state between top-level fragments', function() { - var ops = []; + const ops = []; class Stateful extends React.Component { componentDidUpdate() { @@ -162,7 +162,7 @@ describe('ReactFragment', () => { }); it('should preserve state of children nested at same level', function() { - var ops = []; + const ops = []; class Stateful extends React.Component { componentDidUpdate() { @@ -212,7 +212,7 @@ describe('ReactFragment', () => { }); it('should not preserve state in non-top-level fragment nesting', function() { - var ops = []; + const ops = []; class Stateful extends React.Component { componentDidUpdate() { @@ -255,7 +255,7 @@ describe('ReactFragment', () => { }); it('should not preserve state of children if nested 2 levels without siblings', function() { - var ops = []; + const ops = []; class Stateful extends React.Component { componentDidUpdate() { @@ -296,7 +296,7 @@ describe('ReactFragment', () => { }); it('should not preserve state of children if nested 2 levels with siblings', function() { - var ops = []; + const ops = []; class Stateful extends React.Component { componentDidUpdate() { @@ -338,7 +338,7 @@ describe('ReactFragment', () => { }); it('should preserve state between array nested in fragment and fragment', function() { - var ops = []; + const ops = []; class Stateful extends React.Component { componentDidUpdate() { @@ -377,7 +377,7 @@ describe('ReactFragment', () => { }); it('should preserve state between top level fragment and array', function() { - var ops = []; + const ops = []; class Stateful extends React.Component { componentDidUpdate() { @@ -416,7 +416,7 @@ describe('ReactFragment', () => { }); it('should not preserve state between array nested in fragment and double nested fragment', function() { - var ops = []; + const ops = []; class Stateful extends React.Component { componentDidUpdate() { @@ -457,7 +457,7 @@ describe('ReactFragment', () => { }); it('should not preserve state between array nested in fragment and double nested array', function() { - var ops = []; + const ops = []; class Stateful extends React.Component { componentDidUpdate() { @@ -494,7 +494,7 @@ describe('ReactFragment', () => { }); it('should preserve state between double nested fragment and double nested array', function() { - var ops = []; + const ops = []; class Stateful extends React.Component { componentDidUpdate() { @@ -535,7 +535,7 @@ describe('ReactFragment', () => { }); it('should not preserve state of children when the keys are different', function() { - var ops = []; + const ops = []; class Stateful extends React.Component { componentDidUpdate() { @@ -577,7 +577,7 @@ describe('ReactFragment', () => { }); it('should not preserve state between unkeyed and keyed fragment', function() { - var ops = []; + const ops = []; class Stateful extends React.Component { componentDidUpdate() { @@ -618,7 +618,7 @@ describe('ReactFragment', () => { }); it('should preserve state with reordering in multiple levels', function() { - var ops = []; + const ops = []; class Stateful extends React.Component { componentDidUpdate() { @@ -672,7 +672,7 @@ describe('ReactFragment', () => { it('should not preserve state when switching to a keyed fragment to an array', function() { spyOnDev(console, 'error'); - var ops = []; + const ops = []; class Stateful extends React.Component { componentDidUpdate() { @@ -726,7 +726,7 @@ describe('ReactFragment', () => { it('should preserve state when it does not change positions', function() { spyOnDev(console, 'error'); - var ops = []; + const ops = []; class Stateful extends React.Component { componentDidUpdate() { diff --git a/packages/react-reconciler/src/__tests__/ReactIncremental-test.js b/packages/react-reconciler/src/__tests__/ReactIncremental-test.js index 5bb4765543..ce98b306cd 100644 --- a/packages/react-reconciler/src/__tests__/ReactIncremental-test.js +++ b/packages/react-reconciler/src/__tests__/ReactIncremental-test.js @@ -9,9 +9,9 @@ 'use strict'; -var React; -var ReactNoop; -var PropTypes; +let React; +let ReactNoop; +let PropTypes; describe('ReactIncremental', () => { beforeEach(() => { @@ -35,8 +35,8 @@ describe('ReactIncremental', () => { }); it('should render a simple component, in steps if needed', () => { - var renderCallbackCalled = false; - var barCalled = false; + let renderCallbackCalled = false; + let barCalled = false; function Bar() { barCalled = true; return ( @@ -46,7 +46,7 @@ describe('ReactIncremental', () => { ); } - var fooCalled = false; + let fooCalled = false; function Foo() { fooCalled = true; return [, ]; @@ -69,7 +69,7 @@ describe('ReactIncremental', () => { }); it('updates a previous render', () => { - var ops = []; + let ops = []; function Header() { ops.push('Header'); @@ -86,8 +86,8 @@ describe('ReactIncremental', () => { return
Bye
; } - var header =
; - var footer =