{"parents":["8a8d973d3cc5623676a84f87af66ef9259c3937c"],"files":[{"status":"M","path":".eslintrc.js"},{"status":"M","path":"packages\/react-dom\/src\/client\/ReactDOM.js"},{"status":"M","path":"packages\/react-native-renderer\/src\/ReactFabricHostConfig.js"},{"status":"M","path":"packages\/react-noop-renderer\/src\/createReactNoop.js"},{"status":"M","path":"packages\/react-reconciler\/src\/ReactFiberRoot.js"},{"status":"M","path":"packages\/react-test-renderer\/src\/ReactShallowRenderer.js"},{"status":"M","path":"packages\/react-test-renderer\/src\/ReactTestHostConfig.js"},{"status":"M","path":"packages\/react-test-renderer\/src\/ReactTestRenderer.js"},{"status":"M","path":"packages\/shared\/ReactTypes.js"}],"patch":"diff --git a\/.eslintrc.js b\/.eslintrc.js\nindex 4f085721ab..4444c643ea 100644\n--- a\/.eslintrc.js\n+++ b\/.eslintrc.js\n@@ -37,6 +37,7 @@ module.exports = {\n 'no-shadow': ERROR,\n 'no-unused-expressions': ERROR,\n 'no-unused-vars': [ERROR, {args: 'none'}],\n+ 'no-use-before-define': [ERROR, {functions: false, variables: false}],\n 'no-useless-concat': OFF,\n 'quotes': [ERROR, 'single', {avoidEscape: true, allowTemplateLiterals: true }],\n 'space-before-blocks': ERROR,\ndiff --git a\/packages\/react-dom\/src\/client\/ReactDOM.js b\/packages\/react-dom\/src\/client\/ReactDOM.js\nindex d8e955b88b..80029c4fcc 100644\n--- a\/packages\/react-dom\/src\/client\/ReactDOM.js\n+++ b\/packages\/react-dom\/src\/client\/ReactDOM.js\n@@ -126,6 +126,7 @@ if (__DEV__) {\n \n ReactControlledComponent.setRestoreImplementation(restoreControlledState);\n \n+\/* eslint-disable no-use-before-define *\/\n type DOMContainer =\n | (Element & {\n _reactRootContainer: ?Root,\n@@ -150,6 +151,20 @@ type Batch = FiberRootBatch & {\n _didComplete: boolean,\n };\n \n+type Root = {\n+ render(children: ReactNodeList, callback: ?() => mixed): Work,\n+ unmount(callback: ?() => mixed): Work,\n+ legacy_renderSubtreeIntoContainer(\n+ parentComponent: ?React$Component,\n+ children: ReactNodeList,\n+ callback: ?() => mixed,\n+ ): Work,\n+ createBatch(): Batch,\n+\n+ _internalRoot: FiberRoot,\n+};\n+\/* eslint-enable no-use-before-define *\/\n+\n function ReactBatch(root: ReactRoot) {\n const expirationTime = DOMRenderer.computeUniqueAsyncExpiration();\n this._expirationTime = expirationTime;\n@@ -317,19 +332,6 @@ ReactWork.prototype._onCommit = function(): void {\n }\n };\n \n-type Root = {\n- render(children: ReactNodeList, callback: ?() => mixed): Work,\n- unmount(callback: ?() => mixed): Work,\n- legacy_renderSubtreeIntoContainer(\n- parentComponent: ?React$Component,\n- children: ReactNodeList,\n- callback: ?() => mixed,\n- ): Work,\n- createBatch(): Batch,\n-\n- _internalRoot: FiberRoot,\n-};\n-\n function ReactRoot(container: Container, isAsync: boolean, hydrate: boolean) {\n const root = DOMRenderer.createContainer(container, isAsync, hydrate);\n this._internalRoot = root;\ndiff --git a\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js b\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js\nindex a3be7a3cb9..8d66c97b44 100644\n--- a\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js\n+++ b\/packages\/react-native-renderer\/src\/ReactFabricHostConfig.js\n@@ -50,6 +50,7 @@ import UIManager from 'UIManager';\n \/\/ This means that they never overlap.\n let nextReactTag = 2;\n \n+\/* eslint-disable no-use-before-define *\/\n type Node = Object;\n export type Type = string;\n export type Props = Object;\n@@ -71,6 +72,7 @@ export type UpdatePayload = Object;\n \n export type TimeoutHandle = TimeoutID;\n export type NoTimeout = -1;\n+\/* eslint-enable no-use-before-define *\/\n \n \/\/ TODO: Remove this conditional once all changes have propagated.\n if (registerEventHandler) {\ndiff --git a\/packages\/react-noop-renderer\/src\/createReactNoop.js b\/packages\/react-noop-renderer\/src\/createReactNoop.js\nindex e761e0b353..1d71bd8ab5 100644\n--- a\/packages\/react-noop-renderer\/src\/createReactNoop.js\n+++ b\/packages\/react-noop-renderer\/src\/createReactNoop.js\n@@ -21,6 +21,7 @@ import type {ReactNodeList} from 'shared\/ReactTypes';\n import * as ReactPortal from 'shared\/ReactPortal';\n import expect from 'expect';\n \n+\/* eslint-disable no-use-before-define *\/\n type Container = {rootID: string, children: Array};\n type Props = {prop: any, hidden?: boolean, children?: mixed};\n type Instance = {|\n@@ -30,6 +31,7 @@ type Instance = {|\n prop: any,\n |};\n type TextInstance = {|text: string, id: number|};\n+\/* eslint-enable no-use-before-define *\/\n \n const NO_CONTEXT = {};\n const UPDATE_SIGNAL = {};\ndiff --git a\/packages\/react-reconciler\/src\/ReactFiberRoot.js b\/packages\/react-reconciler\/src\/ReactFiberRoot.js\nindex 9c35ceede1..0065f841d0 100644\n--- a\/packages\/react-reconciler\/src\/ReactFiberRoot.js\n+++ b\/packages\/react-reconciler\/src\/ReactFiberRoot.js\n@@ -18,6 +18,7 @@ import {NoWork} from '.\/ReactFiberExpirationTime';\n import {enableSchedulerTracking} from 'shared\/ReactFeatureFlags';\n import {unstable_getThreadID} from 'schedule\/tracking';\n \n+\/* eslint-disable no-use-before-define *\/\n \/\/ TODO: This should be lifted into the renderer.\n export type Batch = {\n _defer: boolean,\n@@ -98,6 +99,7 @@ export type FiberRoot = {\n ...BaseFiberRootProperties,\n ...ProfilingOnlyFiberRootProperties,\n };\n+\/* eslint-enable no-use-before-define *\/\n \n export function createFiberRoot(\n containerInfo: any,\ndiff --git a\/packages\/react-test-renderer\/src\/ReactShallowRenderer.js b\/packages\/react-test-renderer\/src\/ReactShallowRenderer.js\nindex e20fd9a604..9bf373d033 100644\n--- a\/packages\/react-test-renderer\/src\/ReactShallowRenderer.js\n+++ b\/packages\/react-test-renderer\/src\/ReactShallowRenderer.js\n@@ -19,6 +19,72 @@ if (__DEV__) {\n Object.freeze(emptyObject);\n }\n \n+class Updater {\n+ constructor(renderer) {\n+ this._renderer = renderer;\n+ this._callbacks = [];\n+ }\n+\n+ _enqueueCallback(callback, publicInstance) {\n+ if (typeof callback === 'function' && publicInstance) {\n+ this._callbacks.push({\n+ callback,\n+ publicInstance,\n+ });\n+ }\n+ }\n+\n+ _invokeCallbacks() {\n+ const callbacks = this._callbacks;\n+ this._callbacks = [];\n+\n+ callbacks.forEach(({callback, publicInstance}) => {\n+ callback.call(publicInstance);\n+ });\n+ }\n+\n+ isMounted(publicInstance) {\n+ return !!this._renderer._element;\n+ }\n+\n+ enqueueForceUpdate(publicInstance, callback, callerName) {\n+ this._enqueueCallback(callback, publicInstance);\n+ this._renderer._forcedUpdate = true;\n+ this._renderer.render(this._renderer._element, this._renderer._context);\n+ }\n+\n+ enqueueReplaceState(publicInstance, completeState, callback, callerName) {\n+ this._enqueueCallback(callback, publicInstance);\n+ this._renderer._newState = completeState;\n+ this._renderer.render(this._renderer._element, this._renderer._context);\n+ }\n+\n+ enqueueSetState(publicInstance, partialState, callback, callerName) {\n+ this._enqueueCallback(callback, publicInstance);\n+ const currentState = this._renderer._newState || publicInstance.state;\n+\n+ if (typeof partialState === 'function') {\n+ partialState = partialState.call(\n+ publicInstance,\n+ currentState,\n+ publicInstance.props,\n+ );\n+ }\n+\n+ \/\/ Null and undefined are treated as no-ops.\n+ if (partialState === null || partialState === undefined) {\n+ return;\n+ }\n+\n+ this._renderer._newState = {\n+ ...currentState,\n+ ...partialState,\n+ };\n+\n+ this._renderer.render(this._renderer._element, this._renderer._context);\n+ }\n+}\n+\n class ReactShallowRenderer {\n static createRenderer = function() {\n return new ReactShallowRenderer();\n@@ -263,72 +329,6 @@ class ReactShallowRenderer {\n }\n }\n \n-class Updater {\n- constructor(renderer) {\n- this._renderer = renderer;\n- this._callbacks = [];\n- }\n-\n- _enqueueCallback(callback, publicInstance) {\n- if (typeof callback === 'function' && publicInstance) {\n- this._callbacks.push({\n- callback,\n- publicInstance,\n- });\n- }\n- }\n-\n- _invokeCallbacks() {\n- const callbacks = this._callbacks;\n- this._callbacks = [];\n-\n- callbacks.forEach(({callback, publicInstance}) => {\n- callback.call(publicInstance);\n- });\n- }\n-\n- isMounted(publicInstance) {\n- return !!this._renderer._element;\n- }\n-\n- enqueueForceUpdate(publicInstance, callback, callerName) {\n- this._enqueueCallback(callback, publicInstance);\n- this._renderer._forcedUpdate = true;\n- this._renderer.render(this._renderer._element, this._renderer._context);\n- }\n-\n- enqueueReplaceState(publicInstance, completeState, callback, callerName) {\n- this._enqueueCallback(callback, publicInstance);\n- this._renderer._newState = completeState;\n- this._renderer.render(this._renderer._element, this._renderer._context);\n- }\n-\n- enqueueSetState(publicInstance, partialState, callback, callerName) {\n- this._enqueueCallback(callback, publicInstance);\n- const currentState = this._renderer._newState || publicInstance.state;\n-\n- if (typeof partialState === 'function') {\n- partialState = partialState.call(\n- publicInstance,\n- currentState,\n- publicInstance.props,\n- );\n- }\n-\n- \/\/ Null and undefined are treated as no-ops.\n- if (partialState === null || partialState === undefined) {\n- return;\n- }\n-\n- this._renderer._newState = {\n- ...currentState,\n- ...partialState,\n- };\n-\n- this._renderer.render(this._renderer._element, this._renderer._context);\n- }\n-}\n-\n let currentlyValidatingElement = null;\n \n function getDisplayName(element) {\ndiff --git a\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js b\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js\nindex 57eb83ec11..20131dfc74 100644\n--- a\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js\n+++ b\/packages\/react-test-renderer\/src\/ReactTestHostConfig.js\n@@ -10,6 +10,7 @@\n import warning from 'shared\/warning';\n import * as TestRendererScheduling from '.\/ReactTestRendererScheduling';\n \n+\/* eslint-disable no-use-before-define *\/\n export type Type = string;\n export type Props = Object;\n export type Container = {|\n@@ -35,6 +36,7 @@ export type UpdatePayload = Object;\n export type ChildSet = void; \/\/ Unused\n export type TimeoutHandle = TimeoutID;\n export type NoTimeout = -1;\n+\/* eslint-enable no-use-before-define *\/\n \n export * from 'shared\/HostConfigWithNoPersistence';\n export * from 'shared\/HostConfigWithNoHydration';\ndiff --git a\/packages\/react-test-renderer\/src\/ReactTestRenderer.js b\/packages\/react-test-renderer\/src\/ReactTestRenderer.js\nindex 5563ca5745..4b0c50df69 100644\n--- a\/packages\/react-test-renderer\/src\/ReactTestRenderer.js\n+++ b\/packages\/react-test-renderer\/src\/ReactTestRenderer.js\n@@ -37,6 +37,7 @@ import ReactVersion from 'shared\/ReactVersion';\n import * as ReactTestHostConfig from '.\/ReactTestHostConfig';\n import * as TestRendererScheduling from '.\/ReactTestRendererScheduling';\n \n+\/* eslint-disable no-use-before-define *\/\n type TestRendererOptions = {\n createNodeMock: (element: React$Element) => any,\n unstable_isAsync: boolean,\n@@ -57,6 +58,7 @@ type FindOptions = $Shape<{\n }>;\n \n export type Predicate = (node: ReactTestInstance) => ?boolean;\n+\/* eslint-enable no-use-before-define *\/\n \n const defaultTestOptions = {\n createNodeMock: function() {\n@@ -209,19 +211,6 @@ function toTree(node: ?Fiber) {\n }\n }\n \n-const fiberToWrapper = new WeakMap();\n-function wrapFiber(fiber: Fiber): ReactTestInstance {\n- let wrapper = fiberToWrapper.get(fiber);\n- if (wrapper === undefined && fiber.alternate !== null) {\n- wrapper = fiberToWrapper.get(fiber.alternate);\n- }\n- if (wrapper === undefined) {\n- wrapper = new ReactTestInstance(fiber);\n- fiberToWrapper.set(fiber, wrapper);\n- }\n- return wrapper;\n-}\n-\n const validWrapperTypes = new Set([\n FunctionalComponent,\n FunctionalComponentLazy,\n@@ -543,6 +532,19 @@ const ReactTestRendererFiber = {\n unstable_setNowImplementation: TestRendererScheduling.setNowImplementation,\n };\n \n+const fiberToWrapper = new WeakMap();\n+function wrapFiber(fiber: Fiber): ReactTestInstance {\n+ let wrapper = fiberToWrapper.get(fiber);\n+ if (wrapper === undefined && fiber.alternate !== null) {\n+ wrapper = fiberToWrapper.get(fiber.alternate);\n+ }\n+ if (wrapper === undefined) {\n+ wrapper = new ReactTestInstance(fiber);\n+ fiberToWrapper.set(fiber, wrapper);\n+ }\n+ return wrapper;\n+}\n+\n \/\/ Enable ReactTestRenderer to be used to test DevTools integration.\n TestRenderer.injectIntoDevTools({\n findFiberByHostInstance: (() => {\ndiff --git a\/packages\/shared\/ReactTypes.js b\/packages\/shared\/ReactTypes.js\nindex bd4a47ed9e..4beed2224b 100644\n--- a\/packages\/shared\/ReactTypes.js\n+++ b\/packages\/shared\/ReactTypes.js\n@@ -7,6 +7,7 @@\n * @flow\n *\/\n \n+\/* eslint-disable no-use-before-define *\/\n export type ReactNode =\n | React$Element\n | ReactPortal\n@@ -14,6 +15,9 @@ export type ReactNode =\n | ReactFragment\n | ReactProvider\n | ReactConsumer;\n+\/* eslint-enable no-use-before-define *\/\n+\n+export type ReactEmpty = null | void | boolean;\n \n export type ReactFragment = ReactEmpty | Iterable;\n \n@@ -21,8 +25,6 @@ export type ReactNodeList = ReactEmpty | React$Node;\n \n export type ReactText = string | number;\n \n-export type ReactEmpty = null | void | boolean;\n-\n export type ReactProvider = {\n $$typeof: Symbol | number,\n type: ReactProviderType,\n","commit":{"authoredAt":"2018-09-10T16:15:18+01:00","subject":"Enable no-use-before-define rule (#13606)","revision":"144328fe81719e916b946e22660479e31561bb0b","authorName":"Dan Abramov","shortRevision":"144328fe81","authorEmail":"dan.abramov@gmail.com"},"body":""}

dillon1000/react

Files changed