From f635578e7c268428374b6cd890941a93d7bebd72 Mon Sep 17 00:00:00 2001 From: Raphael Amorim Date: Thu, 30 Nov 2017 22:37:45 -0200 Subject: [PATCH 1/2] react-noop-renderer: convert vars into let/const --- packages/react-noop-renderer/index.js | 2 +- packages/react-noop-renderer/src/ReactNoop.js | 30 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/react-noop-renderer/index.js b/packages/react-noop-renderer/index.js index b209c1f34e45..0c0047d4c1be 100644 --- a/packages/react-noop-renderer/index.js +++ b/packages/react-noop-renderer/index.js @@ -9,7 +9,7 @@ 'use strict'; -var ReactNoop = require('./src/ReactNoop'); +const ReactNoop = require('./src/ReactNoop'); // 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-noop-renderer/src/ReactNoop.js b/packages/react-noop-renderer/src/ReactNoop.js index ab778ddbce65..72c88c9c79da 100644 --- a/packages/react-noop-renderer/src/ReactNoop.js +++ b/packages/react-noop-renderer/src/ReactNoop.js @@ -26,7 +26,7 @@ import expect from 'expect'; const UPDATE_SIGNAL = {}; -var scheduledCallback = null; +let scheduledCallback = null; type Container = {rootID: string, children: Array}; type Props = {prop: any, hidden?: boolean}; @@ -38,9 +38,9 @@ type Instance = {| |}; type TextInstance = {|text: string, id: number|}; -var instanceCounter = 0; +let instanceCounter = 0; -var failInBeginPhase = false; +let failInBeginPhase = false; function appendChild( parentInstance: Instance | Container, @@ -150,7 +150,7 @@ var SharedHostConfig = { hostContext: Object, internalInstanceHandle: Object, ): TextInstance { - var inst = {text: text, id: instanceCounter++}; + const inst = {text: text, id: instanceCounter++}; // Hide from unit tests Object.defineProperty(inst, 'id', {value: inst.id, enumerable: false}); return inst; @@ -183,7 +183,7 @@ var SharedHostConfig = { }, }; -var NoopRenderer = ReactFiberReconciler({ +const NoopRenderer = ReactFiberReconciler({ ...SharedHostConfig, mutation: { commitMount(instance: Instance, type: string, newProps: Props): void { @@ -219,7 +219,7 @@ var NoopRenderer = ReactFiberReconciler({ }, }); -var PersistentNoopRenderer = enablePersistentReconciler +const PersistentNoopRenderer = enablePersistentReconciler ? ReactFiberReconciler({ ...SharedHostConfig, persistence: { @@ -274,10 +274,10 @@ var PersistentNoopRenderer = enablePersistentReconciler }) : null; -var rootContainers = new Map(); -var roots = new Map(); -var persistentRoots = new Map(); -var DEFAULT_ROOT_ID = ''; +const rootContainers = new Map(); +const roots = new Map(); +const persistentRoots = new Map(); +const DEFAULT_ROOT_ID = ''; let yieldedValues = null; @@ -309,7 +309,7 @@ function* flushUnitsOfWork(n: number): Generator, void, void> { } } -var ReactNoop = { +const ReactNoop = { getChildren(rootID: string = DEFAULT_ROOT_ID) { const container = rootContainers.get(rootID); if (container) { @@ -477,15 +477,15 @@ var ReactNoop = { return; } - var bufferedLog = []; + let bufferedLog = []; function log(...args) { bufferedLog.push(...args, '\n'); } function logHostInstances(children: Array, depth) { for (var i = 0; i < children.length; i++) { - var child = children[i]; - var indent = ' '.repeat(depth); + const child = children[i]; + const indent = ' '.repeat(depth); if (typeof child.text === 'string') { log(indent + '- ' + child.text); } else { @@ -514,7 +514,7 @@ var ReactNoop = { firstUpdate.callback ? 'with callback' : '', '[' + firstUpdate.expirationTime + ']', ); - var next; + let next; while ((next = firstUpdate.next)) { log( ' '.repeat(depth + 1) + '~', From a00b2d4482f11d6207e3e9cf4e52e14fbf6ad412 Mon Sep 17 00:00:00 2001 From: Raphael Amorim Date: Thu, 30 Nov 2017 22:53:26 -0200 Subject: [PATCH 2/2] react-dom: validatePropertiesInDevelopment --- packages/react-dom/src/server/ReactPartialRenderer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js index e05ccec20694..949b784bcb9c 100644 --- a/packages/react-dom/src/server/ReactPartialRenderer.js +++ b/packages/react-dom/src/server/ReactPartialRenderer.js @@ -56,7 +56,7 @@ var toArray = ((React.Children.toArray: any): toArrayType); var getStackAddendum = emptyFunction.thatReturns(''); if (__DEV__) { - var validatePropertiesInDevelopment = function(type, props) { + let validatePropertiesInDevelopment = function(type, props) { validateARIAProperties(type, props); validateInputProperties(type, props); validateUnknownProperties(type, props, /* canUseEventSystem */ false);