From 087c48bb36b88ef0b5bbca2b9b70a52d8d413102 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Wed, 25 Oct 2017 21:07:54 +0300 Subject: [PATCH] Reorder imports (#11359) * Reorder imports * Record sizes --- fixtures/art/yarn.lock | 5 + packages/events/EventPluginHub.js | 6 +- packages/events/EventPluginRegistry.js | 8 +- packages/events/EventPluginUtils.js | 1 - packages/events/EventPropagators.js | 2 +- packages/events/ReactControlledComponent.js | 4 +- packages/events/ResponderEventPlugin.js | 4 +- packages/events/ResponderTouchHistoryStore.js | 3 +- packages/react-art/src/ReactART.js | 7 +- .../react-cs-renderer/src/ReactNativeCS.js | 11 +- packages/react-dom/src/client/ReactDOM.js | 35 ++-- .../src/client/ReactDOMClientInjection.js | 7 +- .../src/client/ReactDOMComponentTree.js | 1 - .../src/client/ReactDOMFiberComponent.js | 33 ++-- .../src/client/ReactDOMFiberInput.js | 25 ++- .../src/client/ReactDOMFiberSelect.js | 30 +-- .../src/client/ReactDOMFiberTextarea.js | 24 +-- .../react-dom/src/client/ReactDOMSelection.js | 3 +- .../src/client/ReactInputSelection.js | 6 +- .../react-dom/src/client/setTextContent.js | 3 +- .../src/client/validateDOMNesting.js | 2 +- .../src/events/BeforeInputEventPlugin.js | 5 +- .../react-dom/src/events/ChangeEventPlugin.js | 8 +- .../src/events/EnterLeaveEventPlugin.js | 3 +- .../src/events/ReactBrowserEventEmitter.js | 2 +- .../src/events/ReactDOMEventListener.js | 9 +- .../react-dom/src/events/SelectEventPlugin.js | 10 +- .../react-dom/src/events/SimpleEventPlugin.js | 20 +- .../src/events/SyntheticKeyboardEvent.js | 1 - .../src/events/SyntheticMouseEvent.js | 1 - .../src/events/SyntheticTouchEvent.js | 1 - .../react-dom/src/events/TapEventPlugin.js | 4 +- .../src/server/DOMMarkupOperations.js | 1 - .../src/server/ReactDOMNodeStreamRenderer.js | 3 +- .../src/server/ReactDOMServerBrowser.js | 5 +- .../src/server/ReactDOMServerNode.js | 7 +- .../src/server/ReactPartialRenderer.js | 20 +- .../src/shared/CSSPropertyOperations.js | 1 + .../shared/ReactControlledValuePropTypes.js | 1 + .../shared/ReactDOMNullInputValuePropHook.js | 2 +- .../src/shared/ReactDOMUnknownPropertyHook.js | 5 +- .../react-dom/src/shared/assertValidProps.js | 1 + .../src/test-utils/ReactTestUtils.js | 4 +- .../src/NativeMethodsMixin.js | 30 ++- .../src/ReactNativeAttributePayload.js | 6 +- .../src/ReactNativeBridgeEventPlugin.js | 4 +- .../src/ReactNativeComponent.js | 22 +-- .../src/ReactNativeEventEmitter.js | 3 +- .../src/ReactNativeFiberErrorDialog.js | 4 +- .../src/ReactNativeFiberHostComponent.js | 21 +-- .../src/ReactNativeFiberInspector.js | 13 +- .../src/ReactNativeFiberRenderer.js | 28 ++- .../src/ReactNativeInjection.js | 3 +- .../src/ReactNativeRenderer.js | 20 +- .../src/ReactNativeViewConfigRegistry.js | 4 +- .../src/createReactNativeComponentClass.js | 4 +- .../src/findNodeHandle.js | 7 +- packages/react-noop-renderer/src/ReactNoop.js | 3 +- .../react-reconciler/src/ReactChildFiber.js | 13 +- .../src/ReactDebugCurrentFiber.js | 8 +- .../src/ReactDebugFiberPerf.js | 9 +- packages/react-reconciler/src/ReactFiber.js | 8 +- .../src/ReactFiberBeginWork.js | 41 ++-- .../src/ReactFiberClassComponent.js | 19 +- .../src/ReactFiberCommitWork.js | 7 +- .../src/ReactFiberCompleteWork.js | 21 +-- .../react-reconciler/src/ReactFiberContext.js | 9 +- .../src/ReactFiberErrorLogger.js | 4 +- .../src/ReactFiberHostContext.js | 4 +- .../src/ReactFiberHydrationContext.js | 3 +- .../src/ReactFiberReconciler.js | 11 +- .../src/ReactFiberScheduler.js | 111 ++++++----- .../src/ReactFiberUpdateQueue.js | 6 +- .../react-rt-renderer/src/ReactNativeRT.js | 10 +- .../src/ReactNativeRTEventEmitter.js | 4 +- .../src/ReactNativeRTFiberInspector.js | 8 +- .../src/ReactNativeRTFiberRenderer.js | 9 +- .../src/ReactShallowRenderer.js | 8 +- .../src/ReactTestRenderer.js | 8 +- packages/react/src/React.js | 4 +- packages/react/src/ReactBaseClasses.js | 4 +- packages/react/src/ReactChildren.js | 5 +- packages/react/src/ReactElementValidator.js | 7 +- packages/react/src/onlyChild.js | 4 +- .../shared/ReactFiberComponentTreeHook.js | 4 +- packages/shared/ReactFiberTreeReflection.js | 16 +- scripts/rollup/results.json | 176 +++++++++--------- 87 files changed, 516 insertions(+), 531 deletions(-) diff --git a/fixtures/art/yarn.lock b/fixtures/art/yarn.lock index c442118629..cdae5e0e2d 100644 --- a/fixtures/art/yarn.lock +++ b/fixtures/art/yarn.lock @@ -73,6 +73,10 @@ arrify@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" +art@^0.10.1: + version "0.10.1" + resolved "https://registry.yarnpkg.com/art/-/art-0.10.1.tgz#38541883e399225c5e193ff246e8f157cf7b2146" + asap@~2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" @@ -1741,6 +1745,7 @@ rc@^1.1.7: "react-art@file:../../build/packages/react-art": version "16.0.0" dependencies: + art "^0.10.1" create-react-class "^15.6.2" fbjs "^0.8.16" loose-envify "^1.1.0" diff --git a/packages/events/EventPluginHub.js b/packages/events/EventPluginHub.js index 4d88672aa2..0387ace9c8 100644 --- a/packages/events/EventPluginHub.js +++ b/packages/events/EventPluginHub.js @@ -7,13 +7,13 @@ 'use strict'; +var ReactErrorUtils = require('shared/ReactErrorUtils'); +var invariant = require('fbjs/lib/invariant'); + var EventPluginRegistry = require('./EventPluginRegistry'); var EventPluginUtils = require('./EventPluginUtils'); -var ReactErrorUtils = require('shared/ReactErrorUtils'); - var accumulateInto = require('./accumulateInto'); var forEachAccumulated = require('./forEachAccumulated'); -var invariant = require('fbjs/lib/invariant'); /** * Internal queue of events that have accumulated their dispatches and are diff --git a/packages/events/EventPluginRegistry.js b/packages/events/EventPluginRegistry.js index caddeb122c..1e9599b821 100644 --- a/packages/events/EventPluginRegistry.js +++ b/packages/events/EventPluginRegistry.js @@ -10,19 +10,17 @@ 'use strict'; import type {DispatchConfig} from './ReactSyntheticEventType'; - import type { AnyNativeEvent, PluginName, PluginModule, } from './PluginModuleType'; -type NamesToPlugins = {[key: PluginName]: PluginModule}; - -type EventPluginOrder = null | Array; - var invariant = require('fbjs/lib/invariant'); +type NamesToPlugins = {[key: PluginName]: PluginModule}; +type EventPluginOrder = null | Array; + /** * Injectable ordering of event plugins. */ diff --git a/packages/events/EventPluginUtils.js b/packages/events/EventPluginUtils.js index 79e07bc6e0..71e71fbac8 100644 --- a/packages/events/EventPluginUtils.js +++ b/packages/events/EventPluginUtils.js @@ -8,7 +8,6 @@ 'use strict'; var ReactErrorUtils = require('shared/ReactErrorUtils'); - var invariant = require('fbjs/lib/invariant'); if (__DEV__) { diff --git a/packages/events/EventPropagators.js b/packages/events/EventPropagators.js index d0d0057f8b..e6487af9c7 100644 --- a/packages/events/EventPropagators.js +++ b/packages/events/EventPropagators.js @@ -7,9 +7,9 @@ 'use strict'; -var EventPluginHub = require('./EventPluginHub'); var ReactTreeTraversal = require('shared/ReactTreeTraversal'); +var EventPluginHub = require('./EventPluginHub'); var accumulateInto = require('./accumulateInto'); var forEachAccumulated = require('./forEachAccumulated'); diff --git a/packages/events/ReactControlledComponent.js b/packages/events/ReactControlledComponent.js index a89a2d01f3..fcd329141e 100644 --- a/packages/events/ReactControlledComponent.js +++ b/packages/events/ReactControlledComponent.js @@ -7,10 +7,10 @@ 'use strict'; -var EventPluginUtils = require('./EventPluginUtils'); - var invariant = require('fbjs/lib/invariant'); +var EventPluginUtils = require('./EventPluginUtils'); + // Use to restore controlled state after a change event has fired. var fiberHostComponent = null; diff --git a/packages/events/ResponderEventPlugin.js b/packages/events/ResponderEventPlugin.js index d9df1c28e4..0988b964f5 100644 --- a/packages/events/ResponderEventPlugin.js +++ b/packages/events/ResponderEventPlugin.js @@ -7,12 +7,12 @@ 'use strict'; +var ReactTreeTraversal = require('shared/ReactTreeTraversal'); + var EventPluginUtils = require('./EventPluginUtils'); var EventPropagators = require('./EventPropagators'); -var ReactTreeTraversal = require('shared/ReactTreeTraversal'); var ResponderSyntheticEvent = require('./ResponderSyntheticEvent'); var ResponderTouchHistoryStore = require('./ResponderTouchHistoryStore'); - var accumulate = require('./accumulate'); var isStartish = EventPluginUtils.isStartish; diff --git a/packages/events/ResponderTouchHistoryStore.js b/packages/events/ResponderTouchHistoryStore.js index fa04c0e598..dcf885722d 100644 --- a/packages/events/ResponderTouchHistoryStore.js +++ b/packages/events/ResponderTouchHistoryStore.js @@ -9,10 +9,9 @@ 'use strict'; -const EventPluginUtils = require('./EventPluginUtils'); - const invariant = require('fbjs/lib/invariant'); +const EventPluginUtils = require('./EventPluginUtils'); const {isEndish, isMoveish, isStartish} = EventPluginUtils; if (__DEV__) { diff --git a/packages/react-art/src/ReactART.js b/packages/react-art/src/ReactART.js index de404bb521..fdbc01952a 100644 --- a/packages/react-art/src/ReactART.js +++ b/packages/react-art/src/ReactART.js @@ -12,14 +12,13 @@ require('art/modes/current').setCurrent( require('art/modes/fast-noSideEffects'), ); +const React = require('react'); +const ReactFiberReconciler = require('react-reconciler'); +const ReactDOMFrameScheduling = require('shared/ReactDOMFrameScheduling'); const Mode = require('art/modes/current'); const Transform = require('art/core/transform'); const invariant = require('fbjs/lib/invariant'); const emptyObject = require('fbjs/lib/emptyObject'); -const React = require('react'); -const ReactFiberReconciler = require('react-reconciler'); -const ReactDOMFrameScheduling = require('shared/ReactDOMFrameScheduling'); - const {Component} = React; const pooledTransform = new Transform(); diff --git a/packages/react-cs-renderer/src/ReactNativeCS.js b/packages/react-cs-renderer/src/ReactNativeCS.js index b83a4f25a7..a1751cc778 100644 --- a/packages/react-cs-renderer/src/ReactNativeCS.js +++ b/packages/react-cs-renderer/src/ReactNativeCS.js @@ -9,18 +9,15 @@ 'use strict'; -const ReactGenericBatching = require('events/ReactGenericBatching'); -const ReactVersion = require('shared/ReactVersion'); +import type {ReactNativeCSType} from './ReactNativeCSTypes'; +const ReactFiberReconciler = require('react-reconciler'); // TODO: direct imports like some-package/src/* are bad. Fix me. const { injectInternals, } = require('react-reconciler/src/ReactFiberDevToolsHook'); - -import type {ReactNativeCSType} from './ReactNativeCSTypes'; - -const ReactFiberReconciler = require('react-reconciler'); - +const ReactGenericBatching = require('events/ReactGenericBatching'); +const ReactVersion = require('shared/ReactVersion'); const emptyObject = require('fbjs/lib/emptyObject'); export type Container = number; diff --git a/packages/react-dom/src/client/ReactDOM.js b/packages/react-dom/src/client/ReactDOM.js index 28bfb46218..0de484d48c 100644 --- a/packages/react-dom/src/client/ReactDOM.js +++ b/packages/react-dom/src/client/ReactDOM.js @@ -12,20 +12,28 @@ import type {ReactNodeList} from 'shared/ReactTypes'; require('../shared/checkReact'); -var DOMNamespaces = require('../shared/DOMNamespaces'); + +var ReactFiberReconciler = require('react-reconciler'); +// TODO: direct imports like some-package/src/* are bad. Fix me. +var ReactPortal = require('react-reconciler/src/ReactPortal'); +// TODO: direct imports like some-package/src/* are bad. Fix me. +var {injectInternals} = require('react-reconciler/src/ReactFiberDevToolsHook'); var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); -var ReactBrowserEventEmitter = require('../events/ReactBrowserEventEmitter'); +var ReactGenericBatching = require('events/ReactGenericBatching'); var ReactControlledComponent = require('events/ReactControlledComponent'); +var ReactInstanceMap = require('shared/ReactInstanceMap'); var ReactFeatureFlags = require('shared/ReactFeatureFlags'); +var ReactVersion = require('shared/ReactVersion'); +var ReactDOMFrameScheduling = require('shared/ReactDOMFrameScheduling'); +var {ReactCurrentOwner} = require('shared/ReactGlobalSharedState'); +var getComponentName = require('shared/getComponentName'); +var invariant = require('fbjs/lib/invariant'); + var ReactDOMComponentTree = require('./ReactDOMComponentTree'); var ReactDOMFiberComponent = require('./ReactDOMFiberComponent'); -var ReactDOMFrameScheduling = require('shared/ReactDOMFrameScheduling'); -var ReactGenericBatching = require('events/ReactGenericBatching'); -var ReactFiberReconciler = require('react-reconciler'); var ReactInputSelection = require('./ReactInputSelection'); -var ReactInstanceMap = require('shared/ReactInstanceMap'); -var ReactVersion = require('shared/ReactVersion'); -var {ReactCurrentOwner} = require('shared/ReactGlobalSharedState'); +var ReactBrowserEventEmitter = require('../events/ReactBrowserEventEmitter'); +var DOMNamespaces = require('../shared/DOMNamespaces'); var { ELEMENT_NODE, TEXT_NODE, @@ -34,14 +42,6 @@ var { DOCUMENT_FRAGMENT_NODE, } = require('../shared/HTMLNodeType'); var {ROOT_ATTRIBUTE_NAME} = require('../shared/DOMProperty'); - -// TODO: direct imports like some-package/src/* are bad. Fix me. -var ReactPortal = require('react-reconciler/src/ReactPortal'); -var {injectInternals} = require('react-reconciler/src/ReactFiberDevToolsHook'); - -var getComponentName = require('shared/getComponentName'); -var invariant = require('fbjs/lib/invariant'); - var {getChildNamespace} = DOMNamespaces; var { createElement, @@ -60,12 +60,13 @@ var { var {precacheFiberNode, updateFiberProps} = ReactDOMComponentTree; if (__DEV__) { - var SUPPRESS_HYDRATION_WARNING = 'suppressHydrationWarning'; var lowPriorityWarning = require('shared/lowPriorityWarning'); var warning = require('fbjs/lib/warning'); + var validateDOMNesting = require('./validateDOMNesting'); var {updatedAncestorInfo} = validateDOMNesting; + var SUPPRESS_HYDRATION_WARNING = 'suppressHydrationWarning'; if ( typeof Map !== 'function' || Map.prototype == null || diff --git a/packages/react-dom/src/client/ReactDOMClientInjection.js b/packages/react-dom/src/client/ReactDOMClientInjection.js index 729757efd7..45bf3f5c73 100644 --- a/packages/react-dom/src/client/ReactDOMClientInjection.js +++ b/packages/react-dom/src/client/ReactDOMClientInjection.js @@ -7,14 +7,15 @@ 'use strict'; +var EventPluginHub = require('events/EventPluginHub'); +var EventPluginUtils = require('events/EventPluginUtils'); + +var ReactDOMComponentTree = require('./ReactDOMComponentTree'); var BeforeInputEventPlugin = require('../events/BeforeInputEventPlugin'); var ChangeEventPlugin = require('../events/ChangeEventPlugin'); var DOMEventPluginOrder = require('../events/DOMEventPluginOrder'); var EnterLeaveEventPlugin = require('../events/EnterLeaveEventPlugin'); -var EventPluginHub = require('events/EventPluginHub'); -var EventPluginUtils = require('events/EventPluginUtils'); var ReactBrowserEventEmitter = require('../events/ReactBrowserEventEmitter'); -var ReactDOMComponentTree = require('./ReactDOMComponentTree'); var ReactDOMEventListener = require('../events/ReactDOMEventListener'); var SelectEventPlugin = require('../events/SelectEventPlugin'); var SimpleEventPlugin = require('../events/SimpleEventPlugin'); diff --git a/packages/react-dom/src/client/ReactDOMComponentTree.js b/packages/react-dom/src/client/ReactDOMComponentTree.js index 1e03ab8ba3..a3e91fd5eb 100644 --- a/packages/react-dom/src/client/ReactDOMComponentTree.js +++ b/packages/react-dom/src/client/ReactDOMComponentTree.js @@ -8,7 +8,6 @@ 'use strict'; var {HostComponent, HostText} = require('shared/ReactTypeOfWork'); - var invariant = require('fbjs/lib/invariant'); var randomKey = Math.random().toString(36).slice(2); diff --git a/packages/react-dom/src/client/ReactDOMFiberComponent.js b/packages/react-dom/src/client/ReactDOMFiberComponent.js index 9b2c6a2ee6..fb9301b309 100644 --- a/packages/react-dom/src/client/ReactDOMFiberComponent.js +++ b/packages/react-dom/src/client/ReactDOMFiberComponent.js @@ -9,37 +9,36 @@ 'use strict'; -var CSSPropertyOperations = require('../shared/CSSPropertyOperations'); -var DOMNamespaces = require('../shared/DOMNamespaces'); -var DOMProperty = require('../shared/DOMProperty'); -var DOMPropertyOperations = require('./DOMPropertyOperations'); -var EventPluginRegistry = require('events/EventPluginRegistry'); -var ReactBrowserEventEmitter = require('../events/ReactBrowserEventEmitter'); -var ReactDOMFiberInput = require('./ReactDOMFiberInput'); -var ReactDOMFiberOption = require('./ReactDOMFiberOption'); -var ReactDOMFiberSelect = require('./ReactDOMFiberSelect'); -var ReactDOMFiberTextarea = require('./ReactDOMFiberTextarea'); - // TODO: direct imports like some-package/src/* are bad. Fix me. var { getCurrentFiberOwnerName, } = require('react-reconciler/src/ReactDebugCurrentFiber'); - -var {DOCUMENT_NODE, DOCUMENT_FRAGMENT_NODE} = require('../shared/HTMLNodeType'); - -var assertValidProps = require('../shared/assertValidProps'); +var EventPluginRegistry = require('events/EventPluginRegistry'); var emptyFunction = require('fbjs/lib/emptyFunction'); + +var DOMPropertyOperations = require('./DOMPropertyOperations'); +var ReactDOMFiberInput = require('./ReactDOMFiberInput'); +var ReactDOMFiberOption = require('./ReactDOMFiberOption'); +var ReactDOMFiberSelect = require('./ReactDOMFiberSelect'); +var ReactDOMFiberTextarea = require('./ReactDOMFiberTextarea'); var inputValueTracking = require('./inputValueTracking'); -var isCustomComponent = require('../shared/isCustomComponent'); var setInnerHTML = require('./setInnerHTML'); var setTextContent = require('./setTextContent'); +var ReactBrowserEventEmitter = require('../events/ReactBrowserEventEmitter'); +var CSSPropertyOperations = require('../shared/CSSPropertyOperations'); +var DOMNamespaces = require('../shared/DOMNamespaces'); +var DOMProperty = require('../shared/DOMProperty'); +var assertValidProps = require('../shared/assertValidProps'); +var {DOCUMENT_NODE, DOCUMENT_FRAGMENT_NODE} = require('../shared/HTMLNodeType'); +var isCustomComponent = require('../shared/isCustomComponent'); if (__DEV__) { - var warning = require('fbjs/lib/warning'); // TODO: direct imports like some-package/src/* are bad. Fix me. var { getCurrentFiberStackAddendum, } = require('react-reconciler/src/ReactDebugCurrentFiber'); + var warning = require('fbjs/lib/warning'); + var ReactDOMInvalidARIAHook = require('../shared/ReactDOMInvalidARIAHook'); var ReactDOMNullInputValuePropHook = require('../shared/ReactDOMNullInputValuePropHook'); var ReactDOMUnknownPropertyHook = require('../shared/ReactDOMUnknownPropertyHook'); diff --git a/packages/react-dom/src/client/ReactDOMFiberInput.js b/packages/react-dom/src/client/ReactDOMFiberInput.js index e456af07ec..dadc3e0269 100644 --- a/packages/react-dom/src/client/ReactDOMFiberInput.js +++ b/packages/react-dom/src/client/ReactDOMFiberInput.js @@ -9,22 +9,15 @@ 'use strict'; -type InputWithWrapperState = HTMLInputElement & { - _wrapperState: { - initialValue: ?string, - initialChecked: ?boolean, - controlled?: boolean, - }, -}; - -var DOMPropertyOperations = require('./DOMPropertyOperations'); -var ReactControlledValuePropTypes = require('../shared/ReactControlledValuePropTypes'); -var ReactDOMComponentTree = require('./ReactDOMComponentTree'); - // TODO: direct imports like some-package/src/* are bad. Fix me. var { getCurrentFiberOwnerName, } = require('react-reconciler/src/ReactDebugCurrentFiber'); +var invariant = require('fbjs/lib/invariant'); + +var DOMPropertyOperations = require('./DOMPropertyOperations'); +var ReactDOMComponentTree = require('./ReactDOMComponentTree'); +var ReactControlledValuePropTypes = require('../shared/ReactControlledValuePropTypes'); if (__DEV__) { // TODO: direct imports like some-package/src/* are bad. Fix me. @@ -34,7 +27,13 @@ if (__DEV__) { var warning = require('fbjs/lib/warning'); } -var invariant = require('fbjs/lib/invariant'); +type InputWithWrapperState = HTMLInputElement & { + _wrapperState: { + initialValue: ?string, + initialChecked: ?boolean, + controlled?: boolean, + }, +}; var didWarnValueDefaultValue = false; var didWarnCheckedDefaultChecked = false; diff --git a/packages/react-dom/src/client/ReactDOMFiberSelect.js b/packages/react-dom/src/client/ReactDOMFiberSelect.js index 0772bf7525..60a4d1592b 100644 --- a/packages/react-dom/src/client/ReactDOMFiberSelect.js +++ b/packages/react-dom/src/client/ReactDOMFiberSelect.js @@ -9,6 +9,22 @@ 'use strict'; +var { + getCurrentFiberOwnerName, +} = require('react-reconciler/src/ReactDebugCurrentFiber'); + +var ReactControlledValuePropTypes = require('../shared/ReactControlledValuePropTypes'); + +if (__DEV__) { + // TODO: direct imports like some-package/src/* are bad. Fix me. + var { + getCurrentFiberStackAddendum, + } = require('react-reconciler/src/ReactDebugCurrentFiber'); + var warning = require('fbjs/lib/warning'); + + var didWarnValueDefaultValue = false; +} + type SelectWithWrapperState = HTMLSelectElement & { _wrapperState: { initialValue: ?string, @@ -16,20 +32,6 @@ type SelectWithWrapperState = HTMLSelectElement & { }, }; -var ReactControlledValuePropTypes = require('../shared/ReactControlledValuePropTypes'); -var { - getCurrentFiberOwnerName, -} = require('react-reconciler/src/ReactDebugCurrentFiber'); - -if (__DEV__) { - var didWarnValueDefaultValue = false; - var warning = require('fbjs/lib/warning'); - // TODO: direct imports like some-package/src/* are bad. Fix me. - var { - getCurrentFiberStackAddendum, - } = require('react-reconciler/src/ReactDebugCurrentFiber'); -} - function getDeclarationErrorAddendum() { var ownerName = getCurrentFiberOwnerName(); if (ownerName) { diff --git a/packages/react-dom/src/client/ReactDOMFiberTextarea.js b/packages/react-dom/src/client/ReactDOMFiberTextarea.js index 25901252e6..0a1f0f004c 100644 --- a/packages/react-dom/src/client/ReactDOMFiberTextarea.js +++ b/packages/react-dom/src/client/ReactDOMFiberTextarea.js @@ -9,24 +9,24 @@ 'use strict'; +var invariant = require('fbjs/lib/invariant'); + +var ReactControlledValuePropTypes = require('../shared/ReactControlledValuePropTypes'); + +if (__DEV__) { + // TODO: direct imports like some-package/src/* are bad. Fix me. + var { + getCurrentFiberStackAddendum, + } = require('react-reconciler/src/ReactDebugCurrentFiber'); + var warning = require('fbjs/lib/warning'); +} + type TextAreaWithWrapperState = HTMLTextAreaElement & { _wrapperState: { initialValue: string, }, }; -var ReactControlledValuePropTypes = require('../shared/ReactControlledValuePropTypes'); - -var invariant = require('fbjs/lib/invariant'); - -if (__DEV__) { - var warning = require('fbjs/lib/warning'); - // TODO: direct imports like some-package/src/* are bad. Fix me. - var { - getCurrentFiberStackAddendum, - } = require('react-reconciler/src/ReactDebugCurrentFiber'); -} - var didWarnValDefaultVal = false; /** diff --git a/packages/react-dom/src/client/ReactDOMSelection.js b/packages/react-dom/src/client/ReactDOMSelection.js index dd12760edd..886a4af6f4 100644 --- a/packages/react-dom/src/client/ReactDOMSelection.js +++ b/packages/react-dom/src/client/ReactDOMSelection.js @@ -7,10 +7,9 @@ 'use strict'; -var {TEXT_NODE} = require('../shared/HTMLNodeType'); - var getNodeForCharacterOffset = require('./getNodeForCharacterOffset'); var getTextContentAccessor = require('./getTextContentAccessor'); +var {TEXT_NODE} = require('../shared/HTMLNodeType'); /** * @param {DOMElement} outerNode diff --git a/packages/react-dom/src/client/ReactInputSelection.js b/packages/react-dom/src/client/ReactInputSelection.js index c98fc4571a..605f7ac768 100644 --- a/packages/react-dom/src/client/ReactInputSelection.js +++ b/packages/react-dom/src/client/ReactInputSelection.js @@ -7,13 +7,13 @@ 'use strict'; -var ReactDOMSelection = require('./ReactDOMSelection'); -var {ELEMENT_NODE} = require('../shared/HTMLNodeType'); - var containsNode = require('fbjs/lib/containsNode'); var focusNode = require('fbjs/lib/focusNode'); var getActiveElement = require('fbjs/lib/getActiveElement'); +var ReactDOMSelection = require('./ReactDOMSelection'); +var {ELEMENT_NODE} = require('../shared/HTMLNodeType'); + function isInDocument(node) { return containsNode(document.documentElement, node); } diff --git a/packages/react-dom/src/client/setTextContent.js b/packages/react-dom/src/client/setTextContent.js index cb7129c8ef..c9bda1a9eb 100644 --- a/packages/react-dom/src/client/setTextContent.js +++ b/packages/react-dom/src/client/setTextContent.js @@ -8,8 +8,9 @@ 'use strict'; var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); -var escapeTextContentForBrowser = require('../shared/escapeTextContentForBrowser'); + var setInnerHTML = require('./setInnerHTML'); +var escapeTextContentForBrowser = require('../shared/escapeTextContentForBrowser'); var {TEXT_NODE} = require('../shared/HTMLNodeType'); /** diff --git a/packages/react-dom/src/client/validateDOMNesting.js b/packages/react-dom/src/client/validateDOMNesting.js index 0551df13b9..e4f754f02f 100644 --- a/packages/react-dom/src/client/validateDOMNesting.js +++ b/packages/react-dom/src/client/validateDOMNesting.js @@ -12,11 +12,11 @@ var emptyFunction = require('fbjs/lib/emptyFunction'); var validateDOMNesting = emptyFunction; if (__DEV__) { - var warning = require('fbjs/lib/warning'); // TODO: direct imports like some-package/src/* are bad. Fix me. var { getCurrentFiberStackAddendum, } = require('react-reconciler/src/ReactDebugCurrentFiber'); + var warning = require('fbjs/lib/warning'); // This validation code was written based on the HTML5 parsing spec: // https://html.spec.whatwg.org/multipage/syntax.html#has-an-element-in-scope diff --git a/packages/react-dom/src/events/BeforeInputEventPlugin.js b/packages/react-dom/src/events/BeforeInputEventPlugin.js index 5679dddeb2..04a9342b67 100644 --- a/packages/react-dom/src/events/BeforeInputEventPlugin.js +++ b/packages/react-dom/src/events/BeforeInputEventPlugin.js @@ -7,14 +7,15 @@ 'use strict'; +import type {TopLevelTypes} from './BrowserEventConstants'; + var EventPropagators = require('events/EventPropagators'); var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); + var FallbackCompositionState = require('./FallbackCompositionState'); var SyntheticCompositionEvent = require('./SyntheticCompositionEvent'); var SyntheticInputEvent = require('./SyntheticInputEvent'); -import type {TopLevelTypes} from 'BrowserEventConstants'; - var END_KEYCODES = [9, 13, 27, 32]; // Tab, Return, Esc, Space var START_KEYCODE = 229; diff --git a/packages/react-dom/src/events/ChangeEventPlugin.js b/packages/react-dom/src/events/ChangeEventPlugin.js index b20c17eee8..748d021061 100644 --- a/packages/react-dom/src/events/ChangeEventPlugin.js +++ b/packages/react-dom/src/events/ChangeEventPlugin.js @@ -9,16 +9,16 @@ var EventPluginHub = require('events/EventPluginHub'); var EventPropagators = require('events/EventPropagators'); -var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); var ReactControlledComponent = require('events/ReactControlledComponent'); -var ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); var ReactGenericBatching = require('events/ReactGenericBatching'); var SyntheticEvent = require('events/SyntheticEvent'); +var isTextInputElement = require('shared/isTextInputElement'); +var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); -var inputValueTracking = require('../client/inputValueTracking'); var getEventTarget = require('./getEventTarget'); var isEventSupported = require('./isEventSupported'); -var isTextInputElement = require('shared/isTextInputElement'); +var ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); +var inputValueTracking = require('../client/inputValueTracking'); var eventTypes = { change: { diff --git a/packages/react-dom/src/events/EnterLeaveEventPlugin.js b/packages/react-dom/src/events/EnterLeaveEventPlugin.js index 2105916476..3cfa6a4682 100644 --- a/packages/react-dom/src/events/EnterLeaveEventPlugin.js +++ b/packages/react-dom/src/events/EnterLeaveEventPlugin.js @@ -8,8 +8,9 @@ 'use strict'; var EventPropagators = require('events/EventPropagators'); -var ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); + var SyntheticMouseEvent = require('./SyntheticMouseEvent'); +var ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); var eventTypes = { mouseEnter: { diff --git a/packages/react-dom/src/events/ReactBrowserEventEmitter.js b/packages/react-dom/src/events/ReactBrowserEventEmitter.js index 7b0f579361..be71ed814d 100644 --- a/packages/react-dom/src/events/ReactBrowserEventEmitter.js +++ b/packages/react-dom/src/events/ReactBrowserEventEmitter.js @@ -8,9 +8,9 @@ 'use strict'; var EventPluginRegistry = require('events/EventPluginRegistry'); -var ReactDOMEventListener = require('./ReactDOMEventListener'); var ReactEventEmitterMixin = require('events/ReactEventEmitterMixin'); +var ReactDOMEventListener = require('./ReactDOMEventListener'); var isEventSupported = require('./isEventSupported'); var {topLevelTypes} = require('./BrowserEventConstants'); diff --git a/packages/react-dom/src/events/ReactDOMEventListener.js b/packages/react-dom/src/events/ReactDOMEventListener.js index 2bbf67fad2..ae34fd827d 100644 --- a/packages/react-dom/src/events/ReactDOMEventListener.js +++ b/packages/react-dom/src/events/ReactDOMEventListener.js @@ -7,15 +7,14 @@ 'use strict'; -var EventListener = require('fbjs/lib/EventListener'); -var ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); -var ReactFiberTreeReflection = require('shared/ReactFiberTreeReflection'); var ReactGenericBatching = require('events/ReactGenericBatching'); +var ReactFiberTreeReflection = require('shared/ReactFiberTreeReflection'); var ReactTypeOfWork = require('shared/ReactTypeOfWork'); +var EventListener = require('fbjs/lib/EventListener'); +var {HostRoot} = ReactTypeOfWork; var getEventTarget = require('./getEventTarget'); - -var {HostRoot} = ReactTypeOfWork; +var ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); var CALLBACK_BOOKKEEPING_POOL_SIZE = 10; var callbackBookkeepingPool = []; diff --git a/packages/react-dom/src/events/SelectEventPlugin.js b/packages/react-dom/src/events/SelectEventPlugin.js index aab6fcc7b4..d3023ae8b0 100644 --- a/packages/react-dom/src/events/SelectEventPlugin.js +++ b/packages/react-dom/src/events/SelectEventPlugin.js @@ -9,16 +9,16 @@ var EventPropagators = require('events/EventPropagators'); var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment'); +var SyntheticEvent = require('events/SyntheticEvent'); +var isTextInputElement = require('shared/isTextInputElement'); +var getActiveElement = require('fbjs/lib/getActiveElement'); +var shallowEqual = require('fbjs/lib/shallowEqual'); + var ReactBrowserEventEmitter = require('./ReactBrowserEventEmitter'); var ReactDOMComponentTree = require('../client/ReactDOMComponentTree'); var ReactInputSelection = require('../client/ReactInputSelection'); -var SyntheticEvent = require('events/SyntheticEvent'); var {DOCUMENT_NODE} = require('../shared/HTMLNodeType'); -var getActiveElement = require('fbjs/lib/getActiveElement'); -var isTextInputElement = require('shared/isTextInputElement'); -var shallowEqual = require('fbjs/lib/shallowEqual'); - var skipSelectionChangeEvent = ExecutionEnvironment.canUseDOM && 'documentMode' in document && diff --git a/packages/react-dom/src/events/SimpleEventPlugin.js b/packages/react-dom/src/events/SimpleEventPlugin.js index f0e66fa1c7..dfa9ba5626 100644 --- a/packages/react-dom/src/events/SimpleEventPlugin.js +++ b/packages/react-dom/src/events/SimpleEventPlugin.js @@ -9,10 +9,19 @@ 'use strict'; +import type {TopLevelTypes} from './BrowserEventConstants'; +import type { + DispatchConfig, + ReactSyntheticEvent, +} from 'events/ReactSyntheticEventType'; +import type {Fiber} from 'react-reconciler/src/ReactFiber'; +import type {EventTypes, PluginModule} from 'events/PluginModuleType'; + var EventPropagators = require('events/EventPropagators'); +var SyntheticEvent = require('events/SyntheticEvent'); + var SyntheticAnimationEvent = require('./SyntheticAnimationEvent'); var SyntheticClipboardEvent = require('./SyntheticClipboardEvent'); -var SyntheticEvent = require('events/SyntheticEvent'); var SyntheticFocusEvent = require('./SyntheticFocusEvent'); var SyntheticKeyboardEvent = require('./SyntheticKeyboardEvent'); var SyntheticMouseEvent = require('./SyntheticMouseEvent'); @@ -21,21 +30,12 @@ var SyntheticTouchEvent = require('./SyntheticTouchEvent'); var SyntheticTransitionEvent = require('./SyntheticTransitionEvent'); var SyntheticUIEvent = require('./SyntheticUIEvent'); var SyntheticWheelEvent = require('./SyntheticWheelEvent'); - var getEventCharCode = require('./getEventCharCode'); if (__DEV__) { var warning = require('fbjs/lib/warning'); } -import type {TopLevelTypes} from './BrowserEventConstants'; -import type { - DispatchConfig, - ReactSyntheticEvent, -} from 'events/ReactSyntheticEventType'; -import type {Fiber} from 'react-reconciler/src/ReactFiber'; -import type {EventTypes, PluginModule} from 'events/PluginModuleType'; - /** * Turns * ['abort', ...] diff --git a/packages/react-dom/src/events/SyntheticKeyboardEvent.js b/packages/react-dom/src/events/SyntheticKeyboardEvent.js index 4a187821f1..bb943a050b 100644 --- a/packages/react-dom/src/events/SyntheticKeyboardEvent.js +++ b/packages/react-dom/src/events/SyntheticKeyboardEvent.js @@ -8,7 +8,6 @@ 'use strict'; var SyntheticUIEvent = require('./SyntheticUIEvent'); - var getEventCharCode = require('./getEventCharCode'); var getEventKey = require('./getEventKey'); var getEventModifierState = require('./getEventModifierState'); diff --git a/packages/react-dom/src/events/SyntheticMouseEvent.js b/packages/react-dom/src/events/SyntheticMouseEvent.js index ffc52b55da..817f3647d1 100644 --- a/packages/react-dom/src/events/SyntheticMouseEvent.js +++ b/packages/react-dom/src/events/SyntheticMouseEvent.js @@ -8,7 +8,6 @@ 'use strict'; var SyntheticUIEvent = require('./SyntheticUIEvent'); - var getEventModifierState = require('./getEventModifierState'); /** diff --git a/packages/react-dom/src/events/SyntheticTouchEvent.js b/packages/react-dom/src/events/SyntheticTouchEvent.js index 2fdb43c489..621f300482 100644 --- a/packages/react-dom/src/events/SyntheticTouchEvent.js +++ b/packages/react-dom/src/events/SyntheticTouchEvent.js @@ -8,7 +8,6 @@ 'use strict'; var SyntheticUIEvent = require('./SyntheticUIEvent'); - var getEventModifierState = require('./getEventModifierState'); /** diff --git a/packages/react-dom/src/events/TapEventPlugin.js b/packages/react-dom/src/events/TapEventPlugin.js index d3e53624b8..c390b90553 100644 --- a/packages/react-dom/src/events/TapEventPlugin.js +++ b/packages/react-dom/src/events/TapEventPlugin.js @@ -11,12 +11,12 @@ var EventPluginUtils = require('events/EventPluginUtils'); var EventPropagators = require('events/EventPropagators'); -var SyntheticUIEvent = require('./SyntheticUIEvent'); var TouchEventUtils = require('fbjs/lib/TouchEventUtils'); - var isStartish = EventPluginUtils.isStartish; var isEndish = EventPluginUtils.isEndish; +var SyntheticUIEvent = require('./SyntheticUIEvent'); + /** * We are extending the Flow 'Touch' declaration to enable using bracket * notation to access properties. diff --git a/packages/react-dom/src/server/DOMMarkupOperations.js b/packages/react-dom/src/server/DOMMarkupOperations.js index a908aeda96..e2f751dd1b 100644 --- a/packages/react-dom/src/server/DOMMarkupOperations.js +++ b/packages/react-dom/src/server/DOMMarkupOperations.js @@ -8,7 +8,6 @@ 'use strict'; var DOMProperty = require('../shared/DOMProperty'); - var quoteAttributeValueForBrowser = require('../shared/quoteAttributeValueForBrowser'); if (__DEV__) { diff --git a/packages/react-dom/src/server/ReactDOMNodeStreamRenderer.js b/packages/react-dom/src/server/ReactDOMNodeStreamRenderer.js index 56155183e1..58db6df35a 100644 --- a/packages/react-dom/src/server/ReactDOMNodeStreamRenderer.js +++ b/packages/react-dom/src/server/ReactDOMNodeStreamRenderer.js @@ -7,9 +7,10 @@ 'use strict'; -var ReactPartialRenderer = require('./ReactPartialRenderer'); var Readable = require('stream').Readable; +var ReactPartialRenderer = require('./ReactPartialRenderer'); + // This is a Readable Node.js stream which wraps the ReactDOMPartialRenderer. class ReactMarkupReadableStream extends Readable { constructor(element, makeStaticMarkup) { diff --git a/packages/react-dom/src/server/ReactDOMServerBrowser.js b/packages/react-dom/src/server/ReactDOMServerBrowser.js index c0c8e97fac..c2204caabe 100644 --- a/packages/react-dom/src/server/ReactDOMServerBrowser.js +++ b/packages/react-dom/src/server/ReactDOMServerBrowser.js @@ -7,11 +7,12 @@ 'use strict'; -var ReactDOMStringRenderer = require('./ReactDOMStringRenderer'); +require('../shared/ReactDOMInjection'); + var ReactVersion = require('shared/ReactVersion'); var invariant = require('fbjs/lib/invariant'); -require('../shared/ReactDOMInjection'); +var ReactDOMStringRenderer = require('./ReactDOMStringRenderer'); module.exports = { renderToString: ReactDOMStringRenderer.renderToString, diff --git a/packages/react-dom/src/server/ReactDOMServerNode.js b/packages/react-dom/src/server/ReactDOMServerNode.js index 7b5e103ed2..f38e2c790d 100644 --- a/packages/react-dom/src/server/ReactDOMServerNode.js +++ b/packages/react-dom/src/server/ReactDOMServerNode.js @@ -7,11 +7,12 @@ 'use strict'; -var ReactDOMStringRenderer = require('./ReactDOMStringRenderer'); -var ReactDOMNodeStreamRenderer = require('./ReactDOMNodeStreamRenderer'); +require('../shared/ReactDOMInjection'); + var ReactVersion = require('shared/ReactVersion'); -require('../shared/ReactDOMInjection'); +var ReactDOMStringRenderer = require('./ReactDOMStringRenderer'); +var ReactDOMNodeStreamRenderer = require('./ReactDOMNodeStreamRenderer'); module.exports = { renderToString: ReactDOMStringRenderer.renderToString, diff --git a/packages/react-dom/src/server/ReactPartialRenderer.js b/packages/react-dom/src/server/ReactPartialRenderer.js index 9e62982f84..27fb56df7a 100644 --- a/packages/react-dom/src/server/ReactPartialRenderer.js +++ b/packages/react-dom/src/server/ReactPartialRenderer.js @@ -7,25 +7,25 @@ 'use strict'; +var React = require('react'); +var emptyFunction = require('fbjs/lib/emptyFunction'); +var emptyObject = require('fbjs/lib/emptyObject'); +var hyphenateStyleName = require('fbjs/lib/hyphenateStyleName'); +var invariant = require('fbjs/lib/invariant'); +var memoizeStringOnly = require('fbjs/lib/memoizeStringOnly'); + +var DOMMarkupOperations = require('./DOMMarkupOperations'); var { Namespaces, getIntrinsicNamespace, getChildNamespace, } = require('../shared/DOMNamespaces'); -var DOMMarkupOperations = require('./DOMMarkupOperations'); -var React = require('react'); var ReactControlledValuePropTypes = require('../shared/ReactControlledValuePropTypes'); - var assertValidProps = require('../shared/assertValidProps'); var dangerousStyleValue = require('../shared/dangerousStyleValue'); -var emptyFunction = require('fbjs/lib/emptyFunction'); -var emptyObject = require('fbjs/lib/emptyObject'); var escapeTextContentForBrowser = require('../shared/escapeTextContentForBrowser'); -var hyphenateStyleName = require('fbjs/lib/hyphenateStyleName'); -var invariant = require('fbjs/lib/invariant'); -var memoizeStringOnly = require('fbjs/lib/memoizeStringOnly'); -var omittedCloseTags = require('../shared/omittedCloseTags'); var isCustomComponent = require('../shared/isCustomComponent'); +var omittedCloseTags = require('../shared/omittedCloseTags'); var toArray = React.Children.toArray; var getStackAddendum = emptyFunction.thatReturns(''); @@ -33,6 +33,7 @@ var getStackAddendum = emptyFunction.thatReturns(''); if (__DEV__) { var warning = require('fbjs/lib/warning'); var checkPropTypes = require('prop-types/checkPropTypes'); + var warnValidStyle = require('../shared/warnValidStyle'); var { validateProperties: validateARIAProperties, @@ -43,6 +44,7 @@ if (__DEV__) { var { validateProperties: validateUnknownProperties, } = require('../shared/ReactDOMUnknownPropertyHook'); + var validatePropertiesInDevelopment = function(type, props) { validateARIAProperties(type, props); validateInputProperties(type, props); diff --git a/packages/react-dom/src/shared/CSSPropertyOperations.js b/packages/react-dom/src/shared/CSSPropertyOperations.js index 87e9f2e3b9..d06f2f6d02 100644 --- a/packages/react-dom/src/shared/CSSPropertyOperations.js +++ b/packages/react-dom/src/shared/CSSPropertyOperations.js @@ -11,6 +11,7 @@ var dangerousStyleValue = require('./dangerousStyleValue'); if (__DEV__) { var hyphenateStyleName = require('fbjs/lib/hyphenateStyleName'); + var warnValidStyle = require('./warnValidStyle'); } diff --git a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js index 7aa4784711..31cdbc46d2 100644 --- a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js +++ b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js @@ -15,6 +15,7 @@ if (__DEV__) { var warning = require('fbjs/lib/warning'); var emptyFunction = require('fbjs/lib/emptyFunction'); var PropTypes = require('prop-types'); + var ReactPropTypesSecret = 'SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED'; ReactControlledValuePropTypes.checkPropTypes = emptyFunction; diff --git a/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js b/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js index 27c0718591..ec6a80dc08 100644 --- a/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js +++ b/packages/react-dom/src/shared/ReactDOMNullInputValuePropHook.js @@ -8,8 +8,8 @@ 'use strict'; if (__DEV__) { - var warning = require('fbjs/lib/warning'); var {ReactDebugCurrentFrame} = require('shared/ReactGlobalSharedState'); + var warning = require('fbjs/lib/warning'); } var didWarnValueNull = false; diff --git a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js index 33877cf48e..364e98e50e 100644 --- a/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js +++ b/packages/react-dom/src/shared/ReactDOMUnknownPropertyHook.js @@ -7,13 +7,14 @@ 'use strict'; -var DOMProperty = require('./DOMProperty'); var EventPluginRegistry = require('events/EventPluginRegistry'); + +var DOMProperty = require('./DOMProperty'); var isCustomComponent = require('./isCustomComponent'); if (__DEV__) { - var warning = require('fbjs/lib/warning'); var {ReactDebugCurrentFrame} = require('shared/ReactGlobalSharedState'); + var warning = require('fbjs/lib/warning'); } function getStackAddendum() { diff --git a/packages/react-dom/src/shared/assertValidProps.js b/packages/react-dom/src/shared/assertValidProps.js index 1d9e2f27d6..6db688b67c 100644 --- a/packages/react-dom/src/shared/assertValidProps.js +++ b/packages/react-dom/src/shared/assertValidProps.js @@ -8,6 +8,7 @@ 'use strict'; var invariant = require('fbjs/lib/invariant'); + var voidElementTags = require('./voidElementTags'); if (__DEV__) { diff --git a/packages/react-dom/src/test-utils/ReactTestUtils.js b/packages/react-dom/src/test-utils/ReactTestUtils.js index eab0c9fbe1..4309400dce 100644 --- a/packages/react-dom/src/test-utils/ReactTestUtils.js +++ b/packages/react-dom/src/test-utils/ReactTestUtils.js @@ -7,16 +7,16 @@ 'use strict'; -var BrowserEventConstants = require('../events/BrowserEventConstants'); var React = require('react'); var ReactDOM = require('react-dom'); var ReactFiberTreeReflection = require('shared/ReactFiberTreeReflection'); var ReactInstanceMap = require('shared/ReactInstanceMap'); var ReactTypeOfWork = require('shared/ReactTypeOfWork'); var SyntheticEvent = require('events/SyntheticEvent'); - var invariant = require('fbjs/lib/invariant'); +var BrowserEventConstants = require('../events/BrowserEventConstants'); + var {findDOMNode} = ReactDOM; var { EventPluginHub, diff --git a/packages/react-native-renderer/src/NativeMethodsMixin.js b/packages/react-native-renderer/src/NativeMethodsMixin.js index 6a18916412..4f25981b6a 100644 --- a/packages/react-native-renderer/src/NativeMethodsMixin.js +++ b/packages/react-native-renderer/src/NativeMethodsMixin.js @@ -8,22 +8,6 @@ */ 'use strict'; -const ReactNativeAttributePayload = require('./ReactNativeAttributePayload'); - -// Module provided by RN: -const TextInputState = require('TextInputState'); -const UIManager = require('UIManager'); - -const invariant = require('fbjs/lib/invariant'); -const findNodeHandle = require('./findNodeHandle'); -const findNumericNodeHandle = require('./findNumericNodeHandle'); - -const { - mountSafeCallback, - throwOnStylesProp, - warnForStyleProps, -} = require('./NativeMethodsMixinUtils'); - import type { MeasureInWindowOnSuccessCallback, MeasureLayoutOnSuccessCallback, @@ -32,6 +16,20 @@ import type { ReactNativeBaseComponentViewConfig, } from './ReactNativeTypes'; +const invariant = require('fbjs/lib/invariant'); +// Modules provided by RN: +const TextInputState = require('TextInputState'); +const UIManager = require('UIManager'); + +const ReactNativeAttributePayload = require('./ReactNativeAttributePayload'); +const { + mountSafeCallback, + throwOnStylesProp, + warnForStyleProps, +} = require('./NativeMethodsMixinUtils'); +const findNodeHandle = require('./findNodeHandle'); +const findNumericNodeHandle = require('./findNumericNodeHandle'); + /** * `NativeMethodsMixin` provides methods to access the underlying native * component directly. This can be useful in cases when you want to focus diff --git a/packages/react-native-renderer/src/ReactNativeAttributePayload.js b/packages/react-native-renderer/src/ReactNativeAttributePayload.js index 6579b39cea..dbafeefbcd 100644 --- a/packages/react-native-renderer/src/ReactNativeAttributePayload.js +++ b/packages/react-native-renderer/src/ReactNativeAttributePayload.js @@ -8,12 +8,12 @@ */ 'use strict'; -var ReactNativePropRegistry = require('./ReactNativePropRegistry'); - -// Module provided by RN: +// Modules provided by RN: var deepDiffer = require('deepDiffer'); var flattenStyle = require('flattenStyle'); +var ReactNativePropRegistry = require('./ReactNativePropRegistry'); + var emptyObject = {}; /** diff --git a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js index ecf3fe8f62..632631593e 100644 --- a/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js +++ b/packages/react-native-renderer/src/ReactNativeBridgeEventPlugin.js @@ -8,6 +8,8 @@ */ 'use strict'; +import type {ReactNativeBaseComponentViewConfig} from './ReactNativeTypes'; + const EventPropagators = require('events/EventPropagators'); const SyntheticEvent = require('events/SyntheticEvent'); const invariant = require('fbjs/lib/invariant'); @@ -15,8 +17,6 @@ const invariant = require('fbjs/lib/invariant'); const customBubblingEventTypes = {}; const customDirectEventTypes = {}; -import type {ReactNativeBaseComponentViewConfig} from './ReactNativeTypes'; - const ReactNativeBridgeEventPlugin = { eventTypes: {}, diff --git a/packages/react-native-renderer/src/ReactNativeComponent.js b/packages/react-native-renderer/src/ReactNativeComponent.js index 0022073cdd..12a1ec83bb 100644 --- a/packages/react-native-renderer/src/ReactNativeComponent.js +++ b/packages/react-native-renderer/src/ReactNativeComponent.js @@ -10,18 +10,6 @@ 'use strict'; -const React = require('react'); -const ReactNativeAttributePayload = require('./ReactNativeAttributePayload'); - -// Modules provided by RN: -const TextInputState = require('TextInputState'); -const UIManager = require('UIManager'); - -const findNodeHandle = require('./findNodeHandle'); -const findNumericNodeHandle = require('./findNumericNodeHandle'); - -const {mountSafeCallback} = require('./NativeMethodsMixinUtils'); - import type { MeasureInWindowOnSuccessCallback, MeasureLayoutOnSuccessCallback, @@ -30,6 +18,16 @@ import type { ReactNativeBaseComponentViewConfig, } from './ReactNativeTypes'; +const React = require('react'); +// Modules provided by RN: +const TextInputState = require('TextInputState'); +const UIManager = require('UIManager'); + +const ReactNativeAttributePayload = require('./ReactNativeAttributePayload'); +const {mountSafeCallback} = require('./NativeMethodsMixinUtils'); +const findNodeHandle = require('./findNodeHandle'); +const findNumericNodeHandle = require('./findNumericNodeHandle'); + /** * Superclass that provides methods to access the underlying native component. * This can be useful when you want to focus a view or measure its dimensions. diff --git a/packages/react-native-renderer/src/ReactNativeEventEmitter.js b/packages/react-native-renderer/src/ReactNativeEventEmitter.js index 40fc381650..75bab53821 100644 --- a/packages/react-native-renderer/src/ReactNativeEventEmitter.js +++ b/packages/react-native-renderer/src/ReactNativeEventEmitter.js @@ -11,9 +11,10 @@ var EventPluginHub = require('events/EventPluginHub'); var EventPluginRegistry = require('events/EventPluginRegistry'); var ReactEventEmitterMixin = require('events/ReactEventEmitterMixin'); +var ReactGenericBatching = require('events/ReactGenericBatching'); + var ReactNativeComponentTree = require('./ReactNativeComponentTree'); var ReactNativeTagHandles = require('./ReactNativeTagHandles'); -var ReactGenericBatching = require('events/ReactGenericBatching'); if (__DEV__) { var warning = require('fbjs/lib/warning'); diff --git a/packages/react-native-renderer/src/ReactNativeFiberErrorDialog.js b/packages/react-native-renderer/src/ReactNativeFiberErrorDialog.js index 76d32b1112..963b8c9db0 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberErrorDialog.js +++ b/packages/react-native-renderer/src/ReactNativeFiberErrorDialog.js @@ -9,11 +9,11 @@ 'use strict'; +import type {CapturedError} from 'react-reconciler/src/ReactFiberScheduler'; + // Module provided by RN: const ExceptionsManager = require('ExceptionsManager'); -import type {CapturedError} from 'react-reconciler/src/ReactFiberScheduler'; - /** * Intercept lifecycle errors and ensure they are shown with the correct stack * trace within the native redbox component. diff --git a/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js b/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js index 9e3a8770b0..953781a891 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js +++ b/packages/react-native-renderer/src/ReactNativeFiberHostComponent.js @@ -9,17 +9,6 @@ 'use strict'; -var ReactNativeAttributePayload = require('./ReactNativeAttributePayload'); - -// Modules provided by RN: -var TextInputState = require('TextInputState'); -var UIManager = require('UIManager'); - -var { - mountSafeCallback, - warnForStyleProps, -} = require('./NativeMethodsMixinUtils'); - import type { MeasureInWindowOnSuccessCallback, MeasureLayoutOnSuccessCallback, @@ -29,6 +18,16 @@ import type { } from './ReactNativeTypes'; import type {Instance} from './ReactNativeFiberRenderer'; +// Modules provided by RN: +var TextInputState = require('TextInputState'); +var UIManager = require('UIManager'); + +var ReactNativeAttributePayload = require('./ReactNativeAttributePayload'); +var { + mountSafeCallback, + warnForStyleProps, +} = require('./NativeMethodsMixinUtils'); + /** * This component defines the same methods as NativeMethodsMixin but without the * findNodeHandle wrapper. This wrapper is unnecessary for HostComponent views diff --git a/packages/react-native-renderer/src/ReactNativeFiberInspector.js b/packages/react-native-renderer/src/ReactNativeFiberInspector.js index 7016f08859..75c5361003 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberInspector.js +++ b/packages/react-native-renderer/src/ReactNativeFiberInspector.js @@ -8,21 +8,20 @@ */ 'use strict'; -const ReactNativeComponentTree = require('./ReactNativeComponentTree'); +import type {Fiber} from 'react-reconciler/src/ReactFiber'; + const ReactFiberTreeReflection = require('shared/ReactFiberTreeReflection'); const getComponentName = require('shared/getComponentName'); -const emptyObject = require('fbjs/lib/emptyObject'); const ReactTypeOfWork = require('shared/ReactTypeOfWork'); +const emptyObject = require('fbjs/lib/emptyObject'); const invariant = require('fbjs/lib/invariant'); - +const {findCurrentFiberUsingSlowPath} = ReactFiberTreeReflection; +const {HostComponent} = ReactTypeOfWork; // Module provided by RN: const UIManager = require('UIManager'); +const ReactNativeComponentTree = require('./ReactNativeComponentTree'); const {getClosestInstanceFromNode} = ReactNativeComponentTree; -const {findCurrentFiberUsingSlowPath} = ReactFiberTreeReflection; -const {HostComponent} = ReactTypeOfWork; - -import type {Fiber} from 'react-reconciler/src/ReactFiber'; let getInspectorDataForViewTag; diff --git a/packages/react-native-renderer/src/ReactNativeFiberRenderer.js b/packages/react-native-renderer/src/ReactNativeFiberRenderer.js index 4e5ed2ef4f..61a9141abe 100644 --- a/packages/react-native-renderer/src/ReactNativeFiberRenderer.js +++ b/packages/react-native-renderer/src/ReactNativeFiberRenderer.js @@ -9,21 +9,25 @@ 'use strict'; +import type {ReactNativeBaseComponentViewConfig} from './ReactNativeTypes'; + const ReactFiberReconciler = require('react-reconciler'); +const emptyObject = require('fbjs/lib/emptyObject'); +const invariant = require('fbjs/lib/invariant'); +// Modules provided by RN: +const UIManager = require('UIManager'); +const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev'); + const ReactNativeAttributePayload = require('./ReactNativeAttributePayload'); const ReactNativeComponentTree = require('./ReactNativeComponentTree'); const ReactNativeFiberHostComponent = require('./ReactNativeFiberHostComponent'); const ReactNativeTagHandles = require('./ReactNativeTagHandles'); const ReactNativeViewConfigRegistry = require('./ReactNativeViewConfigRegistry'); - -// Modules provided by RN: -const UIManager = require('UIManager'); -const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev'); - -const emptyObject = require('fbjs/lib/emptyObject'); -const invariant = require('fbjs/lib/invariant'); - -import type {ReactNativeBaseComponentViewConfig} from './ReactNativeTypes'; +const { + precacheFiberNode, + uncacheFiberNode, + updateFiberProps, +} = ReactNativeComponentTree; export type Container = number; export type Instance = { @@ -34,12 +38,6 @@ export type Instance = { export type Props = Object; export type TextInstance = number; -const { - precacheFiberNode, - uncacheFiberNode, - updateFiberProps, -} = ReactNativeComponentTree; - function recursivelyUncacheFiberNode(node: Instance | TextInstance) { if (typeof node === 'number') { // Leaf node (eg text) diff --git a/packages/react-native-renderer/src/ReactNativeInjection.js b/packages/react-native-renderer/src/ReactNativeInjection.js index 0050826574..44cc9c2b49 100644 --- a/packages/react-native-renderer/src/ReactNativeInjection.js +++ b/packages/react-native-renderer/src/ReactNativeInjection.js @@ -19,14 +19,15 @@ require('InitializeCore'); var EventPluginHub = require('events/EventPluginHub'); var EventPluginUtils = require('events/EventPluginUtils'); +var ResponderEventPlugin = require('events/ResponderEventPlugin'); // Module provided by RN: var RCTEventEmitter = require('RCTEventEmitter'); + var ReactNativeBridgeEventPlugin = require('./ReactNativeBridgeEventPlugin'); var ReactNativeComponentTree = require('./ReactNativeComponentTree'); var ReactNativeEventEmitter = require('./ReactNativeEventEmitter'); var ReactNativeEventPluginOrder = require('./ReactNativeEventPluginOrder'); var ReactNativeGlobalResponderHandler = require('./ReactNativeGlobalResponderHandler'); -var ResponderEventPlugin = require('events/ResponderEventPlugin'); /** * Register the event emitter with the native bridge diff --git a/packages/react-native-renderer/src/ReactNativeRenderer.js b/packages/react-native-renderer/src/ReactNativeRenderer.js index 4396c9ad60..08a9f2bf50 100644 --- a/packages/react-native-renderer/src/ReactNativeRenderer.js +++ b/packages/react-native-renderer/src/ReactNativeRenderer.js @@ -9,30 +9,28 @@ 'use strict'; +import type {ReactNativeType} from './ReactNativeTypes'; +import type {ReactNodeList} from 'shared/ReactTypes'; + +require('./ReactNativeInjection'); + // TODO: direct imports like some-package/src/* are bad. Fix me. const ReactFiberErrorLogger = require('react-reconciler/src/ReactFiberErrorLogger'); const ReactPortal = require('react-reconciler/src/ReactPortal'); const { injectInternals, } = require('react-reconciler/src/ReactFiberDevToolsHook'); - const ReactGenericBatching = require('events/ReactGenericBatching'); +const ReactVersion = require('shared/ReactVersion'); +// Module provided by RN: +const UIManager = require('UIManager'); + const ReactNativeFiberErrorDialog = require('./ReactNativeFiberErrorDialog'); const ReactNativeComponentTree = require('./ReactNativeComponentTree'); const ReactNativeFiberRenderer = require('./ReactNativeFiberRenderer'); const ReactNativeFiberInspector = require('./ReactNativeFiberInspector'); -const ReactVersion = require('shared/ReactVersion'); - -// Module provided by RN: -const UIManager = require('UIManager'); - const findNumericNodeHandle = require('./findNumericNodeHandle'); -import type {ReactNativeType} from './ReactNativeTypes'; -import type {ReactNodeList} from 'shared/ReactTypes'; - -require('./ReactNativeInjection'); - ReactGenericBatching.injection.injectFiberBatchedUpdates( ReactNativeFiberRenderer.batchedUpdates, ); diff --git a/packages/react-native-renderer/src/ReactNativeViewConfigRegistry.js b/packages/react-native-renderer/src/ReactNativeViewConfigRegistry.js index a86eccfb50..a5ccec72b4 100644 --- a/packages/react-native-renderer/src/ReactNativeViewConfigRegistry.js +++ b/packages/react-native-renderer/src/ReactNativeViewConfigRegistry.js @@ -9,13 +9,13 @@ 'use strict'; -const invariant = require('fbjs/lib/invariant'); - import type { ReactNativeBaseComponentViewConfig, ViewConfigGetter, } from './ReactNativeTypes'; +const invariant = require('fbjs/lib/invariant'); + const viewConfigCallbacks = new Map(); const viewConfigs = new Map(); diff --git a/packages/react-native-renderer/src/createReactNativeComponentClass.js b/packages/react-native-renderer/src/createReactNativeComponentClass.js index f7118b5275..757459f38e 100644 --- a/packages/react-native-renderer/src/createReactNativeComponentClass.js +++ b/packages/react-native-renderer/src/createReactNativeComponentClass.js @@ -9,10 +9,10 @@ 'use strict'; -const ReactNativeViewConfigRegistry = require('./ReactNativeViewConfigRegistry'); - import type {ViewConfigGetter} from './ReactNativeTypes'; +const ReactNativeViewConfigRegistry = require('./ReactNativeViewConfigRegistry'); + /** * Creates a renderable ReactNative host component. * Use this method for view configs that are loaded from UIManager. diff --git a/packages/react-native-renderer/src/findNodeHandle.js b/packages/react-native-renderer/src/findNodeHandle.js index 32b5328f93..bf0a0afbd1 100644 --- a/packages/react-native-renderer/src/findNodeHandle.js +++ b/packages/react-native-renderer/src/findNodeHandle.js @@ -9,18 +9,19 @@ 'use strict'; +import type {Fiber} from 'react-reconciler/src/ReactFiber'; + var ReactInstanceMap = require('shared/ReactInstanceMap'); -var ReactNativeFiberRenderer = require('./ReactNativeFiberRenderer'); var {ReactCurrentOwner} = require('shared/ReactGlobalSharedState'); var getComponentName = require('shared/getComponentName'); var invariant = require('fbjs/lib/invariant'); +var ReactNativeFiberRenderer = require('./ReactNativeFiberRenderer'); + if (__DEV__) { var warning = require('fbjs/lib/warning'); } -import type {Fiber} from 'react-reconciler/src/ReactFiber'; - /** * ReactNative vs ReactWeb * ----------------------- diff --git a/packages/react-noop-renderer/src/ReactNoop.js b/packages/react-noop-renderer/src/ReactNoop.js index 2c90361135..426d2e62c1 100644 --- a/packages/react-noop-renderer/src/ReactNoop.js +++ b/packages/react-noop-renderer/src/ReactNoop.js @@ -19,13 +19,12 @@ import type {Fiber} from 'react-reconciler/src/ReactFiber'; import type {UpdateQueue} from 'react-reconciler/src/ReactFiberUpdateQueue'; -var ReactFeatureFlags = require('shared/ReactFeatureFlags'); // TODO: direct imports like some-package/src/* are bad. Fix me. var ReactFiberInstrumentation = require('react-reconciler/src/ReactFiberInstrumentation'); var ReactFiberReconciler = require('react-reconciler'); +var ReactFeatureFlags = require('shared/ReactFeatureFlags'); var ReactInstanceMap = require('shared/ReactInstanceMap'); var emptyObject = require('fbjs/lib/emptyObject'); - var expect = require('jest-matchers'); const UPDATE_SIGNAL = {}; diff --git a/packages/react-reconciler/src/ReactChildFiber.js b/packages/react-reconciler/src/ReactChildFiber.js index 602958d553..9b95e0d28f 100644 --- a/packages/react-reconciler/src/ReactChildFiber.js +++ b/packages/react-reconciler/src/ReactChildFiber.js @@ -16,19 +16,20 @@ import type { ExpirationTime, } from 'react-reconciler/src/ReactFiberExpirationTime'; -var {REACT_COROUTINE_TYPE, REACT_YIELD_TYPE} = require('./ReactCoroutine'); -var {REACT_PORTAL_TYPE} = require('./ReactPortal'); - -var ReactFiber = require('./ReactFiber'); var ReactTypeOfSideEffect = require('shared/ReactTypeOfSideEffect'); var ReactTypeOfWork = require('shared/ReactTypeOfWork'); - var emptyObject = require('fbjs/lib/emptyObject'); var invariant = require('fbjs/lib/invariant'); +var {REACT_COROUTINE_TYPE, REACT_YIELD_TYPE} = require('./ReactCoroutine'); +var {REACT_PORTAL_TYPE} = require('./ReactPortal'); +var ReactFiber = require('./ReactFiber'); + if (__DEV__) { - var {getCurrentFiberStackAddendum} = require('./ReactDebugCurrentFiber'); var warning = require('fbjs/lib/warning'); + + var {getCurrentFiberStackAddendum} = require('./ReactDebugCurrentFiber'); + var didWarnAboutMaps = false; /** * Warn if there's no key explicitly set on dynamic arrays of children or diff --git a/packages/react-reconciler/src/ReactDebugCurrentFiber.js b/packages/react-reconciler/src/ReactDebugCurrentFiber.js index d27b203466..5c24755a8b 100644 --- a/packages/react-reconciler/src/ReactDebugCurrentFiber.js +++ b/packages/react-reconciler/src/ReactDebugCurrentFiber.js @@ -9,10 +9,6 @@ 'use strict'; -import type {Fiber} from './ReactFiber'; - -type LifeCyclePhase = 'render' | 'getChildContext'; - var {ReactDebugCurrentFrame} = require('shared/ReactGlobalSharedState'); if (__DEV__) { @@ -22,6 +18,10 @@ if (__DEV__) { } = require('shared/ReactFiberComponentTreeHook'); } +import type {Fiber} from './ReactFiber'; + +type LifeCyclePhase = 'render' | 'getChildContext'; + function getCurrentFiberOwnerName(): string | null { if (__DEV__) { const fiber = ReactDebugCurrentFiber.current; diff --git a/packages/react-reconciler/src/ReactDebugFiberPerf.js b/packages/react-reconciler/src/ReactDebugFiberPerf.js index e84a67d3d0..39a0d75ff8 100644 --- a/packages/react-reconciler/src/ReactDebugFiberPerf.js +++ b/packages/react-reconciler/src/ReactDebugFiberPerf.js @@ -9,6 +9,9 @@ import type {Fiber} from './ReactFiber'; +// Trust the developer to only use this with a __DEV__ check +let ReactDebugFiberPerf = ((null: any): typeof ReactDebugFiberPerf); + type MeasurementPhase = | 'componentWillMount' | 'componentWillUnmount' @@ -19,10 +22,8 @@ type MeasurementPhase = | 'componentDidMount' | 'getChildContext'; -// Trust the developer to only use this with a __DEV__ check -let ReactDebugFiberPerf = ((null: any): typeof ReactDebugFiberPerf); - if (__DEV__) { + const getComponentName = require('shared/getComponentName'); const { HostRoot, HostComponent, @@ -32,8 +33,6 @@ if (__DEV__) { Fragment, } = require('shared/ReactTypeOfWork'); - const getComponentName = require('shared/getComponentName'); - // Prefix measurements so that it's possible to filter them. // Longer prefixes are hard to read in DevTools. const reactEmoji = '\u269B'; diff --git a/packages/react-reconciler/src/ReactFiber.js b/packages/react-reconciler/src/ReactFiber.js index 58a81749c5..6a92e87c17 100644 --- a/packages/react-reconciler/src/ReactFiber.js +++ b/packages/react-reconciler/src/ReactFiber.js @@ -22,6 +22,8 @@ import type {TypeOfSideEffect} from 'shared/ReactTypeOfSideEffect'; import type {ExpirationTime} from './ReactFiberExpirationTime'; import type {UpdateQueue} from './ReactFiberUpdateQueue'; +var invariant = require('fbjs/lib/invariant'); +var {NoEffect} = require('shared/ReactTypeOfSideEffect'); var { IndeterminateComponent, ClassComponent, @@ -35,15 +37,11 @@ var { } = require('shared/ReactTypeOfWork'); var {NoWork} = require('./ReactFiberExpirationTime'); - var {NoContext} = require('./ReactTypeOfInternalContext'); -var {NoEffect} = require('shared/ReactTypeOfSideEffect'); - -var invariant = require('fbjs/lib/invariant'); - if (__DEV__) { var getComponentName = require('shared/getComponentName'); + var hasBadMapPolyfill = false; try { const nonExtensibleObject = Object.preventExtensions({}); diff --git a/packages/react-reconciler/src/ReactFiberBeginWork.js b/packages/react-reconciler/src/ReactFiberBeginWork.js index 6cee50814c..64a0ce5ee5 100644 --- a/packages/react-reconciler/src/ReactFiberBeginWork.js +++ b/packages/react-reconciler/src/ReactFiberBeginWork.js @@ -17,22 +17,6 @@ import type {HydrationContext} from './ReactFiberHydrationContext'; import type {FiberRoot} from './ReactFiberRoot'; import type {ExpirationTime} from './ReactFiberExpirationTime'; -var { - mountChildFibersInPlace, - reconcileChildFibers, - reconcileChildFibersInPlace, - cloneChildFibers, -} = require('./ReactChildFiber'); -var {processUpdateQueue} = require('./ReactFiberUpdateQueue'); -var ReactTypeOfWork = require('shared/ReactTypeOfWork'); -var { - getMaskedContext, - getUnmaskedContext, - hasContextChanged, - pushContextProvider, - pushTopLevelContextObject, - invalidateContextProvider, -} = require('./ReactFiberContext'); var { IndeterminateComponent, FunctionalComponent, @@ -45,8 +29,7 @@ var { CoroutineHandlerPhase, YieldComponent, Fragment, -} = ReactTypeOfWork; -var {NoWork, Never} = require('./ReactFiberExpirationTime'); +} = require('shared/ReactTypeOfWork'); var { PerformedWork, Placement, @@ -54,14 +37,32 @@ var { Err, Ref, } = require('shared/ReactTypeOfSideEffect'); -var ReactFiberClassComponent = require('./ReactFiberClassComponent'); var {ReactCurrentOwner} = require('shared/ReactGlobalSharedState'); var invariant = require('fbjs/lib/invariant'); +var ReactFiberClassComponent = require('./ReactFiberClassComponent'); +var { + mountChildFibersInPlace, + reconcileChildFibers, + reconcileChildFibersInPlace, + cloneChildFibers, +} = require('./ReactChildFiber'); +var {processUpdateQueue} = require('./ReactFiberUpdateQueue'); +var { + getMaskedContext, + getUnmaskedContext, + hasContextChanged, + pushContextProvider, + pushTopLevelContextObject, + invalidateContextProvider, +} = require('./ReactFiberContext'); +var {NoWork, Never} = require('./ReactFiberExpirationTime'); + if (__DEV__) { + var warning = require('fbjs/lib/warning'); + var ReactDebugCurrentFiber = require('./ReactDebugCurrentFiber'); var {cancelWorkTimer} = require('./ReactDebugFiberPerf'); - var warning = require('fbjs/lib/warning'); var warnedAboutStatelessRefs = {}; } diff --git a/packages/react-reconciler/src/ReactFiberClassComponent.js b/packages/react-reconciler/src/ReactFiberClassComponent.js index ff2091dfb8..396be01fb8 100644 --- a/packages/react-reconciler/src/ReactFiberClassComponent.js +++ b/packages/react-reconciler/src/ReactFiberClassComponent.js @@ -13,10 +13,15 @@ import type {Fiber} from './ReactFiber'; import type {ExpirationTime} from './ReactFiberExpirationTime'; var {Update} = require('shared/ReactTypeOfSideEffect'); - var ReactFeatureFlags = require('shared/ReactFeatureFlags'); -var {AsyncUpdates} = require('./ReactTypeOfInternalContext'); +var {isMounted} = require('shared/ReactFiberTreeReflection'); +var ReactInstanceMap = require('shared/ReactInstanceMap'); +var emptyObject = require('fbjs/lib/emptyObject'); +var getComponentName = require('shared/getComponentName'); +var shallowEqual = require('fbjs/lib/shallowEqual'); +var invariant = require('fbjs/lib/invariant'); +var {AsyncUpdates} = require('./ReactTypeOfInternalContext'); var { cacheContext, getMaskedContext, @@ -28,19 +33,15 @@ var { processUpdateQueue, } = require('./ReactFiberUpdateQueue'); var {hasContextChanged} = require('./ReactFiberContext'); -var {isMounted} = require('shared/ReactFiberTreeReflection'); -var ReactInstanceMap = require('shared/ReactInstanceMap'); -var emptyObject = require('fbjs/lib/emptyObject'); -var getComponentName = require('shared/getComponentName'); -var shallowEqual = require('fbjs/lib/shallowEqual'); -var invariant = require('fbjs/lib/invariant'); const fakeInternalInstance = {}; const isArray = Array.isArray; if (__DEV__) { - var {startPhaseTimer, stopPhaseTimer} = require('./ReactDebugFiberPerf'); var warning = require('fbjs/lib/warning'); + + var {startPhaseTimer, stopPhaseTimer} = require('./ReactDebugFiberPerf'); + var warnOnInvalidCallback = function(callback: mixed, callerName: string) { warning( callback === null || typeof callback === 'function', diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.js b/packages/react-reconciler/src/ReactFiberCommitWork.js index 91b3c7a239..2cabff8037 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.js @@ -22,18 +22,17 @@ var { HostPortal, CoroutineComponent, } = ReactTypeOfWork; -var {commitCallbacks} = require('./ReactFiberUpdateQueue'); -var {onCommitUnmount} = require('./ReactFiberDevToolsHook'); var { invokeGuardedCallback, hasCaughtError, clearCaughtError, } = require('shared/ReactErrorUtils'); - var {Placement, Update, ContentReset} = require('shared/ReactTypeOfSideEffect'); - var invariant = require('fbjs/lib/invariant'); +var {commitCallbacks} = require('./ReactFiberUpdateQueue'); +var {onCommitUnmount} = require('./ReactFiberDevToolsHook'); + if (__DEV__) { var {startPhaseTimer, stopPhaseTimer} = require('./ReactDebugFiberPerf'); } diff --git a/packages/react-reconciler/src/ReactFiberCompleteWork.js b/packages/react-reconciler/src/ReactFiberCompleteWork.js index d94db5869f..df49d1e8dc 100644 --- a/packages/react-reconciler/src/ReactFiberCompleteWork.js +++ b/packages/react-reconciler/src/ReactFiberCompleteWork.js @@ -17,15 +17,7 @@ import type {HostContext} from './ReactFiberHostContext'; import type {HydrationContext} from './ReactFiberHydrationContext'; import type {FiberRoot} from './ReactFiberRoot'; -var {reconcileChildFibers} = require('./ReactChildFiber'); -var { - popContextProvider, - popTopLevelContextObject, -} = require('./ReactFiberContext'); var ReactFeatureFlags = require('shared/ReactFeatureFlags'); -var ReactTypeOfWork = require('shared/ReactTypeOfWork'); -var ReactTypeOfSideEffect = require('shared/ReactTypeOfSideEffect'); -var ReactFiberExpirationTime = require('./ReactFiberExpirationTime'); var { IndeterminateComponent, FunctionalComponent, @@ -38,12 +30,17 @@ var { CoroutineHandlerPhase, YieldComponent, Fragment, -} = ReactTypeOfWork; -var {Placement, Ref, Update} = ReactTypeOfSideEffect; -var {Never} = ReactFiberExpirationTime; - +} = require('shared/ReactTypeOfWork'); +var {Placement, Ref, Update} = require('shared/ReactTypeOfSideEffect'); var invariant = require('fbjs/lib/invariant'); +var {reconcileChildFibers} = require('./ReactChildFiber'); +var { + popContextProvider, + popTopLevelContextObject, +} = require('./ReactFiberContext'); +var {Never} = require('./ReactFiberExpirationTime'); + module.exports = function( config: HostConfig, hostContext: HostContext, diff --git a/packages/react-reconciler/src/ReactFiberContext.js b/packages/react-reconciler/src/ReactFiberContext.js index 4f89ccee85..38ca52effc 100644 --- a/packages/react-reconciler/src/ReactFiberContext.js +++ b/packages/react-reconciler/src/ReactFiberContext.js @@ -12,18 +12,21 @@ import type {Fiber} from './ReactFiber'; import type {StackCursor} from './ReactFiberStack'; -var emptyObject = require('fbjs/lib/emptyObject'); -var getComponentName = require('shared/getComponentName'); -var invariant = require('fbjs/lib/invariant'); var {isFiberMounted} = require('shared/ReactFiberTreeReflection'); var {ClassComponent, HostRoot} = require('shared/ReactTypeOfWork'); +var getComponentName = require('shared/getComponentName'); +var emptyObject = require('fbjs/lib/emptyObject'); +var invariant = require('fbjs/lib/invariant'); + const {createCursor, pop, push} = require('./ReactFiberStack'); if (__DEV__) { var warning = require('fbjs/lib/warning'); var checkPropTypes = require('prop-types/checkPropTypes'); + var ReactDebugCurrentFiber = require('./ReactDebugCurrentFiber'); var {startPhaseTimer, stopPhaseTimer} = require('./ReactDebugFiberPerf'); + var warnedAboutMissingGetChildContext = {}; } diff --git a/packages/react-reconciler/src/ReactFiberErrorLogger.js b/packages/react-reconciler/src/ReactFiberErrorLogger.js index cd929552e9..dc900e49ab 100644 --- a/packages/react-reconciler/src/ReactFiberErrorLogger.js +++ b/packages/react-reconciler/src/ReactFiberErrorLogger.js @@ -9,10 +9,10 @@ 'use strict'; -const invariant = require('fbjs/lib/invariant'); - import type {CapturedError} from './ReactFiberScheduler'; +const invariant = require('fbjs/lib/invariant'); + const defaultShowDialog = (capturedError: CapturedError) => true; let showDialog = defaultShowDialog; diff --git a/packages/react-reconciler/src/ReactFiberHostContext.js b/packages/react-reconciler/src/ReactFiberHostContext.js index b6858198d9..c050325655 100644 --- a/packages/react-reconciler/src/ReactFiberHostContext.js +++ b/packages/react-reconciler/src/ReactFiberHostContext.js @@ -13,10 +13,10 @@ import type {HostConfig} from 'react-reconciler'; import type {Fiber} from './ReactFiber'; import type {StackCursor} from './ReactFiberStack'; -const {createCursor, pop, push} = require('./ReactFiberStack'); - const invariant = require('fbjs/lib/invariant'); +const {createCursor, pop, push} = require('./ReactFiberStack'); + declare class NoContextT {} const NO_CONTEXT: NoContextT = ({}: any); diff --git a/packages/react-reconciler/src/ReactFiberHydrationContext.js b/packages/react-reconciler/src/ReactFiberHydrationContext.js index f37fe514ee..6b575b2e84 100644 --- a/packages/react-reconciler/src/ReactFiberHydrationContext.js +++ b/packages/react-reconciler/src/ReactFiberHydrationContext.js @@ -12,10 +12,9 @@ import type {HostConfig} from 'react-reconciler'; import type {Fiber} from './ReactFiber'; -var invariant = require('fbjs/lib/invariant'); - const {HostComponent, HostText, HostRoot} = require('shared/ReactTypeOfWork'); const {Deletion, Placement} = require('shared/ReactTypeOfSideEffect'); +var invariant = require('fbjs/lib/invariant'); const {createFiberFromHostInstanceForDeletion} = require('./ReactFiber'); diff --git a/packages/react-reconciler/src/ReactFiberReconciler.js b/packages/react-reconciler/src/ReactFiberReconciler.js index 43ed72878b..b8d1377a51 100644 --- a/packages/react-reconciler/src/ReactFiberReconciler.js +++ b/packages/react-reconciler/src/ReactFiberReconciler.js @@ -14,6 +14,10 @@ import type {FiberRoot} from './ReactFiberRoot'; import type {ReactNodeList} from 'shared/ReactTypes'; var ReactFeatureFlags = require('shared/ReactFeatureFlags'); +var ReactInstanceMap = require('shared/ReactInstanceMap'); +var {HostComponent} = require('shared/ReactTypeOfWork'); +var emptyObject = require('fbjs/lib/emptyObject'); + var { findCurrentUnmaskedContext, isContextProvider, @@ -21,16 +25,15 @@ var { } = require('./ReactFiberContext'); var {createFiberRoot} = require('./ReactFiberRoot'); var ReactFiberScheduler = require('./ReactFiberScheduler'); -var ReactInstanceMap = require('shared/ReactInstanceMap'); -var {HostComponent} = require('shared/ReactTypeOfWork'); var {insertUpdateIntoFiber} = require('./ReactFiberUpdateQueue'); -var emptyObject = require('fbjs/lib/emptyObject'); if (__DEV__) { + var getComponentName = require('shared/getComponentName'); var warning = require('fbjs/lib/warning'); + var ReactFiberInstrumentation = require('./ReactFiberInstrumentation'); var ReactDebugCurrentFiber = require('./ReactDebugCurrentFiber'); - var getComponentName = require('shared/getComponentName'); + var didWarnAboutNestedUpdates = false; } diff --git a/packages/react-reconciler/src/ReactFiberScheduler.js b/packages/react-reconciler/src/ReactFiberScheduler.js index 6b0b9c577e..6e084c1b43 100644 --- a/packages/react-reconciler/src/ReactFiberScheduler.js +++ b/packages/react-reconciler/src/ReactFiberScheduler.js @@ -15,6 +15,57 @@ import type {FiberRoot} from './ReactFiberRoot'; import type {HydrationContext} from './ReactFiberHydrationContext'; import type {ExpirationTime} from './ReactFiberExpirationTime'; +var { + getStackAddendumByWorkInProgressFiber, +} = require('shared/ReactFiberComponentTreeHook'); +var { + invokeGuardedCallback, + hasCaughtError, + clearCaughtError, +} = require('shared/ReactErrorUtils'); +var {ReactCurrentOwner} = require('shared/ReactGlobalSharedState'); +var getComponentName = require('shared/getComponentName'); +var { + PerformedWork, + Placement, + Update, + PlacementAndUpdate, + Deletion, + ContentReset, + Callback, + Err, + Ref, +} = require('shared/ReactTypeOfSideEffect'); +var { + HostRoot, + HostComponent, + HostPortal, + ClassComponent, +} = require('shared/ReactTypeOfWork'); +var invariant = require('fbjs/lib/invariant'); + +var ReactFiberBeginWork = require('./ReactFiberBeginWork'); +var ReactFiberCompleteWork = require('./ReactFiberCompleteWork'); +var ReactFiberCommitWork = require('./ReactFiberCommitWork'); +var ReactFiberHostContext = require('./ReactFiberHostContext'); +var ReactFiberHydrationContext = require('./ReactFiberHydrationContext'); +var {popContextProvider} = require('./ReactFiberContext'); +const {reset} = require('./ReactFiberStack'); +var {logCapturedError} = require('./ReactFiberErrorLogger'); +var {createWorkInProgress} = require('./ReactFiber'); +var {onCommitRoot} = require('./ReactFiberDevToolsHook'); +var { + NoWork, + Task, + Sync, + Never, + msToExpirationTime, + computeExpirationBucket, +} = require('./ReactFiberExpirationTime'); +var {AsyncUpdates} = require('./ReactTypeOfInternalContext'); +var {getUpdateExpirationTime} = require('./ReactFiberUpdateQueue'); +var {resetContext} = require('./ReactFiberContext'); + export type CapturedError = { componentName: ?string, componentStack: string, @@ -29,67 +80,9 @@ export type HandleErrorInfo = { componentStack: string, }; -var {popContextProvider} = require('./ReactFiberContext'); -const {reset} = require('./ReactFiberStack'); -var { - getStackAddendumByWorkInProgressFiber, -} = require('shared/ReactFiberComponentTreeHook'); -var {logCapturedError} = require('./ReactFiberErrorLogger'); -var { - invokeGuardedCallback, - hasCaughtError, - clearCaughtError, -} = require('shared/ReactErrorUtils'); - -var ReactFiberBeginWork = require('./ReactFiberBeginWork'); -var ReactFiberCompleteWork = require('./ReactFiberCompleteWork'); -var ReactFiberCommitWork = require('./ReactFiberCommitWork'); -var ReactFiberHostContext = require('./ReactFiberHostContext'); -var ReactFiberHydrationContext = require('./ReactFiberHydrationContext'); -var {ReactCurrentOwner} = require('shared/ReactGlobalSharedState'); -var getComponentName = require('shared/getComponentName'); - -var {createWorkInProgress} = require('./ReactFiber'); -var {onCommitRoot} = require('./ReactFiberDevToolsHook'); - -var { - NoWork, - Task, - Sync, - Never, - msToExpirationTime, - computeExpirationBucket, -} = require('./ReactFiberExpirationTime'); - -var {AsyncUpdates} = require('./ReactTypeOfInternalContext'); - -var { - PerformedWork, - Placement, - Update, - PlacementAndUpdate, - Deletion, - ContentReset, - Callback, - Err, - Ref, -} = require('shared/ReactTypeOfSideEffect'); - -var { - HostRoot, - HostComponent, - HostPortal, - ClassComponent, -} = require('shared/ReactTypeOfWork'); - -var {getUpdateExpirationTime} = require('./ReactFiberUpdateQueue'); - -var {resetContext} = require('./ReactFiberContext'); - -var invariant = require('fbjs/lib/invariant'); - if (__DEV__) { var warning = require('fbjs/lib/warning'); + var ReactFiberInstrumentation = require('./ReactFiberInstrumentation'); var ReactDebugCurrentFiber = require('./ReactDebugCurrentFiber'); var { diff --git a/packages/react-reconciler/src/ReactFiberUpdateQueue.js b/packages/react-reconciler/src/ReactFiberUpdateQueue.js index 634f09727e..1fd6fa18cb 100644 --- a/packages/react-reconciler/src/ReactFiberUpdateQueue.js +++ b/packages/react-reconciler/src/ReactFiberUpdateQueue.js @@ -13,13 +13,11 @@ import type {Fiber} from './ReactFiber'; import type {ExpirationTime} from './ReactFiberExpirationTime'; const {Callback: CallbackEffect} = require('shared/ReactTypeOfSideEffect'); +const {ClassComponent, HostRoot} = require('shared/ReactTypeOfWork'); +const invariant = require('fbjs/lib/invariant'); const {NoWork} = require('./ReactFiberExpirationTime'); -const {ClassComponent, HostRoot} = require('shared/ReactTypeOfWork'); - -const invariant = require('fbjs/lib/invariant'); - if (__DEV__) { var warning = require('fbjs/lib/warning'); } diff --git a/packages/react-rt-renderer/src/ReactNativeRT.js b/packages/react-rt-renderer/src/ReactNativeRT.js index 7d1fc67729..4de3786c30 100644 --- a/packages/react-rt-renderer/src/ReactNativeRT.js +++ b/packages/react-rt-renderer/src/ReactNativeRT.js @@ -9,6 +9,9 @@ 'use strict'; +import type {ReactNativeRTType} from './ReactNativeRTTypes'; +import type {ReactNodeList} from 'shared/ReactTypes'; + // TODO: direct imports like some-package/src/* are bad. Fix me. const ReactFiberErrorLogger = require('react-reconciler/src/ReactFiberErrorLogger'); const ReactNativeFiberErrorDialog = require('react-native-renderer/src/ReactNativeFiberErrorDialog'); @@ -16,15 +19,12 @@ const ReactPortal = require('react-reconciler/src/ReactPortal'); const { injectInternals, } = require('react-reconciler/src/ReactFiberDevToolsHook'); - const ReactGenericBatching = require('events/ReactGenericBatching'); +const ReactVersion = require('shared/ReactVersion'); + const ReactNativeRTComponentTree = require('./ReactNativeRTComponentTree'); const ReactNativeRTFiberRenderer = require('./ReactNativeRTFiberRenderer'); const ReactNativeRTFiberInspector = require('./ReactNativeRTFiberInspector'); -const ReactVersion = require('shared/ReactVersion'); - -import type {ReactNativeRTType} from './ReactNativeRTTypes'; -import type {ReactNodeList} from 'shared/ReactTypes'; /** * Make sure essential globals are available and are patched correctly. Please don't remove this diff --git a/packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js b/packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js index 3947414ee5..deeaad20bd 100644 --- a/packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js +++ b/packages/react-rt-renderer/src/ReactNativeRTEventEmitter.js @@ -8,12 +8,12 @@ */ 'use strict'; -var ReactNativeRTComponentTree = require('./ReactNativeRTComponentTree'); var ReactGenericBatching = require('events/ReactGenericBatching'); - // Module provided by RN: var BatchedBridge = require('BatchedBridge'); +var ReactNativeRTComponentTree = require('./ReactNativeRTComponentTree'); + var ReactNativeRTEventEmitter = { /** * Publicly exposed method on module for native objc to invoke when a top diff --git a/packages/react-rt-renderer/src/ReactNativeRTFiberInspector.js b/packages/react-rt-renderer/src/ReactNativeRTFiberInspector.js index 05952f8767..43b460ec28 100644 --- a/packages/react-rt-renderer/src/ReactNativeRTFiberInspector.js +++ b/packages/react-rt-renderer/src/ReactNativeRTFiberInspector.js @@ -8,17 +8,17 @@ */ 'use strict'; -const ReactNativeRTComponentTree = require('./ReactNativeRTComponentTree'); const ReactFiberTreeReflection = require('shared/ReactFiberTreeReflection'); const getComponentName = require('shared/getComponentName'); -const emptyObject = require('fbjs/lib/emptyObject'); const ReactTypeOfWork = require('shared/ReactTypeOfWork'); +const emptyObject = require('fbjs/lib/emptyObject'); const invariant = require('fbjs/lib/invariant'); - -const {getFiberFromTag} = ReactNativeRTComponentTree; const {findCurrentFiberUsingSlowPath} = ReactFiberTreeReflection; const {HostComponent} = ReactTypeOfWork; +const ReactNativeRTComponentTree = require('./ReactNativeRTComponentTree'); +const {getFiberFromTag} = ReactNativeRTComponentTree; + let getInspectorDataForViewTag; if (__DEV__) { diff --git a/packages/react-rt-renderer/src/ReactNativeRTFiberRenderer.js b/packages/react-rt-renderer/src/ReactNativeRTFiberRenderer.js index 29e03213eb..63121839ff 100644 --- a/packages/react-rt-renderer/src/ReactNativeRTFiberRenderer.js +++ b/packages/react-rt-renderer/src/ReactNativeRTFiberRenderer.js @@ -10,14 +10,13 @@ 'use strict'; const ReactFiberReconciler = require('react-reconciler'); -const ReactNativeRTComponentTree = require('./ReactNativeRTComponentTree'); -const ReactNativeRTTagHandles = require('./ReactNativeRTTagHandles'); - +const emptyObject = require('fbjs/lib/emptyObject'); +const invariant = require('fbjs/lib/invariant'); // Module provided by RN: const RTManager = require('RTManager'); -const emptyObject = require('fbjs/lib/emptyObject'); -const invariant = require('fbjs/lib/invariant'); +const ReactNativeRTComponentTree = require('./ReactNativeRTComponentTree'); +const ReactNativeRTTagHandles = require('./ReactNativeRTTagHandles'); export type Container = number; export type Instance = number; diff --git a/packages/react-test-renderer/src/ReactShallowRenderer.js b/packages/react-test-renderer/src/ReactShallowRenderer.js index 9ac35d2bc5..54dc31293a 100644 --- a/packages/react-test-renderer/src/ReactShallowRenderer.js +++ b/packages/react-test-renderer/src/ReactShallowRenderer.js @@ -8,14 +8,12 @@ 'use strict'; -const checkPropTypes = require('prop-types/checkPropTypes'); const React = require('react'); - -const emptyObject = require('fbjs/lib/emptyObject'); -const invariant = require('fbjs/lib/invariant'); - const describeComponentFrame = require('shared/describeComponentFrame'); const getComponentName = require('shared/getComponentName'); +const emptyObject = require('fbjs/lib/emptyObject'); +const invariant = require('fbjs/lib/invariant'); +const checkPropTypes = require('prop-types/checkPropTypes'); class ReactShallowRenderer { static createRenderer = function() { diff --git a/packages/react-test-renderer/src/ReactTestRenderer.js b/packages/react-test-renderer/src/ReactTestRenderer.js index 88f898c84f..4e379f2157 100644 --- a/packages/react-test-renderer/src/ReactTestRenderer.js +++ b/packages/react-test-renderer/src/ReactTestRenderer.js @@ -9,9 +9,12 @@ 'use strict'; +import type {Fiber} from 'react-reconciler/src/ReactFiber'; +import type {FiberRoot} from 'react-reconciler/src/ReactFiberRoot'; + var ReactFiberReconciler = require('react-reconciler'); -var ReactFiberTreeReflection = require('shared/ReactFiberTreeReflection'); var ReactGenericBatching = require('events/ReactGenericBatching'); +var ReactFiberTreeReflection = require('shared/ReactFiberTreeReflection'); var emptyObject = require('fbjs/lib/emptyObject'); var ReactTypeOfWork = require('shared/ReactTypeOfWork'); var invariant = require('fbjs/lib/invariant'); @@ -24,9 +27,6 @@ var { HostRoot, } = ReactTypeOfWork; -import type {Fiber} from 'react-reconciler/src/ReactFiber'; -import type {FiberRoot} from 'react-reconciler/src/ReactFiberRoot'; - type TestRendererOptions = { createNodeMock: (element: React$Element) => any, }; diff --git a/packages/react/src/React.js b/packages/react/src/React.js index 812e5d9ea9..fc718d8c9a 100644 --- a/packages/react/src/React.js +++ b/packages/react/src/React.js @@ -7,11 +7,11 @@ 'use strict'; +var ReactVersion = require('shared/ReactVersion'); + var ReactBaseClasses = require('./ReactBaseClasses'); var ReactChildren = require('./ReactChildren'); var ReactElement = require('./ReactElement'); -var ReactVersion = require('shared/ReactVersion'); - var onlyChild = require('./onlyChild'); var createElement = ReactElement.createElement; diff --git a/packages/react/src/ReactBaseClasses.js b/packages/react/src/ReactBaseClasses.js index 50a47759f8..3c8aff7767 100644 --- a/packages/react/src/ReactBaseClasses.js +++ b/packages/react/src/ReactBaseClasses.js @@ -7,12 +7,12 @@ 'use strict'; -var ReactNoopUpdateQueue = require('./ReactNoopUpdateQueue'); - var emptyObject = require('fbjs/lib/emptyObject'); var invariant = require('fbjs/lib/invariant'); var lowPriorityWarning = require('shared/lowPriorityWarning'); +var ReactNoopUpdateQueue = require('./ReactNoopUpdateQueue'); + /** * Base class helpers for the updating state of a component. */ diff --git a/packages/react/src/ReactChildren.js b/packages/react/src/ReactChildren.js index 4b2fd1cba7..987d3e79c4 100644 --- a/packages/react/src/ReactChildren.js +++ b/packages/react/src/ReactChildren.js @@ -7,13 +7,14 @@ 'use strict'; -var ReactElement = require('./ReactElement'); - var emptyFunction = require('fbjs/lib/emptyFunction'); var invariant = require('fbjs/lib/invariant'); +var ReactElement = require('./ReactElement'); + if (__DEV__) { var warning = require('fbjs/lib/warning'); + var {getStackAddendum} = require('./ReactDebugCurrentFrame'); } diff --git a/packages/react/src/ReactElementValidator.js b/packages/react/src/ReactElementValidator.js index bc43037ce2..94400faf2f 100644 --- a/packages/react/src/ReactElementValidator.js +++ b/packages/react/src/ReactElementValidator.js @@ -18,12 +18,13 @@ var ReactCurrentOwner = require('./ReactCurrentOwner'); var ReactElement = require('./ReactElement'); if (__DEV__) { - var ReactDebugCurrentFrame = require('./ReactDebugCurrentFrame'); - var checkPropTypes = require('prop-types/checkPropTypes'); var lowPriorityWarning = require('shared/lowPriorityWarning'); - var warning = require('fbjs/lib/warning'); var describeComponentFrame = require('shared/describeComponentFrame'); var getComponentName = require('shared/getComponentName'); + var checkPropTypes = require('prop-types/checkPropTypes'); + var warning = require('fbjs/lib/warning'); + + var ReactDebugCurrentFrame = require('./ReactDebugCurrentFrame'); var currentlyValidatingElement = null; diff --git a/packages/react/src/onlyChild.js b/packages/react/src/onlyChild.js index e52a478a8f..d3aa015d55 100644 --- a/packages/react/src/onlyChild.js +++ b/packages/react/src/onlyChild.js @@ -6,10 +6,10 @@ */ 'use strict'; -var ReactElement = require('./ReactElement'); - var invariant = require('fbjs/lib/invariant'); +var ReactElement = require('./ReactElement'); + /** * Returns the first child in a collection of children and verifies that there * is only one child in the collection. diff --git a/packages/shared/ReactFiberComponentTreeHook.js b/packages/shared/ReactFiberComponentTreeHook.js index edbb93947e..6a3adb96df 100644 --- a/packages/shared/ReactFiberComponentTreeHook.js +++ b/packages/shared/ReactFiberComponentTreeHook.js @@ -9,6 +9,8 @@ 'use strict'; +import type {Fiber} from 'react-reconciler/src/ReactFiber'; + var ReactTypeOfWork = require('./ReactTypeOfWork'); var { IndeterminateComponent, @@ -19,8 +21,6 @@ var { var describeComponentFrame = require('./describeComponentFrame'); var getComponentName = require('./getComponentName'); -import type {Fiber} from 'react-reconciler/src/ReactFiber'; - function describeFiber(fiber: Fiber): string { switch (fiber.tag) { case IndeterminateComponent: diff --git a/packages/shared/ReactFiberTreeReflection.js b/packages/shared/ReactFiberTreeReflection.js index 15ba7c3fb6..f98103515f 100644 --- a/packages/shared/ReactFiberTreeReflection.js +++ b/packages/shared/ReactFiberTreeReflection.js @@ -11,16 +11,11 @@ import type {Fiber} from 'react-reconciler/src/ReactFiber'; -var ReactInstanceMap = require('./ReactInstanceMap'); -var {ReactCurrentOwner} = require('./ReactGlobalSharedState'); - -var getComponentName = require('./getComponentName'); var invariant = require('fbjs/lib/invariant'); -if (__DEV__) { - var warning = require('fbjs/lib/warning'); -} - +var ReactInstanceMap = require('./ReactInstanceMap'); +var {ReactCurrentOwner} = require('./ReactGlobalSharedState'); +var getComponentName = require('./getComponentName'); var { ClassComponent, HostComponent, @@ -28,9 +23,12 @@ var { HostPortal, HostText, } = require('./ReactTypeOfWork'); - var {NoEffect, Placement} = require('./ReactTypeOfSideEffect'); +if (__DEV__) { + var warning = require('fbjs/lib/warning'); +} + var MOUNTING = 1; var MOUNTED = 2; var UNMOUNTED = 3; diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json index f2ec25b938..1636646dd6 100644 --- a/scripts/rollup/results.json +++ b/scripts/rollup/results.json @@ -1,200 +1,200 @@ { "bundleSizes": { "react.development.js (UMD_DEV)": { - "size": 54574, - "gzip": 14304 + "size": 54533, + "gzip": 14280 }, "react.production.min.js (UMD_PROD)": { - "size": 6634, - "gzip": 2764 + "size": 6630, + "gzip": 2763 }, "react.development.js (NODE_DEV)": { - "size": 45478, - "gzip": 12054 + "size": 45437, + "gzip": 12025 }, "react.production.min.js (NODE_PROD)": { "size": 5611, "gzip": 2364 }, "React-dev.js (FB_DEV)": { - "size": 42953, - "gzip": 11326 + "size": 42912, + "gzip": 11311 }, "React-prod.js (FB_PROD)": { "size": 24830, - "gzip": 6718 + "gzip": 6719 }, "react-dom.development.js (UMD_DEV)": { - "size": 628275, - "gzip": 144026 + "size": 628548, + "gzip": 144062 }, "react-dom.production.min.js (UMD_PROD)": { - "size": 100910, - "gzip": 31885 + "size": 100908, + "gzip": 31646 }, "react-dom.development.js (NODE_DEV)": { - "size": 590510, - "gzip": 135251 + "size": 590784, + "gzip": 135367 }, "react-dom.production.min.js (NODE_PROD)": { - "size": 107143, - "gzip": 33563 + "size": 107149, + "gzip": 33143 }, "ReactDOM-dev.js (FB_DEV)": { - "size": 590443, - "gzip": 135554 + "size": 590759, + "gzip": 135629 }, "ReactDOM-prod.js (FB_PROD)": { - "size": 420794, - "gzip": 93574 + "size": 421333, + "gzip": 93558 }, "react-dom-test-utils.development.js (NODE_DEV)": { - "size": 41554, - "gzip": 11082 + "size": 41553, + "gzip": 11076 }, "react-dom-test-utils.production.min.js (NODE_PROD)": { - "size": 11608, - "gzip": 4241 + "size": 11609, + "gzip": 4250 }, "ReactTestUtils-dev.js (FB_DEV)": { - "size": 41172, - "gzip": 11056 + "size": 41171, + "gzip": 11041 }, "react-dom-unstable-native-dependencies.development.js (UMD_DEV)": { "size": 84862, - "gzip": 21266 + "gzip": 21152 }, "react-dom-unstable-native-dependencies.production.min.js (UMD_PROD)": { "size": 14441, - "gzip": 4650 + "gzip": 4652 }, "react-dom-unstable-native-dependencies.development.js (NODE_DEV)": { "size": 80643, - "gzip": 19931 + "gzip": 19924 }, "react-dom-unstable-native-dependencies.production.min.js (NODE_PROD)": { - "size": 14003, - "gzip": 4510 + "size": 14002, + "gzip": 4509 }, "ReactDOMUnstableNativeDependencies-dev.js (FB_DEV)": { "size": 80136, - "gzip": 19877 + "gzip": 19870 }, "ReactDOMUnstableNativeDependencies-prod.js (FB_PROD)": { "size": 65144, - "gzip": 15540 + "gzip": 15547 }, "react-dom-server.browser.development.js (UMD_DEV)": { - "size": 124580, - "gzip": 32216 + "size": 124541, + "gzip": 32144 }, "react-dom-server.browser.production.min.js (UMD_PROD)": { "size": 15337, - "gzip": 5967 + "gzip": 5975 }, "react-dom-server.browser.development.js (NODE_DEV)": { - "size": 94467, - "gzip": 25081 + "size": 94428, + "gzip": 24913 }, "react-dom-server.browser.production.min.js (NODE_PROD)": { - "size": 15063, - "gzip": 5899 + "size": 15066, + "gzip": 5893 }, "ReactDOMServer-dev.js (FB_DEV)": { - "size": 93901, - "gzip": 25000 + "size": 93904, + "gzip": 24858 }, "ReactDOMServer-prod.js (FB_PROD)": { - "size": 42426, - "gzip": 11846 + "size": 42609, + "gzip": 11796 }, "react-dom-server.node.development.js (NODE_DEV)": { - "size": 96739, - "gzip": 25630 + "size": 96701, + "gzip": 25447 }, "react-dom-server.node.production.min.js (NODE_PROD)": { - "size": 15988, - "gzip": 6235 + "size": 15991, + "gzip": 6227 }, "react-art.development.js (UMD_DEV)": { - "size": 374324, - "gzip": 82151 + "size": 374492, + "gzip": 82196 }, "react-art.production.min.js (UMD_PROD)": { "size": 82762, - "gzip": 25775 + "gzip": 25785 }, "react-art.development.js (NODE_DEV)": { - "size": 300081, - "gzip": 63132 + "size": 300260, + "gzip": 63352 }, "react-art.production.min.js (NODE_PROD)": { - "size": 54393, - "gzip": 17033 + "size": 54391, + "gzip": 17050 }, "ReactART-dev.js (FB_DEV)": { - "size": 298687, - "gzip": 63040 + "size": 298866, + "gzip": 63281 }, "ReactART-prod.js (FB_PROD)": { - "size": 223978, - "gzip": 46012 + "size": 223988, + "gzip": 45978 }, "ReactNativeRenderer-dev.js (RN_DEV)": { - "size": 286147, - "gzip": 49197 + "size": 286160, + "gzip": 49086 }, "ReactNativeRenderer-prod.js (RN_PROD)": { - "size": 223837, - "gzip": 38577 + "size": 223851, + "gzip": 38395 }, "ReactRTRenderer-dev.js (RN_DEV)": { - "size": 218004, - "gzip": 36738 + "size": 218007, + "gzip": 36780 }, "ReactRTRenderer-prod.js (RN_PROD)": { - "size": 165480, - "gzip": 27593 + "size": 165490, + "gzip": 27606 }, "ReactCSRenderer-dev.js (RN_DEV)": { - "size": 210411, - "gzip": 35016 + "size": 210392, + "gzip": 35120 }, "ReactCSRenderer-prod.js (RN_PROD)": { - "size": 160471, - "gzip": 26308 + "size": 160483, + "gzip": 26404 }, "react-test-renderer.development.js (NODE_DEV)": { - "size": 303938, - "gzip": 63567 + "size": 304118, + "gzip": 63787 }, "react-test-renderer.production.min.js (NODE_PROD)": { - "size": 55986, - "gzip": 17251 + "size": 55985, + "gzip": 17315 }, "ReactTestRenderer-dev.js (FB_DEV)": { - "size": 302534, - "gzip": 63485 + "size": 302714, + "gzip": 63724 }, "react-test-renderer-shallow.development.js (NODE_DEV)": { - "size": 9290, - "gzip": 2321 + "size": 9246, + "gzip": 2306 }, "react-test-renderer-shallow.production.min.js (NODE_PROD)": { - "size": 4630, - "gzip": 1665 + "size": 4634, + "gzip": 1667 }, "ReactShallowRenderer-dev.js (FB_DEV)": { - "size": 9002, - "gzip": 2256 + "size": 8958, + "gzip": 2250 }, "react-noop-renderer.development.js (NODE_DEV)": { - "size": 293219, - "gzip": 60806 + "size": 293399, + "gzip": 61042 }, "react-reconciler.development.js (NODE_DEV)": { - "size": 278819, - "gzip": 57593 + "size": 278999, + "gzip": 57818 }, "react-reconciler.production.min.js (NODE_PROD)": { "size": 38245,